From 329493903aac6d3bd6c1a840c90391d10bae8296 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 29 Mar 2021 09:12:28 -0700
Subject: [PATCH 01/77] Update hiredis from 1.1.0 to 2.0.0

---
 {{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 6e566ecc..d4ed6f83 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -11,7 +11,7 @@ Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 sentry-sdk==1.0.0  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
-hiredis==1.1.0  # https://github.com/redis/hiredis-py
+hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}
 
 # Django

From 83423025d9b805b7667363fcea66b7ef65bc4f39 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 29 Mar 2021 09:12:29 -0700
Subject: [PATCH 02/77] Update hiredis from 1.1.0 to 2.0.0

---
 {{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 a4ab01b0..fd7daccb 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -14,7 +14,7 @@ whitenoise==5.2.0  # https://github.com/evansd/whitenoise
 {%- endif %}
 redis==3.5.3  # https://github.com/andymccurdy/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
-hiredis==1.1.0  # https://github.com/redis/hiredis-py
+hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.4.6  # pyup: < 5.0,!=4.4.7  # https://github.com/celery/celery

From 7b4a0bafb670fb51c061c4f0297a21d05b5fe5db Mon Sep 17 00:00:00 2001
From: Floyd Hightower <floyd.hightower27@gmail.com>
Date: Mon, 26 Apr 2021 06:43:52 -0400
Subject: [PATCH 03/77] Removing pycharm docs if app does not use pycharm

---
 {{cookiecutter.project_slug}}/docs/index.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/docs/index.rst b/{{cookiecutter.project_slug}}/docs/index.rst
index 5fafc696..cb4cbaed 100644
--- a/{{cookiecutter.project_slug}}/docs/index.rst
+++ b/{{cookiecutter.project_slug}}/docs/index.rst
@@ -10,8 +10,8 @@ Welcome to {{ cookiecutter.project_name }}'s documentation!
    :maxdepth: 2
    :caption: Contents:
 
-   howto
-   pycharm/configuration
+   howto{% if cookiecutter.use_pycharm == 'y' %}
+   pycharm/configuration{% endif %}
    users
 
 

From 6b5ad4e8336d30b2b69b3053403b590c638a573d Mon Sep 17 00:00:00 2001
From: Floyd Hightower <floyd.hightower27@gmail.com>
Date: Mon, 26 Apr 2021 06:17:02 -0500
Subject: [PATCH 04/77] Adding test to validate pycharm docs are removed
 appropriately

---
 tests/test_cookiecutter_generation.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)

diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 7e585ea4..cbe3324a 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -282,3 +282,20 @@ def test_error_if_incompatible(cookies, context, invalid_context):
 
     assert result.exit_code != 0
     assert isinstance(result.exception, FailedHookException)
+
+
+@pytest.mark.parametrize(
+    ["use_pycharm", "pycharm_docs_exist"],
+    [
+        ("n", False),
+        ("y", True),
+    ],
+)
+def test_pycharm_docs_removed(cookies, context, use_pycharm, pycharm_docs_exist):
+    """."""
+    context.update({"use_pycharm": use_pycharm})
+    result = cookies.bake(extra_context=context)
+
+    with open(f"{result.project}/docs/index.rst", "r") as f:
+        has_pycharm_docs = 'pycharm/configuration' in f.read()
+        assert has_pycharm_docs == pycharm_docs_exist

From 6f66b330e659c252cf49ed772fee9c1bf334d3dd Mon Sep 17 00:00:00 2001
From: Floyd Hightower <floyd.hightower27@gmail.com>
Date: Tue, 27 Apr 2021 05:41:00 -0500
Subject: [PATCH 05/77] Running black on updated file

---
 tests/test_cookiecutter_generation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index cbe3324a..f62d4bc9 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -297,5 +297,5 @@ def test_pycharm_docs_removed(cookies, context, use_pycharm, pycharm_docs_exist)
     result = cookies.bake(extra_context=context)
 
     with open(f"{result.project}/docs/index.rst", "r") as f:
-        has_pycharm_docs = 'pycharm/configuration' in f.read()
+        has_pycharm_docs = "pycharm/configuration" in f.read()
         assert has_pycharm_docs == pycharm_docs_exist

From 93ce22615f327e03013ff7449513f13d7b6a12e5 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 22 Jun 2021 14:11:04 -0700
Subject: [PATCH 06/77] Update mypy from 0.902 to 0.910

---
 {{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 e77e15b9..4e10401b 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -13,7 +13,7 @@ watchgod==0.7  # https://github.com/samuelcolvin/watchgod
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.902  # https://github.com/python/mypy
+mypy==0.910  # https://github.com/python/mypy
 django-stubs==1.8.0  # https://github.com/typeddjango/django-stubs
 pytest==6.2.4  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar

From 391874b426fa5bb20a95ea59a8b58e1b2bb6daee Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwangpython@gmail.com>
Date: Mon, 5 Jul 2021 16:37:35 -0400
Subject: [PATCH 07/77] Add Redis 6 support

---
 {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 2 +-
 {{cookiecutter.project_slug}}/local.yml                | 2 +-
 {{cookiecutter.project_slug}}/production.yml           | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
index 70023b53..d2d7f703 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -42,7 +42,7 @@ jobs:
     services:
       {%- if cookiecutter.use_celery == 'y' %}
       redis:
-        image: redis:5.0
+        image: redis:6.2.4
         ports:
           - 6379:6379
       {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index 6241ceed..a9f80307 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -64,7 +64,7 @@ services:
   {%- if cookiecutter.use_celery == 'y' %}
 
   redis:
-    image: redis:5.0
+    image: redis:6.2.4
     container_name: redis
 
   celeryworker:
diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index 3cccdb65..551d05a0 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -47,7 +47,7 @@ services:
       {%- endif %}
 
   redis:
-    image: redis:5.0
+    image: redis:6.2.4
   {%- if cookiecutter.use_celery == 'y' %}
 
   celeryworker:

From 9c62cfe2eb3f3df3101ff8d3d6b035a79d0a53f5 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 6 Jul 2021 20:39:32 -0700
Subject: [PATCH 08/77] Update pillow from 8.2.0 to 8.3.1

---
 {{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 36f02a3c..5ce15391 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,6 +1,6 @@
 pytz==2021.1  # https://github.com/stub42/pytz
 python-slugify==5.0.2  # https://github.com/un33k/python-slugify
-Pillow==8.2.0  # https://github.com/python-pillow/Pillow
+Pillow==8.3.1  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
 {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %}
 rcssmin==1.0.6 --install-option="--without-c-extensions"  # https://github.com/ndparker/rcssmin

From 3e02640e29fe897ed7facfe57930edf4ed381da3 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 8 Jul 2021 07:55:45 -0700
Subject: [PATCH 09/77] Update sentry-sdk from 1.1.0 to 1.3.0

---
 {{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 06d33ae0..a560d0f1 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.1  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.1.0  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.3.0  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
 hiredis==1.1.0  # https://github.com/redis/hiredis-py

From 83a7ac6e4d2eb1206faf00b7cefb744f98e80596 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 12 Jul 2021 08:45:29 -0700
Subject: [PATCH 10/77] Update django-allauth from 0.44.0 to 0.45.0

---
 {{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 a39de1bc..17583afe 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -32,7 +32,7 @@ uvicorn[standard]==0.14.0  # https://github.com/encode/uvicorn
 django==3.1.13  # pyup: < 3.2  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==4.1.1  # https://github.com/jazzband/django-model-utils
-django-allauth==0.44.0  # https://github.com/pennersr/django-allauth
+django-allauth==0.45.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.12.0  # https://github.com/django-crispy-forms/django-crispy-forms
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==2.4.1  # https://github.com/django-compressor/django-compressor

From e295ddb778fbd76ee4ba96643b05392ab632255b Mon Sep 17 00:00:00 2001
From: Mike97M <mike97m@yahoo.com>
Date: Wed, 14 Jul 2021 16:06:38 +0300
Subject: [PATCH 11/77] Backup - get container ID automatically from
 docker-compose

Backup documentation to show how to use "docker-compose -f local.yml ps -q postgres" to get the container ID instead of hard coding it.
---
 docs/docker-postgres-backups.rst | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/docs/docker-postgres-backups.rst b/docs/docker-postgres-backups.rst
index 6ccb7cf1..875d737e 100644
--- a/docs/docker-postgres-backups.rst
+++ b/docs/docker-postgres-backups.rst
@@ -55,8 +55,11 @@ With a single backup file copied to ``.`` that would be ::
 
     $ docker cp 9c5c3f055843:/backups/backup_2018_03_13T09_05_07.sql.gz .
 
-.. _`command`: https://docs.docker.com/engine/reference/commandline/cp/
+You can also get the container ID using ``docker-compose -f local.yml ps -q postgres`` so if you want to automate your backups, you don't have to check the container ID manually every time. Here is the full command ::
 
+    $ docker cp $(docker-compose -f local.yml ps -q postgres):/backups ./backups
+
+.. _`command`: https://docs.docker.com/engine/reference/commandline/cp/
 
 Restoring from the Existing Backup
 ----------------------------------

From f702f43fd154aa267d435c146a54e86cec13a48e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 14 Jul 2021 21:03:52 -0700
Subject: [PATCH 12/77] Update tox from 3.23.1 to 3.24.0

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

diff --git a/requirements.txt b/requirements.txt
index b48a5ab9..5a12d6dc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==2.13.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.23.1
+tox==3.24.0
 pytest==6.2.4
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From f1edf59ce467e0e40553226d91a2aa02f533e3d7 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 16 Jul 2021 10:53:41 -0700
Subject: [PATCH 13/77] Update black from 21.6b0 to 21.7b0

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

diff --git a/requirements.txt b/requirements.txt
index b48a5ab9..edef7ef6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-black==21.6b0
+black==21.7b0
 isort==5.9.1
 flake8==3.9.2
 flake8-isort==4.0.0

From aaca5aa2a192343f3181b87a3b3176de618cf041 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 16 Jul 2021 10:53:41 -0700
Subject: [PATCH 14/77] Update black from 21.6b0 to 21.7b0

---
 {{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 e77e15b9..792023f0 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -28,7 +28,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 flake8==3.9.2  # https://github.com/PyCQA/flake8
 flake8-isort==4.0.0  # https://github.com/gforcada/flake8-isort
 coverage==5.5  # https://github.com/nedbat/coveragepy
-black==21.6b0  # https://github.com/psf/black
+black==21.7b0  # https://github.com/psf/black
 pylint-django==2.4.4  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery

From d1ce715e832134e5e3245723287cb5695f6e5e63 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 17 Jul 2021 00:04:19 +0000
Subject: [PATCH 15/77] Auto-update pre-commit hooks

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

diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index ac71019a..81c3011b 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -11,12 +11,12 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/psf/black
-    rev: 21.6b0
+    rev: 21.7b0
     hooks:
       - id: black
 
   - repo: https://github.com/timothycrosley/isort
-    rev: 5.9.1
+    rev: 5.9.2
     hooks:
       - id: isort
 

From 91172cc6e2a1aa3483297cf0cf576f7e6df52e20 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 17 Jul 2021 10:28:59 -0700
Subject: [PATCH 16/77] Update whitenoise from 5.2.0 to 5.3.0

---
 {{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 a39de1bc..6b00cbe2 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -10,7 +10,7 @@ rcssmin==1.0.6  # https://github.com/ndparker/rcssmin
 {%- endif %}
 argon2-cffi==20.1.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
-whitenoise==5.2.0  # https://github.com/evansd/whitenoise
+whitenoise==5.3.0  # https://github.com/evansd/whitenoise
 {%- endif %}
 redis==3.5.3  # https://github.com/andymccurdy/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}

From 88c487dfbd1613a84c65fa878353eef029ee6ed2 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwangpython@gmail.com>
Date: Tue, 27 Jul 2021 01:20:30 -0400
Subject: [PATCH 17/77] Convert trans to translate in templates

Signed-off-by: Andrew-Chen-Wang <acwangpython@gmail.com>
---
 .../templates/account/account_inactive.html   |  6 ++---
 .../templates/account/email.html              | 26 +++++++++----------
 .../templates/account/email_confirm.html      | 10 +++----
 .../templates/account/login.html              | 18 ++++++-------
 .../templates/account/logout.html             |  8 +++---
 .../templates/account/password_change.html    |  6 ++---
 .../templates/account/password_reset.html     | 10 +++----
 .../account/password_reset_done.html          |  6 ++---
 .../account/password_reset_from_key.html      | 10 +++----
 .../account/password_reset_from_key_done.html |  6 ++---
 .../templates/account/password_set.html       |  6 ++---
 .../templates/account/signup.html             |  8 +++---
 .../templates/account/signup_closed.html      |  6 ++---
 .../templates/account/verification_sent.html  |  6 ++---
 .../account/verified_email_required.html      | 14 +++++-----
 .../templates/base.html                       |  8 +++---
 16 files changed, 77 insertions(+), 77 deletions(-)

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
index 0713ff11..ab910820 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/account_inactive.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/account_inactive.html
@@ -2,11 +2,11 @@
 
 {% load i18n %}
 
-{% block head_title %}{% trans "Account Inactive" %}{% endblock %}
+{% block head_title %}{% translate "Account Inactive" %}{% endblock %}
 
 {% block inner %}
-<h1>{% trans "Account Inactive" %}</h1>
+<h1>{% translate "Account Inactive" %}</h1>
 
-<p>{% trans "This account is inactive." %}</p>
+<p>{% translate "This account is inactive." %}</p>
 {% endblock %}
 {%- 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
index 5c9406f3..07b5789e 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html
@@ -4,13 +4,13 @@
 {% load i18n %}
 {% load crispy_forms_tags %}
 
-{% block head_title %}{% trans "Account" %}{% endblock %}
+{% block head_title %}{% translate "Account" %}{% endblock %}
 
 {% block inner %}
-<h1>{% trans "E-mail Addresses" %}</h1>
+<h1>{% translate "E-mail Addresses" %}</h1>
 
 {% if user.emailaddress_set.all %}
-<p>{% trans 'The following e-mail addresses are associated with your account:' %}</p>
+<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 %}
@@ -24,36 +24,36 @@
 
     {{ emailaddress.email }}
     {% if emailaddress.verified %}
-    <span class="verified">{% trans "Verified" %}</span>
+    <span class="verified">{% translate "Verified" %}</span>
     {% else %}
-    <span class="unverified">{% trans "Unverified" %}</span>
+    <span class="unverified">{% translate "Unverified" %}</span>
     {% endif %}
-    {% if emailaddress.primary %}<span class="primary">{% trans "Primary" %}</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" >{% trans 'Make Primary' %}</button>
-      <button class="secondaryAction btn btn-primary" type="submit" name="action_send" >{% trans 'Re-send Verification' %}</button>
-      <button class="primaryAction btn btn-primary" type="submit" name="action_remove" >{% trans 'Remove' %}</button>
+      <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>{% trans 'Warning:'%}</strong> {% trans "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>
+<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>{% trans "Add E-mail Address" %}</h2>
+    <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">{% trans "Add E-mail" %}</button>
+        <button class="btn btn-primary" name="action_add" type="submit">{% translate "Add E-mail" %}</button>
     </form>
 
 {% endblock %}
@@ -63,7 +63,7 @@
 {{ block.super }}
 <script type="text/javascript">
 window.addEventListener('DOMContentLoaded',function() {
-  const message = "{% trans 'Do you really want to remove the selected e-mail address?' %}";
+  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) {
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
index 2a0722a1..5e4924c8 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email_confirm.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email_confirm.html
@@ -3,28 +3,28 @@
 {% load i18n %}
 {% load account %}
 
-{% block head_title %}{% trans "Confirm E-mail Address" %}{% endblock %}
+{% block head_title %}{% translate "Confirm E-mail Address" %}{% endblock %}
 
 
 {% block inner %}
-<h1>{% trans "Confirm E-mail Address" %}</h1>
+<h1>{% translate "Confirm E-mail Address" %}</h1>
 
 {% if confirmation %}
 
 {% user_display confirmation.email_address.user as user_display %}
 
-<p>{% blocktrans 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 }}.{% endblocktrans %}</p>
+<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">{% trans 'Confirm' %}</button>
+    <button class="btn btn-primary" type="submit">{% translate 'Confirm' %}</button>
 </form>
 
 {% else %}
 
 {% url 'account_email' as email_url %}
 
-<p>{% blocktrans %}This e-mail confirmation link expired or is invalid. Please <a href="{{ email_url }}">issue a new e-mail confirmation request</a>.{% endblocktrans %}</p>
+<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 %}
 
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/login.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/login.html
index 247ca690..8c7b5ae6 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/login.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/login.html
@@ -4,18 +4,18 @@
 {% load account socialaccount %}
 {% load crispy_forms_tags %}
 
-{% block head_title %}{% trans "Sign In" %}{% endblock %}
+{% block head_title %}{% translate "Sign In" %}{% endblock %}
 
 {% block inner %}
 
-<h1>{% trans "Sign In" %}</h1>
+<h1>{% translate "Sign In" %}</h1>
 
 {% get_providers as socialaccount_providers %}
 
 {% if socialaccount_providers %}
-<p>{% blocktrans with site.name as site_name %}Please sign in with one
+<p>{% blocktranslate with site.name as site_name %}Please sign in with one
 of your existing third party accounts. Or, <a href="{{ signup_url }}">sign up</a>
-for a {{ site_name }} account and sign in below:{% endblocktrans %}</p>
+for a {{ site_name }} account and sign in below:{% endblocktranslate %}</p>
 
 <div class="socialaccount_ballot">
 
@@ -23,15 +23,15 @@ for a {{ site_name }} account and sign in below:{% endblocktrans %}</p>
     {% include "socialaccount/snippets/provider_list.html" with process="login" %}
   </ul>
 
-  <div class="login-or">{% trans 'or' %}</div>
+  <div class="login-or">{% translate 'or' %}</div>
 
 </div>
 
 {% include "socialaccount/snippets/login_extra.html" %}
 
 {% else %}
-<p>{% blocktrans %}If you have not created an account yet, then please
-<a href="{{ signup_url }}">sign up</a> first.{% endblocktrans %}</p>
+<p>{% blocktranslate %}If you have not created an account yet, then please
+<a href="{{ signup_url }}">sign up</a> first.{% endblocktranslate %}</p>
 {% endif %}
 
 <form class="login" method="POST" action="{% url 'account_login' %}">
@@ -40,8 +40,8 @@ for a {{ site_name }} account and sign in below:{% endblocktrans %}</p>
   {% 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' %}">{% trans "Forgot Password?" %}</a>
-  <button class="primaryAction btn btn-primary" type="submit">{% trans "Sign In" %}</button>
+  <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 %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/logout.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/logout.html
index 6659724e..5edc6047 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/logout.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/logout.html
@@ -2,19 +2,19 @@
 
 {% load i18n %}
 
-{% block head_title %}{% trans "Sign Out" %}{% endblock %}
+{% block head_title %}{% translate "Sign Out" %}{% endblock %}
 
 {% block inner %}
-<h1>{% trans "Sign Out" %}</h1>
+<h1>{% translate "Sign Out" %}</h1>
 
-<p>{% trans 'Are you sure you want to sign out?' %}</p>
+<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">{% trans 'Sign Out' %}</button>
+  <button class="btn btn-danger" type="submit">{% translate 'Sign Out' %}</button>
 </form>
 {% endblock %}
 {%- 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
index 7f2fbed0..b8dd7ac5 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_change.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_change.html
@@ -3,15 +3,15 @@
 {% load i18n %}
 {% load crispy_forms_tags %}
 
-{% block head_title %}{% trans "Change Password" %}{% endblock %}
+{% block head_title %}{% translate "Change Password" %}{% endblock %}
 
 {% block inner %}
-    <h1>{% trans "Change Password" %}</h1>
+    <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">{% trans "Change Password" %}</button>
+        <button class="btn btn-primary" type="submit" name="action">{% translate "Change Password" %}</button>
     </form>
 {% endblock %}
 {%- 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
index 474b0f4a..f424b211 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset.html
@@ -4,23 +4,23 @@
 {% load account %}
 {% load crispy_forms_tags %}
 
-{% block head_title %}{% trans "Password Reset" %}{% endblock %}
+{% block head_title %}{% translate "Password Reset" %}{% endblock %}
 
 {% block inner %}
 
-    <h1>{% trans "Password Reset" %}</h1>
+    <h1>{% translate "Password Reset" %}</h1>
     {% if user.is_authenticated %}
     {% include "account/snippets/already_logged_in.html" %}
     {% endif %}
 
-    <p>{% trans "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it." %}</p>
+    <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="{% trans 'Reset My Password' %}" />
+        <input class="btn btn-primary" type="submit" value="{% translate 'Reset My Password' %}" />
     </form>
 
-    <p>{% blocktrans %}Please contact us if you have any trouble resetting your password.{% endblocktrans %}</p>
+    <p>{% blocktranslate %}Please contact us if you have any trouble resetting your password.{% endblocktranslate %}</p>
 {% endblock %}
 {%- 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
index 94ea2dfb..76d07eb2 100644
--- 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
@@ -3,15 +3,15 @@
 {% load i18n %}
 {% load account %}
 
-{% block head_title %}{% trans "Password Reset" %}{% endblock %}
+{% block head_title %}{% translate "Password Reset" %}{% endblock %}
 
 {% block inner %}
-    <h1>{% trans "Password Reset" %}</h1>
+    <h1>{% translate "Password Reset" %}</h1>
 
     {% if user.is_authenticated %}
     {% include "account/snippets/already_logged_in.html" %}
     {% endif %}
 
-    <p>{% blocktrans %}We have sent you an e-mail. Please contact us if you do not receive it within a few minutes.{% endblocktrans %}</p>
+    <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 %}
 {%- 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
index 66ea9ba6..ce5d72a6 100644
--- 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
@@ -2,23 +2,23 @@
 
 {% load i18n %}
 {% load crispy_forms_tags %}
-{% block head_title %}{% trans "Change Password" %}{% endblock %}
+{% block head_title %}{% translate "Change Password" %}{% endblock %}
 
 {% block inner %}
-    <h1>{% if token_fail %}{% trans "Bad Token" %}{% else %}{% trans "Change Password" %}{% endif %}</h1>
+    <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>{% blocktrans %}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>.{% endblocktrans %}</p>
+        <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="{% trans 'change password' %}"/>
+                <input class="btn btn-primary" type="submit" name="action" value="{% translate 'change password' %}"/>
             </form>
         {% else %}
-            <p>{% trans 'Your password is now changed.' %}</p>
+            <p>{% translate 'Your password is now changed.' %}</p>
         {% endif %}
     {% endif %}
 {% endblock %}
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
index 7defcc86..34123fd5 100644
--- 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
@@ -1,10 +1,10 @@
 {% raw %}{% extends "account/base.html" %}
 
 {% load i18n %}
-{% block head_title %}{% trans "Change Password" %}{% endblock %}
+{% block head_title %}{% translate "Change Password" %}{% endblock %}
 
 {% block inner %}
-    <h1>{% trans "Change Password" %}</h1>
-    <p>{% trans 'Your password is now changed.' %}</p>
+    <h1>{% translate "Change Password" %}</h1>
+    <p>{% translate 'Your password is now changed.' %}</p>
 {% endblock %}
 {%- 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
index 435ed073..812410fc 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_set.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_set.html
@@ -3,15 +3,15 @@
 {% load i18n %}
 {% load crispy_forms_tags %}
 
-{% block head_title %}{% trans "Set Password" %}{% endblock %}
+{% block head_title %}{% translate "Set Password" %}{% endblock %}
 
 {% block inner %}
-    <h1>{% trans "Set Password" %}</h1>
+    <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="{% trans 'Set Password' %}"/>
+        <input class="btn btn-primary" type="submit" name="action" value="{% translate 'Set Password' %}"/>
     </form>
 {% endblock %}
 {%- 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
index 7a1e29a4..8c1c11ac 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/signup.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/signup.html
@@ -3,12 +3,12 @@
 {% load i18n %}
 {% load crispy_forms_tags %}
 
-{% block head_title %}{% trans "Signup" %}{% endblock %}
+{% block head_title %}{% translate "Signup" %}{% endblock %}
 
 {% block inner %}
-<h1>{% trans "Sign Up" %}</h1>
+<h1>{% translate "Sign Up" %}</h1>
 
-<p>{% blocktrans %}Already have an account? Then please <a href="{{ login_url }}">sign in</a>.{% endblocktrans %}</p>
+<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 %}
@@ -16,7 +16,7 @@
   {% if redirect_field_value %}
   <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
   {% endif %}
-  <button class="btn btn-primary" type="submit">{% trans "Sign Up" %} &raquo;</button>
+  <button class="btn btn-primary" type="submit">{% translate "Sign Up" %} &raquo;</button>
 </form>
 
 {% endblock %}
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
index 08b93772..c2e64d14 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/signup_closed.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/signup_closed.html
@@ -2,11 +2,11 @@
 
 {% load i18n %}
 
-{% block head_title %}{% trans "Sign Up Closed" %}{% endblock %}
+{% block head_title %}{% translate "Sign Up Closed" %}{% endblock %}
 
 {% block inner %}
-<h1>{% trans "Sign Up Closed" %}</h1>
+<h1>{% translate "Sign Up Closed" %}</h1>
 
-<p>{% trans "We are sorry, but the sign up is currently closed." %}</p>
+<p>{% translate "We are sorry, but the sign up is currently closed." %}</p>
 {% endblock %}
 {%- 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
index 4394e9c6..be8f1cef 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/verification_sent.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/verification_sent.html
@@ -2,12 +2,12 @@
 
 {% load i18n %}
 
-{% block head_title %}{% trans "Verify Your E-mail Address" %}{% endblock %}
+{% block head_title %}{% translate "Verify Your E-mail Address" %}{% endblock %}
 
 {% block inner %}
-    <h1>{% trans "Verify Your E-mail Address" %}</h1>
+    <h1>{% translate "Verify Your E-mail Address" %}</h1>
 
-    <p>{% blocktrans %}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.{% endblocktrans %}</p>
+    <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 %}
 {%- 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
index 8eafcbed..2148a180 100644
--- 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
@@ -2,21 +2,21 @@
 
 {% load i18n %}
 
-{% block head_title %}{% trans "Verify Your E-mail Address" %}{% endblock %}
+{% block head_title %}{% translate "Verify Your E-mail Address" %}{% endblock %}
 
 {% block inner %}
-<h1>{% trans "Verify Your E-mail Address" %}</h1>
+<h1>{% translate "Verify Your E-mail Address" %}</h1>
 
 {% url 'account_email' as email_url %}
 
-<p>{% blocktrans %}This part of the site requires us to verify that
+<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. {% endblocktrans %}</p>
+verify ownership of your e-mail address. {% endblocktranslate %}</p>
 
-<p>{% blocktrans %}We have sent an e-mail to you for
+<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.{% endblocktrans %}</p>
+contact us if you do not receive it within a few minutes.{% endblocktranslate %}</p>
 
-<p>{% blocktrans %}<strong>Note:</strong> you can still <a href="{{ email_url }}">change your e-mail address</a>.{% endblocktrans %}</p>
+<p>{% blocktranslate %}<strong>Note:</strong> you can still <a href="{{ email_url }}">change your e-mail address</a>.{% endblocktranslate %}</p>
 {% endblock %}
 {%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
index c3679404..c233028b 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -78,20 +78,20 @@
             {% if request.user.is_authenticated %}
               <li class="nav-item">
                 {# URL provided by django-allauth/account/urls.py #}
-                <a class="nav-link" href="{% url 'users:detail' request.user.username  %}">{% trans "My Profile" %}</a>
+                <a class="nav-link" href="{% url 'users:detail' request.user.username  %}">{% translate "My Profile" %}</a>
               </li>
               <li class="nav-item">
                 {# URL provided by django-allauth/account/urls.py #}
-                <a class="nav-link" href="{% url 'account_logout' %}">{% trans "Sign Out" %}</a>
+                <a class="nav-link" href="{% url 'account_logout' %}">{% translate "Sign Out" %}</a>
               </li>
             {% else %}
               <li class="nav-item">
                 {# URL provided by django-allauth/account/urls.py #}
-                <a id="sign-up-link" class="nav-link" href="{% url 'account_signup' %}">{% trans "Sign Up" %}</a>
+                <a id="sign-up-link" class="nav-link" href="{% url 'account_signup' %}">{% translate "Sign Up" %}</a>
               </li>
               <li class="nav-item">
                 {# URL provided by django-allauth/account/urls.py #}
-                <a id="log-in-link" class="nav-link" href="{% url 'account_login' %}">{% trans "Sign In" %}</a>
+                <a id="log-in-link" class="nav-link" href="{% url 'account_login' %}">{% translate "Sign In" %}</a>
               </li>
             {% endif %}
           </ul>

From aa371f1836506f8e9e8005674e0db8de0fe13e4a Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 27 Jul 2021 01:56:45 -0700
Subject: [PATCH 18/77] Update sphinx from 4.0.2 to 4.1.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 e77e15b9..18de69d2 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -20,7 +20,7 @@ pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 
 # Documentation
 # ------------------------------------------------------------------------------
-sphinx==4.0.2  # https://github.com/sphinx-doc/sphinx
+sphinx==4.1.2  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From 7512f44a4d2a78447e4567b3aa4d275875b3517f Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 27 Jul 2021 04:23:35 -0700
Subject: [PATCH 19/77] Update isort from 5.9.1 to 5.9.2

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

diff --git a/requirements.txt b/requirements.txt
index edef7ef6..ce7ef90c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==21.7b0
-isort==5.9.1
+isort==5.9.2
 flake8==3.9.2
 flake8-isort==4.0.0
 pre-commit==2.13.0

From cb2920c05688a42419a0c8ed495e8d2eec05cfac Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 28 Jul 2021 02:16:35 +0000
Subject: [PATCH 20/77] Update Changelog

---
 CHANGELOG.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 588c58ab..d95c621c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,22 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-07-27]
+### Changed
+- Convert trans to translate in templates ([#3277](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3277))
+### Updated
+- Update hiredis to 2.0.0 ([#3110](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3110))
+- Update mypy to 0.910 ([#3237](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3237))
+- Update whitenoise to 5.3.0 ([#3273](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3273))
+- Update tox to 3.24.0 ([#3269](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3269))
+- Update django-allauth to 0.45.0 ([#3267](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3267))
+- Update sentry-sdk to 1.3.0 ([#3262](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3262))
+- Update sphinx to 4.1.2 ([#3278](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3278))
+- Auto-update pre-commit hooks ([#3264](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3264))
+- Update isort to 5.9.2 ([#3279](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3279))
+- Update pillow to 8.3.1 ([#3259](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3259))
+- Update black to 21.7b0 ([#3272](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3272))
+
 ## [2021-07-12]
 ### Changed
 - Define REMAP_SIGTERM=SIGQUIT on Profile of Celery on Heroku ([#3263](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3263))

From c26f5cb5f01e2050c1398c18c4421f68520fbd2f Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 28 Jul 2021 04:38:03 -0700
Subject: [PATCH 21/77] Update sentry-sdk from 1.3.0 to 1.3.1

---
 {{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 21057370..61ca0b97 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.1  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.3.0  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.3.1  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
 hiredis==2.0.0  # https://github.com/redis/hiredis-py

From d4edc4dc439c6f9f795f53b5612c21be59fe4bc2 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 29 Jul 2021 02:42:47 -0700
Subject: [PATCH 22/77] Update isort from 5.9.2 to 5.9.3

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

diff --git a/requirements.txt b/requirements.txt
index 8fda1ff6..89cb602c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==21.7b0
-isort==5.9.2
+isort==5.9.3
 flake8==3.9.2
 flake8-isort==4.0.0
 pre-commit==2.13.0

From f3145b895eb8f56025d58a2f98821a9f50e6d8ea Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 30 Jul 2021 00:04:45 +0000
Subject: [PATCH 23/77] 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 81c3011b..5551169e 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -16,7 +16,7 @@ repos:
       - id: black
 
   - repo: https://github.com/timothycrosley/isort
-    rev: 5.9.2
+    rev: 5.9.3
     hooks:
       - id: isort
 

From 103cc9f2ffb594796b98b2916ecec043b8b5dd9e Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 31 Jul 2021 02:14:58 +0000
Subject: [PATCH 24/77] Update Changelog

---
 CHANGELOG.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d95c621c..e9a9cd24 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,11 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-07-30]
+### Updated
+- Auto-update pre-commit hooks ([#3283](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3283))
+- Update isort to 5.9.3 ([#3282](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3282))
+
 ## [2021-07-27]
 ### Changed
 - Convert trans to translate in templates ([#3277](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3277))

From 61a6fd31897ff19527b20e65e543d474daab5a3d Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 31 Jul 2021 20:02:05 -0700
Subject: [PATCH 25/77] Update tox from 3.24.0 to 3.24.1

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

diff --git a/requirements.txt b/requirements.txt
index 89cb602c..f4cac5c7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==2.13.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.24.0
+tox==3.24.1
 pytest==6.2.4
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From 370cefdf24f67e8b57cdedf2f878ae4e0fc0dc4d Mon Sep 17 00:00:00 2001
From: Abdul Qoyyuum <abdul.qoyyuum@gmail.com>
Date: Fri, 6 Aug 2021 15:55:40 +0100
Subject: [PATCH 26/77] How to pre-commit in Docker Development

It is clear that pre-commit cannot work inside Docker containers and it can only work with git stored on the local machine since its not in a shared volume with the containers. Therefore, it should be noted that anyone who uses this cookicutter with pre-commit already generated by default in every project, should start using pre-commit into their general workflow.
---
 docs/developing-locally-docker.rst | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index 0d582d48..be89f6e9 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -32,6 +32,17 @@ This can take a while, especially the first time you run this particular command
 
 Generally, if you want to emulate production environment use ``production.yml`` instead. And this is true for any other actions you might need to perform: whenever a switch is required, just do it!
 
+Before doing any commit, pre-commit hooks are required on your local machine, outside of docker::
+
+    $ pip install -r requirements/local.txt # Advisable within a virtualenv if possible
+    $ git init # A git repo is required for pre-commit to install
+    $ pre-commit install
+
+   .. note::
+
+       the `pre-commit` hook exists in the generated project as default.
+       For the details of `pre-commit`, follow the `pre-commit`_ site.
+
 
 Run the Stack
 -------------

From 2fdbcb52eb5a56c60509acbd1648d7e0001a5117 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 6 Aug 2021 13:43:02 -0700
Subject: [PATCH 27/77] Update pre-commit from 2.13.0 to 2.14.0

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

diff --git a/requirements.txt b/requirements.txt
index 89cb602c..b49b1e94 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ black==21.7b0
 isort==5.9.3
 flake8==3.9.2
 flake8-isort==4.0.0
-pre-commit==2.13.0
+pre-commit==2.14.0
 
 # Testing
 # ------------------------------------------------------------------------------

From eff1c5dfdedb926c9cbdcc1616686e6b21356cac Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 6 Aug 2021 13:43:03 -0700
Subject: [PATCH 28/77] Update pre-commit from 2.13.0 to 2.14.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 5ef9656a..9eab142d 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -33,7 +33,7 @@ pylint-django==2.4.4  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}
-pre-commit==2.13.0  # https://github.com/pre-commit/pre-commit
+pre-commit==2.14.0  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From 3dfb5d15642e2c1d54b30230ac8b86a3f9e71aeb Mon Sep 17 00:00:00 2001
From: Abdul Qoyyuum <abdul.qoyyuum@gmail.com>
Date: Sat, 7 Aug 2021 16:43:47 +0100
Subject: [PATCH 29/77] Update developing-locally-docker.rst

---
 docs/developing-locally-docker.rst | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index be89f6e9..858f89b8 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -18,10 +18,11 @@ Prerequisites
 
 * Docker; if you don't have it yet, follow the `installation instructions`_;
 * Docker Compose; refer to the official documentation for the `installation guide`_.
+* Pre-commit; refer to the official documentation for the `installation guide`_.
 
 .. _`installation instructions`: https://docs.docker.com/install/#supported-platforms
 .. _`installation guide`: https://docs.docker.com/compose/install/
-
+.. _`pre-commit`: https://pre-commit.com/#install
 
 Build the Stack
 ---------------
@@ -32,16 +33,12 @@ This can take a while, especially the first time you run this particular command
 
 Generally, if you want to emulate production environment use ``production.yml`` instead. And this is true for any other actions you might need to perform: whenever a switch is required, just do it!
 
-Before doing any commit, pre-commit hooks are required on your local machine, outside of docker::
+Before doing any git commit, `pre-commit`_ should be installed globally on your local machine, and then::
 
-    $ pip install -r requirements/local.txt # Advisable within a virtualenv if possible
-    $ git init # A git repo is required for pre-commit to install
+    $ git init
     $ pre-commit install
 
-   .. note::
-
-       the `pre-commit` hook exists in the generated project as default.
-       For the details of `pre-commit`, follow the `pre-commit`_ site.
+Failing to do so will result with a bunch of CI and Linter errors that can be avoided with pre-commit.
 
 
 Run the Stack

From 0d4190c243977fc99ec4739aa2d98ba95ff55c08 Mon Sep 17 00:00:00 2001
From: Matthew Foster Walsh <15671892+mfosterw@users.noreply.github.com>
Date: Sun, 8 Aug 2021 22:58:48 -0500
Subject: [PATCH 30/77] Moved isort config from .editorconfig to setup.cfg

---
 {{cookiecutter.project_slug}}/.editorconfig | 12 ------------
 {{cookiecutter.project_slug}}/setup.cfg     | 12 ++++++++++++
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/.editorconfig b/{{cookiecutter.project_slug}}/.editorconfig
index 39c15f07..26140706 100644
--- a/{{cookiecutter.project_slug}}/.editorconfig
+++ b/{{cookiecutter.project_slug}}/.editorconfig
@@ -12,18 +12,6 @@ trim_trailing_whitespace = true
 indent_style = space
 indent_size = 4
 
-[*.py]
-line_length = 88
-known_first_party = {{cookiecutter.project_slug}},config
-multi_line_output = 3
-default_section = THIRDPARTY
-recursive = true
-skip = venv/
-skip_glob = **/migrations/*.py
-include_trailing_comma = true
-force_grid_wrap = 0
-use_parentheses = true
-
 [*.{html,css,scss,json,yml}]
 indent_style = space
 indent_size = 2
diff --git a/{{cookiecutter.project_slug}}/setup.cfg b/{{cookiecutter.project_slug}}/setup.cfg
index c3ce2a0e..2be67cbc 100644
--- a/{{cookiecutter.project_slug}}/setup.cfg
+++ b/{{cookiecutter.project_slug}}/setup.cfg
@@ -6,6 +6,18 @@ exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv
 max-line-length = 120
 exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv
 
+[isort]
+line_length = 88
+known_first_party = {{cookiecutter.project_slug}},config
+multi_line_output = 3
+default_section = THIRDPARTY
+recursive = true
+skip = venv/
+skip_glob = **/migrations/*.py
+include_trailing_comma = true
+force_grid_wrap = 0
+use_parentheses = true
+
 [mypy]
 python_version = 3.9
 check_untyped_defs = True

From 4d8923f584848e3e1a93b7ee559cb860ea78658d Mon Sep 17 00:00:00 2001
From: Matthew Foster Walsh <15671892+mfosterw@users.noreply.github.com>
Date: Sun, 8 Aug 2021 23:38:40 -0500
Subject: [PATCH 31/77] Removed outdated isort option "recursive=true"

---
 {{cookiecutter.project_slug}}/setup.cfg | 1 -
 1 file changed, 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/setup.cfg b/{{cookiecutter.project_slug}}/setup.cfg
index 2be67cbc..d0ba6387 100644
--- a/{{cookiecutter.project_slug}}/setup.cfg
+++ b/{{cookiecutter.project_slug}}/setup.cfg
@@ -11,7 +11,6 @@ line_length = 88
 known_first_party = {{cookiecutter.project_slug}},config
 multi_line_output = 3
 default_section = THIRDPARTY
-recursive = true
 skip = venv/
 skip_glob = **/migrations/*.py
 include_trailing_comma = true

From 081711ee6331e10d4806680b0d8ae11011e758df Mon Sep 17 00:00:00 2001
From: Keith Callenberg <keithcallenberg@gmail.com>
Date: Mon, 9 Aug 2021 16:29:09 -0400
Subject: [PATCH 32/77] minor correction in working directory in docs

---
 docs/developing-locally.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index f3358866..83bc1342 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -30,6 +30,7 @@ First things first.
 
 #. Install development requirements: ::
 
+    $ cd <what you have entered as the project_slug at setup stage>
     $ pip install -r requirements/local.txt
     $ git init # A git repo is required for pre-commit to install
     $ pre-commit install

From 4c45aa2e6004a2c2d592fd74bc12a5b39f087a66 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Wed, 11 Aug 2021 23:13:30 -0400
Subject: [PATCH 33/77] Fix RTD Python version

* Python 3.9 is technically supported via the testing image.
---
 {{cookiecutter.project_slug}}/.readthedocs.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/.readthedocs.yml b/{{cookiecutter.project_slug}}/.readthedocs.yml
index 1b6020f3..05bdd515 100644
--- a/{{cookiecutter.project_slug}}/.readthedocs.yml
+++ b/{{cookiecutter.project_slug}}/.readthedocs.yml
@@ -4,6 +4,6 @@ sphinx:
   configuration: docs/conf.py
 
 python:
-  version: 3.9
+  image: testing
   install:
     - requirements: requirements/local.txt

From b946378ef137c08ffb18675300ee8384699e1fde Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 12 Aug 2021 07:05:23 +0000
Subject: [PATCH 34/77] 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 f7c0a05b..30fdd68b 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1107,5 +1107,10 @@
     "name": "Haseeb ur Rehman",
     "github_login": "professorhaseeb",
     "twitter_username": "professorhaseeb"
+  },
+  {
+    "name": "Abdul Qoyyuum",
+    "github_login": "Qoyyuum",
+    "twitter_username": "Qoyyuum"
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 0493530b..80e1b398 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -124,6 +124,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Abdul Qoyyuum</td>
+    <td>
+      <a href="https://github.com/Qoyyuum">Qoyyuum</a>
+    </td>
+    <td>Qoyyuum</td>
+  </tr>
   <tr>
     <td>Adam Bogdał</td>
     <td>

From 42d9cbbe8cde350352c52ee506591d080744720f Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 12 Aug 2021 07:12:15 +0000
Subject: [PATCH 35/77] 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 30fdd68b..fc81def7 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1112,5 +1112,10 @@
     "name": "Abdul Qoyyuum",
     "github_login": "Qoyyuum",
     "twitter_username": "Qoyyuum"
+  },
+  {
+    "name": "mfosterw",
+    "github_login": "mfosterw",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 80e1b398..92a13411 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1174,6 +1174,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>mfosterw</td>
+    <td>
+      <a href="https://github.com/mfosterw">mfosterw</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Michael Gecht</td>
     <td>

From 5690c9503b5629fe674d34c569cb204ba3d83d1b Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 12 Aug 2021 09:40:54 +0200
Subject: [PATCH 36/77] Bump version to 3.1.13

---
 setup.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/setup.py b/setup.py
index ddc9524d..64e923ae 100644
--- a/setup.py
+++ b/setup.py
@@ -10,7 +10,7 @@ except ImportError:
 
 # Our version ALWAYS matches the version of Django we support
 # If Django has a new release, we branch, tag, then update this setting after the tag.
-version = "3.1.12"
+version = "3.1.13"
 
 if sys.argv[-1] == "tag":
     os.system(f'git tag -a {version} -m "version {version}"')

From 32c5cb057bbf6b6a197533987dc9260084c658f1 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 12 Aug 2021 08:35:59 +0000
Subject: [PATCH 37/77] 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 fc81def7..a9ed956a 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1117,5 +1117,10 @@
     "name": "mfosterw",
     "github_login": "mfosterw",
     "twitter_username": ""
+  },
+  {
+    "name": "Keith Callenberg",
+    "github_login": "keithcallenberg",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 92a13411..665f9ed2 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -957,6 +957,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Keith Callenberg</td>
+    <td>
+      <a href="https://github.com/keithcallenberg">keithcallenberg</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Keith Webber</td>
     <td>

From 71bcf6c4a0944c3131b7617dd9fd3bd4732629a5 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 12 Aug 2021 08:42:23 +0000
Subject: [PATCH 38/77] 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 a9ed956a..c4cbb38d 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1122,5 +1122,10 @@
     "name": "Keith Callenberg",
     "github_login": "keithcallenberg",
     "twitter_username": ""
+  },
+  {
+    "name": "Mike97M",
+    "github_login": "Mike97M",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 665f9ed2..388baa38 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1202,6 +1202,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Mike97M</td>
+    <td>
+      <a href="https://github.com/Mike97M">Mike97M</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Min ho Kim</td>
     <td>

From c0a61573731ae488ce44858b1e5ae4a96d942602 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Thu, 12 Aug 2021 09:18:19 -0400
Subject: [PATCH 39/77] Use major version 6 without minor

---
 {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
index d2d7f703..1e17068e 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -42,7 +42,7 @@ jobs:
     services:
       {%- if cookiecutter.use_celery == 'y' %}
       redis:
-        image: redis:6.2.4
+        image: redis:6
         ports:
           - 6379:6379
       {%- endif %}

From 29f3706aef8ddc0fbf1505146b3d038199787a41 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Thu, 12 Aug 2021 16:28:21 -0400
Subject: [PATCH 40/77] Update production.yml

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

diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index 551d05a0..ea4292a0 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -47,7 +47,7 @@ services:
       {%- endif %}
 
   redis:
-    image: redis:6.2.4
+    image: redis:6
   {%- if cookiecutter.use_celery == 'y' %}
 
   celeryworker:

From 64d3dfba8c418dd1c6dd7edf92ef43141b995b46 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Thu, 12 Aug 2021 16:31:35 -0400
Subject: [PATCH 41/77] Add back version number but use testing image

---
 {{cookiecutter.project_slug}}/.readthedocs.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/.readthedocs.yml b/{{cookiecutter.project_slug}}/.readthedocs.yml
index 05bdd515..b4cf0c08 100644
--- a/{{cookiecutter.project_slug}}/.readthedocs.yml
+++ b/{{cookiecutter.project_slug}}/.readthedocs.yml
@@ -3,7 +3,10 @@ version: 2
 sphinx:
   configuration: docs/conf.py
 
-python:
+build:
   image: testing
+
+python:
+  version: 3.9
   install:
     - requirements: requirements/local.txt

From 9359d8f3f1fe79f8136148c6611a01fe1a8cedc2 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 13 Aug 2021 02:13:00 +0000
Subject: [PATCH 42/77] Update Changelog

---
 CHANGELOG.md | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9a9cd24..d76f0811 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,17 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-08-12]
+### Changed
+- Add documentation for automating backups ([#3268](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3268))
+- Add missing step to getting started locally in docs ([#3291](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3291))
+- Moved isort config from `.editorconfig` to `setup.cfg` ([#3290](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3290))
+- How to pre-commit in Docker Development ([#3287](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3287))
+### Updated
+- Update sentry-sdk to 1.3.1 ([#3281](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3281))
+- Update tox to 3.24.1 ([#3285](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3285))
+- Update pre-commit to 2.14.0 ([#3289](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3289))
+
 ## [2021-07-30]
 ### Updated
 - Auto-update pre-commit hooks ([#3283](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3283))

From d28bd97f3ade81a0ef80bd8aa7189f3f61763a2a Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 13 Aug 2021 09:52:25 +0200
Subject: [PATCH 43/77] Update {{cookiecutter.project_slug}}/local.yml

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

diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index a9f80307..8cce827c 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -64,7 +64,7 @@ services:
   {%- if cookiecutter.use_celery == 'y' %}
 
   redis:
-    image: redis:6.2.4
+    image: redis:6
     container_name: redis
 
   celeryworker:

From c5671cf242bb930812b4b311cfd0e978424915b1 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 14 Aug 2021 02:13:26 +0000
Subject: [PATCH 44/77] Update Changelog

---
 CHANGELOG.md | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d76f0811..110c3b3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,12 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-08-13]
+### Changed
+- Upgrade to Redis 6 ([#3255](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3255))
+### Fixed
+- Fix RTD build image to support Python 3.9 ([#3293](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3293))
+
 ## [2021-08-12]
 ### Changed
 - Add documentation for automating backups ([#3268](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3268))

From 8c3e85a7a10d83560bb74a564e787e28b5822c52 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 14 Aug 2021 07:14:13 -0700
Subject: [PATCH 45/77] Update uvicorn from 0.14.0 to 0.15.0

---
 {{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 3680b390..17c3d932 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -24,7 +24,7 @@ flower==0.9.7  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn[standard]==0.14.0  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.15.0  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django

From 7ebe768d60520cefa1490f5636794e0ca54e7a98 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 15 Aug 2021 07:20:08 -0700
Subject: [PATCH 46/77] Update django-cors-headers from 3.7.0 to 3.8.0

---
 {{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 3680b390..36166aaf 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -41,5 +41,5 @@ django-redis==5.0.0  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == "y" %}
 # Django REST Framework
 djangorestframework==3.12.4  # https://github.com/encode/django-rest-framework
-django-cors-headers==3.7.0 # https://github.com/adamchainz/django-cors-headers
+django-cors-headers==3.8.0 # https://github.com/adamchainz/django-cors-headers
 {%- endif %}

From 0f4e4ee7c113120e2ad1715e73167cd85d388f12 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 15 Aug 2021 07:20:11 -0700
Subject: [PATCH 47/77] Update django-debug-toolbar from 3.2.1 to 3.2.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 9eab142d..a092dbb1 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -39,7 +39,7 @@ pre-commit==2.14.0  # https://github.com/pre-commit/pre-commit
 # ------------------------------------------------------------------------------
 factory-boy==3.2.0  # https://github.com/FactoryBoy/factory_boy
 
-django-debug-toolbar==3.2.1  # https://github.com/jazzband/django-debug-toolbar
+django-debug-toolbar==3.2.2  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.1.3  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==2.0.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.4.0  # https://github.com/pytest-dev/pytest-django

From 5529c44b16331b5fbabd30db29fe11d3588361e8 Mon Sep 17 00:00:00 2001
From: Charlie Macfarlane Brodie <charliembrodie@gmail.com>
Date: Tue, 17 Aug 2021 09:44:45 +0100
Subject: [PATCH 48/77] Update available postgres versions

The listed versions in the documentation were out of sync with those given when running cookiecutter as recommended in the documentation.
---
 docs/project-generation-options.rst | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index 8a81e19d..a2573b94 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -49,11 +49,10 @@ use_docker:
 postgresql_version:
     Select a PostgreSQL_ version to use. The choices are:
 
-    1. 12.3
-    2. 11.8
-    3. 10.8
-    4. 9.6
-    5. 9.5
+    1. 13.2
+    2. 12.6
+    3. 11.11
+    4. 10.16
 
 js_task_runner:
     Select a JavaScript task runner. The choices are:

From 7e49a1c9c72ab5743abc0aea112a7f57397af6ce Mon Sep 17 00:00:00 2001
From: "Fabio C. Barrionuevo da Luz" <bnafta@gmail.com>
Date: Thu, 19 Aug 2021 09:30:42 -0300
Subject: [PATCH 49/77] Fix Jinja2 break line control on Procfile

---
 {{cookiecutter.project_slug}}/Procfile | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/Procfile b/{{cookiecutter.project_slug}}/Procfile
index e23ca13c..ddb5cd8a 100644
--- a/{{cookiecutter.project_slug}}/Procfile
+++ b/{{cookiecutter.project_slug}}/Procfile
@@ -1,10 +1,10 @@
 release: python manage.py migrate
-{%- if cookiecutter.use_async == "y" -%}
+{% if cookiecutter.use_async == "y" -%}
 web: gunicorn config.asgi:application -k uvicorn.workers.UvicornWorker
-{%- else  %}
+{%- else %}
 web: gunicorn config.wsgi:application
 {%- endif %}
-{%- if cookiecutter.use_celery == "y" -%}
+{% if cookiecutter.use_celery == "y" -%}
 worker: REMAP_SIGTERM=SIGQUIT celery worker --app=config.celery_app --loglevel=info
 beat: REMAP_SIGTERM=SIGQUIT celery beat --app=config.celery_app --loglevel=info
 {%- endif %}

From a4a6cbf90c5c74403d3a7c980b9af7f68783cb4a Mon Sep 17 00:00:00 2001
From: Keith Callenberg <keithcallenberg@gmail.com>
Date: Thu, 19 Aug 2021 16:43:44 -0400
Subject: [PATCH 50/77] Fix several minor typos

---
 docs/developing-locally-docker.rst | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index 858f89b8..bdfff254 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -213,7 +213,7 @@ Developing locally with HTTPS
 
 Increasingly it is becoming necessary to develop software in a secure environment in order that there are very few changes when deploying to production. Recently Facebook changed their policies for apps/sites that use Facebook login which requires the use of an HTTPS URL for the OAuth redirect URL. So if you want to use the ``users`` application with a OAuth provider such as Facebook, securing your communication to the local development environment will be necessary.
 
-On order to create a secure environment, we need to have a trusted SSL certficate installed in our Docker application.
+In order to create a secure environment, we need to have a trusted SSL certficate installed in our Docker application.
 
 #.  **Let's Encrypt**
     
@@ -233,14 +233,14 @@ On order to create a secure environment, we need to have a trusted SSL certficat
 
     .. _`mkcert`:  https://github.com/FiloSottile/mkcert/blob/master/README.md#supported-root-stores
 
-After installing a trusted TLS certificate, configure your docker installation. We are going to configure an ``nginx`` reverse-proxy server. This makes sure that it does not interfere with our ``traefik`` configuration that is reserved for production environements.
+After installing a trusted TLS certificate, configure your docker installation. We are going to configure an ``nginx`` reverse-proxy server. This makes sure that it does not interfere with our ``traefik`` configuration that is reserved for production environments.
 
 These are the places that you should configure to secure your local environment.
 
 certs
 ~~~~~
 
-Take the certificates that you generated and place them in a folder called ``certs`` on the projects root folder. Assuming that you registered your local hostname as ``my-dev-env.local``, the certificates you will put in the folder should have the names ``my-dev-env.local.crt`` and ``my-dev-env.local.key``.
+Take the certificates that you generated and place them in a folder called ``certs`` in the project's root folder. Assuming that you registered your local hostname as ``my-dev-env.local``, the certificates you will put in the folder should have the names ``my-dev-env.local.crt`` and ``my-dev-env.local.key``.
 
 local.yml
 ~~~~~~~~~
@@ -264,7 +264,7 @@ local.yml
     
     ...
 
-#. Link the ``nginx-proxy`` to ``django`` through environmental variables.
+#. Link the ``nginx-proxy`` to ``django`` through environment variables.
    
    ``django`` already has an ``.env`` file connected to it. Add the following variables. You should do this especially if you are working with a team and you want to keep your local environment details to yourself.
 

From d5ebb1f7bf5ba5e0c957687f4b360a3bb43383c5 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 20 Aug 2021 02:12:15 +0000
Subject: [PATCH 51/77] Update Changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 110c3b3f..f7cdefba 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-08-19]
+### Changed
+- Fix several minor typos ([#3301](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3301))
+
 ## [2021-08-13]
 ### Changed
 - Upgrade to Redis 6 ([#3255](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3255))

From e205372b20585e218d007db4235ad3db06285dda Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 21 Aug 2021 02:14:13 +0000
Subject: [PATCH 52/77] Update Changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7cdefba..5c0229e1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-08-20]
+### Changed
+- Fix Jinja2 break line control on Procfile ([#3300](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3300))
+
 ## [2021-08-19]
 ### Changed
 - Fix several minor typos ([#3301](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3301))

From bc87b254becb1a7ce812edbfc023d04739b00c31 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 22 Aug 2021 20:03:39 -0700
Subject: [PATCH 53/77] Update tox from 3.24.1 to 3.24.3

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

diff --git a/requirements.txt b/requirements.txt
index 57541921..3fdf2cde 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==2.14.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.24.1
+tox==3.24.3
 pytest==6.2.4
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From af47398dddbed7d3c4b77978dbfcf32df7e9e956 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 23 Aug 2021 05:02:27 +0000
Subject: [PATCH 54/77] Bump peter-evans/create-pull-request from 3.10.0 to
 3.10.1

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 3.10.0 to 3.10.1.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v3.10.0...v3.10.1)

---
updated-dependencies:
- dependency-name: peter-evans/create-pull-request
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/pre-commit-autoupdate.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml
index 25a6f7a0..25512200 100644
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -26,7 +26,7 @@ jobs:
       run: pre-commit autoupdate
 
     - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v3.10.0
+      uses: peter-evans/create-pull-request@v3.10.1
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         branch: update/pre-commit-autoupdate

From adbab90c2ed69a40c3e0aa2c876a6371c01ec20e Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 28 Aug 2021 02:13:27 +0000
Subject: [PATCH 55/77] Update Changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c0229e1..6376c0cf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-08-27]
+### Updated
+- Update tox to 3.24.3 ([#3302](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3302))
+
 ## [2021-08-20]
 ### Changed
 - Fix Jinja2 break line control on Procfile ([#3300](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3300))

From 2afeae260b448b63820ca803c7ea5ce6549f1a8f Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 29 Aug 2021 10:29:42 -0700
Subject: [PATCH 56/77] Update argon2-cffi from 20.1.0 to 21.1.0

---
 {{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 3680b390..165ee197 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -8,7 +8,7 @@ rcssmin==1.0.6 --install-option="--without-c-extensions"  # https://github.com/n
 rcssmin==1.0.6  # https://github.com/ndparker/rcssmin
 {%- endif %}
 {%- endif %}
-argon2-cffi==20.1.0  # https://github.com/hynek/argon2_cffi
+argon2-cffi==21.1.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==5.3.0  # https://github.com/evansd/whitenoise
 {%- endif %}

From 59ab2b1ac80e0d27932f4adc6d15ac33029a214f Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Mon, 30 Aug 2021 00:04:53 +0000
Subject: [PATCH 57/77] 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 5551169e..e397722b 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -11,7 +11,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/psf/black
-    rev: 21.7b0
+    rev: 21.8b0
     hooks:
       - id: black
 

From caa255ce1a40861dfc5e922d1b3d6ff0e0bc7672 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 29 Aug 2021 17:04:59 -0700
Subject: [PATCH 58/77] Update black from 21.7b0 to 21.8b0

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

diff --git a/requirements.txt b/requirements.txt
index 3fdf2cde..67328f85 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-black==21.7b0
+black==21.8b0
 isort==5.9.3
 flake8==3.9.2
 flake8-isort==4.0.0

From 8325dfa23285429389ee3f4a687579c1d87e7518 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 29 Aug 2021 17:04:59 -0700
Subject: [PATCH 59/77] Update black from 21.7b0 to 21.8b0

---
 {{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 9eab142d..a763d4ae 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -28,7 +28,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 flake8==3.9.2  # https://github.com/PyCQA/flake8
 flake8-isort==4.0.0  # https://github.com/gforcada/flake8-isort
 coverage==5.5  # https://github.com/nedbat/coveragepy
-black==21.7b0  # https://github.com/psf/black
+black==21.8b0  # https://github.com/psf/black
 pylint-django==2.4.4  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery

From e4b39897c7cd3d530d04be605f4b416146aa6fb0 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 31 Aug 2021 08:58:32 -0700
Subject: [PATCH 60/77] Update pytest from 6.2.4 to 6.2.5

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

diff --git a/requirements.txt b/requirements.txt
index 3fdf2cde..eb8cb56c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,7 +13,7 @@ pre-commit==2.14.0
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.24.3
-pytest==6.2.4
+pytest==6.2.5
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2
 pyyaml==5.4.1

From 6ca683722c0386fbe3325a3db5e0f98968bf19c7 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 31 Aug 2021 08:58:32 -0700
Subject: [PATCH 61/77] Update pytest from 6.2.4 to 6.2.5

---
 {{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 9eab142d..ef6e941d 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -15,7 +15,7 @@ watchgod==0.7  # https://github.com/samuelcolvin/watchgod
 # ------------------------------------------------------------------------------
 mypy==0.910  # https://github.com/python/mypy
 django-stubs==1.8.0  # https://github.com/typeddjango/django-stubs
-pytest==6.2.4  # https://github.com/pytest-dev/pytest
+pytest==6.2.5  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 
 # Documentation

From cf6323af2cb245a71facc1abc8874e92e2ae624c Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 31 Aug 2021 08:58:34 -0700
Subject: [PATCH 62/77] Update django-environ from 0.4.5 to 0.5.0

---
 {{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 3680b390..c7eeaf8e 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -30,7 +30,7 @@ uvicorn[standard]==0.14.0  # https://github.com/encode/uvicorn
 # Django
 # ------------------------------------------------------------------------------
 django==3.1.13  # pyup: < 3.2  # https://www.djangoproject.com/
-django-environ==0.4.5  # https://github.com/joke2k/django-environ
+django-environ==0.5.0  # https://github.com/joke2k/django-environ
 django-model-utils==4.1.1  # https://github.com/jazzband/django-model-utils
 django-allauth==0.45.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.12.0  # https://github.com/django-crispy-forms/django-crispy-forms

From 1ebadc74f476f674b5ede32dc80defd95e4e991b Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 2 Sep 2021 13:43:44 -0700
Subject: [PATCH 63/77] Update pillow from 8.3.1 to 8.3.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 3680b390..caddeba9 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,6 +1,6 @@
 pytz==2021.1  # https://github.com/stub42/pytz
 python-slugify==5.0.2  # https://github.com/un33k/python-slugify
-Pillow==8.3.1  # https://github.com/python-pillow/Pillow
+Pillow==8.3.2  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
 {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %}
 rcssmin==1.0.6 --install-option="--without-c-extensions"  # https://github.com/ndparker/rcssmin

From f0d72fd32974849ca412e463f60dfdeb1416e701 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 2 Sep 2021 19:44:16 -0700
Subject: [PATCH 64/77] Update pre-commit from 2.14.0 to 2.15.0

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

diff --git a/requirements.txt b/requirements.txt
index 3fdf2cde..ccb613ba 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ black==21.7b0
 isort==5.9.3
 flake8==3.9.2
 flake8-isort==4.0.0
-pre-commit==2.14.0
+pre-commit==2.15.0
 
 # Testing
 # ------------------------------------------------------------------------------

From b2c26bba5b4b2422b885ef6a3ea079846e82aae3 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 2 Sep 2021 19:44:16 -0700
Subject: [PATCH 65/77] Update pre-commit from 2.14.0 to 2.15.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 9eab142d..ca080c1a 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -33,7 +33,7 @@ pylint-django==2.4.4  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}
-pre-commit==2.14.0  # https://github.com/pre-commit/pre-commit
+pre-commit==2.15.0  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From 2fdece533ef341e49e4163f1510d234b7ae9bb9e Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 3 Sep 2021 17:16:09 +0000
Subject: [PATCH 66/77] 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 c4cbb38d..045c1f07 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1127,5 +1127,10 @@
     "name": "Mike97M",
     "github_login": "Mike97M",
     "twitter_username": ""
+  },
+  {
+    "name": "Charlie Macfarlane Brodie",
+    "github_login": "tannart",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 388baa38..f75e34c9 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -390,6 +390,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Charlie Macfarlane Brodie</td>
+    <td>
+      <a href="https://github.com/tannart">tannart</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Charlie Smith</td>
     <td>

From db09f07eb9ecfefebefe205deea6e1d4ef57ae12 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 27 Jul 2021 14:05:01 +0200
Subject: [PATCH 67/77] Update Celery to v5

---
 {{cookiecutter.project_slug}}/requirements/base.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 94ab4485..8d5531f4 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -17,10 +17,10 @@ redis==3.5.3  # https://github.com/andymccurdy/redis-py
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
-celery==4.4.6  # pyup: < 5.0,!=4.4.7  # https://github.com/celery/celery
-django-celery-beat==2.2.0  # https://github.com/celery/django-celery-beat
+celery==5.1.2  # pyup: < 6.0  # https://github.com/celery/celery
+django-celery-beat==2.2.1  # https://github.com/celery/django-celery-beat
 {%- if cookiecutter.use_docker == 'y' %}
-flower==0.9.7  # https://github.com/mher/flower
+flower==1.0.0  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}

From 9cfb7646cb0bb1f5e89929ad3fbe922dd0825a38 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 3 Sep 2021 19:16:08 +0100
Subject: [PATCH 68/77] Update command line for Flower

---
 .../compose/local/django/celery/flower/start               | 7 ++++---
 .../compose/production/django/celery/flower/start          | 7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start
index 5bcaa816..bd3c9f2f 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start
@@ -4,7 +4,8 @@ set -o errexit
 set -o nounset
 
 
-celery flower \
-    --app=config.celery_app \
-    --broker="${CELERY_BROKER_URL}" \
+celery \
+    -A config.celery_app \
+    -b "${CELERY_BROKER_URL}" \
+    flower \
     --basic_auth="${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}"
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start b/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start
index 5bcaa816..bd3c9f2f 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start
+++ b/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start
@@ -4,7 +4,8 @@ set -o errexit
 set -o nounset
 
 
-celery flower \
-    --app=config.celery_app \
-    --broker="${CELERY_BROKER_URL}" \
+celery \
+    -A config.celery_app \
+    -b "${CELERY_BROKER_URL}" \
+    flower \
     --basic_auth="${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}"

From d74bd51a64d5383a345f19191dc30520753f8187 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 3 Sep 2021 19:17:23 +0100
Subject: [PATCH 69/77] Update Celery command line on Heroku

---
 {{cookiecutter.project_slug}}/Procfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/Procfile b/{{cookiecutter.project_slug}}/Procfile
index ddb5cd8a..274108d1 100644
--- a/{{cookiecutter.project_slug}}/Procfile
+++ b/{{cookiecutter.project_slug}}/Procfile
@@ -5,6 +5,6 @@ web: gunicorn config.asgi:application -k uvicorn.workers.UvicornWorker
 web: gunicorn config.wsgi:application
 {%- endif %}
 {% if cookiecutter.use_celery == "y" -%}
-worker: REMAP_SIGTERM=SIGQUIT celery worker --app=config.celery_app --loglevel=info
-beat: REMAP_SIGTERM=SIGQUIT celery beat --app=config.celery_app --loglevel=info
+worker: REMAP_SIGTERM=SIGQUIT celery -A config.celery_app worker --loglevel=info
+beat: REMAP_SIGTERM=SIGQUIT celery -A config.celery_app beat --loglevel=info
 {%- endif %}

From bd5ce0edfa8823fe2592b0a4daba95863315a41a Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 4 Sep 2021 02:14:51 +0000
Subject: [PATCH 70/77] Update Changelog

---
 CHANGELOG.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6376c0cf..243c2079 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,22 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-09-03]
+### Changed
+- Update available postgres versions ([#3297](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3297))
+### Updated
+- Update pre-commit to 2.15.0 ([#3313](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3313))
+- Auto-update pre-commit hooks ([#3307](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3307))
+- Update pillow to 8.3.2 ([#3312](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3312))
+- Update django-environ to 0.5.0 ([#3311](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3311))
+- Update pytest to 6.2.5 ([#3310](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3310))
+- Update black to 21.8b0 ([#3308](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3308))
+- Update argon2-cffi to 21.1.0 ([#3306](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3306))
+- Bump peter-evans/create-pull-request from 3.10.0 to 3.10.1 ([#3303](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3303))
+- Update django-debug-toolbar to 3.2.2 ([#3296](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3296))
+- Update django-cors-headers to 3.8.0 ([#3295](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3295))
+- Update uvicorn to 0.15.0 ([#3294](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3294))
+
 ## [2021-08-27]
 ### Updated
 - Update tox to 3.24.3 ([#3302](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3302))

From 0d88e6aaabb282b734ec14af1ca85cc574f94225 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 4 Sep 2021 09:05:57 -0700
Subject: [PATCH 71/77] Update django-environ from 0.5.0 to 0.6.0

---
 {{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 94ab4485..917fada6 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -30,7 +30,7 @@ uvicorn[standard]==0.15.0  # https://github.com/encode/uvicorn
 # Django
 # ------------------------------------------------------------------------------
 django==3.1.13  # pyup: < 3.2  # https://www.djangoproject.com/
-django-environ==0.5.0  # https://github.com/joke2k/django-environ
+django-environ==0.6.0  # https://github.com/joke2k/django-environ
 django-model-utils==4.1.1  # https://github.com/jazzband/django-model-utils
 django-allauth==0.45.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.12.0  # https://github.com/django-crispy-forms/django-crispy-forms

From eecdc45dd72c36ed5d1323dc60aba97c209114f3 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Mon, 6 Sep 2021 02:16:01 +0000
Subject: [PATCH 72/77] Update Changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 243c2079..aa36f590 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-09-05]
+### Updated
+- Update django-environ to 0.6.0 ([#3314](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3314))
+
 ## [2021-09-03]
 ### Changed
 - Update available postgres versions ([#3297](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3297))

From 34da2fa94b6e5a023d3492a0c7b1f2ecae815049 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 7 Sep 2021 02:12:27 +0000
Subject: [PATCH 73/77] Update Changelog

---
 CHANGELOG.md | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa36f590..3d3c1b95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,10 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-09-06]
+### Changed
+- Update Celery to v5 ([#3280](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3280))
+
 ## [2021-09-05]
 ### Updated
 - Update django-environ to 0.6.0 ([#3314](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3314))

From 7b70f576e760cab0ef76efeea06636609d9a88ad Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 11 Sep 2021 09:42:13 -0700
Subject: [PATCH 74/77] Update django-environ from 0.6.0 to 0.7.0

---
 {{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 59b4a6f0..726e2d21 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -30,7 +30,7 @@ uvicorn[standard]==0.15.0  # https://github.com/encode/uvicorn
 # Django
 # ------------------------------------------------------------------------------
 django==3.1.13  # pyup: < 3.2  # https://www.djangoproject.com/
-django-environ==0.6.0  # https://github.com/joke2k/django-environ
+django-environ==0.7.0  # https://github.com/joke2k/django-environ
 django-model-utils==4.1.1  # https://github.com/jazzband/django-model-utils
 django-allauth==0.45.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.12.0  # https://github.com/django-crispy-forms/django-crispy-forms

From b7de132d31e94832757ccf4770d5a7685e54c8e3 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 11 Sep 2021 17:48:47 +0100
Subject: [PATCH 75/77] Compare boolean with is instead of equality

---
 tests/test_cookiecutter_generation.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index f62d4bc9..295e9c5f 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -298,4 +298,4 @@ def test_pycharm_docs_removed(cookies, context, use_pycharm, pycharm_docs_exist)
 
     with open(f"{result.project}/docs/index.rst", "r") as f:
         has_pycharm_docs = "pycharm/configuration" in f.read()
-        assert has_pycharm_docs == pycharm_docs_exist
+        assert has_pycharm_docs is pycharm_docs_exist

From 46512acfee003a16f5a241d384874edeec0172d7 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 11 Sep 2021 16:55:41 +0000
Subject: [PATCH 76/77] 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 045c1f07..de5807e0 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1132,5 +1132,10 @@
     "name": "Charlie Macfarlane Brodie",
     "github_login": "tannart",
     "twitter_username": ""
+  },
+  {
+    "name": "Floyd Hightower",
+    "github_login": "fhightower",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index f75e34c9..b655f8fb 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -691,6 +691,13 @@ Listed in alphabetical order.
     </td>
     <td>windrush</td>
   </tr>
+  <tr>
+    <td>Floyd Hightower</td>
+    <td>
+      <a href="https://github.com/fhightower">fhightower</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Gabriel Mejia</td>
     <td>

From 40598448e20d785a717c885bdfa8647cf070c5b6 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 11 Sep 2021 18:03:46 +0100
Subject: [PATCH 77/77] Upgrade Heroku runtime to ptyhon 3.9.7

---
 {{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 87665291..2153d1e1 100644
--- a/{{cookiecutter.project_slug}}/runtime.txt
+++ b/{{cookiecutter.project_slug}}/runtime.txt
@@ -1 +1 @@
-python-3.9.4
+python-3.9.7