From 03772dec1b40bd0a970f58528c4b920b76f7cc9e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 21 Nov 2016 14:49:39 -0800
Subject: [PATCH 0001/2840] Update flake8 from 3.2.0 to 3.2.1

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

diff --git a/requirements.txt b/requirements.txt
index 1052e2179..369520cb2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 cookiecutter==1.4.0
-flake8==3.2.0 # pyup: != 2.6.0
+flake8==3.2.1 # pyup: != 2.6.0
 sh==1.11
 binaryornot==0.4.0
 

From 0c203241669277411df4bccf9d4bc9708c77affb Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 21 Nov 2016 14:49:40 -0800
Subject: [PATCH 0002/2840] Update flake8 from 3.2.0 to 3.2.1

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

diff --git a/{{cookiecutter.project_slug}}/requirements/test.txt b/{{cookiecutter.project_slug}}/requirements/test.txt
index 2dc42bd4c..704a508c9 100644
--- a/{{cookiecutter.project_slug}}/requirements/test.txt
+++ b/{{cookiecutter.project_slug}}/requirements/test.txt
@@ -8,7 +8,7 @@ psycopg2==2.6.2
 {%- endif %}
 
 coverage==4.2
-flake8==3.2.0 # pyup: != 2.6.0
+flake8==3.2.1 # pyup: != 2.6.0
 django-test-plus==1.0.16
 factory_boy==2.7.0
 

From 3a17f9bc271a7fff90c3dccbef86cd839975cf7d Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Fri, 25 May 2018 12:16:04 +0300
Subject: [PATCH 0003/2840] Remove project doc files likely to remain unused

---
 {{cookiecutter.project_slug}}/docs/deploy.rst |   4 -
 .../docs/docker_ec2.rst                       | 186 ------------------
 {{cookiecutter.project_slug}}/docs/index.rst  |  14 +-
 .../docs/install.rst                          |   4 -
 4 files changed, 4 insertions(+), 204 deletions(-)
 delete mode 100644 {{cookiecutter.project_slug}}/docs/deploy.rst
 delete mode 100644 {{cookiecutter.project_slug}}/docs/docker_ec2.rst
 delete mode 100644 {{cookiecutter.project_slug}}/docs/install.rst

diff --git a/{{cookiecutter.project_slug}}/docs/deploy.rst b/{{cookiecutter.project_slug}}/docs/deploy.rst
deleted file mode 100644
index 1e642c798..000000000
--- a/{{cookiecutter.project_slug}}/docs/deploy.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Deploy
-========
-
-This is where you describe how the project is deployed in production.
diff --git a/{{cookiecutter.project_slug}}/docs/docker_ec2.rst b/{{cookiecutter.project_slug}}/docs/docker_ec2.rst
deleted file mode 100644
index 606d29563..000000000
--- a/{{cookiecutter.project_slug}}/docs/docker_ec2.rst
+++ /dev/null
@@ -1,186 +0,0 @@
-Developing with Docker
-======================
-
-You can develop your application in a `Docker`_ container for simpler deployment onto bare Linux machines later. This instruction assumes an `Amazon Web Services`_ EC2 instance, but it should work on any machine with Docker > 1.3 and `Docker compose`_ installed.
-
-.. _Docker: https://www.docker.com/
-.. _Amazon Web Services: http://aws.amazon.com/
-.. _Docker compose: https://docs.docker.com/compose/
-
-Setting up
-^^^^^^^^^^
-
-Docker encourages running one container for each process. This might mean one container for your web server, one for Django application and a third for your database. Once you're happy composing containers in this way you can easily add more, such as a `Redis`_ cache.
-
-.. _Redis: http://redis.io/
-
-The Docker compose tool (previously known as `fig`_) makes linking these containers easy. An example set up for your Cookiecutter Django project might look like this:
-
-.. _fig: http://www.fig.sh/
-
-::
-
-    webapp/ # Your cookiecutter project would be in here
-        Dockerfile
-        ...
-    database/
-        Dockerfile
-        ...
-    webserver/
-        Dockerfile
-        ...
-    production.yml
-
-Each component of your application would get its own `Dockerfile`_. The rest of this example assumes you are using the `base postgres image`_ for your database. Your database settings in `config/base.py` might then look something like:
-
-.. _Dockerfile: https://docs.docker.com/reference/builder/
-.. _base postgres image: https://registry.hub.docker.com/_/postgres/
-
-.. code-block:: python
-
-    DATABASES = {
-            'default': {
-                'ENGINE': 'django.db.backends.postgresql_psycopg2',
-                'NAME': 'postgres',
-                'USER': 'postgres',
-                'HOST': 'database',
-                'PORT': 5432,
-            }
-        }
-
-The `Docker compose documentation`_ explains in detail what you can accomplish in the `production.yml` file, but an example configuration might look like this:
-
-.. _Docker compose documentation: https://docs.docker.com/compose/#compose-documentation
-
-.. code-block:: yaml
-
-    database:
-        build: database
-    webapp:
-        build: webapp:
-        command: /usr/bin/python3.6 manage.py runserver 0.0.0.0:8000 # dev setting
-        # command: gunicorn -b 0.0.0.0:8000 wsgi:application # production setting
-        volumes:
-            - webapp/your_project_name:/path/to/container/workdir/
-        links:
-            - database
-    webserver:
-        build: webserver
-        ports:
-            - "80:80"
-            - "443:443"
-        links:
-            - webapp
-
-We'll ignore the webserver for now (you'll want to comment that part out while we do). A working Dockerfile to run your cookiecutter application might look like this:
-
-::
-
-    FROM ubuntu:14.04
-    ENV REFRESHED_AT 2015-01-13
-
-    # update packages and prepare to build software
-    RUN ["apt-get", "update"]
-    RUN ["apt-get", "-y", "install", "build-essential", "vim", "git", "curl"]
-    RUN ["locale-gen", "en_GB.UTF-8"]
-
-    # install latest python
-    RUN ["apt-get", "-y", "build-dep", "python3-dev", "python3-imaging"]
-    RUN ["apt-get", "-y", "install", "python3-dev", "python3-imaging", "python3-pip"]
-
-    # prepare postgreSQL support
-    RUN ["apt-get", "-y", "build-dep", "python3-psycopg2"]
-
-    # move into our working directory
-    # ADD must be after chown see http://stackoverflow.com/a/26145444/1281947
-    RUN ["groupadd", "python"]
-    RUN ["useradd", "python", "-s", "/bin/bash", "-m", "-g", "python", "-G", "python"]
-    ENV HOME /home/python
-    WORKDIR /home/python
-    RUN ["chown", "-R", "python:python", "/home/python"]
-    ADD ./ /home/python
-
-    # manage requirements
-    ENV REQUIREMENTS_REFRESHED_AT 2015-02-25
-    RUN ["pip3", "install", "-r", "requirements.txt"]
-
-    # uncomment the line below to use container as a non-root user
-    USER python:python
-
-Running `sudo docker-compose -f production.yml build` will follow the instructions in your `production.yml` file and build the database container, then your webapp, before mounting your cookiecutter project files as a volume in the webapp container and linking to the database. Our example yaml file runs in development mode but changing it to production mode is as simple as commenting out the line using `runserver` and uncommenting the line using `gunicorn`.
-
-Both are set to run on port `0.0.0.0:8000`, which is where the Docker daemon will discover it. You can now run `sudo docker-compose -f production.yml up` and browse to `localhost:8000` to see your application running.
-
-Deployment
-^^^^^^^^^^
-
-You'll need a webserver container for deployment. An example setup for `Nginx`_ might look like this:
-
-.. _Nginx: http://wiki.nginx.org/Main
-
-::
-
-    FROM ubuntu:14.04
-    ENV REFRESHED_AT 2015-02-11
-
-    # get the nginx package and set it up
-    RUN ["apt-get", "update"]
-    RUN ["apt-get", "-y", "install", "nginx"]
-
-    # forward request and error logs to docker log collector
-    RUN ln -sf /dev/stdout /var/log/nginx/access.log
-    RUN ln -sf /dev/stderr /var/log/nginx/error.log
-    VOLUME ["/var/cache/nginx"]
-    EXPOSE 80 443
-
-    # load nginx conf
-    ADD ./site.conf /etc/nginx/sites-available/your_cookiecutter_project
-    RUN ["ln", "-s", "/etc/nginx/sites-available/your_cookiecutter_project", "/etc/nginx/sites-enabled/your_cookiecutter_project"]
-    RUN ["rm", "-rf", "/etc/nginx/sites-available/default"]
-
-    #start the server
-    CMD ["nginx", "-g", "daemon off;"]
-
-That Dockerfile assumes you have an Nginx conf file named `site.conf` in the same directory as the webserver Dockerfile. A very basic example, which forwards traffic onto the development server or gunicorn for processing, would look like this:
-
-::
-
-    # see http://serverfault.com/questions/577370/how-can-i-use-environment-variables-in-nginx-conf#comment730384_577370
-    upstream localhost {
-        server webapp_1:8000;
-    }
-    server {
-        location / {
-            proxy_pass http://localhost;
-        }
-    }
-
-Running `sudo docker-compose -f production.yml build webserver` will build your server container. Running `sudo docker-compose -f production.yml up` will now expose your application directly on `localhost` (no need to specify the port number).
-
-Building and running your app on EC2
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-All you now need to do to run your app in production is:
-
-* Create an empty EC2 Linux instance (any Linux machine should do).
-
-* Install your preferred source control solution, Docker and Docker compose on the news instance.
-
-* Pull in your code from source control. The root directory should be the one with your `production.yml` file in it.
-
-* Run `sudo docker-compose -f production.yml build` and `sudo docker-compose -f production.yml up`.
-
-* Assign an `Elastic IP address`_ to your new machine.
-
-.. _Elastic IP address: https://aws.amazon.com/articles/1346
-
-* Point your domain name to the elastic IP.
-
-**Be careful with Elastic IPs** because, on the AWS free tier, if you assign one and then stop the machine you will incur charges while the machine is down (presumably because you're preventing them allocating the IP to someone else).
-
-Security advisory
-^^^^^^^^^^^^^^^^^
-
-The setup described in this instruction will get you up-and-running but it hasn't been audited for security. If you are running your own setup like this it is always advisable to, at a minimum, examine your application with a tool like `OWASP ZAP`_ to see what security holes you might be leaving open.
-
-.. _OWASP ZAP: https://www.owasp.org/index.php/OWASP_Zed_Attack_Proxy_Project
diff --git a/{{cookiecutter.project_slug}}/docs/index.rst b/{{cookiecutter.project_slug}}/docs/index.rst
index 21ef98ee5..96752d807 100644
--- a/{{cookiecutter.project_slug}}/docs/index.rst
+++ b/{{cookiecutter.project_slug}}/docs/index.rst
@@ -3,23 +3,17 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-Welcome to {{ cookiecutter.project_name }}'s documentation!
+{{ cookiecutter.project_name }} Project Documentation
 ====================================================================
 
-Contents:
+Table of Contents:
 
 .. toctree::
    :maxdepth: 2
 
-   install
-   deploy
-   docker_ec2
-   tests
 
-
-
-Indices and tables
-==================
+Indices & Tables
+================
 
 * :ref:`genindex`
 * :ref:`modindex`
diff --git a/{{cookiecutter.project_slug}}/docs/install.rst b/{{cookiecutter.project_slug}}/docs/install.rst
deleted file mode 100644
index 1bc03335d..000000000
--- a/{{cookiecutter.project_slug}}/docs/install.rst
+++ /dev/null
@@ -1,4 +0,0 @@
-Install
-=========
-
-This is where you write how to get a new laptop to run this project.

From 867e2ad629a03a5678dc5bea87fcd06b94099599 Mon Sep 17 00:00:00 2001
From: Demetris Stavrou <demestav@gmail.com>
Date: Thu, 21 Jun 2018 23:11:08 +0300
Subject: [PATCH 0004/2840] Redis config in local is now conditional on Celery.

---
 {{cookiecutter.project_slug}}/.envs/.local/.django | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/.envs/.local/.django b/{{cookiecutter.project_slug}}/.envs/.local/.django
index 8aa9a9946..a145c6bcd 100644
--- a/{{cookiecutter.project_slug}}/.envs/.local/.django
+++ b/{{cookiecutter.project_slug}}/.envs/.local/.django
@@ -2,6 +2,8 @@
 # ------------------------------------------------------------------------------
 USE_DOCKER=yes
 
+{%- if cookiecutter.use_celery == 'y' %}
 # Redis
 # ------------------------------------------------------------------------------
 REDIS_URL=redis://redis:6379/0
+{% endif %}

From 6f638078ebe6edcf6b1930658ba2ee4451c94c95 Mon Sep 17 00:00:00 2001
From: Demetris Stavrou <demestav@gmail.com>
Date: Fri, 22 Jun 2018 17:32:10 +0300
Subject: [PATCH 0005/2840] Moved CELERY_BROKER_URL definition to .django env
 file to resolve error when Celery is not used (PR #1693)

---
 {{cookiecutter.project_slug}}/.envs/.production/.django    | 7 +++++++
 .../compose/production/django/entrypoint.sh                | 3 ---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/.envs/.production/.django b/{{cookiecutter.project_slug}}/.envs/.production/.django
index 2e9eefea7..1203ce648 100644
--- a/{{cookiecutter.project_slug}}/.envs/.production/.django
+++ b/{{cookiecutter.project_slug}}/.envs/.production/.django
@@ -43,3 +43,10 @@ DJANGO_SENTRY_DSN=
 # Redis
 # ------------------------------------------------------------------------------
 REDIS_URL=redis://redis:6379/0
+
+{% if cookiecutter.use_celery == "y" %}
+# Celery
+# ------------------------------------------------------------------------------
+CELERY_BROKER_URL=redis://redis:6379/0
+
+{% endif %}
\ No newline at end of file
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint.sh b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint.sh
index 74242bde4..ae0858e1a 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint.sh
+++ b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint.sh
@@ -7,9 +7,6 @@ set -o nounset
 
 cmd="$@"
 
-# N.B. If only .env files supported variable expansion...
-export CELERY_BROKER_URL="${REDIS_URL}"
-
 if [ -z "${POSTGRES_USER}" ]; then
     base_postgres_image_default_user='postgres'
     export POSTGRES_USER="${base_postgres_image_default_user}"

From 72893b1d0678b9e248e16660e419fbd680b30d4f Mon Sep 17 00:00:00 2001
From: Demetris Stavrou <demestav@gmail.com>
Date: Thu, 21 Jun 2018 23:11:08 +0300
Subject: [PATCH 0006/2840] Redis config in local is now conditional on Celery.

---
 {{cookiecutter.project_slug}}/.envs/.local/.django | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/.envs/.local/.django b/{{cookiecutter.project_slug}}/.envs/.local/.django
index 8aa9a9946..a145c6bcd 100644
--- a/{{cookiecutter.project_slug}}/.envs/.local/.django
+++ b/{{cookiecutter.project_slug}}/.envs/.local/.django
@@ -2,6 +2,8 @@
 # ------------------------------------------------------------------------------
 USE_DOCKER=yes
 
+{%- if cookiecutter.use_celery == 'y' %}
 # Redis
 # ------------------------------------------------------------------------------
 REDIS_URL=redis://redis:6379/0
+{% endif %}

From 065becf277d1d56207114aeefbb25f85f62a678d Mon Sep 17 00:00:00 2001
From: Demetris Stavrou <demestav@gmail.com>
Date: Fri, 22 Jun 2018 17:32:10 +0300
Subject: [PATCH 0007/2840] Moved CELERY_BROKER_URL definition to .django env
 file to resolve error when Celery is not used (PR #1693)

---
 {{cookiecutter.project_slug}}/.envs/.production/.django    | 7 +++++++
 .../compose/production/django/entrypoint                   | 3 ---
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/.envs/.production/.django b/{{cookiecutter.project_slug}}/.envs/.production/.django
index 5cb90897b..34ab71a28 100644
--- a/{{cookiecutter.project_slug}}/.envs/.production/.django
+++ b/{{cookiecutter.project_slug}}/.envs/.production/.django
@@ -43,3 +43,10 @@ SENTRY_DSN=
 # Redis
 # ------------------------------------------------------------------------------
 REDIS_URL=redis://redis:6379/0
+
+{% if cookiecutter.use_celery == "y" %}
+# Celery
+# ------------------------------------------------------------------------------
+CELERY_BROKER_URL=redis://redis:6379/0
+
+{% endif %}
\ No newline at end of file
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint
index 4845e343b..e2c22de5f 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint
+++ b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint
@@ -5,9 +5,6 @@ set -o pipefail
 set -o nounset
 
 
-# N.B. If only .env files supported variable expansion...
-export CELERY_BROKER_URL="${REDIS_URL}"
-
 if [ -z "${POSTGRES_USER}" ]; then
     base_postgres_image_default_user='postgres'
     export POSTGRES_USER="${base_postgres_image_default_user}"

From c3026e7dfbf94960bc7416bf782dc69285cc0de1 Mon Sep 17 00:00:00 2001
From: Demetris Stavrou <demestav@gmail.com>
Date: Wed, 27 Jun 2018 23:36:06 +0300
Subject: [PATCH 0008/2840] Added CELERY_BROKER_URL back to entrypoint and
 surrounded it with a conditional

---
 .../compose/production/django/entrypoint                     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint
index e2c22de5f..0a76b3107 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint
+++ b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint
@@ -5,6 +5,11 @@ set -o pipefail
 set -o nounset
 
 
+{% if cookiecutter.use_celery == 'y' %}
+# N.B. If only .env files supported variable expansion...
+export CELERY_BROKER_URL="${REDIS_URL}"
+{% endif %}
+
 if [ -z "${POSTGRES_USER}" ]; then
     base_postgres_image_default_user='postgres'
     export POSTGRES_USER="${base_postgres_image_default_user}"

From d79f122bc93346ec2f8cbbe5fab6922737060321 Mon Sep 17 00:00:00 2001
From: Demetris Stavrou <demestav@gmail.com>
Date: Thu, 21 Jun 2018 23:11:08 +0300
Subject: [PATCH 0009/2840] Redis config in local is now conditional on Celery.

---
 {{cookiecutter.project_slug}}/.envs/.local/.django | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/.envs/.local/.django b/{{cookiecutter.project_slug}}/.envs/.local/.django
index d94a17e59..6f7a2b11e 100644
--- a/{{cookiecutter.project_slug}}/.envs/.local/.django
+++ b/{{cookiecutter.project_slug}}/.envs/.local/.django
@@ -2,10 +2,11 @@
 # ------------------------------------------------------------------------------
 USE_DOCKER=yes
 
+{%- if cookiecutter.use_celery == 'y' %}
 # Redis
 # ------------------------------------------------------------------------------
 REDIS_URL=redis://redis:6379/0
-{% if cookiecutter.use_celery == 'y' %}
+
 # Celery
 # ------------------------------------------------------------------------------
 

From 7c69704f9fe3351be10f976e6eb26f7e98932b33 Mon Sep 17 00:00:00 2001
From: Demetris Stavrou <demestav@gmail.com>
Date: Fri, 22 Jun 2018 17:32:10 +0300
Subject: [PATCH 0010/2840] Moved CELERY_BROKER_URL definition to .django env
 file to resolve error when Celery is not used (PR #1693)

---
 .../compose/production/django/entrypoint                       | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint
index 4845e343b..e2c22de5f 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint
+++ b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint
@@ -5,9 +5,6 @@ set -o pipefail
 set -o nounset
 
 
-# N.B. If only .env files supported variable expansion...
-export CELERY_BROKER_URL="${REDIS_URL}"
-
 if [ -z "${POSTGRES_USER}" ]; then
     base_postgres_image_default_user='postgres'
     export POSTGRES_USER="${base_postgres_image_default_user}"

From 2c56b2e0e30196b2f89582a640170b3a5fae0145 Mon Sep 17 00:00:00 2001
From: Demetris Stavrou <demestav@gmail.com>
Date: Wed, 27 Jun 2018 23:36:06 +0300
Subject: [PATCH 0011/2840] Added CELERY_BROKER_URL back to entrypoint and
 surrounded it with a conditional

---
 .../compose/production/django/entrypoint                     | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint
index e2c22de5f..0a76b3107 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint
+++ b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint
@@ -5,6 +5,11 @@ set -o pipefail
 set -o nounset
 
 
+{% if cookiecutter.use_celery == 'y' %}
+# N.B. If only .env files supported variable expansion...
+export CELERY_BROKER_URL="${REDIS_URL}"
+{% endif %}
+
 if [ -z "${POSTGRES_USER}" ]; then
     base_postgres_image_default_user='postgres'
     export POSTGRES_USER="${base_postgres_image_default_user}"

From 0ef965cbfd3af71cf42dbd603e8e61f04b976462 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 30 Jan 2019 11:53:28 -0800
Subject: [PATCH 0012/2840] Update django-extensions from 2.1.4 to 2.1.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 7ee9a1ee3..9c7646bde 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -25,6 +25,6 @@ coverage==4.5.2  # https://github.com/nedbat/coveragepy
 factory-boy==2.11.1  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==1.11  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==2.1.4  # https://github.com/django-extensions/django-extensions
+django-extensions==2.1.5  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.6.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.4.5  # https://github.com/pytest-dev/pytest-django

From 75837bac657a9cdf32b34c1ed77962f6bf6294c6 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 30 Jan 2019 16:40:22 -0800
Subject: [PATCH 0013/2840] Update pytest from 4.1.1 to 4.2.0

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

diff --git a/requirements.txt b/requirements.txt
index 90870656e..12e880804 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,5 +9,5 @@ flake8==3.6.0
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.6.1
-pytest==4.1.1
+pytest==4.2.0
 pytest-cookies==0.3.0

From 8c7a3613babefd2903ecff08956e15dce9adf7a7 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 30 Jan 2019 16:40:23 -0800
Subject: [PATCH 0014/2840] Update pytest from 4.1.1 to 4.2.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 7ee9a1ee3..8fe77cc21 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -12,7 +12,7 @@ psycopg2-binary==2.7.7  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.660  # https://github.com/python/mypy
-pytest==4.1.1  # https://github.com/pytest-dev/pytest
+pytest==4.2.0  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From 12777d06c9c552980e829f53bc65700b074a0185 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 31 Jan 2019 05:23:22 -0800
Subject: [PATCH 0015/2840] Update flake8 from 3.6.0 to 3.7.3

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

diff --git a/requirements.txt b/requirements.txt
index 90870656e..f3dc61e77 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-flake8==3.6.0
+flake8==3.7.3
 
 # Testing
 # ------------------------------------------------------------------------------

From 43bfd66aa07c4b483429af8b09b189f319cb36f2 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 31 Jan 2019 05:23:23 -0800
Subject: [PATCH 0016/2840] Update flake8 from 3.6.0 to 3.7.3

---
 {{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 7ee9a1ee3..45acbb134 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -17,7 +17,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality
 # ------------------------------------------------------------------------------
-flake8==3.6.0  # https://github.com/PyCQA/flake8
+flake8==3.7.3  # https://github.com/PyCQA/flake8
 coverage==4.5.2  # https://github.com/nedbat/coveragepy
 
 # Django

From 57c18bb2a0a0fba04c87b3926eb1f58c5f3bbfd4 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 1 Feb 2019 06:53:35 -0800
Subject: [PATCH 0017/2840] Update flake8 from 3.7.3 to 3.7.4

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

diff --git a/requirements.txt b/requirements.txt
index 63aacd870..cd78264b9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-flake8==3.7.3
+flake8==3.7.4
 
 # Testing
 # ------------------------------------------------------------------------------

From 8774ede3b01acb2d44ddbf3c1efd1bae4d1a6663 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 1 Feb 2019 06:53:37 -0800
Subject: [PATCH 0018/2840] Update flake8 from 3.7.3 to 3.7.4

---
 {{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 2a321cc1c..76cff8956 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -17,7 +17,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality
 # ------------------------------------------------------------------------------
-flake8==3.7.3  # https://github.com/PyCQA/flake8
+flake8==3.7.4  # https://github.com/PyCQA/flake8
 coverage==4.5.2  # https://github.com/nedbat/coveragepy
 
 # Django

From 6050368df08e4b4fb07e6f211db2c3bca98cc5f1 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 3 Feb 2019 13:54:30 -0800
Subject: [PATCH 0019/2840] Update pytest-django from 3.4.5 to 3.4.7

---
 {{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 2a321cc1c..afcb6655f 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -27,4 +27,4 @@ factory-boy==2.11.1  # https://github.com/FactoryBoy/factory_boy
 django-debug-toolbar==1.11  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==2.1.5  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.6.0  # https://github.com/nedbat/django_coverage_plugin
-pytest-django==3.4.5  # https://github.com/pytest-dev/pytest-django
+pytest-django==3.4.7  # https://github.com/pytest-dev/pytest-django

From ce23247401c82d9bf243582496924b7e5f562dcd Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 4 Feb 2019 18:46:33 -0800
Subject: [PATCH 0020/2840] Update flake8 from 3.7.4 to 3.7.5

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

diff --git a/requirements.txt b/requirements.txt
index cd78264b9..1fd7fe7ca 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-flake8==3.7.4
+flake8==3.7.5
 
 # Testing
 # ------------------------------------------------------------------------------

From fe819925015f9d617ee83bd48ab76a9788f5c357 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 4 Feb 2019 18:46:34 -0800
Subject: [PATCH 0021/2840] Update flake8 from 3.7.4 to 3.7.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 76cff8956..2c26e1f5c 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -17,7 +17,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality
 # ------------------------------------------------------------------------------
-flake8==3.7.4  # https://github.com/PyCQA/flake8
+flake8==3.7.5  # https://github.com/PyCQA/flake8
 coverage==4.5.2  # https://github.com/nedbat/coveragepy
 
 # Django

From 06a96b68dcfedbcd14728195a0b8d362881841c7 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 4 Feb 2019 18:46:40 -0800
Subject: [PATCH 0022/2840] Update sphinx from 1.8.3 to 1.8.4

---
 {{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 76cff8956..901e0f0c7 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -2,7 +2,7 @@
 
 Werkzeug==0.14.1  # https://github.com/pallets/werkzeug
 ipdb==0.11  # https://github.com/gotcha/ipdb
-Sphinx==1.8.3  # https://github.com/sphinx-doc/sphinx
+Sphinx==1.8.4  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.7.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}

From 9e2d335ed33d49c7a84157657533294a3bf097a1 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 8 Feb 2019 16:28:37 -0800
Subject: [PATCH 0023/2840] Update mypy from 0.660 to 0.670

---
 {{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 17900ac8a..a496135b6 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -11,7 +11,7 @@ psycopg2-binary==2.7.7  # https://github.com/psycopg/psycopg2
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.660  # https://github.com/python/mypy
+mypy==0.670  # https://github.com/python/mypy
 pytest==4.2.0  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 

From 1c11f0950f290ef8401a85afc83becbc95e363e3 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 16 Feb 2019 13:34:11 +0200
Subject: [PATCH 0024/2840] Update django from 2.0.10 to 2.0.13 (#1936)

---
 {{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 09ca8ddd6..e43b70af6 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -18,7 +18,7 @@ flower==0.9.2  # https://github.com/mher/flower
 
 # Django
 # ------------------------------------------------------------------------------
-django==2.0.10  # pyup: < 2.1  # https://www.djangoproject.com/
+django==2.0.13  # pyup: < 2.1  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==3.1.2  # https://github.com/jazzband/django-model-utils
 django-allauth==0.38.0  # https://github.com/pennersr/django-allauth

From 0f8275911bcb297fd88624ddd2137d3ffb9e4ba1 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 16 Feb 2019 03:34:22 -0800
Subject: [PATCH 0025/2840] Update pytest from 4.2.0 to 4.2.1

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

diff --git a/requirements.txt b/requirements.txt
index 1fd7fe7ca..db6dcb6d0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,5 +9,5 @@ flake8==3.7.5
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.6.1
-pytest==4.2.0
+pytest==4.2.1
 pytest-cookies==0.3.0

From 407ccb64ba1157283973225a357bbe78c30d94e7 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 20 Feb 2019 19:10:41 +0200
Subject: [PATCH 0026/2840] Update pytest from 4.2.1 to 4.3.0 (#1944)

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

diff --git a/requirements.txt b/requirements.txt
index db6dcb6d0..a8db78f9d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,5 +9,5 @@ flake8==3.7.5
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.6.1
-pytest==4.2.1
+pytest==4.3.0
 pytest-cookies==0.3.0

From b09d840b54f6b874a5e35c4cb59162f87d3f4cb5 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 20 Feb 2019 19:10:52 +0200
Subject: [PATCH 0027/2840] Update flake8 from 3.7.5 to 3.7.6 (#1943)

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

diff --git a/requirements.txt b/requirements.txt
index a8db78f9d..dabb5dd91 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-flake8==3.7.5
+flake8==3.7.6
 
 # Testing
 # ------------------------------------------------------------------------------

From 2676401ed79d74881b86821b35e5ce59254b5fd0 Mon Sep 17 00:00:00 2001
From: Anna Sidwell <anna@takkaria.org>
Date: Sat, 23 Feb 2019 17:12:19 +1100
Subject: [PATCH 0028/2840] Update Gulp & other dependencies

---
 {{cookiecutter.project_slug}}/gulpfile.js  | 157 +++++++++++----------
 {{cookiecutter.project_slug}}/package.json |  33 ++---
 2 files changed, 101 insertions(+), 89 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/gulpfile.js b/{{cookiecutter.project_slug}}/gulpfile.js
index bb18a535d..1f65b30cc 100644
--- a/{{cookiecutter.project_slug}}/gulpfile.js
+++ b/{{cookiecutter.project_slug}}/gulpfile.js
@@ -1,34 +1,32 @@
+////////////////////////////////
+// Setup
+////////////////////////////////
 
-////////////////////////////////
-		//Setup//
-////////////////////////////////
+// Gulp and package
+const { src, dest, parallel, series, watch } = require('gulp')
+const pjson = require('./package.json')
 
 // Plugins
-var gulp = require('gulp'),
-      pjson = require('./package.json'),
-      gutil = require('gulp-util'),
-      sass = require('gulp-sass'),
-      autoprefixer = require('gulp-autoprefixer'),
-      cssnano = require('gulp-cssnano'),
-      {% if cookiecutter.custom_bootstrap_compilation == 'y' %}
-      concat = require('gulp-concat'),
-      {% endif %}
-      rename = require('gulp-rename'),
-      del = require('del'),
-      plumber = require('gulp-plumber'),
-      pixrem = require('gulp-pixrem'),
-      uglify = require('gulp-uglify'),
-      imagemin = require('gulp-imagemin'),
-      spawn = require('child_process').spawn,
-      runSequence = require('run-sequence'),
-      browserSync = require('browser-sync').create(),
-      reload = browserSync.reload;
-
+const autoprefixer = require('autoprefixer')
+const browserSync = require('browser-sync').create()
+{% if cookiecutter.custom_bootstrap_compilation == 'y' %}
+const concat = require('gulp-concat')
+{% endif %}
+const cssnano = require ('cssnano')
+const imagemin = require('gulp-imagemin')
+const pixrem = require('pixrem')
+const plumber = require('gulp-plumber')
+const postcss = require('gulp-postcss')
+const reload = browserSync.reload
+const rename = require('gulp-rename')
+const sass = require('gulp-sass')
+const spawn = require('child_process').spawn
+const uglify = require('gulp-uglify-es').default
 
 // Relative paths function
-var pathsConfig = function (appName) {
-  this.app = "./" + (appName || pjson.name);
-  var vendorsRoot = 'node_modules/';
+function pathsConfig(appName) {
+  this.app = "./" + (appName || pjson.name)
+  var vendorsRoot = 'node_modules/'
 
   return {
     {% if cookiecutter.custom_bootstrap_compilation == 'y' %}
@@ -47,17 +45,26 @@ var pathsConfig = function (appName) {
     images: this.app + '/static/images',
     js: this.app + '/static/js'
   }
-};
+}
 
-var paths = pathsConfig();
+var paths = pathsConfig()
 
 ////////////////////////////////
-		//Tasks//
+// Tasks
 ////////////////////////////////
 
 // Styles autoprefixing and minification
-gulp.task('styles', function() {
-  return gulp.src(paths.sass + '/project.scss')
+function styles() {
+  var processCss = [
+      autoprefixer(), // adds vendor prefixes
+      pixrem(),       // add fallbacks for rem units
+  ]
+
+  var minifyCss = [
+      cssnano({ preset: 'default' })   // minify result
+  ]
+
+  return src(paths.sass + '/project.scss')
     .pipe(sass({
       includePaths: [
         {% if cookiecutter.custom_bootstrap_compilation == 'y' %}
@@ -67,72 +74,80 @@ gulp.task('styles', function() {
       ]
     }).on('error', sass.logError))
     .pipe(plumber()) // Checks for errors
-    .pipe(autoprefixer({browsers: ['last 2 versions']})) // Adds vendor prefixes
-    .pipe(pixrem())  // add fallbacks for rem units
-    .pipe(gulp.dest(paths.css))
+    .pipe(postcss(processCss))
+    .pipe(dest(paths.css))
     .pipe(rename({ suffix: '.min' }))
-    .pipe(cssnano()) // Minifies the result
-    .pipe(gulp.dest(paths.css));
-});
+    .pipe(postcss(minifyCss)) // Minifies the result
+    .pipe(dest(paths.css))
+}
 
 // Javascript minification
-gulp.task('scripts', function() {
-  return gulp.src(paths.js + '/project.js')
+function scripts() {
+  return src(paths.js + '/project.js')
     .pipe(plumber()) // Checks for errors
     .pipe(uglify()) // Minifies the js
     .pipe(rename({ suffix: '.min' }))
-    .pipe(gulp.dest(paths.js));
-});
-
+    .pipe(dest(paths.js))
+}
 
 {% if cookiecutter.custom_bootstrap_compilation == 'y' %}
 // Vendor Javascript minification
-gulp.task('vendor-scripts', function() {
-  return gulp.src(paths.vendorsJs)
+function vendorScripts() {
+  return src(paths.vendorsJs)
     .pipe(concat('vendors.js'))
-    .pipe(gulp.dest(paths.js))
+    .pipe(dest(paths.js))
     .pipe(plumber()) // Checks for errors
     .pipe(uglify()) // Minifies the js
     .pipe(rename({ suffix: '.min' }))
-    .pipe(gulp.dest(paths.js));
-});
+    .pipe(dest(paths.js))
+}
 {% endif %}
 
 // Image compression
-gulp.task('imgCompression', function(){
-  return gulp.src(paths.images + '/*')
+function imgCompression() {
+  return src(paths.images + '/*')
     .pipe(imagemin()) // Compresses PNG, JPEG, GIF and SVG images
-    .pipe(gulp.dest(paths.images))
-});
+    .pipe(dest(paths.images))
+}
+
+// Generate all assets
+const generateAssets = parallel(
+  styles,
+  scripts,
+  {% if cookiecutter.custom_bootstrap_compilation == 'y' %}vendorScripts,{% endif %}
+  imgCompression
+)
 
 // Run django server
-gulp.task('runServer', function(cb) {
-  var cmd = spawn('python', ['manage.py', 'runserver'], {stdio: 'inherit'});
+function runServer(cb) {
+  var cmd = spawn('python', ['manage.py', 'runserver'], {stdio: 'inherit'})
   cmd.on('close', function(code) {
-    console.log('runServer exited with code ' + code);
-    cb(code);
-  });
-});
+    console.log('runServer exited with code ' + code)
+    cb(code)
+  })
+}
 
 // Browser sync server for live reload
-gulp.task('browserSync', function() {
+function initBrowserSync() {
     browserSync.init(
       [paths.css + "/*.css", paths.js + "*.js", paths.templates + '*.html'], {
         proxy:  "localhost:8000"
-    });
-});
+    })
+}
 
 // Watch
-gulp.task('watch', function() {
+function watchPaths() {
+  watch(paths.sass + '/*.scss', styles)
+  watch(paths.js + '/*.js', scripts).on("change", reload)
+  watch(paths.images + '/*', imgCompression)
+  watch(paths.templates + '/**/*.html').on("change", reload)
+}
 
-  gulp.watch(paths.sass + '/*.scss', ['styles']);
-  gulp.watch(paths.js + '/*.js', ['scripts']).on("change", reload);
-  gulp.watch(paths.images + '/*', ['imgCompression']);
-  gulp.watch(paths.templates + '/**/*.html').on("change", reload);
+// Set up dev environment
+const dev = parallel(
+  runServer,
+  initBrowserSync,
+  watchPaths
+)
 
-});
-
-// Default task
-gulp.task('default', function() {
-    runSequence(['styles', 'scripts', {% if cookiecutter.custom_bootstrap_compilation == 'y' %}'vendor-scripts', {% endif %}'imgCompression'], ['runServer', 'browserSync', 'watch']);
-});
+exports.default = series(generateAssets, dev)
diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json
index b29d52963..a15df941e 100644
--- a/{{cookiecutter.project_slug}}/package.json
+++ b/{{cookiecutter.project_slug}}/package.json
@@ -6,32 +6,29 @@
     {% if cookiecutter.js_task_runner == 'Gulp' -%}
     {% if cookiecutter.custom_bootstrap_compilation == 'y' -%}
     "bootstrap": "4.1.1",
-    {% endif -%}
-    "browser-sync": "^2.14.0",
-    "del": "^2.2.2",
-    "gulp": "^3.9.1",
-    "gulp-autoprefixer": "^5.0.0",
-    {% if cookiecutter.custom_bootstrap_compilation == 'y' -%}
     "gulp-concat": "^2.6.1",
-    {% endif -%}
-    "gulp-cssnano": "^2.1.2",
-    "gulp-imagemin": "^4.1.0",
-    "gulp-pixrem": "^1.0.0",
-    "gulp-plumber": "^1.1.0",
-    "gulp-rename": "^1.2.2",
-    "gulp-sass": "^3.1.0",
-    "gulp-uglify": "^3.0.0",
-    "gulp-util": "^3.0.7",
-    {% if cookiecutter.custom_bootstrap_compilation == 'y' -%}
     "jquery": "3.3.1",
     "popper.js": "1.14.3",
     {% endif -%}
-    "run-sequence": "^2.1.1"
+    "autoprefixer": "^9.4.7",
+    "browser-sync": "^2.14.0",
+    "cssnano": "^4.1.10",
+    "gulp": "^4.0.0",
+    "gulp-imagemin": "^5.0.3",
+    "gulp-plumber": "^1.2.1",
+    "gulp-postcss": "^8.0.0",
+    "gulp-rename": "^1.2.2",
+    "gulp-sass": "^4.0.2",
+    "gulp-uglify-es": "^1.0.4",
+    "pixrem": "^5.0.0"
     {%- endif %}
   },
   "engines": {
-    "node": ">=0.8.0"
+    "node": ">=8"
   },
+  "browserslist": [
+    "last 2 versions"
+  ],
   "scripts": {
     {% if cookiecutter.js_task_runner == 'Gulp' -%}
     "dev": "gulp"

From 17a9632031d55ca5bd464f9c8ef79480f99ab48c Mon Sep 17 00:00:00 2001
From: Anna Sidwell <anna@takkaria.org>
Date: Sat, 23 Feb 2019 18:57:42 +1100
Subject: [PATCH 0029/2840] Add my name to contributors

---
 CONTRIBUTORS.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index e3569e78e..e6111cd15 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -57,6 +57,7 @@ Listed in alphabetical order.
   Andrew Mikhnevich        `@zcho`_
   Andy Rose
   Anna Callahan            `@jazztpt`_
+  Anna Sidwell             `@takkaria`_
   Antonia Blair            `@antoniablair`_             @antoniablairart
   Anuj Bansal              `@ahhda`_
   Arcuri Davide            `@dadokkio`_
@@ -271,6 +272,7 @@ Listed in alphabetical order.
 .. _@ssteinerX: https://github.com/ssteinerx
 .. _@stepmr: https://github.com/stepmr
 .. _@suledev: https://github.com/suledev
+.. _@takkaria: https://github.com/takkaria
 .. _@timfreund: https://github.com/timfreund
 .. _@Travistock: https://github.com/Tavistock
 .. _@trungdong: https://github.com/trungdong

From b6b7176d02fc95e03b6bd29b9ec8dcad63f6dd2e Mon Sep 17 00:00:00 2001
From: Anna Sidwell <anna@takkaria.org>
Date: Wed, 27 Feb 2019 10:11:20 +1100
Subject: [PATCH 0030/2840] Make requested changes:

* Reorder meta tasks to the bottom
* Fix JS compilation issue
* Replace strings concatenation with templates
---
 {{cookiecutter.project_slug}}/gulpfile.js | 66 ++++++++++++-----------
 1 file changed, 36 insertions(+), 30 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/gulpfile.js b/{{cookiecutter.project_slug}}/gulpfile.js
index 1f65b30cc..d92678ed2 100644
--- a/{{cookiecutter.project_slug}}/gulpfile.js
+++ b/{{cookiecutter.project_slug}}/gulpfile.js
@@ -25,25 +25,25 @@ const uglify = require('gulp-uglify-es').default
 
 // Relative paths function
 function pathsConfig(appName) {
-  this.app = "./" + (appName || pjson.name)
-  var vendorsRoot = 'node_modules/'
+  this.app = `./${pjson.name}`
+  const vendorsRoot = 'node_modules'
 
   return {
     {% if cookiecutter.custom_bootstrap_compilation == 'y' %}
-    bootstrapSass: vendorsRoot + '/bootstrap/scss',
+    bootstrapSass: `${vendorsRoot}/bootstrap/scss`,
     vendorsJs: [
-      vendorsRoot + 'jquery/dist/jquery.slim.js',
-      vendorsRoot + 'popper.js/dist/umd/popper.js',
-      vendorsRoot + 'bootstrap/dist/js/bootstrap.js'
+      `${vendorsRoot}/jquery/dist/jquery.slim.js`,
+      `${vendorsRoot}/popper.js/dist/umd/popper.js`,
+      `${vendorsRoot}/bootstrap/dist/js/bootstrap.js`,
     ],
     {% endif %}
     app: this.app,
-    templates: this.app + '/templates',
-    css: this.app + '/static/css',
-    sass: this.app + '/static/sass',
-    fonts: this.app + '/static/fonts',
-    images: this.app + '/static/images',
-    js: this.app + '/static/js'
+    templates: `${this.app}/templates`,
+    css: `${this.app}/static/css`,
+    sass: `${this.app}/static/sass`,
+    fonts: `${this.app}/static/fonts`,
+    images: `${this.app}/static/images`,
+    js: `${this.app}/static/js`,
   }
 }
 
@@ -64,7 +64,7 @@ function styles() {
       cssnano({ preset: 'default' })   // minify result
   ]
 
-  return src(paths.sass + '/project.scss')
+  return src(`${paths.sass}/project.scss`)
     .pipe(sass({
       includePaths: [
         {% if cookiecutter.custom_bootstrap_compilation == 'y' %}
@@ -83,7 +83,7 @@ function styles() {
 
 // Javascript minification
 function scripts() {
-  return src(paths.js + '/project.js')
+  return src(`${paths.js}/project.js`)
     .pipe(plumber()) // Checks for errors
     .pipe(uglify()) // Minifies the js
     .pipe(rename({ suffix: '.min' }))
@@ -105,19 +105,11 @@ function vendorScripts() {
 
 // Image compression
 function imgCompression() {
-  return src(paths.images + '/*')
+  return src(`${paths.images}/*`)
     .pipe(imagemin()) // Compresses PNG, JPEG, GIF and SVG images
     .pipe(dest(paths.images))
 }
 
-// Generate all assets
-const generateAssets = parallel(
-  styles,
-  scripts,
-  {% if cookiecutter.custom_bootstrap_compilation == 'y' %}vendorScripts,{% endif %}
-  imgCompression
-)
-
 // Run django server
 function runServer(cb) {
   var cmd = spawn('python', ['manage.py', 'runserver'], {stdio: 'inherit'})
@@ -130,19 +122,31 @@ function runServer(cb) {
 // Browser sync server for live reload
 function initBrowserSync() {
     browserSync.init(
-      [paths.css + "/*.css", paths.js + "*.js", paths.templates + '*.html'], {
-        proxy:  "localhost:8000"
-    })
+      [
+        `${paths.css}/*.css`,
+        `${paths.js}/*.js`,
+        `${paths.templates}/*.html`
+      ], {
+        proxy: "localhost:8000"
+      }
+    )
 }
 
 // Watch
 function watchPaths() {
-  watch(paths.sass + '/*.scss', styles)
-  watch(paths.js + '/*.js', scripts).on("change", reload)
-  watch(paths.images + '/*', imgCompression)
-  watch(paths.templates + '/**/*.html').on("change", reload)
+  watch(`${paths.sass}/*.scss`, styles)
+  watch(`${paths.templates}/**/*.html`).on("change", reload)
+  watch([`${paths.js}/*.js`, `!${paths.js}/*.min.js`], scripts).on("change", reload)
 }
 
+// Generate all assets
+const generateAssets = parallel(
+  styles,
+  scripts,
+  {% if cookiecutter.custom_bootstrap_compilation == 'y' %}vendorScripts,{% endif %}
+  imgCompression
+)
+
 // Set up dev environment
 const dev = parallel(
   runServer,
@@ -151,3 +155,5 @@ const dev = parallel(
 )
 
 exports.default = series(generateAssets, dev)
+exports["generate-assets"] = generateAssets
+exports["dev"] = dev

From aea5c807f6c3d123b5d8dbe7e0ceaa2791abcbee Mon Sep 17 00:00:00 2001
From: keithjeb <keith.j.bailey@gmail.com>
Date: Sat, 2 Mar 2019 14:51:30 +0100
Subject: [PATCH 0031/2840] Change eager celery setting in local Docker (#1945)

[//]: # (Thank you for helping us out: your efforts mean great deal to the project and the community as a whole!)

[//]: # (Before you proceed:)

[//]: # (1. Make sure to add yourself to `CONTRIBUTORS.rst` through this PR provided you're contributing here for the first time)
[//]: # (2. Don't forget to update the `docs/` presuming others would benefit from a concise description of whatever that you're proposing)


## Description

[//]: # (What's it you're proposing?)

Added a note around CELERY_TASK_ALWAYS_EAGER = True in docker config for local development. This causes tasks to be executed on the 'main' thread rather than by the workers. I understand why that might be desirable, but thought it worth calling out incase (like me) it makes people think something is broken.


## Rationale

[//]: # (Why does the project need that?)

Ease of use/troubleshooting


## Use case(s) / visualization(s)

[//]: # ("Better to see something once than to hear about it a thousand times.")
---
 CONTRIBUTORS.rst                                       |  2 ++
 docs/developing-locally-docker.rst                     | 10 ++++++++++
 docs/developing-locally.rst                            | 10 ++++++++++
 {{cookiecutter.project_slug}}/config/settings/local.py |  2 ++
 4 files changed, 24 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index e6111cd15..0de1077e6 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -180,6 +180,7 @@ Listed in alphabetical order.
   Denis Bobrov             `@delneg`_
   Philipp Matthies         `@canonnervio`_
   Vadim Iskuchekov         `@Egregors`_                 @egregors
+  Keith Bailey             `@keithjeb`_
 ========================== ============================ ==============
 
 .. _@a7p: https://github.com/a7p
@@ -297,6 +298,7 @@ Listed in alphabetical order.
 .. _@purplediane: https://github.com/purplediane
 .. _@umrashrf: https://github.com/umrashrf
 .. _@ahhda: https://github.com/ahhda
+.. _@keithjeb: https://github.com/keithjeb
 Special Thanks
 ~~~~~~~~~~~~~~
 
diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index 08b25f3bc..895140f9c 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -171,6 +171,16 @@ When developing locally you can go with MailHog_ for email testing provided ``us
 
 .. _Mailhog: https://github.com/mailhog/MailHog/
 
+.. _`CeleryTasks`:
+
+Celery tasks in local development
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+When not using docker Celery tasks are set to run in Eager mode, so that a full stack is not needed. When using docker the task
+scheduler will be used by default.
+
+If you need tasks to be executed on the main thread during development set CELERY_TASK_ALWAYS_EAGER = True in config/settings/local.py.
+
+Possible uses could be for testing, or ease of profiling with DJDT.
 
 .. _`CeleryFlower`:
 
diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index 09c5db396..3434f68b6 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -118,6 +118,16 @@ In production, we have Mailgun_ configured to have your back!
 .. _Mailgun: https://www.mailgun.com/
 
 
+Celery
+------
+If the project is configured to use Celery as a task scheduler then by default tasks are set to run on the main thread
+when developing locally. If you have the appropriate setup on your local machine then set
+
+CELERY_TASK_ALWAYS_EAGER = False
+
+in /config/settings/local.py
+
+
 Sass Compilation & Live Reloading
 ---------------------------------
 
diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py
index 741f324af..6667a2653 100644
--- a/{{cookiecutter.project_slug}}/config/settings/local.py
+++ b/{{cookiecutter.project_slug}}/config/settings/local.py
@@ -76,8 +76,10 @@ INSTALLED_APPS += ['django_extensions']  # noqa F405
 
 # Celery
 # ------------------------------------------------------------------------------
+{% if cookiecutter.use_docker == 'n' -%}
 # http://docs.celeryproject.org/en/latest/userguide/configuration.html#task-always-eager
 CELERY_TASK_ALWAYS_EAGER = True
+{%- endif %}
 # http://docs.celeryproject.org/en/latest/userguide/configuration.html#task-eager-propagates
 CELERY_TASK_EAGER_PROPAGATES = True
 

From 6e72169ffe3022b54db3d44297226226cf86c1e8 Mon Sep 17 00:00:00 2001
From: btknu <48227652+btknu@users.noreply.github.com>
Date: Wed, 6 Mar 2019 02:10:45 +0100
Subject: [PATCH 0032/2840] Add missing `script` key to Travis CI config
 (#1950)

* Add failing test for travis.yml

I see three options to test travis.yml :

1. Testing that the YAML contains relevant value. Least useful and least
reliable, but simplest to implement.

2. Testing that the YAML is valid TravisCI YAML. Unfortunately this is
difficult / impossible. Doing 'travis lint' would succeed, this command
does not check for 'script' key presence and wouldn't be useful for us.

We could use 'travis-build' to verify that the YAML can be converted to
a worker config, but as of now 'travis-build' doesn't work out of the
box.

There is a new tool for validating travis YAML files 'travis-yml', but
as of now it's a ruby-only library and it's still a work in progress.

3. Running Travis CI task based on the generated YAML. This seems the
best approach, however since cookiecutter-django itself uses Travis CI,
that would require running Travis CI from within Travis CI.

Scheduling Travis CI job without a github push still requires a public
github repo, which is something that we can't generate on demand.

Given that I'm opting to use approach 1.

* Adds missing config to generated .travis.yml

The keys added are as follows:

1. 'script'

Required by Travis, cookiecutter-django used to provide it until it has
been removed together with hitch.

I'm assuming hitch has been replaced with pytest, I'm setting pytest as
the new value for the 'script' key.

2. 'install'

Not required by Travis, but necessary in our case; installs test
libraries, mostly pytest.

As of now this points to 'local.txt' requirements file. There used to be
a separate 'test.txt' requirements file but it has been decided to merge
it with 'local.txt', see discussion in
https://github.com/pydanny/cookiecutter-django/pull/1557 .

* Update CONTRIBUTORS.rst
---
 CONTRIBUTORS.rst                          |  2 ++
 requirements.txt                          |  1 +
 tests/test_cookiecutter_generation.py     | 17 +++++++++++++++++
 {{cookiecutter.project_slug}}/.travis.yml |  4 ++++
 4 files changed, 24 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 0de1077e6..dc41463f8 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -71,6 +71,7 @@ Listed in alphabetical order.
   Bo Lopker                `@blopker`_
   Bouke Haarsma
   Brent Payne              `@brentpayne`_               @brentpayne
+  Bartek                   `@btknu`
   Burhan Khalid            `@burhan`_                   @burhan
   Carl Johnson             `@carlmjohnson`_             @carlmjohnson
   Catherine Devlin         `@catherinedevlin`_
@@ -299,6 +300,7 @@ Listed in alphabetical order.
 .. _@umrashrf: https://github.com/umrashrf
 .. _@ahhda: https://github.com/ahhda
 .. _@keithjeb: https://github.com/keithjeb
+.. _@btknu: https://github.com/btknu
 Special Thanks
 ~~~~~~~~~~~~~~
 
diff --git a/requirements.txt b/requirements.txt
index dabb5dd91..37a96913c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,3 +11,4 @@ flake8==3.7.6
 tox==3.6.1
 pytest==4.3.0
 pytest-cookies==0.3.0
+pyyaml==3.13
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index cf173576b..b2c235a82 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -1,6 +1,7 @@
 import os
 import re
 import sh
+import yaml
 
 import pytest
 from binaryornot.check import is_binary
@@ -85,3 +86,19 @@ def test_flake8_compliance(cookies):
         sh.flake8(str(result.project))
     except sh.ErrorReturnCode as e:
         pytest.fail(e)
+
+
+def test_travis_invokes_pytest(cookies, context):
+    context.update({"use_travisci": "y"})
+    result = cookies.bake(extra_context=context)
+
+    assert result.exit_code == 0
+    assert result.exception is None
+    assert result.project.basename == context["project_slug"]
+    assert result.project.isdir()
+
+    with open(f'{result.project}/.travis.yml', 'r') as travis_yml:
+        try:
+            assert yaml.load(travis_yml)['script'] == ['pytest']
+        except yaml.YAMLError as e:
+            pytest.fail(e)
diff --git a/{{cookiecutter.project_slug}}/.travis.yml b/{{cookiecutter.project_slug}}/.travis.yml
index 5ca54d000..3072f75f3 100644
--- a/{{cookiecutter.project_slug}}/.travis.yml
+++ b/{{cookiecutter.project_slug}}/.travis.yml
@@ -9,3 +9,7 @@ before_install:
 language: python
 python:
   - "3.6"
+install:
+  - pip install -r requirements/local.txt
+script:
+  - "pytest"

From 1c5c4e52c02bbe8df3bbae381e333806f0919c95 Mon Sep 17 00:00:00 2001
From: yunti <yunti9-mail@yahoo.com>
Date: Mon, 11 Mar 2019 21:05:31 +0000
Subject: [PATCH 0033/2840] Add automatic migrations to heroku deploys (#1951)

heroku now has a new feature for running tasks as part of deployment. Perfect for automatic migrations.
https://devcenter.heroku.com/articles/release-phase#specifying-release-phase-tasks
---
 docs/deployment-on-heroku.rst          | 1 -
 {{cookiecutter.project_slug}}/Procfile | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/deployment-on-heroku.rst b/docs/deployment-on-heroku.rst
index f753aa5a4..5acb44faa 100644
--- a/docs/deployment-on-heroku.rst
+++ b/docs/deployment-on-heroku.rst
@@ -47,7 +47,6 @@ Run these commands to deploy the project to Heroku:
 
     git push heroku master
 
-    heroku run python manage.py migrate
     heroku run python manage.py createsuperuser
     heroku run python manage.py collectstatic --no-input
 
diff --git a/{{cookiecutter.project_slug}}/Procfile b/{{cookiecutter.project_slug}}/Procfile
index c77d76d96..d9319f5cc 100644
--- a/{{cookiecutter.project_slug}}/Procfile
+++ b/{{cookiecutter.project_slug}}/Procfile
@@ -1,3 +1,4 @@
+release: python manage.py migrate
 web: gunicorn config.wsgi:application
 {% if cookiecutter.use_celery == "y" -%}
 worker: celery worker --app={{cookiecutter.project_slug}}.taskapp --loglevel=info

From eb85627d1a30ea3417ec42b034bce41f71d3f0cd Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 11 Mar 2019 22:02:11 +0000
Subject: [PATCH 0034/2840] Update to latest bug fix for Python 3.6 to fix
 Heroku warning when deploying

Python has released a security update! Please consider upgrading to python-3.6.8
Learn More: https://devcenter.heroku.com/articles/python-runtimes
---
 {{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 1935e9778..9fbd3bf0a 100644
--- a/{{cookiecutter.project_slug}}/runtime.txt
+++ b/{{cookiecutter.project_slug}}/runtime.txt
@@ -1 +1 @@
-python-3.6.6
+python-3.6.8

From 6213af4b562f640362c95f9c8386cec597e8600d Mon Sep 17 00:00:00 2001
From: Oleg Russkin <oleg.rolep@gmail.com>
Date: Tue, 12 Mar 2019 16:35:03 +0200
Subject: [PATCH 0035/2840] Update redis to 3.2.0

Related bug was fixed: celery/kombu#947
Moreover, recent kombu versiones demand
such redis version.
---
 {{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 e43b70af6..0a9144ecd 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -8,7 +8,7 @@ argon2-cffi==19.1.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==4.1.2  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis>=2.10.6, < 3  # pyup: < 3 # https://github.com/antirez/redis
+redis>=3.2.0  # https://github.com/antirez/redis
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.2.1  # pyup: < 5.0  # https://github.com/celery/celery
 {%- if cookiecutter.use_docker == 'y' %}

From 638c93d1dff45849b531e2633d0369f7ac130567 Mon Sep 17 00:00:00 2001
From: Oleg Russkin <oleg.rolep@gmail.com>
Date: Tue, 12 Mar 2019 16:38:43 +0200
Subject: [PATCH 0036/2840] Add kombu to base (celery) dependencies

Using latest version 4.4.0, previous suitable 4.3.0
also had bug: kombu/issues#1006
---
 {{cookiecutter.project_slug}}/requirements/base.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 0a9144ecd..605ff19cc 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -11,6 +11,7 @@ whitenoise==4.1.2  # https://github.com/evansd/whitenoise
 redis>=3.2.0  # https://github.com/antirez/redis
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.2.1  # pyup: < 5.0  # https://github.com/celery/celery
+kombu==4.4.0  # https://github.com/celery/kombu
 {%- if cookiecutter.use_docker == 'y' %}
 flower==0.9.2  # https://github.com/mher/flower
 {%- endif %}

From 8ab63940ec9b151f03f99f6aff3e84eae973b47b Mon Sep 17 00:00:00 2001
From: Oleg Russkin <oleg.rolep@gmail.com>
Date: Tue, 12 Mar 2019 16:49:24 +0200
Subject: [PATCH 0037/2840] Contributors: Add Oleg Russkin

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index dc41463f8..2a26e2121 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -145,6 +145,7 @@ Listed in alphabetical order.
   Mesut Yılmaz             `@myilmaz`_
   Michael Gecht            `@mimischi`_                  @_mischi
   mozillazg                `@mozillazg`_
+  Oleg Russkin             `@rolep`_
   Pablo                    `@oubiga`_
   Parbhat Puri             `@parbhat`_
   Peter Bittner            `@bittner`_

From 8ce3e6605bf819b18262de7d71eec4ee53c235c1 Mon Sep 17 00:00:00 2001
From: anuj <highlightanuj@gmail.com>
Date: Wed, 13 Mar 2019 14:22:36 +0530
Subject: [PATCH 0038/2840] Added link for Google Cloud storage blog

---
 README.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/README.rst b/README.rst
index b9e71ace2..de2710808 100644
--- a/README.rst
+++ b/README.rst
@@ -279,6 +279,7 @@ experience better.
 Articles
 ---------
 
+* `Using cookiecutter-django with Google Cloud Storage`_ - Mar. 12, 2019
 * `cookiecutter-django with Nginx, Route 53 and ELB`_ - Feb. 12, 2018
 * `cookiecutter-django and Amazon RDS`_ - Feb. 7, 2018
 * `Deploying Cookiecutter-Django with Docker-Compose`_ - Oct. 19, 2017
@@ -292,6 +293,7 @@ Articles
 
 Have a blog or online publication? Write about your cookiecutter-django tips and tricks, then send us a pull request with the link.
 
+.. _`Using cookiecutter-django with Google Cloud Storage`: https://ahhda.github.io/cloud/gce/django/2019/03/12/using-django-cookiecutter-cloud-storage.html
 .. _`cookiecutter-django with Nginx, Route 53 and ELB`: https://msaizar.com/blog/cookiecutter-django-nginx-route-53-and-elb/
 .. _`cookiecutter-django and Amazon RDS`: https://msaizar.com/blog/cookiecutter-django-and-amazon-rds/
 .. _`Deploying Cookiecutter-Django with Docker-Compose`: http://adamantine.me/2017/10/19/deploying-cookiecutter-django-with-docker-compose/

From 4550e4aa373a7069f14eda956f602d98736eed5f Mon Sep 17 00:00:00 2001
From: anuj <highlightanuj@gmail.com>
Date: Wed, 13 Mar 2019 14:31:35 +0530
Subject: [PATCH 0039/2840] Remove link that does not exist

---
 README.rst | 2 --
 1 file changed, 2 deletions(-)

diff --git a/README.rst b/README.rst
index b9e71ace2..8ce39ab23 100644
--- a/README.rst
+++ b/README.rst
@@ -281,7 +281,6 @@ Articles
 
 * `cookiecutter-django with Nginx, Route 53 and ELB`_ - Feb. 12, 2018
 * `cookiecutter-django and Amazon RDS`_ - Feb. 7, 2018
-* `Deploying Cookiecutter-Django with Docker-Compose`_ - Oct. 19, 2017
 * `Using Cookiecutter to Jumpstart a Django Project on Windows with PyCharm`_ - May 19, 2017
 * `Exploring with Cookiecutter`_ - Dec. 3, 2016
 * `Introduction to Cookiecutter-Django`_ - Feb. 19, 2016
@@ -294,7 +293,6 @@ Have a blog or online publication? Write about your cookiecutter-django tips and
 
 .. _`cookiecutter-django with Nginx, Route 53 and ELB`: https://msaizar.com/blog/cookiecutter-django-nginx-route-53-and-elb/
 .. _`cookiecutter-django and Amazon RDS`: https://msaizar.com/blog/cookiecutter-django-and-amazon-rds/
-.. _`Deploying Cookiecutter-Django with Docker-Compose`: http://adamantine.me/2017/10/19/deploying-cookiecutter-django-with-docker-compose/
 .. _`Exploring with Cookiecutter`: http://www.snowboardingcoder.com/django/2016/12/03/exploring-with-cookiecutter/
 .. _`Using Cookiecutter to Jumpstart a Django Project on Windows with PyCharm`: https://joshuahunter.com/posts/using-cookiecutter-to-jumpstart-a-django-project-on-windows-with-pycharm/
 

From 2edd51aa77f97ba2531c863ce2d3d65d544257a7 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 13 Mar 2019 05:37:54 -0400
Subject: [PATCH 0040/2840] Update pytest from 4.3.0 to 4.3.1

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

diff --git a/requirements.txt b/requirements.txt
index 37a96913c..1d0823b56 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,6 +9,6 @@ flake8==3.7.6
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.6.1
-pytest==4.3.0
+pytest==4.3.1
 pytest-cookies==0.3.0
 pyyaml==3.13

From b142713ec666ca624f93f4f79ad41cec3bdab821 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Wed, 13 Mar 2019 14:31:17 +0000
Subject: [PATCH 0041/2840] Remove running collectstatic from Heroku docs, it's
 done during deployments

---
 docs/deployment-on-heroku.rst | 1 -
 1 file changed, 1 deletion(-)

diff --git a/docs/deployment-on-heroku.rst b/docs/deployment-on-heroku.rst
index 5acb44faa..09953cf88 100644
--- a/docs/deployment-on-heroku.rst
+++ b/docs/deployment-on-heroku.rst
@@ -48,7 +48,6 @@ Run these commands to deploy the project to Heroku:
     git push heroku master
 
     heroku run python manage.py createsuperuser
-    heroku run python manage.py collectstatic --no-input
 
     heroku run python manage.py check --deploy
 

From aee746b5a2b4308a71371cd2983ad3ea9a1c2a4d Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 13 Mar 2019 10:40:27 -0700
Subject: [PATCH 0042/2840] Update pyyaml from 3.13 to 5.1

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

diff --git a/requirements.txt b/requirements.txt
index 1d0823b56..647bccaef 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,4 +11,4 @@ flake8==3.7.6
 tox==3.6.1
 pytest==4.3.1
 pytest-cookies==0.3.0
-pyyaml==3.13
+pyyaml==5.1

From 02c19193a0a54800dfaaea75c39d52f23a5a12d8 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 18 Mar 2019 09:54:39 +0000
Subject: [PATCH 0043/2840] Specify requirements file in Pyup config

---
 .pyup.yml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .pyup.yml

diff --git a/.pyup.yml b/.pyup.yml
new file mode 100644
index 000000000..4eab42d54
--- /dev/null
+++ b/.pyup.yml
@@ -0,0 +1,6 @@
+# Specify requirement files by hand
+requirements:
+  - requirements.txt
+  - {{cookiecutter.project_slug}}/requirements/base.txt
+  - {{cookiecutter.project_slug}}/requirements/local.txt
+  - {{cookiecutter.project_slug}}/requirements/production.txt

From a4a7c6488f79bba6c2c556ab6dbfee4f7e242655 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 18 Mar 2019 09:56:20 +0000
Subject: [PATCH 0044/2840] Fix syntax in PyUP config file

---
 .pyup.yml | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/.pyup.yml b/.pyup.yml
index 4eab42d54..b368b6645 100644
--- a/.pyup.yml
+++ b/.pyup.yml
@@ -1,6 +1,18 @@
 # Specify requirement files by hand
 requirements:
-  - requirements.txt
-  - {{cookiecutter.project_slug}}/requirements/base.txt
-  - {{cookiecutter.project_slug}}/requirements/local.txt
-  - {{cookiecutter.project_slug}}/requirements/production.txt
+  - requirements.txt:
+      # update all dependencies and pin them
+      update: all
+      pin: True
+  - {{cookiecutter.project_slug}}/requirements/base.txt:
+      # update all dependencies and pin them
+      update: all
+      pin: True
+  - {{cookiecutter.project_slug}}/requirements/local.txt:
+      # update all dependencies and pin them
+      update: all
+      pin: True
+  - {{cookiecutter.project_slug}}/requirements/production.txt:
+      # update all dependencies and pin them
+      update: all
+      pin: True

From 135c6d7f595a7828201987657f16f8c6fc798ba4 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 18 Mar 2019 09:59:13 +0000
Subject: [PATCH 0045/2840] Fix syntax error in PyUP config - take 2

---
 .pyup.yml | 20 ++++----------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/.pyup.yml b/.pyup.yml
index b368b6645..9f78cf8ce 100644
--- a/.pyup.yml
+++ b/.pyup.yml
@@ -1,18 +1,6 @@
 # Specify requirement files by hand
 requirements:
-  - requirements.txt:
-      # update all dependencies and pin them
-      update: all
-      pin: True
-  - {{cookiecutter.project_slug}}/requirements/base.txt:
-      # update all dependencies and pin them
-      update: all
-      pin: True
-  - {{cookiecutter.project_slug}}/requirements/local.txt:
-      # update all dependencies and pin them
-      update: all
-      pin: True
-  - {{cookiecutter.project_slug}}/requirements/production.txt:
-      # update all dependencies and pin them
-      update: all
-      pin: True
+  - "requirements.txt"
+  - "{{cookiecutter.project_slug}}/requirements/base.txt"
+  - "{{cookiecutter.project_slug}}/requirements/local.txt"
+  - "{{cookiecutter.project_slug}}/requirements/production.txt"

From 43a6f5d854d1cc8ef2afb3d78067fcb8d08a76c7 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 18 Mar 2019 10:03:32 +0000
Subject: [PATCH 0046/2840] Update .pyup.yml

---
 .pyup.yml | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/.pyup.yml b/.pyup.yml
index 9f78cf8ce..4978524e8 100644
--- a/.pyup.yml
+++ b/.pyup.yml
@@ -1,4 +1,15 @@
-# Specify requirement files by hand
+# configure updates globally
+# default: all
+# allowed: all, insecure, False
+update: all
+
+# configure dependency pinning globally
+# default: True
+# allowed: True, False
+pin: True
+
+# Specify requirement files by hand, pyup seems to struggle to 
+# find the ones in the project_slug folder
 requirements:
   - "requirements.txt"
   - "{{cookiecutter.project_slug}}/requirements/base.txt"

From 68f7268770057752609dd1f6beca4d432eb9f2a5 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 18 Mar 2019 17:49:43 +0000
Subject: [PATCH 0047/2840] Run Black on Travis (#1957)

* Create a test matrix on Travis CI to help testing multiple options

* Change test_docker.sh to fail if any command in it fails

* Run black on the CI with --check option

* Fix formatting of project files using black

* Install black in the docker container

* Exclude migrations in black checks

* Fix Black formatting violations

* Run black on the whole generated project & fix issues
---
 .travis.yml                                   |  16 +-
 hooks/post_gen_project.py                     |  54 ++--
 hooks/pre_gen_project.py                      |  10 +-
 tests/test_cookiecutter_generation.py         |   4 +-
 tests/test_docker.sh                          |   7 +-
 tox.ini                                       |   6 +-
 .../config/settings/base.py                   | 206 +++++++--------
 .../config/settings/local.py                  |  48 ++--
 .../config/settings/production.py             | 249 +++++++++---------
 .../config/settings/test.py                   |   8 +-
 {{cookiecutter.project_slug}}/config/urls.py  |  13 +-
 {{cookiecutter.project_slug}}/config/wsgi.py  |  11 +-
 .../requirements/local.txt                    |   1 +
 .../taskapp/celery.py                         |  18 +-
 .../users/adapters.py                         |   2 -
 .../users/forms.py                            |   1 -
 .../users/tests/factories.py                  |   4 +-
 .../users/tests/test_forms.py                 |   1 -
 .../users/tests/test_views.py                 |   1 -
 19 files changed, 328 insertions(+), 332 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a46726d6c..65b2a28d1 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -7,16 +7,20 @@ language: python
 
 python: 3.6
 
-env:
-  - TOX_ENV=py36
-
 before_install:
   - docker-compose -v
   - docker -v
 
-script:
-  - tox -e $TOX_ENV
-  - sh tests/test_docker.sh
+matrix:
+  include:
+    - name: Test
+      script: tox -e py36
+    - name: Black
+      script: tox -e black
+    - name: Basic Docker
+      script: sh tests/test_docker.sh
+    - name: Docker with Celery
+      script: sh tests/test_docker.sh use_celery=y
 
 install:
   - pip install tox
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index 45435dd02..a9c1c9410 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -32,10 +32,7 @@ DEBUG_VALUE = "debug"
 
 
 def remove_open_source_files():
-    file_names = [
-        "CONTRIBUTORS.txt",
-        "LICENSE",
-    ]
+    file_names = ["CONTRIBUTORS.txt", "LICENSE"]
     for file_name in file_names:
         os.remove(file_name)
 
@@ -71,7 +68,10 @@ def remove_utility_files():
 def remove_heroku_files():
     file_names = ["Procfile", "runtime.txt", "requirements.txt"]
     for file_name in file_names:
-        if file_name == "requirements.txt" and "{{ cookiecutter.use_travisci }}".lower() == "y":
+        if (
+            file_name == "requirements.txt"
+            and "{{ cookiecutter.use_travisci }}".lower() == "y"
+        ):
             # don't remove the file if we are using travisci but not using heroku
             continue
         os.remove(file_name)
@@ -183,11 +183,7 @@ def generate_postgres_user(debug=False):
 
 
 def set_postgres_user(file_path, value):
-    postgres_user = set_flag(
-        file_path,
-        "!!!SET POSTGRES_USER!!!",
-        value=value,
-    )
+    postgres_user = set_flag(file_path, "!!!SET POSTGRES_USER!!!", value=value)
     return postgres_user
 
 
@@ -205,9 +201,7 @@ def set_postgres_password(file_path, value=None):
 
 def set_celery_flower_user(file_path, value):
     celery_flower_user = set_flag(
-        file_path,
-        "!!!SET CELERY_FLOWER_USER!!!",
-        value=value,
+        file_path, "!!!SET CELERY_FLOWER_USER!!!", value=value
     )
     return celery_flower_user
 
@@ -230,11 +224,7 @@ def append_to_gitignore_file(s):
         gitignore_file.write(os.linesep)
 
 
-def set_flags_in_envs(
-    postgres_user,
-    celery_flower_user,
-    debug=False,
-):
+def set_flags_in_envs(postgres_user, celery_flower_user, debug=False):
     local_django_envs_path = os.path.join(".envs", ".local", ".django")
     production_django_envs_path = os.path.join(".envs", ".production", ".django")
     local_postgres_envs_path = os.path.join(".envs", ".local", ".postgres")
@@ -244,14 +234,22 @@ def set_flags_in_envs(
     set_django_admin_url(production_django_envs_path)
 
     set_postgres_user(local_postgres_envs_path, value=postgres_user)
-    set_postgres_password(local_postgres_envs_path, value=DEBUG_VALUE if debug else None)
+    set_postgres_password(
+        local_postgres_envs_path, value=DEBUG_VALUE if debug else None
+    )
     set_postgres_user(production_postgres_envs_path, value=postgres_user)
-    set_postgres_password(production_postgres_envs_path, value=DEBUG_VALUE if debug else None)
+    set_postgres_password(
+        production_postgres_envs_path, value=DEBUG_VALUE if debug else None
+    )
 
     set_celery_flower_user(local_django_envs_path, value=celery_flower_user)
-    set_celery_flower_password(local_django_envs_path, value=DEBUG_VALUE if debug else None)
+    set_celery_flower_password(
+        local_django_envs_path, value=DEBUG_VALUE if debug else None
+    )
     set_celery_flower_user(production_django_envs_path, value=celery_flower_user)
-    set_celery_flower_password(production_django_envs_path, value=DEBUG_VALUE if debug else None)
+    set_celery_flower_password(
+        production_django_envs_path, value=DEBUG_VALUE if debug else None
+    )
 
 
 def set_flags_in_settings_files():
@@ -302,8 +300,8 @@ def main():
         if "{{ cookiecutter.keep_local_envs_in_vcs }}".lower() == "y":
             print(
                 INFO + ".env(s) are only utilized when Docker Compose and/or "
-                       "Heroku support is enabled so keeping them does not "
-                       "make sense given your current setup." + TERMINATOR
+                "Heroku support is enabled so keeping them does not "
+                "make sense given your current setup." + TERMINATOR
             )
         remove_envs_and_associated_files()
     else:
@@ -325,10 +323,10 @@ def main():
                 "{{ cookiecutter.js_task_runner }}".lower().capitalize()
             )
             + "working together not supported yet. "
-              "You can continue using the generated project like you "
-              "normally would, however you would need to add a JS "
-              "task runner service to your Docker Compose configuration "
-              "manually." + TERMINATOR
+            "You can continue using the generated project like you "
+            "normally would, however you would need to add a JS "
+            "task runner service to your Docker Compose configuration "
+            "manually." + TERMINATOR
         )
 
     if "{{ cookiecutter.use_celery }}".lower() == "n":
diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py
index b7f4dfbbb..a6b834556 100644
--- a/hooks/pre_gen_project.py
+++ b/hooks/pre_gen_project.py
@@ -18,11 +18,13 @@ SUCCESS = "\x1b[1;32m [SUCCESS]: "
 
 project_slug = "{{ cookiecutter.project_slug }}"
 if hasattr(project_slug, "isidentifier"):
-    assert project_slug.isidentifier(), "'{}' project slug is not a valid Python identifier.".format(
-        project_slug
-    )
+    assert (
+        project_slug.isidentifier()
+    ), "'{}' project slug is not a valid Python identifier.".format(project_slug)
 
-assert "\\" not in "{{ cookiecutter.author_name }}", "Don't include backslashes in author name."
+assert (
+    "\\" not in "{{ cookiecutter.author_name }}"
+), "Don't include backslashes in author name."
 
 if "{{ cookiecutter.use_docker }}".lower() == "n":
     python_major_version = sys.version_info[0]
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index b2c235a82..3010d364f 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -97,8 +97,8 @@ def test_travis_invokes_pytest(cookies, context):
     assert result.project.basename == context["project_slug"]
     assert result.project.isdir()
 
-    with open(f'{result.project}/.travis.yml', 'r') as travis_yml:
+    with open(f"{result.project}/.travis.yml", "r") as travis_yml:
         try:
-            assert yaml.load(travis_yml)['script'] == ['pytest']
+            assert yaml.load(travis_yml)["script"] == ["pytest"]
         except yaml.YAMLError as e:
             pytest.fail(e)
diff --git a/tests/test_docker.sh b/tests/test_docker.sh
index eddfe98c6..55771c14c 100755
--- a/tests/test_docker.sh
+++ b/tests/test_docker.sh
@@ -3,6 +3,8 @@
 # it is meant to be run from the root directory of the repository, eg:
 # sh tests/test_docker.sh
 
+set -o errexit
+
 # install test requirements
 pip install -r requirements.txt
 
@@ -11,12 +13,15 @@ mkdir -p .cache/docker
 cd .cache/docker
 
 # create the project using the default settings in cookiecutter.json
-cookiecutter ../../ --no-input --overwrite-if-exists use_docker=y
+cookiecutter ../../ --no-input --overwrite-if-exists use_docker=y $@
 cd my_awesome_project
 
 # run the project's type checks
 docker-compose -f local.yml run django mypy my_awesome_project
 
+# Run black with --check option
+docker-compose -f local.yml run django black --check --diff  --exclude 'migrations' ./
+
 # run the project's tests
 docker-compose -f local.yml run django pytest
 
diff --git a/tox.ini b/tox.ini
index 040c8a41c..cef3efc78 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,7 +1,11 @@
 [tox]
 skipsdist = true
-envlist = py36
+envlist = py36,black
 
 [testenv]
 deps = -rrequirements.txt
 commands = pytest {posargs:./tests}
+
+[testenv:black]
+deps = black
+commands = black --check hooks tests setup.py docs
diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 950b9ed7f..848af8e89 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -4,27 +4,29 @@ Base settings to build other settings files upon.
 
 import environ
 
-ROOT_DIR = environ.Path(__file__) - 3  # ({{ cookiecutter.project_slug }}/config/settings/base.py - 3 = {{ cookiecutter.project_slug }}/)
-APPS_DIR = ROOT_DIR.path('{{ cookiecutter.project_slug }}')
+ROOT_DIR = (
+    environ.Path(__file__) - 3
+)  # ({{ cookiecutter.project_slug }}/config/settings/base.py - 3 = {{ cookiecutter.project_slug }}/)
+APPS_DIR = ROOT_DIR.path("{{ cookiecutter.project_slug }}")
 
 env = environ.Env()
 
-READ_DOT_ENV_FILE = env.bool('DJANGO_READ_DOT_ENV_FILE', default=False)
+READ_DOT_ENV_FILE = env.bool("DJANGO_READ_DOT_ENV_FILE", default=False)
 if READ_DOT_ENV_FILE:
     # OS environment variables take precedence over variables from .env
-    env.read_env(str(ROOT_DIR.path('.env')))
+    env.read_env(str(ROOT_DIR.path(".env")))
 
 # GENERAL
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#debug
-DEBUG = env.bool('DJANGO_DEBUG', False)
+DEBUG = env.bool("DJANGO_DEBUG", False)
 # Local time zone. Choices are
 # http://en.wikipedia.org/wiki/List_of_tz_zones_by_name
 # though not all of them may be available with every OS.
 # In Windows, this must be set to your system time zone.
-TIME_ZONE = '{{ cookiecutter.timezone }}'
+TIME_ZONE = "{{ cookiecutter.timezone }}"
 # https://docs.djangoproject.com/en/dev/ref/settings/#language-code
-LANGUAGE_CODE = 'en-us'
+LANGUAGE_CODE = "en-us"
 # https://docs.djangoproject.com/en/dev/ref/settings/#site-id
 SITE_ID = 1
 # https://docs.djangoproject.com/en/dev/ref/settings/#use-i18n
@@ -37,45 +39,45 @@ USE_TZ = True
 # DATABASES
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#databases
-{% if cookiecutter.use_docker == 'y' -%}
-DATABASES = {
-    'default': env.db('DATABASE_URL'),
-}
+{% if cookiecutter.use_docker == "y" -%}
+DATABASES = {"default": env.db("DATABASE_URL")}
 {%- else %}
 DATABASES = {
-    'default': env.db('DATABASE_URL', default='postgres://{% if cookiecutter.windows == 'y' %}localhost{% endif %}/{{cookiecutter.project_slug}}'),
+    "default": env.db(
+        "DATABASE_URL", default="postgres://{% if cookiecutter.windows == 'y' %}localhost{% endif %}/{{cookiecutter.project_slug}}"
+    ),
 }
 {%- endif %}
-DATABASES['default']['ATOMIC_REQUESTS'] = True
+DATABASES["default"]["ATOMIC_REQUESTS"] = True
 
 # URLS
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#root-urlconf
-ROOT_URLCONF = 'config.urls'
+ROOT_URLCONF = "config.urls"
 # https://docs.djangoproject.com/en/dev/ref/settings/#wsgi-application
-WSGI_APPLICATION = 'config.wsgi.application'
+WSGI_APPLICATION = "config.wsgi.application"
 
 # APPS
 # ------------------------------------------------------------------------------
 DJANGO_APPS = [
-    'django.contrib.auth',
-    'django.contrib.contenttypes',
-    'django.contrib.sessions',
-    'django.contrib.sites',
-    'django.contrib.messages',
-    'django.contrib.staticfiles',
-    # 'django.contrib.humanize', # Handy template tags
-    'django.contrib.admin',
+    "django.contrib.auth",
+    "django.contrib.contenttypes",
+    "django.contrib.sessions",
+    "django.contrib.sites",
+    "django.contrib.messages",
+    "django.contrib.staticfiles",
+    # "django.contrib.humanize", # Handy template tags
+    "django.contrib.admin",
 ]
 THIRD_PARTY_APPS = [
-    'crispy_forms',
-    'allauth',
-    'allauth.account',
-    'allauth.socialaccount',
-    'rest_framework',
+    "crispy_forms",
+    "allauth",
+    "allauth.account",
+    "allauth.socialaccount",
+    "rest_framework",
 ]
 LOCAL_APPS = [
-    '{{ cookiecutter.project_slug }}.users.apps.UsersAppConfig',
+    "{{ cookiecutter.project_slug }}.users.apps.UsersAppConfig",
     # Your stuff: custom apps go here
 ]
 # https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps
@@ -84,86 +86,76 @@ INSTALLED_APPS = DJANGO_APPS + THIRD_PARTY_APPS + LOCAL_APPS
 # MIGRATIONS
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#migration-modules
-MIGRATION_MODULES = {
-    'sites': '{{ cookiecutter.project_slug }}.contrib.sites.migrations'
-}
+MIGRATION_MODULES = {"sites": "{{ cookiecutter.project_slug }}.contrib.sites.migrations"}
 
 # AUTHENTICATION
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#authentication-backends
 AUTHENTICATION_BACKENDS = [
-    'django.contrib.auth.backends.ModelBackend',
-    'allauth.account.auth_backends.AuthenticationBackend',
+    "django.contrib.auth.backends.ModelBackend",
+    "allauth.account.auth_backends.AuthenticationBackend",
 ]
 # https://docs.djangoproject.com/en/dev/ref/settings/#auth-user-model
-AUTH_USER_MODEL = 'users.User'
+AUTH_USER_MODEL = "users.User"
 # https://docs.djangoproject.com/en/dev/ref/settings/#login-redirect-url
-LOGIN_REDIRECT_URL = 'users:redirect'
+LOGIN_REDIRECT_URL = "users:redirect"
 # https://docs.djangoproject.com/en/dev/ref/settings/#login-url
-LOGIN_URL = 'account_login'
+LOGIN_URL = "account_login"
 
 # PASSWORDS
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#password-hashers
 PASSWORD_HASHERS = [
     # https://docs.djangoproject.com/en/dev/topics/auth/passwords/#using-argon2-with-django
-    'django.contrib.auth.hashers.Argon2PasswordHasher',
-    'django.contrib.auth.hashers.PBKDF2PasswordHasher',
-    'django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher',
-    'django.contrib.auth.hashers.BCryptSHA256PasswordHasher',
-    'django.contrib.auth.hashers.BCryptPasswordHasher',
+    "django.contrib.auth.hashers.Argon2PasswordHasher",
+    "django.contrib.auth.hashers.PBKDF2PasswordHasher",
+    "django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher",
+    "django.contrib.auth.hashers.BCryptSHA256PasswordHasher",
+    "django.contrib.auth.hashers.BCryptPasswordHasher",
 ]
 # https://docs.djangoproject.com/en/dev/ref/settings/#auth-password-validators
 AUTH_PASSWORD_VALIDATORS = [
     {
-        'NAME': 'django.contrib.auth.password_validation.UserAttributeSimilarityValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.MinimumLengthValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.CommonPasswordValidator',
-    },
-    {
-        'NAME': 'django.contrib.auth.password_validation.NumericPasswordValidator',
+        "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator"
     },
+    {"NAME": "django.contrib.auth.password_validation.MinimumLengthValidator"},
+    {"NAME": "django.contrib.auth.password_validation.CommonPasswordValidator"},
+    {"NAME": "django.contrib.auth.password_validation.NumericPasswordValidator"},
 ]
 
 # MIDDLEWARE
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#middleware
 MIDDLEWARE = [
-    'django.middleware.security.SecurityMiddleware',
-    'django.contrib.sessions.middleware.SessionMiddleware',
-    'django.middleware.common.CommonMiddleware',
-    'django.middleware.csrf.CsrfViewMiddleware',
-    'django.contrib.auth.middleware.AuthenticationMiddleware',
-    'django.contrib.messages.middleware.MessageMiddleware',
-    'django.middleware.clickjacking.XFrameOptionsMiddleware',
+    "django.middleware.security.SecurityMiddleware",
+    "django.contrib.sessions.middleware.SessionMiddleware",
+    "django.middleware.common.CommonMiddleware",
+    "django.middleware.csrf.CsrfViewMiddleware",
+    "django.contrib.auth.middleware.AuthenticationMiddleware",
+    "django.contrib.messages.middleware.MessageMiddleware",
+    "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
 
 # STATIC
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#static-root
-STATIC_ROOT = str(ROOT_DIR('staticfiles'))
+STATIC_ROOT = str(ROOT_DIR("staticfiles"))
 # https://docs.djangoproject.com/en/dev/ref/settings/#static-url
-STATIC_URL = '/static/'
+STATIC_URL = "/static/"
 # https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#std:setting-STATICFILES_DIRS
-STATICFILES_DIRS = [
-    str(APPS_DIR.path('static')),
-]
+STATICFILES_DIRS = [str(APPS_DIR.path("static"))]
 # https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#staticfiles-finders
 STATICFILES_FINDERS = [
-    'django.contrib.staticfiles.finders.FileSystemFinder',
-    'django.contrib.staticfiles.finders.AppDirectoriesFinder',
+    "django.contrib.staticfiles.finders.FileSystemFinder",
+    "django.contrib.staticfiles.finders.AppDirectoriesFinder",
 ]
 
 # MEDIA
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#media-root
-MEDIA_ROOT = str(APPS_DIR('media'))
+MEDIA_ROOT = str(APPS_DIR("media"))
 # https://docs.djangoproject.com/en/dev/ref/settings/#media-url
-MEDIA_URL = '/media/'
+MEDIA_URL = "/media/"
 
 # TEMPLATES
 # ------------------------------------------------------------------------------
@@ -171,43 +163,39 @@ MEDIA_URL = '/media/'
 TEMPLATES = [
     {
         # https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-TEMPLATES-BACKEND
-        'BACKEND': 'django.template.backends.django.DjangoTemplates',
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
         # https://docs.djangoproject.com/en/dev/ref/settings/#template-dirs
-        'DIRS': [
-            str(APPS_DIR.path('templates')),
-        ],
-        'OPTIONS': {
+        "DIRS": [str(APPS_DIR.path("templates"))],
+        "OPTIONS": {
             # https://docs.djangoproject.com/en/dev/ref/settings/#template-debug
-            'debug': DEBUG,
+            "debug": DEBUG,
             # https://docs.djangoproject.com/en/dev/ref/settings/#template-loaders
             # https://docs.djangoproject.com/en/dev/ref/templates/api/#loader-types
-            'loaders': [
-                'django.template.loaders.filesystem.Loader',
-                'django.template.loaders.app_directories.Loader',
+            "loaders": [
+                "django.template.loaders.filesystem.Loader",
+                "django.template.loaders.app_directories.Loader",
             ],
             # https://docs.djangoproject.com/en/dev/ref/settings/#template-context-processors
-            'context_processors': [
-                'django.template.context_processors.debug',
-                'django.template.context_processors.request',
-                'django.contrib.auth.context_processors.auth',
-                'django.template.context_processors.i18n',
-                'django.template.context_processors.media',
-                'django.template.context_processors.static',
-                'django.template.context_processors.tz',
-                'django.contrib.messages.context_processors.messages',
+            "context_processors": [
+                "django.template.context_processors.debug",
+                "django.template.context_processors.request",
+                "django.contrib.auth.context_processors.auth",
+                "django.template.context_processors.i18n",
+                "django.template.context_processors.media",
+                "django.template.context_processors.static",
+                "django.template.context_processors.tz",
+                "django.contrib.messages.context_processors.messages",
             ],
         },
-    },
+    }
 ]
 # http://django-crispy-forms.readthedocs.io/en/latest/install.html#template-packs
-CRISPY_TEMPLATE_PACK = 'bootstrap4'
+CRISPY_TEMPLATE_PACK = "bootstrap4"
 
 # FIXTURES
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#fixture-dirs
-FIXTURE_DIRS = (
-    str(APPS_DIR.path('fixtures')),
-)
+FIXTURE_DIRS = (str(APPS_DIR.path("fixtures")),)
 
 # SECURITY
 # ------------------------------------------------------------------------------
@@ -218,41 +206,41 @@ CSRF_COOKIE_HTTPONLY = True
 # https://docs.djangoproject.com/en/dev/ref/settings/#secure-browser-xss-filter
 SECURE_BROWSER_XSS_FILTER = True
 # https://docs.djangoproject.com/en/dev/ref/settings/#x-frame-options
-X_FRAME_OPTIONS = 'DENY'
+X_FRAME_OPTIONS = "DENY"
 
 # EMAIL
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#email-backend
-EMAIL_BACKEND = env('DJANGO_EMAIL_BACKEND', default='django.core.mail.backends.smtp.EmailBackend')
+EMAIL_BACKEND = env(
+    "DJANGO_EMAIL_BACKEND", default="django.core.mail.backends.smtp.EmailBackend"
+)
 
 # ADMIN
 # ------------------------------------------------------------------------------
 # Django Admin URL.
-ADMIN_URL = 'admin/'
+ADMIN_URL = "admin/"
 # https://docs.djangoproject.com/en/dev/ref/settings/#admins
-ADMINS = [
-    ("""{{cookiecutter.author_name}}""", '{{cookiecutter.email}}'),
-]
+ADMINS = [("""{{cookiecutter.author_name}}""", "{{cookiecutter.email}}")]
 # https://docs.djangoproject.com/en/dev/ref/settings/#managers
 MANAGERS = ADMINS
 
 {% if cookiecutter.use_celery == 'y' -%}
 # Celery
 # ------------------------------------------------------------------------------
-INSTALLED_APPS += ['{{cookiecutter.project_slug}}.taskapp.celery.CeleryAppConfig']
+INSTALLED_APPS += ["{{cookiecutter.project_slug}}.taskapp.celery.CeleryAppConfig"]
 if USE_TZ:
     # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-timezone
     CELERY_TIMEZONE = TIME_ZONE
 # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-broker_url
-CELERY_BROKER_URL = env('CELERY_BROKER_URL')
+CELERY_BROKER_URL = env("CELERY_BROKER_URL")
 # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-result_backend
 CELERY_RESULT_BACKEND = CELERY_BROKER_URL
 # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-accept_content
-CELERY_ACCEPT_CONTENT = ['json']
+CELERY_ACCEPT_CONTENT = ["json"]
 # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-task_serializer
-CELERY_TASK_SERIALIZER = 'json'
+CELERY_TASK_SERIALIZER = "json"
 # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-result_serializer
-CELERY_RESULT_SERIALIZER = 'json'
+CELERY_RESULT_SERIALIZER = "json"
 # http://docs.celeryproject.org/en/latest/userguide/configuration.html#task-time-limit
 # TODO: set to whatever value is adequate in your circumstances
 CELERYD_TASK_TIME_LIMIT = 5 * 60
@@ -263,24 +251,24 @@ CELERYD_TASK_SOFT_TIME_LIMIT = 60
 {%- endif %}
 # django-allauth
 # ------------------------------------------------------------------------------
-ACCOUNT_ALLOW_REGISTRATION = env.bool('DJANGO_ACCOUNT_ALLOW_REGISTRATION', True)
+ACCOUNT_ALLOW_REGISTRATION = env.bool("DJANGO_ACCOUNT_ALLOW_REGISTRATION", True)
 # https://django-allauth.readthedocs.io/en/latest/configuration.html
-ACCOUNT_AUTHENTICATION_METHOD = 'username'
+ACCOUNT_AUTHENTICATION_METHOD = "username"
 # https://django-allauth.readthedocs.io/en/latest/configuration.html
 ACCOUNT_EMAIL_REQUIRED = True
 # https://django-allauth.readthedocs.io/en/latest/configuration.html
-ACCOUNT_EMAIL_VERIFICATION = 'mandatory'
+ACCOUNT_EMAIL_VERIFICATION = "mandatory"
 # https://django-allauth.readthedocs.io/en/latest/configuration.html
-ACCOUNT_ADAPTER = '{{cookiecutter.project_slug}}.users.adapters.AccountAdapter'
+ACCOUNT_ADAPTER = "{{cookiecutter.project_slug}}.users.adapters.AccountAdapter"
 # https://django-allauth.readthedocs.io/en/latest/configuration.html
-SOCIALACCOUNT_ADAPTER = '{{cookiecutter.project_slug}}.users.adapters.SocialAccountAdapter'
+SOCIALACCOUNT_ADAPTER = "{{cookiecutter.project_slug}}.users.adapters.SocialAccountAdapter"
 
 {% if cookiecutter.use_compressor == 'y' -%}
 # django-compressor
 # ------------------------------------------------------------------------------
 # https://django-compressor.readthedocs.io/en/latest/quickstart/#installation
-INSTALLED_APPS += ['compressor']
-STATICFILES_FINDERS += ['compressor.finders.CompressorFinder']
+INSTALLED_APPS += ["compressor"]
+STATICFILES_FINDERS += ["compressor.finders.CompressorFinder"]
 
 {%- endif %}
 # Your stuff...
diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py
index 6667a2653..0c0588bd4 100644
--- a/{{cookiecutter.project_slug}}/config/settings/local.py
+++ b/{{cookiecutter.project_slug}}/config/settings/local.py
@@ -6,42 +6,43 @@ from .base import env
 # https://docs.djangoproject.com/en/dev/ref/settings/#debug
 DEBUG = True
 # https://docs.djangoproject.com/en/dev/ref/settings/#secret-key
-SECRET_KEY = env('DJANGO_SECRET_KEY', default='!!!SET DJANGO_SECRET_KEY!!!')
+SECRET_KEY = env(
+    "DJANGO_SECRET_KEY",
+    default="!!!SET DJANGO_SECRET_KEY!!!",
+)
 # https://docs.djangoproject.com/en/dev/ref/settings/#allowed-hosts
-ALLOWED_HOSTS = [
-    "localhost",
-    "0.0.0.0",
-    "127.0.0.1",
-]
+ALLOWED_HOSTS = ["localhost", "0.0.0.0", "127.0.0.1"]
 
 # CACHES
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#caches
 CACHES = {
-    'default': {
-        'BACKEND': 'django.core.cache.backends.locmem.LocMemCache',
-        'LOCATION': ''
+    "default": {
+        "BACKEND": "django.core.cache.backends.locmem.LocMemCache",
+        "LOCATION": "",
     }
 }
 
 # TEMPLATES
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#templates
-TEMPLATES[0]['OPTIONS']['debug'] = DEBUG  # noqa F405
+TEMPLATES[0]["OPTIONS"]["debug"] = DEBUG  # noqa F405
 
 # EMAIL
 # ------------------------------------------------------------------------------
 {% if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'y' -%}
 # https://docs.djangoproject.com/en/dev/ref/settings/#email-host
-EMAIL_HOST = env('EMAIL_HOST', default='mailhog')
+EMAIL_HOST = env("EMAIL_HOST", default="mailhog")
 {%- elif cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'n' -%}
 # https://docs.djangoproject.com/en/dev/ref/settings/#email-host
-EMAIL_HOST = 'localhost'
+EMAIL_HOST = "localhost"
 {%- else -%}
 # https://docs.djangoproject.com/en/dev/ref/settings/#email-backend
-EMAIL_BACKEND = env('DJANGO_EMAIL_BACKEND', default='django.core.mail.backends.console.EmailBackend')
+EMAIL_BACKEND = env(
+    "DJANGO_EMAIL_BACKEND", default="django.core.mail.backends.console.EmailBackend"
+)
 # https://docs.djangoproject.com/en/dev/ref/settings/#email-host
-EMAIL_HOST = 'localhost'
+EMAIL_HOST = "localhost"
 {%- endif %}
 # https://docs.djangoproject.com/en/dev/ref/settings/#email-port
 EMAIL_PORT = 1025
@@ -49,29 +50,28 @@ EMAIL_PORT = 1025
 # django-debug-toolbar
 # ------------------------------------------------------------------------------
 # https://django-debug-toolbar.readthedocs.io/en/latest/installation.html#prerequisites
-INSTALLED_APPS += ['debug_toolbar']  # noqa F405
+INSTALLED_APPS += ["debug_toolbar"]  # noqa F405
 # https://django-debug-toolbar.readthedocs.io/en/latest/installation.html#middleware
-MIDDLEWARE += ['debug_toolbar.middleware.DebugToolbarMiddleware']  # noqa F405
+MIDDLEWARE += ["debug_toolbar.middleware.DebugToolbarMiddleware"]  # noqa F405
 # https://django-debug-toolbar.readthedocs.io/en/latest/configuration.html#debug-toolbar-config
 DEBUG_TOOLBAR_CONFIG = {
-    'DISABLE_PANELS': [
-        'debug_toolbar.panels.redirects.RedirectsPanel',
-    ],
-    'SHOW_TEMPLATE_CONTEXT': True,
+    "DISABLE_PANELS": ["debug_toolbar.panels.redirects.RedirectsPanel"],
+    "SHOW_TEMPLATE_CONTEXT": True,
 }
 # https://django-debug-toolbar.readthedocs.io/en/latest/installation.html#internal-ips
-INTERNAL_IPS = ['127.0.0.1', '10.0.2.2']
+INTERNAL_IPS = ["127.0.0.1", "10.0.2.2"]
 {% if cookiecutter.use_docker == 'y' -%}
-if env('USE_DOCKER') == 'yes':
+if env("USE_DOCKER") == "yes":
     import socket
+
     hostname, _, ips = socket.gethostbyname_ex(socket.gethostname())
-    INTERNAL_IPS += [ip[:-1] + '1' for ip in ips]
+    INTERNAL_IPS += [ip[:-1] + "1" for ip in ips]
 {%- endif %}
 
 # django-extensions
 # ------------------------------------------------------------------------------
 # https://django-extensions.readthedocs.io/en/latest/installation_instructions.html#configuration
-INSTALLED_APPS += ['django_extensions']  # noqa F405
+INSTALLED_APPS += ["django_extensions"]  # noqa F405
 {% if cookiecutter.use_celery == 'y' -%}
 
 # Celery
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index e77d4304c..161587421 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -8,37 +8,37 @@ from .base import env
 # GENERAL
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#secret-key
-SECRET_KEY = env('DJANGO_SECRET_KEY')
+SECRET_KEY = env("DJANGO_SECRET_KEY")
 # https://docs.djangoproject.com/en/dev/ref/settings/#allowed-hosts
-ALLOWED_HOSTS = env.list('DJANGO_ALLOWED_HOSTS', default=['{{ cookiecutter.domain_name }}'])
+ALLOWED_HOSTS = env.list("DJANGO_ALLOWED_HOSTS", default=["{{ cookiecutter.domain_name }}"])
 
 # DATABASES
 # ------------------------------------------------------------------------------
-DATABASES['default'] = env.db('DATABASE_URL')  # noqa F405
-DATABASES['default']['ATOMIC_REQUESTS'] = True  # noqa F405
-DATABASES['default']['CONN_MAX_AGE'] = env.int('CONN_MAX_AGE', default=60)  # noqa F405
+DATABASES["default"] = env.db("DATABASE_URL")  # noqa F405
+DATABASES["default"]["ATOMIC_REQUESTS"] = True  # noqa F405
+DATABASES["default"]["CONN_MAX_AGE"] = env.int("CONN_MAX_AGE", default=60)  # noqa F405
 
 # CACHES
 # ------------------------------------------------------------------------------
 CACHES = {
-    'default': {
-        'BACKEND': 'django_redis.cache.RedisCache',
-        'LOCATION': env('REDIS_URL'),
-        'OPTIONS': {
-            'CLIENT_CLASS': 'django_redis.client.DefaultClient',
+    "default": {
+        "BACKEND": "django_redis.cache.RedisCache",
+        "LOCATION": env("REDIS_URL"),
+        "OPTIONS": {
+            "CLIENT_CLASS": "django_redis.client.DefaultClient",
             # Mimicing memcache behavior.
             # http://niwinz.github.io/django-redis/latest/#_memcached_exceptions_behavior
-            'IGNORE_EXCEPTIONS': True,
-        }
+            "IGNORE_EXCEPTIONS": True,
+        },
     }
 }
 
 # SECURITY
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#secure-proxy-ssl-header
-SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
+SECURE_PROXY_SSL_HEADER = ("HTTP_X_FORWARDED_PROTO", "https")
 # https://docs.djangoproject.com/en/dev/ref/settings/#secure-ssl-redirect
-SECURE_SSL_REDIRECT = env.bool('DJANGO_SECURE_SSL_REDIRECT', default=True)
+SECURE_SSL_REDIRECT = env.bool("DJANGO_SECURE_SSL_REDIRECT", default=True)
 # https://docs.djangoproject.com/en/dev/ref/settings/#session-cookie-secure
 SESSION_COOKIE_SECURE = True
 # https://docs.djangoproject.com/en/dev/ref/settings/#csrf-cookie-secure
@@ -48,45 +48,49 @@ CSRF_COOKIE_SECURE = True
 # TODO: set this to 60 seconds first and then to 518400 once you prove the former works
 SECURE_HSTS_SECONDS = 60
 # https://docs.djangoproject.com/en/dev/ref/settings/#secure-hsts-include-subdomains
-SECURE_HSTS_INCLUDE_SUBDOMAINS = env.bool('DJANGO_SECURE_HSTS_INCLUDE_SUBDOMAINS', default=True)
+SECURE_HSTS_INCLUDE_SUBDOMAINS = env.bool(
+    "DJANGO_SECURE_HSTS_INCLUDE_SUBDOMAINS", default=True
+)
 # https://docs.djangoproject.com/en/dev/ref/settings/#secure-hsts-preload
-SECURE_HSTS_PRELOAD = env.bool('DJANGO_SECURE_HSTS_PRELOAD', default=True)
+SECURE_HSTS_PRELOAD = env.bool("DJANGO_SECURE_HSTS_PRELOAD", default=True)
 # https://docs.djangoproject.com/en/dev/ref/middleware/#x-content-type-options-nosniff
-SECURE_CONTENT_TYPE_NOSNIFF = env.bool('DJANGO_SECURE_CONTENT_TYPE_NOSNIFF', default=True)
+SECURE_CONTENT_TYPE_NOSNIFF = env.bool(
+    "DJANGO_SECURE_CONTENT_TYPE_NOSNIFF", default=True
+)
 
 # STORAGES
 # ------------------------------------------------------------------------------
 # https://django-storages.readthedocs.io/en/latest/#installation
-INSTALLED_APPS += ['storages']  # noqa F405
+INSTALLED_APPS += ["storages"]  # noqa F405
 # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
-AWS_ACCESS_KEY_ID = env('DJANGO_AWS_ACCESS_KEY_ID')
+AWS_ACCESS_KEY_ID = env("DJANGO_AWS_ACCESS_KEY_ID")
 # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
-AWS_SECRET_ACCESS_KEY = env('DJANGO_AWS_SECRET_ACCESS_KEY')
+AWS_SECRET_ACCESS_KEY = env("DJANGO_AWS_SECRET_ACCESS_KEY")
 # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
-AWS_STORAGE_BUCKET_NAME = env('DJANGO_AWS_STORAGE_BUCKET_NAME')
+AWS_STORAGE_BUCKET_NAME = env("DJANGO_AWS_STORAGE_BUCKET_NAME")
 # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
 AWS_QUERYSTRING_AUTH = False
 # DO NOT change these unless you know what you're doing.
 _AWS_EXPIRY = 60 * 60 * 24 * 7
 # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
 AWS_S3_OBJECT_PARAMETERS = {
-    'CacheControl': f'max-age={_AWS_EXPIRY}, s-maxage={_AWS_EXPIRY}, must-revalidate',
+    "CacheControl": f"max-age={_AWS_EXPIRY}, s-maxage={_AWS_EXPIRY}, must-revalidate"
 }
 
 # STATIC
 # ------------------------
 {% if cookiecutter.use_whitenoise == 'y' -%}
-STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
+STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
 {%- else %}
-STATICFILES_STORAGE = 'config.settings.production.StaticRootS3Boto3Storage'
-STATIC_URL = f'https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/static/'
+STATICFILES_STORAGE = "config.settings.production.StaticRootS3Boto3Storage"
+STATIC_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/static/"
 {%- endif %}
 
 # MEDIA
 # ------------------------------------------------------------------------------
 {% if cookiecutter.use_whitenoise == 'y' -%}
-DEFAULT_FILE_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage'
-MEDIA_URL = f'https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/'
+DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
+MEDIA_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/"
 {%- else %}
 # region http://stackoverflow.com/questions/10390244/
 # Full-fledge class: https://stackoverflow.com/a/18046120/104731
@@ -94,78 +98,79 @@ from storages.backends.s3boto3 import S3Boto3Storage  # noqa E402
 
 
 class StaticRootS3Boto3Storage(S3Boto3Storage):
-    location = 'static'
+    location = "static"
 
 
 class MediaRootS3Boto3Storage(S3Boto3Storage):
-    location = 'media'
+    location = "media"
     file_overwrite = False
 
 
 # endregion
-DEFAULT_FILE_STORAGE = 'config.settings.production.MediaRootS3Boto3Storage'
-MEDIA_URL = f'https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/media/'
+DEFAULT_FILE_STORAGE = "config.settings.production.MediaRootS3Boto3Storage"
+MEDIA_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/media/"
 {%- endif %}
 
 # TEMPLATES
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#templates
-TEMPLATES[0]['OPTIONS']['loaders'] = [  # noqa F405
+TEMPLATES[0]["OPTIONS"]["loaders"] = [  # noqa F405
     (
-        'django.template.loaders.cached.Loader',
+        "django.template.loaders.cached.Loader",
         [
-            'django.template.loaders.filesystem.Loader',
-            'django.template.loaders.app_directories.Loader',
-        ]
-    ),
+            "django.template.loaders.filesystem.Loader",
+            "django.template.loaders.app_directories.Loader",
+        ],
+    )
 ]
 
 # EMAIL
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#default-from-email
 DEFAULT_FROM_EMAIL = env(
-    'DJANGO_DEFAULT_FROM_EMAIL',
-    default='{{cookiecutter.project_name}} <noreply@{{cookiecutter.domain_name}}>'
+    "DJANGO_DEFAULT_FROM_EMAIL", default="{{cookiecutter.project_name}} <noreply@{{cookiecutter.domain_name}}>"
 )
 # https://docs.djangoproject.com/en/dev/ref/settings/#server-email
-SERVER_EMAIL = env('DJANGO_SERVER_EMAIL', default=DEFAULT_FROM_EMAIL)
+SERVER_EMAIL = env("DJANGO_SERVER_EMAIL", default=DEFAULT_FROM_EMAIL)
 # https://docs.djangoproject.com/en/dev/ref/settings/#email-subject-prefix
-EMAIL_SUBJECT_PREFIX = env('DJANGO_EMAIL_SUBJECT_PREFIX', default='[{{cookiecutter.project_name}}]')
+EMAIL_SUBJECT_PREFIX = env(
+    "DJANGO_EMAIL_SUBJECT_PREFIX", default="[{{cookiecutter.project_name}}]"
+)
 
 # ADMIN
 # ------------------------------------------------------------------------------
 # Django Admin URL regex.
-ADMIN_URL = env('DJANGO_ADMIN_URL')
+ADMIN_URL = env("DJANGO_ADMIN_URL")
 
 # Anymail (Mailgun)
 # ------------------------------------------------------------------------------
 # https://anymail.readthedocs.io/en/stable/installation/#installing-anymail
-INSTALLED_APPS += ['anymail']  # noqa F405
-EMAIL_BACKEND = 'anymail.backends.mailgun.EmailBackend'
+INSTALLED_APPS += ["anymail"]  # noqa F405
+EMAIL_BACKEND = "anymail.backends.mailgun.EmailBackend"
 # https://anymail.readthedocs.io/en/stable/installation/#anymail-settings-reference
 ANYMAIL = {
-    'MAILGUN_API_KEY': env('MAILGUN_API_KEY'),
-    'MAILGUN_SENDER_DOMAIN': env('MAILGUN_DOMAIN')
+    "MAILGUN_API_KEY": env("MAILGUN_API_KEY"),
+    "MAILGUN_SENDER_DOMAIN": env("MAILGUN_DOMAIN"),
 }
 
 # Gunicorn
 # ------------------------------------------------------------------------------
-INSTALLED_APPS += ['gunicorn']  # noqa F405
+INSTALLED_APPS += ["gunicorn"]  # noqa F405
 
 {% if cookiecutter.use_whitenoise == 'y' -%}
 # WhiteNoise
 # ------------------------------------------------------------------------------
 # http://whitenoise.evans.io/en/latest/django.html#enable-whitenoise
-MIDDLEWARE.insert(1, 'whitenoise.middleware.WhiteNoiseMiddleware')  # noqa F405
+MIDDLEWARE.insert(1, "whitenoise.middleware.WhiteNoiseMiddleware")  # noqa F405
 
 {% endif %}
 {%- if cookiecutter.use_compressor == 'y' -%}
 # django-compressor
 # ------------------------------------------------------------------------------
 # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_ENABLED
-COMPRESS_ENABLED = env.bool('COMPRESS_ENABLED', default=True)
+COMPRESS_ENABLED = env.bool("COMPRESS_ENABLED", default=True)
 # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_STORAGE
-COMPRESS_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage'
+COMPRESS_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
 # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_URL
 COMPRESS_URL = STATIC_URL
 
@@ -174,7 +179,7 @@ COMPRESS_URL = STATIC_URL
 # Collectfast
 # ------------------------------------------------------------------------------
 # https://github.com/antonagestam/collectfast#installation
-INSTALLED_APPS = ['collectfast'] + INSTALLED_APPS  # noqa F405
+INSTALLED_APPS = ["collectfast"] + INSTALLED_APPS  # noqa F405
 AWS_PRELOAD_METADATA = True
 
 {% endif %}
@@ -182,64 +187,64 @@ AWS_PRELOAD_METADATA = True
 # raven
 # ------------------------------------------------------------------------------
 # https://docs.sentry.io/clients/python/integrations/django/
-INSTALLED_APPS += ['raven.contrib.django.raven_compat']  # noqa F405
-MIDDLEWARE = ['raven.contrib.django.raven_compat.middleware.SentryResponseErrorIdMiddleware'] + MIDDLEWARE
+INSTALLED_APPS += ["raven.contrib.django.raven_compat"]  # noqa F405
+MIDDLEWARE = ["raven.contrib.django.raven_compat.middleware.SentryResponseErrorIdMiddleware"] + MIDDLEWARE
 
 # Sentry
 # ------------------------------------------------------------------------------
-SENTRY_DSN = env('SENTRY_DSN')
-SENTRY_CLIENT = env('DJANGO_SENTRY_CLIENT', default='raven.contrib.django.raven_compat.DjangoClient')
+SENTRY_DSN = env("SENTRY_DSN")
+SENTRY_CLIENT = env("DJANGO_SENTRY_CLIENT", default="raven.contrib.django.raven_compat.DjangoClient")
 LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': True,
-    'root': {
-        'level': 'WARNING',
-        'handlers': ['sentry'],
+    "version": 1,
+    "disable_existing_loggers": True,
+    "root": {
+        "level": "WARNING",
+        "handlers": ["sentry"],
     },
-    'formatters': {
-        'verbose': {
-            'format': '%(levelname)s %(asctime)s %(module)s '
-                      '%(process)d %(thread)d %(message)s'
-        },
-    },
-    'handlers': {
-        'sentry': {
-            'level': 'ERROR',
-            'class': 'raven.contrib.django.raven_compat.handlers.SentryHandler',
-        },
-        'console': {
-            'level': 'DEBUG',
-            'class': 'logging.StreamHandler',
-            'formatter': 'verbose'
+    "formatters": {
+        "verbose": {
+            "format": "%(levelname)s %(asctime)s %(module)s "
+            "%(process)d %(thread)d %(message)s"
         }
     },
-    'loggers': {
-        'django.db.backends': {
-            'level': 'ERROR',
-            'handlers': ['console'],
-            'propagate': False,
+    "handlers": {
+        "sentry": {
+            "level": "ERROR",
+            "class": "raven.contrib.django.raven_compat.handlers.SentryHandler",
         },
-        'raven': {
-            'level': 'DEBUG',
-            'handlers': ['console'],
-            'propagate': False,
+        "console": {
+            "level": "DEBUG",
+            "class": "logging.StreamHandler",
+            "formatter": "verbose",
         },
-        'sentry.errors': {
-            'level': 'DEBUG',
-            'handlers': ['console'],
-            'propagate': False,
+    },
+    "loggers": {
+        "django.db.backends": {
+            "level": "ERROR",
+            "handlers": ["console"],
+            "propagate": False,
         },
-        'django.security.DisallowedHost': {
-            'level': 'ERROR',
-            'handlers': ['console', 'sentry'],
-            'propagate': False,
+        "raven": {
+            "level": "DEBUG",
+            "handlers": ["console"],
+            "propagate": False,
+        },
+        "sentry.errors": {
+            "level": "DEBUG",
+            "handlers": ["console"],
+            "propagate": False,
+        },
+        "django.security.DisallowedHost": {
+            "level": "ERROR",
+            "handlers": ["console", "sentry"],
+            "propagate": False,
         },
     },
 }
 
-SENTRY_CELERY_LOGLEVEL = env.int('DJANGO_SENTRY_LOG_LEVEL', logging.INFO)
+SENTRY_CELERY_LOGLEVEL = env.int("DJANGO_SENTRY_LOG_LEVEL", logging.INFO)
 RAVEN_CONFIG = {
-    'dsn': SENTRY_DSN
+    "dsn": SENTRY_DSN
 }
 
 {%- else %}
@@ -252,43 +257,39 @@ RAVEN_CONFIG = {
 # See https://docs.djangoproject.com/en/dev/topics/logging for
 # more details on how to customize your logging configuration.
 LOGGING = {
-    'version': 1,
-    'disable_existing_loggers': False,
-    'filters': {
-        'require_debug_false': {
-            '()': 'django.utils.log.RequireDebugFalse'
+    "version": 1,
+    "disable_existing_loggers": False,
+    "filters": {"require_debug_false": {"()": "django.utils.log.RequireDebugFalse"}},
+    "formatters": {
+        "verbose": {
+            "format": "%(levelname)s %(asctime)s %(module)s "
+            "%(process)d %(thread)d %(message)s"
         }
     },
-    'formatters': {
-        'verbose': {
-            'format': '%(levelname)s %(asctime)s %(module)s '
-                      '%(process)d %(thread)d %(message)s'
+    "handlers": {
+        "mail_admins": {
+            "level": "ERROR",
+            "filters": ["require_debug_false"],
+            "class": "django.utils.log.AdminEmailHandler",
+        },
+        "console": {
+            "level": "DEBUG",
+            "class": "logging.StreamHandler",
+            "formatter": "verbose",
         },
     },
-    'handlers': {
-        'mail_admins': {
-            'level': 'ERROR',
-            'filters': ['require_debug_false'],
-            'class': 'django.utils.log.AdminEmailHandler'
+    "loggers": {
+        "django.request": {
+            "handlers": ["mail_admins"],
+            "level": "ERROR",
+            "propagate": True,
         },
-        'console': {
-            'level': 'DEBUG',
-            'class': 'logging.StreamHandler',
-            'formatter': 'verbose',
+        "django.security.DisallowedHost": {
+            "level": "ERROR",
+            "handlers": ["console", "mail_admins"],
+            "propagate": True,
         },
     },
-    'loggers': {
-        'django.request': {
-            'handlers': ['mail_admins'],
-            'level': 'ERROR',
-            'propagate': True
-        },
-        'django.security.DisallowedHost': {
-            'level': 'ERROR',
-            'handlers': ['console', 'mail_admins'],
-            'propagate': True
-        }
-    }
 }
 
 {% endif %}
diff --git a/{{cookiecutter.project_slug}}/config/settings/test.py b/{{cookiecutter.project_slug}}/config/settings/test.py
index e947d4101..2ade134a2 100644
--- a/{{cookiecutter.project_slug}}/config/settings/test.py
+++ b/{{cookiecutter.project_slug}}/config/settings/test.py
@@ -10,7 +10,10 @@ from .base import env
 # https://docs.djangoproject.com/en/dev/ref/settings/#debug
 DEBUG = False
 # https://docs.djangoproject.com/en/dev/ref/settings/#secret-key
-SECRET_KEY = env("DJANGO_SECRET_KEY", default="!!!SET DJANGO_SECRET_KEY!!!")
+SECRET_KEY = env(
+    "DJANGO_SECRET_KEY",
+    default="!!!SET DJANGO_SECRET_KEY!!!",
+)
 # https://docs.djangoproject.com/en/dev/ref/settings/#test-runner
 TEST_RUNNER = "django.test.runner.DiscoverRunner"
 
@@ -19,7 +22,8 @@ TEST_RUNNER = "django.test.runner.DiscoverRunner"
 # https://docs.djangoproject.com/en/dev/ref/settings/#caches
 CACHES = {
     "default": {
-        "BACKEND": "django.core.cache.backends.locmem.LocMemCache", "LOCATION": ""
+        "BACKEND": "django.core.cache.backends.locmem.LocMemCache",
+        "LOCATION": "",
     }
 }
 
diff --git a/{{cookiecutter.project_slug}}/config/urls.py b/{{cookiecutter.project_slug}}/config/urls.py
index 62d86c94d..909d5e86e 100644
--- a/{{cookiecutter.project_slug}}/config/urls.py
+++ b/{{cookiecutter.project_slug}}/config/urls.py
@@ -8,22 +8,15 @@ from django.views import defaults as default_views
 urlpatterns = [
     path("", TemplateView.as_view(template_name="pages/home.html"), name="home"),
     path(
-        "about/",
-        TemplateView.as_view(template_name="pages/about.html"),
-        name="about",
+        "about/", TemplateView.as_view(template_name="pages/about.html"), name="about"
     ),
     # Django Admin, use {% raw %}{% url 'admin:index' %}{% endraw %}
     path(settings.ADMIN_URL, admin.site.urls),
     # User management
-    path(
-        "users/",
-        include("{{ cookiecutter.project_slug }}.users.urls", namespace="users"),
-    ),
+    path("users/", include("{{ cookiecutter.project_slug }}.users.urls", namespace="users")),
     path("accounts/", include("allauth.urls")),
     # Your stuff: custom urls includes go here
-] + static(
-    settings.MEDIA_URL, document_root=settings.MEDIA_ROOT
-)
+] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
 
 if settings.DEBUG:
     # This allows the error pages to be debugged during development, just visit
diff --git a/{{cookiecutter.project_slug}}/config/wsgi.py b/{{cookiecutter.project_slug}}/config/wsgi.py
index 4c1350061..abc093149 100644
--- a/{{cookiecutter.project_slug}}/config/wsgi.py
+++ b/{{cookiecutter.project_slug}}/config/wsgi.py
@@ -20,11 +20,12 @@ from django.core.wsgi import get_wsgi_application
 
 # This allows easy placement of apps within the interior
 # {{ cookiecutter.project_slug }} directory.
-app_path = os.path.abspath(os.path.join(
-    os.path.dirname(os.path.abspath(__file__)), os.pardir))
-sys.path.append(os.path.join(app_path, '{{ cookiecutter.project_slug }}'))
+app_path = os.path.abspath(
+    os.path.join(os.path.dirname(os.path.abspath(__file__)), os.pardir)
+)
+sys.path.append(os.path.join(app_path, "{{ cookiecutter.project_slug }}"))
 {% if cookiecutter.use_sentry == 'y' -%}
-if os.environ.get('DJANGO_SETTINGS_MODULE') == 'config.settings.production':
+if os.environ.get("DJANGO_SETTINGS_MODULE") == "config.settings.production":
     from raven.contrib.django.raven_compat.middleware.wsgi import Sentry
 {%- endif %}
 # We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks
@@ -38,7 +39,7 @@ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.production")
 # setting points here.
 application = get_wsgi_application()
 {% if cookiecutter.use_sentry == 'y' -%}
-if os.environ.get('DJANGO_SETTINGS_MODULE') == 'config.settings.production':
+if os.environ.get("DJANGO_SETTINGS_MODULE") == "config.settings.production":
     application = Sentry(application)
 {%- endif %}
 # Apply WSGI middleware here.
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index a496135b6..c9fbb96e0 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -19,6 +19,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 # ------------------------------------------------------------------------------
 flake8==3.7.5  # https://github.com/PyCQA/flake8
 coverage==4.5.2  # https://github.com/nedbat/coveragepy
+black==18.9b0  # https://github.com/ambv/black
 
 # Django
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py
index 570abc125..b3b086a06 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py
@@ -1,4 +1,4 @@
-{% if cookiecutter.use_celery == 'y' %}
+{% if cookiecutter.use_celery == 'y' -%}
 import os
 from celery import Celery
 from django.apps import apps, AppConfig
@@ -7,26 +7,28 @@ from django.conf import settings
 
 if not settings.configured:
     # set the default Django settings module for the 'celery' program.
-    os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'config.settings.local')  # pragma: no cover
+    os.environ.setdefault(
+        "DJANGO_SETTINGS_MODULE", "config.settings.local"
+    )  # pragma: no cover
 
 
-app = Celery('{{cookiecutter.project_slug}}')
+app = Celery("{{cookiecutter.project_slug}}")
 # Using a string here means the worker will not have to
 # pickle the object when using Windows.
 # - namespace='CELERY' means all celery-related configuration keys
 #   should have a `CELERY_` prefix.
-app.config_from_object('django.conf:settings', namespace='CELERY')
+app.config_from_object("django.conf:settings", namespace="CELERY")
 
 
 class CeleryAppConfig(AppConfig):
-    name = '{{cookiecutter.project_slug}}.taskapp'
-    verbose_name = 'Celery Config'
+    name = "{{cookiecutter.project_slug}}.taskapp"
+    verbose_name = "Celery Config"
 
     def ready(self):
         installed_apps = [app_config.name for app_config in apps.get_app_configs()]
         app.autodiscover_tasks(lambda: installed_apps, force=True)
+        {%- if cookiecutter.use_sentry == 'y' %}
 
-        {% if cookiecutter.use_sentry == 'y' -%}
         if hasattr(settings, 'RAVEN_CONFIG'):
             # Celery signal registration
 {% if cookiecutter.use_pycharm == 'y' -%}
@@ -51,7 +53,7 @@ class CeleryAppConfig(AppConfig):
 
 @app.task(bind=True)
 def debug_task(self):
-    print(f'Request: {self.request!r}')  # pragma: no cover
+    print(f"Request: {self.request!r}")  # pragma: no cover
 {% else %}
 # Use this as a starting point for your project with celery.
 # If you are not using celery, you can remove this app
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/adapters.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/adapters.py
index 9361d6eca..0d206fae4 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/adapters.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/adapters.py
@@ -7,12 +7,10 @@ from django.http import HttpRequest
 
 
 class AccountAdapter(DefaultAccountAdapter):
-
     def is_open_for_signup(self, request: HttpRequest):
         return getattr(settings, "ACCOUNT_ALLOW_REGISTRATION", True)
 
 
 class SocialAccountAdapter(DefaultSocialAccountAdapter):
-
     def is_open_for_signup(self, request: HttpRequest, sociallogin: Any):
         return getattr(settings, "ACCOUNT_ALLOW_REGISTRATION", True)
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
index 7bba81ff3..250cc9040 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
@@ -6,7 +6,6 @@ User = get_user_model()
 
 
 class UserChangeForm(forms.UserChangeForm):
-
     class Meta(forms.UserChangeForm.Meta):
         model = User
 
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
index 009905768..b53713661 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
@@ -19,9 +19,7 @@ class UserFactory(DjangoModelFactory):
             digits=True,
             upper_case=True,
             lower_case=True,
-        ).generate(
-            extra_kwargs={}
-        )
+        ).generate(extra_kwargs={})
         self.set_password(password)
 
     class Meta:
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
index e80661648..dfa5da52e 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
@@ -7,7 +7,6 @@ pytestmark = pytest.mark.django_db
 
 
 class TestUserCreationForm:
-
     def test_clean_username(self):
         # A user with proto_user params does not exist yet.
         proto_user = UserFactory.build()
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
index 0992e4626..76cb80aa8 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
@@ -40,7 +40,6 @@ class TestUserUpdateView:
 
 
 class TestUserRedirectView:
-
     def test_get_redirect_url(
         self, user: settings.AUTH_USER_MODEL, request_factory: RequestFactory
     ):

From 3bd7aa4e1a14763579824cbdf99e83eab9139466 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 18 Mar 2019 20:55:47 +0000
Subject: [PATCH 0048/2840] Fix build error with windows=y and docker=y
 combination

Fixes #1917
---
 {{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 e43b70af6..b73e46024 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -2,7 +2,7 @@ pytz==2018.9  # https://github.com/stub42/pytz
 python-slugify==2.0.1  # https://github.com/un33k/python-slugify
 Pillow==5.4.1  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
-rcssmin==1.0.6{% if cookiecutter.windows == 'y' %} --install-option="--without-c-extensions"{% endif %}  # https://github.com/ndparker/rcssmin
+rcssmin==1.0.6{% if cookiecutter.windows == 'y' and use_docker == 'n' %} --install-option="--without-c-extensions"{% endif %}  # https://github.com/ndparker/rcssmin
 {%- endif %}
 argon2-cffi==19.1.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}

From b312d516a422b08c299b57cdd3515a235f82b03e Mon Sep 17 00:00:00 2001
From: Demetris <demestav@gmail.com>
Date: Tue, 19 Mar 2019 11:32:45 +0200
Subject: [PATCH 0049/2840] Replace Caddy with Traefik (#1714)

## Description

Replace Caddy with Traefik

## Rationale

There is some trouble with the Caddy license (https://github.com/pydanny/cookiecutter-django/pull/1282#issuecomment-329617536)

@drdaeman suggested using Traefik (https://github.com/pydanny/cookiecutter-django/pull/1282#issuecomment-353655273) which supports ACME and also plays very nice with Docker.

## Comments

I am currently using the proposed setup on a live site and it working great so far. If this PR is of interest to the maintainers, then I could commit more changes and take care of the documentation. Of course, any suggestions by the more experienced people around here, are welcome!
---
 CONTRIBUTORS.rst                              |  2 +
 README.rst                                    |  4 +-
 docs/deployment-with-docker.rst               | 10 ++---
 docs/developing-locally-docker.rst            |  3 +-
 .../.envs/.production/.caddy                  |  3 --
 .../compose/production/caddy/Caddyfile        | 15 -------
 .../compose/production/caddy/Dockerfile       |  3 --
 .../compose/production/traefik/Dockerfile     |  5 +++
 .../compose/production/traefik/traefik.toml   | 41 +++++++++++++++++++
 .../merge_production_dotenvs_in_dotenv.py     |  1 -
 {{cookiecutter.project_slug}}/production.yml  | 12 +++---
 11 files changed, 61 insertions(+), 38 deletions(-)
 delete mode 100644 {{cookiecutter.project_slug}}/.envs/.production/.caddy
 delete mode 100644 {{cookiecutter.project_slug}}/compose/production/caddy/Caddyfile
 delete mode 100644 {{cookiecutter.project_slug}}/compose/production/caddy/Dockerfile
 create mode 100644 {{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
 create mode 100644 {{cookiecutter.project_slug}}/compose/production/traefik/traefik.toml

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index dc41463f8..d8d312ab2 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -93,6 +93,7 @@ Listed in alphabetical order.
   Davit Tovmasyan          `@davitovmasyan`_
   Davur Clementsen         `@dsclementsen`_              @davur
   Delio Castillo           `@jangeador`_                 @jangeador
+  Demetris Stavrou         `@demestav`_
   Denis Orehovsky          `@apirobot`_
   Dónal Adams              `@epileptic-fish`_
   Diane Chen               `@purplediane`_               @purplediane88
@@ -216,6 +217,7 @@ Listed in alphabetical order.
 .. _@Collederas: https://github.com/Collederas
 .. _@davitovmasyan: https://github.com/davitovmasyan
 .. _@ddiazpinto: https://github.com/ddiazpinto
+.. _@demestav: https://github.com/demestav
 .. _@dezoito: https://github.com/dezoito
 .. _@dhepper: https://github.com/dhepper
 .. _@dot2dotseurat: https://github.com/dot2dotseurat
diff --git a/README.rst b/README.rst
index 37f362045..2c037e51f 100644
--- a/README.rst
+++ b/README.rst
@@ -48,7 +48,7 @@ Features
 * Optional custom static build using Gulp and livereload
 * Send emails via Anymail_ (using Mailgun_ by default, but switchable)
 * Media storage using Amazon S3
-* Docker support using docker-compose_ for development and production (using Caddy_ with LetsEncrypt_ support)
+* Docker support using docker-compose_ for development and production (using Traefik_ with LetsEncrypt_ support)
 * Procfile_ for deploying to Heroku
 * Instructions for deploying to PythonAnywhere_
 * Run tests with unittest or py.test
@@ -82,7 +82,7 @@ Optional Integrations
 .. _Sentry: https://sentry.io/welcome/
 .. _docker-compose: https://github.com/docker/compose
 .. _PythonAnywhere: https://www.pythonanywhere.com/
-.. _Caddy: https://caddyserver.com/
+.. _Traefik: https://traefik.io/
 .. _LetsEncrypt: https://letsencrypt.org/
 
 Constraints
diff --git a/docs/deployment-with-docker.rst b/docs/deployment-with-docker.rst
index f6e21e828..904947e3d 100644
--- a/docs/deployment-with-docker.rst
+++ b/docs/deployment-with-docker.rst
@@ -19,7 +19,7 @@ Before you begin, check out the ``production.yml`` file in the root of this proj
 * ``django``: your application running behind ``Gunicorn``;
 * ``postgres``: PostgreSQL database with the application's relational data;
 * ``redis``: Redis instance for caching;
-* ``caddy``: Caddy web server with HTTPS on by default.
+* ``traefik``: Traefik reverse proxy with HTTPS on by default.
 
 Provided you have opted for Celery (via setting ``use_celery`` to ``y``) there are three more services:
 
@@ -63,11 +63,11 @@ It is always better to deploy a site behind HTTPS and will become crucial as the
 
 * Access to the Django admin is set up by default to require HTTPS in production or once *live*.
 
-The Caddy web server used in the default configuration will get you a valid certificate from Lets Encrypt and update it automatically. All you need to do to enable this is to make sure that your DNS records are pointing to the server Caddy runs on.
+The Traefik reverse proxy used in the default configuration will get you a valid certificate from Lets Encrypt and update it automatically. All you need to do to enable this is to make sure that your DNS records are pointing to the server Traefik runs on.
 
-You can read more about this here at `Automatic HTTPS`_ in the Caddy docs.
+You can read more about this feature and how to configure it, at `Automatic HTTPS`_ in the Traefik docs.
 
-.. _Automatic HTTPS: https://caddyserver.com/docs/automatic-https
+.. _Automatic HTTPS: https://docs.traefik.io/configuration/acme/
 
 
 (Optional) Postgres Data Volume Modifications
@@ -112,7 +112,7 @@ If you want to scale your application, run::
    docker-compose -f production.yml scale django=4
    docker-compose -f production.yml scale celeryworker=2
 
-.. warning:: don't try to scale ``postgres``, ``celerybeat``, or ``caddy``.
+.. warning:: don't try to scale ``postgres``, ``celerybeat``, or ``traefik``.
 
 To see how your containers are doing run::
 
diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index 895140f9c..108154198 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -105,7 +105,6 @@ The most important thing for us here now is ``env_file`` section enlisting ``./.
     │   ├── .django
     │   └── .postgres
     └── .production
-        ├── .caddy
         ├── .django
         └── .postgres
 
@@ -120,7 +119,7 @@ Consider the aforementioned ``.envs/.local/.postgres``: ::
     POSTGRES_USER=XgOWtQtJecsAbaIyslwGvFvPawftNaqO
     POSTGRES_PASSWORD=jSljDz4whHuwO3aJIgVBrqEml5Ycbghorep4uVJ4xjDYQu0LfuTZdctj7y0YcCLu
 
-The three envs we are presented with here are ``POSTGRES_DB``, ``POSTGRES_USER``, and ``POSTGRES_PASSWORD`` (by the way, their values have also been generated for you). You might have figured out already where these definitions will end up; it's all the same with ``django`` and ``caddy`` service container envs.
+The three envs we are presented with here are ``POSTGRES_DB``, ``POSTGRES_USER``, and ``POSTGRES_PASSWORD`` (by the way, their values have also been generated for you). You might have figured out already where these definitions will end up; it's all the same with ``django`` service container envs.
 
 One final touch: should you ever need to merge ``.envs/production/*`` in a single ``.env`` run the ``merge_production_dotenvs_in_dotenv.py``: ::
 
diff --git a/{{cookiecutter.project_slug}}/.envs/.production/.caddy b/{{cookiecutter.project_slug}}/.envs/.production/.caddy
deleted file mode 100644
index 83d7fc7af..000000000
--- a/{{cookiecutter.project_slug}}/.envs/.production/.caddy
+++ /dev/null
@@ -1,3 +0,0 @@
-# Caddy
-# ------------------------------------------------------------------------------
-DOMAIN_NAME={{ cookiecutter.domain_name }}
diff --git a/{{cookiecutter.project_slug}}/compose/production/caddy/Caddyfile b/{{cookiecutter.project_slug}}/compose/production/caddy/Caddyfile
deleted file mode 100644
index 323e43922..000000000
--- a/{{cookiecutter.project_slug}}/compose/production/caddy/Caddyfile
+++ /dev/null
@@ -1,15 +0,0 @@
-www.{% raw %}{$DOMAIN_NAME}{% endraw %} {
-    redir https://{% raw %}{$DOMAIN_NAME}{% endraw %}
-}
-
-{% raw %}{$DOMAIN_NAME}{% endraw %} {
-    proxy / django:5000 {
-        header_upstream Host {host}
-        header_upstream X-Real-IP {remote}
-        header_upstream X-Forwarded-Proto {scheme}
-        header_upstream X-CSRFToken {~csrftoken}
-    }
-    log stdout
-    errors stdout
-    gzip
-}
diff --git a/{{cookiecutter.project_slug}}/compose/production/caddy/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/caddy/Dockerfile
deleted file mode 100644
index c32efb3ee..000000000
--- a/{{cookiecutter.project_slug}}/compose/production/caddy/Dockerfile
+++ /dev/null
@@ -1,3 +0,0 @@
-FROM abiosoft/caddy:0.11.0
-
-COPY ./compose/production/caddy/Caddyfile /etc/Caddyfile
diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
new file mode 100644
index 000000000..7088e6fe3
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
@@ -0,0 +1,5 @@
+FROM traefik:alpine
+RUN mkdir -p /etc/traefik/acme
+RUN touch /etc/traefik/acme/acme.json
+RUN chmod 600 /etc/traefik/acme/acme.json
+COPY ./compose/production/traefik/traefik.toml /etc/traefik
diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.toml b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.toml
new file mode 100644
index 000000000..ad1f20e9e
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.toml
@@ -0,0 +1,41 @@
+logLevel = "INFO"
+defaultEntryPoints = ["http", "https"]
+
+# Entrypoints, http and https
+[entryPoints]
+  # http should be redirected to https
+  [entryPoints.http]
+  address = ":80"
+    [entryPoints.http.redirect]
+    entryPoint = "https"
+  # https is the default
+  [entryPoints.https]
+  address = ":443"
+    [entryPoints.https.tls]
+
+# Enable ACME (Let's Encrypt): automatic SSL
+[acme]
+# Email address used for registration
+email = "{{ cookiecutter.email }}"
+storageFile = "/etc/traefik/acme/acme.json"
+entryPoint = "https"
+onDemand = false
+OnHostRule = true
+  # Use a HTTP-01 acme challenge rather than TLS-SNI-01 challenge
+  [acme.httpChallenge]
+  entryPoint = "http"
+
+[file]
+[backends]
+  [backends.django]
+    [backends.django.servers.server1]
+      url = "http://django:5000"
+
+[frontends]
+  [frontends.django]
+    backend = "django"
+    passHostHeader = true
+    [frontends.django.headers]
+      HostsProxyHeaders = ['X-CSRFToken']
+    [frontends.django.routes.dr1]
+      rule = "Host:{{ cookiecutter.domain_name }}"
diff --git a/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py b/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py
index 5c3027a40..4e70e2adb 100644
--- a/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py
+++ b/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py
@@ -8,7 +8,6 @@ PRODUCTION_DOTENVS_DIR_PATH = os.path.join(ROOT_DIR_PATH, ".envs", ".production"
 PRODUCTION_DOTENV_FILE_PATHS = [
     os.path.join(PRODUCTION_DOTENVS_DIR_PATH, ".django"),
     os.path.join(PRODUCTION_DOTENVS_DIR_PATH, ".postgres"),
-    os.path.join(PRODUCTION_DOTENVS_DIR_PATH, ".caddy"),
 ]
 DOTENV_FILE_PATH = os.path.join(ROOT_DIR_PATH, ".env")
 
diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index fd8388acb..88cf8773c 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -3,7 +3,7 @@ version: '3'
 volumes:
   production_postgres_data: {}
   production_postgres_data_backups: {}
-  production_caddy: {}
+  production_traefik: {}
 
 services:
   django:{% if cookiecutter.use_celery == 'y' %} &django{% endif %}
@@ -30,17 +30,15 @@ services:
     env_file:
       - ./.envs/.production/.postgres
 
-  caddy:
+  traefik:
     build:
       context: .
-      dockerfile: ./compose/production/caddy/Dockerfile
-    image: {{ cookiecutter.project_slug }}_production_caddy
+      dockerfile: ./compose/production/traefik/Dockerfile
+    image: {{ cookiecutter.project_slug }}_production_traefik
     depends_on:
       - django
     volumes:
-      - production_caddy:/root/.caddy
-    env_file:
-      - ./.envs/.production/.caddy
+      - production_traefik:/etc/traefik/acme
     ports:
       - "0.0.0.0:80:80"
       - "0.0.0.0:443:443"

From e740a54da68b383d79ef33225d5c8ca5081eeced Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 19 Mar 2019 12:30:19 +0000
Subject: [PATCH 0050/2840] Update Flower version

---
 {{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 b73e46024..79999cb44 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -12,7 +12,7 @@ redis>=2.10.6, < 3  # pyup: < 3 # https://github.com/antirez/redis
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.2.1  # pyup: < 5.0  # https://github.com/celery/celery
 {%- if cookiecutter.use_docker == 'y' %}
-flower==0.9.2  # https://github.com/mher/flower
+flower==0.9.3  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 

From 6e9f87fced04ab76a133ae2fbd9b0bbbe52bd61f Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 19 Mar 2019 19:57:31 +0000
Subject: [PATCH 0051/2840] Set AWS_DEFAULT_ACL to None as per django-storages
 documentation

fixes #1885
---
 {{cookiecutter.project_slug}}/config/settings/production.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 161587421..19195582d 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -76,6 +76,8 @@ _AWS_EXPIRY = 60 * 60 * 24 * 7
 AWS_S3_OBJECT_PARAMETERS = {
     "CacheControl": f"max-age={_AWS_EXPIRY}, s-maxage={_AWS_EXPIRY}, must-revalidate"
 }
+#  https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
+AWS_DEFAULT_ACL = None
 
 # STATIC
 # ------------------------

From b594a1584718775e4e8abd928a68213b899719f4 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 19 Mar 2019 20:02:26 +0000
Subject: [PATCH 0052/2840] Add code style black to the generated README

---
 {{cookiecutter.project_slug}}/README.rst | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/README.rst b/{{cookiecutter.project_slug}}/README.rst
index 49df70198..6ef3b63c4 100644
--- a/{{cookiecutter.project_slug}}/README.rst
+++ b/{{cookiecutter.project_slug}}/README.rst
@@ -6,6 +6,9 @@
 .. image:: https://img.shields.io/badge/built%20with-Cookiecutter%20Django-ff69b4.svg
      :target: https://github.com/pydanny/cookiecutter-django/
      :alt: Built with Cookiecutter Django
+.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
+     :target: https://github.com/ambv/black
+     :alt: Black code style
 {% if cookiecutter.open_source_license != "Not open source" %}
 
 :License: {{cookiecutter.open_source_license}}

From 7d1e90bdf5343299c31388981b6af7cb0e631bbb Mon Sep 17 00:00:00 2001
From: Guilherme Fabrizio <gfabricio@gmail.com>
Date: Wed, 20 Mar 2019 10:04:44 +0000
Subject: [PATCH 0053/2840] Migrate to unified Sentry SDK (#1820)

The raven library is deprecated. Replace it by the new sentry-sdk library:

https://docs.sentry.io/error-reporting/quickstart/?platform=python

fixes #1818
---
 docs/settings.rst                             |   1 -
 .../config/settings/production.py             | 132 ++++++++----------
 {{cookiecutter.project_slug}}/config/wsgi.py  |   8 --
 .../requirements/production.txt               |   4 +-
 .../taskapp/celery.py                         |  22 ---
 5 files changed, 64 insertions(+), 103 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 26b161a09..705add877 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -45,7 +45,6 @@ DJANGO_AWS_ACCESS_KEY_ID                AWS_ACCESS_KEY_ID           n/a
 DJANGO_AWS_SECRET_ACCESS_KEY            AWS_SECRET_ACCESS_KEY       n/a                                            raises error
 DJANGO_AWS_STORAGE_BUCKET_NAME          AWS_STORAGE_BUCKET_NAME     n/a                                            raises error
 SENTRY_DSN                              SENTRY_DSN                  n/a                                            raises error
-DJANGO_SENTRY_CLIENT                    SENTRY_CLIENT               n/a                                            raven.contrib.django.raven_compat.DjangoClient
 DJANGO_SENTRY_LOG_LEVEL                 SENTRY_LOG_LEVEL            n/a                                            logging.INFO
 MAILGUN_API_KEY                         MAILGUN_ACCESS_KEY          n/a                                            raises error
 MAILGUN_DOMAIN                          MAILGUN_SENDER_DOMAIN       n/a                                            raises error
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 19195582d..546f2364f 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -1,6 +1,14 @@
 {% if cookiecutter.use_sentry == 'y' -%}
 import logging
 
+import sentry_sdk
+
+from sentry_sdk.integrations.django import DjangoIntegration
+from sentry_sdk.integrations.logging import LoggingIntegration
+{%- if cookiecutter.use_celery == 'y' %}
+from sentry_sdk.integrations.celery import CeleryIntegration
+{% endif %}
+
 {% endif -%}
 from .base import *  # noqa
 from .base import env
@@ -175,7 +183,6 @@ COMPRESS_ENABLED = env.bool("COMPRESS_ENABLED", default=True)
 COMPRESS_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
 # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_URL
 COMPRESS_URL = STATIC_URL
-
 {% endif %}
 {%- if cookiecutter.use_whitenoise == 'n' -%}
 # Collectfast
@@ -183,81 +190,16 @@ COMPRESS_URL = STATIC_URL
 # https://github.com/antonagestam/collectfast#installation
 INSTALLED_APPS = ["collectfast"] + INSTALLED_APPS  # noqa F405
 AWS_PRELOAD_METADATA = True
-
 {% endif %}
-{%- if cookiecutter.use_sentry == 'y' -%}
-# raven
-# ------------------------------------------------------------------------------
-# https://docs.sentry.io/clients/python/integrations/django/
-INSTALLED_APPS += ["raven.contrib.django.raven_compat"]  # noqa F405
-MIDDLEWARE = ["raven.contrib.django.raven_compat.middleware.SentryResponseErrorIdMiddleware"] + MIDDLEWARE
-
-# Sentry
-# ------------------------------------------------------------------------------
-SENTRY_DSN = env("SENTRY_DSN")
-SENTRY_CLIENT = env("DJANGO_SENTRY_CLIENT", default="raven.contrib.django.raven_compat.DjangoClient")
-LOGGING = {
-    "version": 1,
-    "disable_existing_loggers": True,
-    "root": {
-        "level": "WARNING",
-        "handlers": ["sentry"],
-    },
-    "formatters": {
-        "verbose": {
-            "format": "%(levelname)s %(asctime)s %(module)s "
-            "%(process)d %(thread)d %(message)s"
-        }
-    },
-    "handlers": {
-        "sentry": {
-            "level": "ERROR",
-            "class": "raven.contrib.django.raven_compat.handlers.SentryHandler",
-        },
-        "console": {
-            "level": "DEBUG",
-            "class": "logging.StreamHandler",
-            "formatter": "verbose",
-        },
-    },
-    "loggers": {
-        "django.db.backends": {
-            "level": "ERROR",
-            "handlers": ["console"],
-            "propagate": False,
-        },
-        "raven": {
-            "level": "DEBUG",
-            "handlers": ["console"],
-            "propagate": False,
-        },
-        "sentry.errors": {
-            "level": "DEBUG",
-            "handlers": ["console"],
-            "propagate": False,
-        },
-        "django.security.DisallowedHost": {
-            "level": "ERROR",
-            "handlers": ["console", "sentry"],
-            "propagate": False,
-        },
-    },
-}
-
-SENTRY_CELERY_LOGLEVEL = env.int("DJANGO_SENTRY_LOG_LEVEL", logging.INFO)
-RAVEN_CONFIG = {
-    "dsn": SENTRY_DSN
-}
-
-{%- else %}
 # LOGGING
 # ------------------------------------------------------------------------------
-# See: https://docs.djangoproject.com/en/dev/ref/settings/#logging
+# https://docs.djangoproject.com/en/dev/ref/settings/#logging
+# See https://docs.djangoproject.com/en/dev/topics/logging for
+# more details on how to customize your logging configuration.
+{% if cookiecutter.use_sentry == 'n' -%}
 # A sample logging configuration. The only tangible logging
 # performed by this configuration is to send an email to
 # the site admins on every HTTP 500 error when DEBUG=False.
-# See https://docs.djangoproject.com/en/dev/topics/logging for
-# more details on how to customize your logging configuration.
 LOGGING = {
     "version": 1,
     "disable_existing_loggers": False,
@@ -293,7 +235,57 @@ LOGGING = {
         },
     },
 }
+{% else %}
+LOGGING = {
+    "version": 1,
+    "disable_existing_loggers": True,
+    "formatters": {
+        "verbose": {
+            "format": "%(levelname)s %(asctime)s %(module)s "
+            "%(process)d %(thread)d %(message)s"
+        }
+    },
+    "handlers": {
+        "console": {
+            "level": "DEBUG",
+            "class": "logging.StreamHandler",
+            "formatter": "verbose",
+        }
+    },
+    "loggers": {
+        "django.db.backends": {
+            "level": "ERROR",
+            "handlers": ["console"],
+            "propagate": False,
+        },
+        # Errors logged by the SDK itself
+        "sentry_sdk": {"level": "ERROR", "handlers": ["console"], "propagate": False},
+        "django.security.DisallowedHost": {
+            "level": "ERROR",
+            "handlers": ["console"],
+            "propagate": False,
+        },
+    },
+}
 
+# Sentry
+# ------------------------------------------------------------------------------
+SENTRY_DSN = env("SENTRY_DSN")
+SENTRY_LOG_LEVEL = env.int("DJANGO_SENTRY_LOG_LEVEL", logging.INFO)
+
+sentry_logging = LoggingIntegration(
+    level=SENTRY_LOG_LEVEL,  # Capture info and above as breadcrumbs
+    event_level=None,  # Send no events from log messages
+)
+
+{%- if cookiecutter.use_celery == 'y' %}
+sentry_sdk.init(
+    dsn=SENTRY_DSN,
+    integrations=[sentry_logging, DjangoIntegration(), CeleryIntegration()],
+)
+{% else %}
+sentry_sdk.init(dsn=SENTRY_DSN, integrations=[sentry_logging, DjangoIntegration()])
+{% endif -%}
 {% endif %}
 # Your stuff...
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/config/wsgi.py b/{{cookiecutter.project_slug}}/config/wsgi.py
index abc093149..1899a30ca 100644
--- a/{{cookiecutter.project_slug}}/config/wsgi.py
+++ b/{{cookiecutter.project_slug}}/config/wsgi.py
@@ -24,10 +24,6 @@ app_path = os.path.abspath(
     os.path.join(os.path.dirname(os.path.abspath(__file__)), os.pardir)
 )
 sys.path.append(os.path.join(app_path, "{{ cookiecutter.project_slug }}"))
-{% if cookiecutter.use_sentry == 'y' -%}
-if os.environ.get("DJANGO_SETTINGS_MODULE") == "config.settings.production":
-    from raven.contrib.django.raven_compat.middleware.wsgi import Sentry
-{%- endif %}
 # We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks
 # if running multiple sites in the same mod_wsgi process. To fix this, use
 # mod_wsgi daemon mode with each site in its own daemon process, or use
@@ -38,10 +34,6 @@ os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.production")
 # file. This includes Django's development server, if the WSGI_APPLICATION
 # setting points here.
 application = get_wsgi_application()
-{% if cookiecutter.use_sentry == 'y' -%}
-if os.environ.get("DJANGO_SETTINGS_MODULE") == "config.settings.production":
-    application = Sentry(application)
-{%- endif %}
 # Apply WSGI middleware here.
 # from helloworld.wsgi import HelloWorldApplication
 # application = HelloWorldApplication(application)
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 34877e3fd..628a67bd4 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,10 +8,10 @@ psycopg2==2.7.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==0.6.2  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-raven==6.10.0  # https://github.com/getsentry/raven-python
+sentry-sdk==0.7.6  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django
 # ------------------------------------------------------------------------------
 django-storages[boto3]==1.7.1  # https://github.com/jschneier/django-storages
-django-anymail[mailgun]==5.0  # https://github.com/anymail/django-anymail
\ No newline at end of file
+django-anymail[mailgun]==5.0  # https://github.com/anymail/django-anymail
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py
index b3b086a06..529da1ae0 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py
@@ -27,28 +27,6 @@ class CeleryAppConfig(AppConfig):
     def ready(self):
         installed_apps = [app_config.name for app_config in apps.get_app_configs()]
         app.autodiscover_tasks(lambda: installed_apps, force=True)
-        {%- if cookiecutter.use_sentry == 'y' %}
-
-        if hasattr(settings, 'RAVEN_CONFIG'):
-            # Celery signal registration
-{% if cookiecutter.use_pycharm == 'y' -%}
-	    # Since raven is required in production only,
-            # imports might (most surely will) be wiped out
-            # during PyCharm code clean up started
-            # in other environments.
-            # @formatter:off
-{%- endif %}
-            from raven import Client as RavenClient
-            from raven.contrib.celery import register_signal as raven_register_signal
-            from raven.contrib.celery import register_logger_signal as raven_register_logger_signal
-{% if cookiecutter.use_pycharm == 'y' -%}
-            # @formatter:on
-{%- endif %}
-
-            raven_client = RavenClient(dsn=settings.RAVEN_CONFIG['dsn'])
-            raven_register_logger_signal(raven_client)
-            raven_register_signal(raven_client)
-        {%- endif %}
 
 
 @app.task(bind=True)

From 5bf0a397ac2fef207b817cff99f08373841b7eb9 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Wed, 20 Mar 2019 12:09:43 +0000
Subject: [PATCH 0054/2840] Pin redis version

---
 {{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 6f9cd64f8..cbc9485f0 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -8,7 +8,7 @@ argon2-cffi==19.1.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==4.1.2  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis>=3.2.0  # https://github.com/antirez/redis
+redis==3.2.1  # https://github.com/antirez/redis
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.2.1  # pyup: < 5.0  # https://github.com/celery/celery
 kombu==4.4.0  # https://github.com/celery/kombu

From f1def67b6d70dd8ef31d8e38bbf9faaa0db8f483 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Wed, 20 Mar 2019 12:12:32 +0000
Subject: [PATCH 0055/2840] Fix broken links in list of contributors

---
 CONTRIBUTORS.rst | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index d804a9703..b7607562a 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -46,7 +46,7 @@ Listed in alphabetical order.
   Aaron Eikenberry         `@aeikenberry`_
   Adam Bogdał              `@bogdal`_
   Adam Dobrawy             `@ad-m`_
-  Adam Steele              `@adammsteele`
+  Adam Steele              `@adammsteele`_
   Agam Dua
   Alberto Sanchez          `@alb3rto`_
   Alex Tsai                `@caffodian`_
@@ -64,14 +64,14 @@ Listed in alphabetical order.
   Areski Belaid            `@areski`_
   Ashley Camba
   Barclay Gauld            `@yunti`_
-  Ben Warren               `@bwarren2`
+  Ben Warren               `@bwarren2`_
   Ben Lopatin
   Benjamin Abel
   Bert de Miranda          `@bertdemiranda`_
   Bo Lopker                `@blopker`_
   Bouke Haarsma
   Brent Payne              `@brentpayne`_               @brentpayne
-  Bartek                   `@btknu`
+  Bartek                   `@btknu`_
   Burhan Khalid            `@burhan`_                   @burhan
   Carl Johnson             `@carlmjohnson`_             @carlmjohnson
   Catherine Devlin         `@catherinedevlin`_
@@ -159,7 +159,7 @@ Listed in alphabetical order.
   Roman Afanaskin          `@siauPatrick`_
   Roman Osipenko           `@romanosipenko`_
   Russell Davies
-  Sascha                   `@saschalalala`              @saschalalala
+  Sascha                   `@saschalalala`_             @saschalalala
   Sam Collins              `@MightySCollins`_
   Shupeyko Nikita          `@webyneter`_
   Sławek Ehlert            `@slafs`_
@@ -304,6 +304,14 @@ Listed in alphabetical order.
 .. _@ahhda: https://github.com/ahhda
 .. _@keithjeb: https://github.com/keithjeb
 .. _@btknu: https://github.com/btknu
+.. _@rolep: https://github.com/rolep
+.. _@canonnervio: https://github.com/canonnervio
+.. _@jcass77: https://github.com/jcass77
+.. _@Egregors: https://github.com/Egregors
+.. _@saschalalala: https://github.com/saschalalala
+.. _@mrcoles: https://github.com/mrcoles
+.. _@ericgroom: https://github.com/ericgroom
+
 Special Thanks
 ~~~~~~~~~~~~~~
 

From 823ee637d14fe163cf9c3563a9fc37a01497601a Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Wed, 20 Mar 2019 12:16:43 +0000
Subject: [PATCH 0056/2840] Remove dead link in .gitignore

Fixes #1972
---
 {{cookiecutter.project_slug}}/.gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore
index 1874e9d92..cb8ad8358 100644
--- a/{{cookiecutter.project_slug}}/.gitignore
+++ b/{{cookiecutter.project_slug}}/.gitignore
@@ -325,7 +325,6 @@ tags
 
 ### VirtualEnv template
 # Virtualenv
-# http://iamzed.com/2009/05/07/a-primer-on-virtualenv/
 [Bb]in
 [Ii]nclude
 [Ll]ib

From 91585a0eb23b8c244e664e6078e2da525e2d14de Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Wed, 20 Mar 2019 12:54:58 +0000
Subject: [PATCH 0057/2840] Add OS requirements for Ubuntu Bionic 18.04

Fixes #1973
---
 .../utility/requirements-bionic.apt           | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 {{cookiecutter.project_slug}}/utility/requirements-bionic.apt

diff --git a/{{cookiecutter.project_slug}}/utility/requirements-bionic.apt b/{{cookiecutter.project_slug}}/utility/requirements-bionic.apt
new file mode 100644
index 000000000..1ca82b264
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/utility/requirements-bionic.apt
@@ -0,0 +1,23 @@
+##basic build dependencies of various Django apps for Ubuntu Bionic 18.04
+#build-essential metapackage install: make, gcc, g++,
+build-essential
+#required to translate
+gettext
+python3-dev
+
+##shared dependencies of:
+##Pillow, pylibmc
+zlib1g-dev
+
+##Postgresql and psycopg2 dependencies
+libpq-dev
+
+##Pillow dependencies
+libtiff5-dev
+libjpeg8-dev
+libfreetype6-dev
+liblcms2-dev
+libwebp-dev
+
+##django-extensions
+libgraphviz-dev

From 1ed1e6ac47d9ee9101034a110762e0074060894a Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 21 Mar 2019 16:00:43 +0000
Subject: [PATCH 0058/2840] Update sentry-sdk from 0.7.6 to 0.7.7

---
 {{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 628a67bd4..07e766460 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.7.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==0.6.2  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.7.6  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.7.7  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From 4cd30e4657e2dbce3c7d19d02e9db2ae5ed8e6fd Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 21 Mar 2019 16:00:47 +0000
Subject: [PATCH 0059/2840] Update django-anymail from 5.0 to 6.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 628a67bd4..e4f09c389 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -14,4 +14,4 @@ sentry-sdk==0.7.6  # https://github.com/getsentry/sentry-python
 # Django
 # ------------------------------------------------------------------------------
 django-storages[boto3]==1.7.1  # https://github.com/jschneier/django-storages
-django-anymail[mailgun]==5.0  # https://github.com/anymail/django-anymail
+django-anymail[mailgun]==6.0  # https://github.com/anymail/django-anymail

From bb26ed565beca0cc9c04199eec6b4e9fa66ee69d Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 21 Mar 2019 16:00:50 +0000
Subject: [PATCH 0060/2840] Update python-slugify from 2.0.1 to 3.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 cbc9485f0..fdfec62b2 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,5 +1,5 @@
 pytz==2018.9  # https://github.com/stub42/pytz
-python-slugify==2.0.1  # https://github.com/un33k/python-slugify
+python-slugify==3.0.0  # https://github.com/un33k/python-slugify
 Pillow==5.4.1  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
 rcssmin==1.0.6{% if cookiecutter.windows == 'y' and use_docker == 'n' %} --install-option="--without-c-extensions"{% endif %}  # https://github.com/ndparker/rcssmin

From dd85d6df39cb3167a39a613ec2ceb4c7f9c0722b Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 21 Mar 2019 16:00:57 +0000
Subject: [PATCH 0061/2840] Update django-allauth from 0.38.0 to 0.39.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 cbc9485f0..956587ef5 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -22,7 +22,7 @@ flower==0.9.3  # https://github.com/mher/flower
 django==2.0.13  # pyup: < 2.1  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==3.1.2  # https://github.com/jazzband/django-model-utils
-django-allauth==0.38.0  # https://github.com/pennersr/django-allauth
+django-allauth==0.39.1  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.7.2  # https://github.com/django-crispy-forms/django-crispy-forms
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==2.2  # https://github.com/django-compressor/django-compressor

From f04e96e30f3efb266e03555ce61929e966f4db23 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 21 Mar 2019 16:01:00 +0000
Subject: [PATCH 0062/2840] Update djangorestframework from 3.9.1 to 3.9.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 cbc9485f0..fe5aaf262 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -30,5 +30,5 @@ django-compressor==2.2  # https://github.com/django-compressor/django-compressor
 django-redis==4.10.0  # https://github.com/niwinz/django-redis
 
 # Django REST Framework
-djangorestframework==3.9.1  # https://github.com/encode/django-rest-framework
+djangorestframework==3.9.2  # https://github.com/encode/django-rest-framework
 coreapi==2.3.3  # https://github.com/core-api/python-client

From 7b83d47e2b44ea60d9e65696889aa470b3522b42 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 21 Mar 2019 16:01:05 +0000
Subject: [PATCH 0063/2840] Update werkzeug from 0.14.1 to 0.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 c9fbb96e0..8c7bc6949 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,6 +1,6 @@
 -r ./base.txt
 
-Werkzeug==0.14.1  # https://github.com/pallets/werkzeug
+Werkzeug==0.15.0  # https://github.com/pallets/werkzeug
 ipdb==0.11  # https://github.com/gotcha/ipdb
 Sphinx==1.8.4  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}

From f67a78903ef67148b1b3d7c1d4807f396ab06494 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 21 Mar 2019 16:01:08 +0000
Subject: [PATCH 0064/2840] Update ipdb from 0.11 to 0.12

---
 {{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 c9fbb96e0..3e56c1bc2 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,7 +1,7 @@
 -r ./base.txt
 
 Werkzeug==0.14.1  # https://github.com/pallets/werkzeug
-ipdb==0.11  # https://github.com/gotcha/ipdb
+ipdb==0.12  # https://github.com/gotcha/ipdb
 Sphinx==1.8.4  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.7.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2

From b5ab945ca2b6b50fcee8708d9e8b1c4db86e30d7 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 21 Mar 2019 16:01:14 +0000
Subject: [PATCH 0065/2840] Update sphinx from 1.8.4 to 1.8.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 c9fbb96e0..7159a06e0 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -2,7 +2,7 @@
 
 Werkzeug==0.14.1  # https://github.com/pallets/werkzeug
 ipdb==0.11  # https://github.com/gotcha/ipdb
-Sphinx==1.8.4  # https://github.com/sphinx-doc/sphinx
+Sphinx==1.8.5  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.7.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}

From a7163b9409543e69026896b70a4d8ff45b9bb716 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 21 Mar 2019 16:01:18 +0000
Subject: [PATCH 0066/2840] Update pytest from 4.2.0 to 4.3.1

---
 {{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 c9fbb96e0..0c77b17b1 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -12,7 +12,7 @@ psycopg2-binary==2.7.7  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.670  # https://github.com/python/mypy
-pytest==4.2.0  # https://github.com/pytest-dev/pytest
+pytest==4.3.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From 3995e9e807297167bfed646597e4863c991f9317 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 21 Mar 2019 16:01:21 +0000
Subject: [PATCH 0067/2840] Update coverage from 4.5.2 to 4.5.3

---
 {{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 c9fbb96e0..6b8309598 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -18,7 +18,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 # Code quality
 # ------------------------------------------------------------------------------
 flake8==3.7.5  # https://github.com/PyCQA/flake8
-coverage==4.5.2  # https://github.com/nedbat/coveragepy
+coverage==4.5.3  # https://github.com/nedbat/coveragepy
 black==18.9b0  # https://github.com/ambv/black
 
 # Django

From d92754684f89450a05020fda90bcd2acc4345a15 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 21 Mar 2019 16:01:24 +0000
Subject: [PATCH 0068/2840] Update black from 18.9b0 to 19.3b0

---
 {{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 c9fbb96e0..f8e3e96ca 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -19,7 +19,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 # ------------------------------------------------------------------------------
 flake8==3.7.5  # https://github.com/PyCQA/flake8
 coverage==4.5.2  # https://github.com/nedbat/coveragepy
-black==18.9b0  # https://github.com/ambv/black
+black==19.3b0  # https://github.com/ambv/black
 
 # Django
 # ------------------------------------------------------------------------------

From a8c52e2d455a82d43dda8021ca4691776b27f3d0 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 21 Mar 2019 16:01:28 +0000
Subject: [PATCH 0069/2840] Update django-extensions from 2.1.5 to 2.1.6

---
 {{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 c9fbb96e0..18ef4aac3 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -26,6 +26,6 @@ black==18.9b0  # https://github.com/ambv/black
 factory-boy==2.11.1  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==1.11  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==2.1.5  # https://github.com/django-extensions/django-extensions
+django-extensions==2.1.6  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.6.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.4.7  # https://github.com/pytest-dev/pytest-django

From 65d315ed292224039e4fc2f76c8b7bb1954992fc Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 21 Mar 2019 16:01:31 +0000
Subject: [PATCH 0070/2840] Update pytest-django from 3.4.7 to 3.4.8

---
 {{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 c9fbb96e0..70ebedfc7 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -28,4 +28,4 @@ factory-boy==2.11.1  # https://github.com/FactoryBoy/factory_boy
 django-debug-toolbar==1.11  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==2.1.5  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.6.0  # https://github.com/nedbat/django_coverage_plugin
-pytest-django==3.4.7  # https://github.com/pytest-dev/pytest-django
+pytest-django==3.4.8  # https://github.com/pytest-dev/pytest-django

From 7f3aa6cebb9f2efb188e2b01acd90b184e2e72b3 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 22 Mar 2019 11:00:31 +0000
Subject: [PATCH 0071/2840] Update werkzeug from 0.15.0 to 0.15.1

---
 {{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 2fa606c18..df1ef0078 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,6 +1,6 @@
 -r ./base.txt
 
-Werkzeug==0.15.0  # https://github.com/pallets/werkzeug
+Werkzeug==0.15.1  # https://github.com/pallets/werkzeug
 ipdb==0.12  # https://github.com/gotcha/ipdb
 Sphinx==1.8.5  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}

From 85aea55fc64d117a31ffe50e481a1e2de17e3385 Mon Sep 17 00:00:00 2001
From: Hana Quadara <hana@angelos-mbp.home>
Date: Sat, 23 Mar 2019 00:01:23 -0400
Subject: [PATCH 0072/2840] add plugins to req file; remove pylint-common

---
 docs/linters.rst                        | 2 +-
 requirements.txt                        | 2 ++
 {{cookiecutter.project_slug}}/.pylintrc | 2 +-
 3 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/docs/linters.rst b/docs/linters.rst
index e59ff0df7..2d6232181 100644
--- a/docs/linters.rst
+++ b/docs/linters.rst
@@ -25,7 +25,7 @@ This is included in flake8's checks, but you can also run it separately to see a
 
 The config for pylint is located in .pylintrc. It specifies:
 
-* Use the pylint_common and pylint_django plugins. If using Celery, also use pylint_celery.
+* Use the pylint_django plugin. If using Celery, also use pylint_celery.
 * Set max line length to 120 chars
 * Disable linting messages for missing docstring and invalid name
 * max-parents=13
diff --git a/requirements.txt b/requirements.txt
index 647bccaef..ce2cd07e1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,6 +5,8 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 flake8==3.7.6
+pylint-django==0.9.4
+pylint-celery==0.3
 
 # Testing
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/.pylintrc b/{{cookiecutter.project_slug}}/.pylintrc
index 1a1992862..a0955f076 100644
--- a/{{cookiecutter.project_slug}}/.pylintrc
+++ b/{{cookiecutter.project_slug}}/.pylintrc
@@ -1,5 +1,5 @@
 [MASTER]
-load-plugins=pylint_common, pylint_django{% if cookiecutter.use_celery == "y" %}, pylint_celery {% endif %}
+load-plugins=pylint_django{% if cookiecutter.use_celery == "y" %}, pylint_celery {% endif %}
 
 [FORMAT]
 max-line-length=120

From 015319ca3f63fd4720dda4737ac5c56764ea75ef Mon Sep 17 00:00:00 2001
From: Hana Quadara <hana.quadara@gmail.com>
Date: Sat, 23 Mar 2019 00:26:13 -0400
Subject: [PATCH 0073/2840] add username to contributors

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index b7607562a..24d8fda6f 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -106,6 +106,7 @@ Listed in alphabetical order.
   Garry Cairns             `@garry-cairns`_
   Garry Polley             `@garrypolley`_
   Hamish Durkin            `@durkode`_
+  Hana Quadara             `@hanaquadara`_
   Harry Percival           `@hjwp`_
   Hendrik Schneider        `@hendrikschneider`_
   Henrique G. G. Pereira   `@ikkebr`_

From b91c70d75578e56c2ca74400684c5b5523cd0cd4 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 25 Mar 2019 12:10:55 +0000
Subject: [PATCH 0074/2840] Add a node image to run Gulp when selecting it with
 Docker (#1687)

## Description

Following up on @webyneter attempt in #1205, which is now getting outdated, I've tried to make Gulp task runner work with Docker. There is no documentation yet, but this seems to work locally with the custom bootstrap compilation...

- [x] Add a node image for local developement
- [x] Proxy the django image rather than localhost in Browser sync, pass header to keep hostname
- [x] Don't call the runserver command from Gulp, let docker-compose handle
- [x] Update package.json & gulpfile.js templates to reduce the number of unwanted empty lines
- [x] Use [multi-stage build](https://docs.docker.com/develop/develop-images/multistage-build/) in production to make sure the static assets are produced
- [x] Update documentation
- [x] Verify that the previous issue with static assets missing from production isn't there

## Rationale

Currently, the static build isn't working nicely with Docker, extra manual setup is required.

Fixes #1762
---
 docs/deployment-with-docker.rst               |  5 +++--
 hooks/post_gen_project.py                     | 21 ++++++-------------
 .../compose/local/node/Dockerfile             |  9 ++++++++
 .../compose/production/django/Dockerfile      | 21 +++++++++++++++++--
 {{cookiecutter.project_slug}}/gulpfile.js     | 20 +++++++++++++++++-
 {{cookiecutter.project_slug}}/local.yml       | 20 ++++++++++++++++++
 {{cookiecutter.project_slug}}/package.json    |  5 +++--
 .../templates/base.html                       |  8 +++----
 8 files changed, 83 insertions(+), 26 deletions(-)
 create mode 100644 {{cookiecutter.project_slug}}/compose/local/node/Dockerfile

diff --git a/docs/deployment-with-docker.rst b/docs/deployment-with-docker.rst
index 904947e3d..4ab2312ea 100644
--- a/docs/deployment-with-docker.rst
+++ b/docs/deployment-with-docker.rst
@@ -7,8 +7,8 @@ Deployment with Docker
 Prerequisites
 -------------
 
-* Docker 1.10+.
-* Docker Compose 1.6+
+* Docker 17.05+.
+* Docker Compose 1.17+
 
 
 Understanding the Docker Compose Setup
@@ -144,3 +144,4 @@ Move it to ``/etc/supervisor/conf.d/{{cookiecutter.project_slug}}.conf`` and run
 For status check, run::
 
     supervisorctl status
+
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index a9c1c9410..ab05b375a 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -267,6 +267,10 @@ def remove_celery_compose_dirs():
     shutil.rmtree(os.path.join("compose", "production", "django", "celery"))
 
 
+def remove_node_dockerfile():
+    shutil.rmtree(os.path.join("compose", "local", "node"))
+
+
 def main():
     debug = "{{ cookiecutter.debug }}".lower() == "y"
 
@@ -313,21 +317,8 @@ def main():
     if "{{ cookiecutter.js_task_runner}}".lower() == "none":
         remove_gulp_files()
         remove_packagejson_file()
-    if (
-        "{{ cookiecutter.js_task_runner }}".lower() != "none"
-        and "{{ cookiecutter.use_docker }}".lower() == "y"
-    ):
-        print(
-            WARNING
-            + "Docker and {} JS task runner ".format(
-                "{{ cookiecutter.js_task_runner }}".lower().capitalize()
-            )
-            + "working together not supported yet. "
-            "You can continue using the generated project like you "
-            "normally would, however you would need to add a JS "
-            "task runner service to your Docker Compose configuration "
-            "manually." + TERMINATOR
-        )
+        if "{{ cookiecutter.use_docker }}".lower() == "y":
+            remove_node_dockerfile()
 
     if "{{ cookiecutter.use_celery }}".lower() == "n":
         remove_celery_app()
diff --git a/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile
new file mode 100644
index 000000000..f9976e206
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile
@@ -0,0 +1,9 @@
+FROM node:10-stretch-slim
+
+WORKDIR /app
+
+COPY ./package.json /app
+
+RUN npm install && npm cache clean --force
+
+ENV PATH ./node_modules/.bin/:$PATH
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index 68d72327f..80b5bc2cf 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -1,3 +1,14 @@
+{% if cookiecutter.js_task_runner == 'Gulp' -%}
+FROM node:10-stretch-slim as client-builder
+
+WORKDIR /app
+COPY ./package.json /app
+RUN npm install && npm cache clean --force
+COPY . /app
+RUN npm run build
+
+# Python build stage
+{%- endif %}
 FROM python:3.6-alpine
 
 ENV PYTHONUNBUFFERED 1
@@ -28,7 +39,8 @@ COPY ./compose/production/django/start /start
 RUN sed -i 's/\r//' /start
 RUN chmod +x /start
 RUN chown django /start
-{% if cookiecutter.use_celery == "y" %}
+
+{%- if cookiecutter.use_celery == "y" %}
 COPY ./compose/production/django/celery/worker/start /start-celeryworker
 RUN sed -i 's/\r//' /start-celeryworker
 RUN chmod +x /start-celeryworker
@@ -42,8 +54,13 @@ RUN chown django /start-celerybeat
 COPY ./compose/production/django/celery/flower/start /start-flower
 RUN sed -i 's/\r//' /start-flower
 RUN chmod +x /start-flower
-{% endif %}
+{%- endif %}
+
+{%- if cookiecutter.js_task_runner == 'Gulp' %}
+COPY --from=client-builder /app /app
+{% else %}
 COPY . /app
+{%- endif %}
 
 RUN chown -R django /app
 
diff --git a/{{cookiecutter.project_slug}}/gulpfile.js b/{{cookiecutter.project_slug}}/gulpfile.js
index d92678ed2..3c28a7359 100644
--- a/{{cookiecutter.project_slug}}/gulpfile.js
+++ b/{{cookiecutter.project_slug}}/gulpfile.js
@@ -127,7 +127,23 @@ function initBrowserSync() {
         `${paths.js}/*.js`,
         `${paths.templates}/*.html`
       ], {
-        proxy: "localhost:8000"
+        // https://www.browsersync.io/docs/options/#option-proxy
+        {%- if cookiecutter.use_docker == 'n' %}
+        proxy: 'localhost:8000'
+        {% else %}
+        proxy:  {
+          target: 'django:8000',
+          proxyReq: [
+            function(proxyReq, req) {
+              // Assign proxy "host" header same as current request at Browsersync server
+              proxyReq.setHeader('Host', req.headers.host)
+            }
+          ]
+        },
+        // https://www.browsersync.io/docs/options/#option-open
+        // Disable as it doesn't work from inside a container
+        open: false
+        {%- endif %}
       }
     )
 }
@@ -149,7 +165,9 @@ const generateAssets = parallel(
 
 // Set up dev environment
 const dev = parallel(
+  {%- if cookiecutter.use_docker == 'n' %}
   runServer,
+  {%- endif %}
   initBrowserSync,
   watchPaths
 )
diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index 366389320..c6dd654e5 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -79,3 +79,23 @@ services:
     command: /start-flower
 
   {%- endif %}
+  {%- if cookiecutter.js_task_runner == 'Gulp' %}
+
+  node:
+    build:
+      context: .
+      dockerfile: ./compose/local/node/Dockerfile
+    image: {{ cookiecutter.project_slug }}_local_node
+    depends_on:
+      - django
+    volumes:
+      - .:/app
+      # http://jdlm.info/articles/2016/03/06/lessons-building-node-app-docker.html
+      - /app/node_modules
+    command: npm run dev
+    ports:
+      - "3000:3000"
+      # Expose browsersync UI: https://www.browsersync.io/docs/options/#option-ui
+      - "3001:3001"
+
+  {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json
index a15df941e..6edf2e114 100644
--- a/{{cookiecutter.project_slug}}/package.json
+++ b/{{cookiecutter.project_slug}}/package.json
@@ -5,7 +5,7 @@
   "devDependencies": {
     {% if cookiecutter.js_task_runner == 'Gulp' -%}
     {% if cookiecutter.custom_bootstrap_compilation == 'y' -%}
-    "bootstrap": "4.1.1",
+    "bootstrap": "4.3.1",
     "gulp-concat": "^2.6.1",
     "jquery": "3.3.1",
     "popper.js": "1.14.3",
@@ -31,7 +31,8 @@
   ],
   "scripts": {
     {% if cookiecutter.js_task_runner == 'Gulp' -%}
-    "dev": "gulp"
+    "dev": "gulp",
+    "build": "gulp generate-assets"
     {%- endif %}
   }
 }
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
index 4470e955a..9caab43aa 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -17,8 +17,8 @@
 
     {% block css %}
     {% endraw %}{% if cookiecutter.custom_bootstrap_compilation == "n" %}{% raw %}
-    <!-- Latest compiled and minified Bootstrap 4.1.1 CSS -->
-    <link rel="stylesheet" href="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/css/bootstrap.min.css" integrity="sha384-WskhaSGFgHYWDcbwN70/dfYBj47jz9qbsMId/iRN3ewGhXQFZCSftd1LZCfmhktB" crossorigin="anonymous">
+    <!-- Latest compiled and minified Bootstrap CSS -->
+    <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
     {% endraw %}{% endif %}{% raw %}
 
     <!-- Your stuff: Third-party CSS libraries go here -->
@@ -102,10 +102,10 @@
       <script src="{% static 'js/vendors.js' %}"></script>
       {% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %}
       {% endraw %}{% else %}{% raw %}
-      <!-- Required by Bootstrap v4.1.1 -->
+      <!-- Bootstrap JS and its dependencies-->
       <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
       <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
-      <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.1.1/js/bootstrap.min.js" integrity="sha384-smHYKdLADwkXOn1EmN1qk/HfnUcbVRZyYmZ4qpPea6sjB/pTJ0euyQp0Mk8ck+5T" crossorigin="anonymous"></script>
+      <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
 
       <!-- Your stuff: Third-party javascript libraries go here -->
       {% endraw %}{% endif %}{% raw %}

From ec79f1f6763e097df152649353bea5f08ffa2023 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 25 Mar 2019 19:04:47 +0000
Subject: [PATCH 0075/2840] Rename test phases in Travis build matrix

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 65b2a28d1..a74090b28 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,9 +13,9 @@ before_install:
 
 matrix:
   include:
-    - name: Test
+    - name: Tox Test
       script: tox -e py36
-    - name: Black
+    - name: Black template
       script: tox -e black
     - name: Basic Docker
       script: sh tests/test_docker.sh

From b261ce27c4351996d5186f37a56c3b72e6330e0c Mon Sep 17 00:00:00 2001
From: hanasuhail <hana.quadara@intersection.com>
Date: Mon, 25 Mar 2019 15:52:49 -0400
Subject: [PATCH 0076/2840] update restructured text link; add condition for
 celery linter

---
 CONTRIBUTORS.rst                                     | 1 +
 requirements.txt                                     | 2 --
 {{cookiecutter.project_slug}}/requirements/local.txt | 4 ++++
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 24d8fda6f..154fa1ac5 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -312,6 +312,7 @@ Listed in alphabetical order.
 .. _@saschalalala: https://github.com/saschalalala
 .. _@mrcoles: https://github.com/mrcoles
 .. _@ericgroom: https://github.com/ericgroom
+.. _@hanaquadara: https://github.com/hanaquadara
 
 Special Thanks
 ~~~~~~~~~~~~~~
diff --git a/requirements.txt b/requirements.txt
index ce2cd07e1..647bccaef 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,8 +5,6 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 flake8==3.7.6
-pylint-django==0.9.4
-pylint-celery==0.3
 
 # Testing
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index df1ef0078..d3ad17fd2 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -20,6 +20,10 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 flake8==3.7.5  # https://github.com/PyCQA/flake8
 coverage==4.5.3  # https://github.com/nedbat/coveragepy
 black==19.3b0  # https://github.com/ambv/black
+pylint-django==0.9.4
+{%- if cookiecutter.use_celery == 'y' %}
+pylint-celery==0.3
+{%- endif %}
 
 # Django
 # ------------------------------------------------------------------------------

From 5db400fbcf6263cbefb18a0d28ae7c448e785c14 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 26 Mar 2019 11:00:32 +0000
Subject: [PATCH 0077/2840] Update sentry-sdk from 0.7.7 to 0.7.8

---
 {{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 1d842de4b..17b9d00c6 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.7.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==0.6.2  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.7.7  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.7.8  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From 99d7e1d5efd9328c5ce4aa94510efcf1070885a2 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 26 Mar 2019 11:00:35 +0000
Subject: [PATCH 0078/2840] Update python-slugify from 3.0.0 to 3.0.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 e26f65360..e0a762327 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,5 +1,5 @@
 pytz==2018.9  # https://github.com/stub42/pytz
-python-slugify==3.0.0  # https://github.com/un33k/python-slugify
+python-slugify==3.0.1  # https://github.com/un33k/python-slugify
 Pillow==5.4.1  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
 rcssmin==1.0.6{% if cookiecutter.windows == 'y' and use_docker == 'n' %} --install-option="--without-c-extensions"{% endif %}  # https://github.com/ndparker/rcssmin

From c2f8569eb375d6e4d5ef80c32c339a8529478678 Mon Sep 17 00:00:00 2001
From: hanasuhail <hana.quadara@intersection.com>
Date: Tue, 26 Mar 2019 17:16:40 -0400
Subject: [PATCH 0079/2840] add sources

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

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index d3ad17fd2..066f01ad9 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -20,9 +20,9 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 flake8==3.7.5  # https://github.com/PyCQA/flake8
 coverage==4.5.3  # https://github.com/nedbat/coveragepy
 black==19.3b0  # https://github.com/ambv/black
-pylint-django==0.9.4
+pylint-django==0.9.4  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
-pylint-celery==0.3
+pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}
 
 # Django

From 9e93adaf98a1da5b4befe113f22a2ae646094d36 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 26 Mar 2019 21:20:56 +0000
Subject: [PATCH 0080/2840] Add documentation to include optional integrations
 fixes #449

---
 docs/deployment-on-heroku.rst | 65 +++++++++++++++++++++++++++++++++--
 1 file changed, 62 insertions(+), 3 deletions(-)

diff --git a/docs/deployment-on-heroku.rst b/docs/deployment-on-heroku.rst
index 09953cf88..6f3076bcb 100644
--- a/docs/deployment-on-heroku.rst
+++ b/docs/deployment-on-heroku.rst
@@ -17,11 +17,8 @@ Run these commands to deploy the project to Heroku:
 
     heroku addons:create heroku-redis:hobby-dev
 
-    # If using mailgun:
     heroku addons:create mailgun:starter
 
-    heroku addons:create sentry:f1
-
     heroku config:set PYTHONHASHSEED=random
     
     heroku config:set WEB_CONCURRENCY=4
@@ -52,3 +49,65 @@ Run these commands to deploy the project to Heroku:
     heroku run python manage.py check --deploy
 
     heroku open
+
+
+Optional actions
+----------------
+
+Celery
+++++++
+
+Celery requires a few extra environment variables to be ready operational. Also, the worker is created,
+it's in the ``Procfile``, but is turned off by default:
+
+.. code-block:: bash
+
+    # Set the broker URL to Redis
+    heroku config:set CELERY_BROKER_URL=`heroku config:get REDIS_URL`
+    # Scale dyno to 1 instance
+    heroku ps:scale worker=1
+
+Sentry
+++++++
+
+If you're opted for Sentry error tracking, you can either install it through the `Sentry add-on`_:
+
+.. code-block:: bash
+
+    heroku addons:create sentry:f1
+
+
+Or add the DSN for your account, if you already have one:
+
+.. code-block:: bash
+
+    heroku config:set SENTRY_DSN=https://xxxx@sentry.io/12345
+
+.. _Sentry add-on: https://elements.heroku.com/addons/sentry
+
+
+Gulp & Bootstrap compilation
+++++++++++++++++++++++++++++
+
+If you've opted for a custom bootstrap build, you'll most likely need to setup
+your app to use `multiple buildpacks`_: one for Python & one for Node.js:
+
+.. code-block:: bash
+
+    heroku buildpacks:add --index 1 heroku/nodejs
+
+At time of writing, this should do the trick: during deployment,
+the Heroku should run ``npm install`` and then ``npm build``,
+which runs Gulp in cookiecutter-django.
+
+If things don't work, please refer to the Heroku docs.
+
+.. _multiple buildpacks: https://devcenter.heroku.com/articles/using-multiple-buildpacks-for-an-app
+
+About Heroku & Docker
+---------------------
+
+Although Heroku has some sort of `Docker support`_, it's not supported by cookiecutter-django.
+We invite you to follow Heroku documentation about it.
+
+.. _Docker support:: https://devcenter.heroku.com/articles/build-docker-images-heroku-yml

From eb3325f767264190fbc1305547d7d3bfd8bedb06 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 26 Mar 2019 21:36:38 +0000
Subject: [PATCH 0081/2840] Add documentation about Mailgun setup fixes #1705

---
 docs/deployment-on-heroku.rst   |  5 +++++
 docs/deployment-with-docker.rst |  5 +++++
 docs/mailgun.rst                | 13 +++++++++++++
 docs/troubleshooting.rst        |  2 ++
 4 files changed, 25 insertions(+)
 create mode 100644 docs/mailgun.rst

diff --git a/docs/deployment-on-heroku.rst b/docs/deployment-on-heroku.rst
index 6f3076bcb..8cc3a6b56 100644
--- a/docs/deployment-on-heroku.rst
+++ b/docs/deployment-on-heroku.rst
@@ -51,6 +51,11 @@ Run these commands to deploy the project to Heroku:
     heroku open
 
 
+.. warning::
+
+    .. include:: mailgun.rst
+
+
 Optional actions
 ----------------
 
diff --git a/docs/deployment-with-docker.rst b/docs/deployment-with-docker.rst
index 4ab2312ea..aad549327 100644
--- a/docs/deployment-with-docker.rst
+++ b/docs/deployment-with-docker.rst
@@ -43,6 +43,11 @@ You will probably also need to setup the Mail backend, for example by adding a `
 .. _Mailgun: https://mailgun.com
 
 
+.. warning::
+
+    .. include:: mailgun.rst
+
+
 Optional: Use AWS IAM Role for EC2 instance
 -------------------------------------------
 
diff --git a/docs/mailgun.rst b/docs/mailgun.rst
new file mode 100644
index 000000000..1f34e3c86
--- /dev/null
+++ b/docs/mailgun.rst
@@ -0,0 +1,13 @@
+If your email server used to send email isn't configured properly (Mailgun by default),
+attempting to send an email will cause an Internal Server Error.
+
+By default, django-allauth is setup to `have emails verifications mandatory`_,
+which means it'll send a verification email when an unverified user tries to
+log-in or when someone tries to sign-up.
+
+This may happen just after you've setup your Mailgun account, which is running in a
+sandbox subdomain by default. Either add your email to the list of authorized recipients
+or verify your domain.
+
+
+.. _have emails verifications mandatory: https://django-allauth.readthedocs.io/en/latest/configuration.html?highlight=ACCOUNT_EMAIL_VERIFICATION
diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst
index d0c0ba434..68db2fb08 100644
--- a/docs/troubleshooting.rst
+++ b/docs/troubleshooting.rst
@@ -11,5 +11,7 @@ This page contains some advice about errors and problems commonly encountered du
 
 #. New apps not getting created in project root: This is the expected behavior, because cookiecutter-django does not change the way that django startapp works, you'll have to fix this manually (see `#1725`_)
 
+#. .. include:: mailgun.rst
+
 .. _#528: https://github.com/pydanny/cookiecutter-django/issues/528#issuecomment-212650373
 .. _#1725: https://github.com/pydanny/cookiecutter-django/issues/1725#issuecomment-407493176

From 28c60116a6a9e8eaa1131da7223e67872787b370 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 27 Mar 2019 11:00:31 +0000
Subject: [PATCH 0082/2840] Update pylint-django from 0.9.4 to 2.0.6

---
 {{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 066f01ad9..0c6886f7c 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -20,7 +20,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 flake8==3.7.5  # https://github.com/PyCQA/flake8
 coverage==4.5.3  # https://github.com/nedbat/coveragepy
 black==19.3b0  # https://github.com/ambv/black
-pylint-django==0.9.4  # https://github.com/PyCQA/pylint-django
+pylint-django==2.0.6  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}

From 7e60f1259a3d25b25d6dd4eec19bc2a88335fc44 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 27 Mar 2019 14:15:44 -0700
Subject: [PATCH 0083/2840] Update tox from 3.6.1 to 3.8.0

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

diff --git a/requirements.txt b/requirements.txt
index 647bccaef..01e826cd7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ flake8==3.7.6
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.6.1
+tox==3.8.0
 pytest==4.3.1
 pytest-cookies==0.3.0
 pyyaml==5.1

From becd2dce1329670f5286ac6435e5ef9b7d8ae8aa Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Wed, 27 Mar 2019 21:27:52 +0000
Subject: [PATCH 0084/2840] Reword & clarify Python 2 warning in pre gen hook

Fixes #1942
---
 hooks/pre_gen_project.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py
index a6b834556..e7bc1e39a 100644
--- a/hooks/pre_gen_project.py
+++ b/hooks/pre_gen_project.py
@@ -30,9 +30,8 @@ if "{{ cookiecutter.use_docker }}".lower() == "n":
     python_major_version = sys.version_info[0]
     if python_major_version == 2:
         print(
-            WARNING + "Cookiecutter Django does not support Python 2. "
-            "Stability is guaranteed with Python 3.6+ only, "
-            "are you sure you want to proceed (y/n)? " + TERMINATOR
+            WARNING + "You're running cookiecutter under Python 2, but the generated "
+            "project requires Python 3.6+. Do you want to proceed (y/n)? " + TERMINATOR
         )
         yes_options, no_options = frozenset(["y"]), frozenset(["n"])
         while True:

From c33417aa427f4923ce584d6274042d619fe8a4c4 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 28 Mar 2019 18:52:24 -0700
Subject: [PATCH 0085/2840] Update tox from 3.8.0 to 3.8.1

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

diff --git a/requirements.txt b/requirements.txt
index 01e826cd7..d0c1602db 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ flake8==3.7.6
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.8.0
+tox==3.8.1
 pytest==4.3.1
 pytest-cookies==0.3.0
 pyyaml==5.1

From 3b6f73afb252ca0e283696006faf06c0dac021ff Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 29 Mar 2019 11:00:31 +0000
Subject: [PATCH 0086/2840] Update sphinx from 1.8.5 to 2.0.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 0c6886f7c..baac837c7 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -2,7 +2,7 @@
 
 Werkzeug==0.15.1  # https://github.com/pallets/werkzeug
 ipdb==0.12  # https://github.com/gotcha/ipdb
-Sphinx==1.8.5  # https://github.com/sphinx-doc/sphinx
+Sphinx==2.0.0  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.7.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}

From da51b7a364e2ff8b509208e2e62e025ced443a5e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 29 Mar 2019 09:58:15 -0700
Subject: [PATCH 0087/2840] Update tox from 3.8.1 to 3.8.3

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

diff --git a/requirements.txt b/requirements.txt
index d0c1602db..f54359585 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ flake8==3.7.6
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.8.1
+tox==3.8.3
 pytest==4.3.1
 pytest-cookies==0.3.0
 pyyaml==5.1

From 1bc185d2f7289b481a56165a11bbe39c32d2f983 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sun, 31 Mar 2019 12:00:28 +0100
Subject: [PATCH 0088/2840] Update sentry-sdk from 0.7.8 to 0.7.9

---
 {{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 17b9d00c6..035cefd7f 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.7.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==0.6.2  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.7.8  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.7.9  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From 4e70a4b55a2d5efafdb9761719bafb1b6ece3154 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 1 Apr 2019 08:47:46 +0100
Subject: [PATCH 0089/2840] Test all possible template combinations (#1993)

## Description

Fixes #591.

## Rationale

We are currently not testing many combinations, we run Flake8 on the generated project with default options, but that rarely catch any issues.

## Use case(s) / visualization(s)

Catch problems with invalid combinations, for instance, it fails due to Whitenoise breaking flake8 with `django-compressor` because `STATIC_URL` was undefined here:

https://github.com/pydanny/cookiecutter-django/blob/b91c70d75578e56c2ca74400684c5b5523cd0cd4/%7B%7Bcookiecutter.project_slug%7D%7D/config/settings/production.py#L185
---
 requirements.txt                              |  2 +
 tests/test_cookiecutter_generation.py         | 76 +++++++++++++------
 .../config/settings/base.py                   |  4 +-
 .../config/settings/production.py             |  2 +-
 .../requirements/base.txt                     |  2 +-
 5 files changed, 57 insertions(+), 29 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index f54359585..a44e1fe40 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,11 +4,13 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
+black==19.3b0
 flake8==3.7.6
 
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.8.3
 pytest==4.3.1
+pytest_cases==1.5.1
 pytest-cookies==0.3.0
 pyyaml==5.1
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 3010d364f..36395627f 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -1,14 +1,17 @@
 import os
 import re
-import sh
-import yaml
 
 import pytest
+from pytest_cases import pytest_fixture_plus
+import sh
+import yaml
 from binaryornot.check import is_binary
 
 PATTERN = "{{(\s?cookiecutter)[.](.*?)}}"
 RE_OBJ = re.compile(PATTERN)
 
+YN_CHOICES = ["y", "n"]
+
 
 @pytest.fixture
 def context():
@@ -24,6 +27,35 @@ def context():
     }
 
 
+@pytest_fixture_plus
+@pytest.mark.parametrize("windows", YN_CHOICES, ids=lambda yn: f"win:{yn}")
+@pytest.mark.parametrize("use_docker", YN_CHOICES, ids=lambda yn: f"docker:{yn}")
+@pytest.mark.parametrize("use_celery", YN_CHOICES, ids=lambda yn: f"celery:{yn}")
+@pytest.mark.parametrize("use_mailhog", YN_CHOICES, ids=lambda yn: f"mailhog:{yn}")
+@pytest.mark.parametrize("use_sentry", YN_CHOICES, ids=lambda yn: f"sentry:{yn}")
+@pytest.mark.parametrize("use_compressor", YN_CHOICES, ids=lambda yn: f"cmpr:{yn}")
+@pytest.mark.parametrize("use_whitenoise", YN_CHOICES, ids=lambda yn: f"wnoise:{yn}")
+def context_combination(
+    windows,
+    use_docker,
+    use_celery,
+    use_mailhog,
+    use_sentry,
+    use_compressor,
+    use_whitenoise,
+):
+    """Fixture that parametrize the function where it's used."""
+    return {
+        "windows": windows,
+        "use_docker": use_docker,
+        "use_compressor": use_compressor,
+        "use_celery": use_celery,
+        "use_mailhog": use_mailhog,
+        "use_sentry": use_sentry,
+        "use_whitenoise": use_whitenoise,
+    }
+
+
 def build_files_list(root_dir):
     """Build a list containing absolute paths to the generated files."""
     return [
@@ -48,8 +80,13 @@ def check_paths(paths):
             assert match is None, msg.format(path)
 
 
-def test_default_configuration(cookies, context):
-    result = cookies.bake(extra_context=context)
+def test_project_generation(cookies, context, context_combination):
+    """
+    Test that project is generated and fully rendered.
+
+    This is parametrized for each combination from ``context_combination`` fixture
+    """
+    result = cookies.bake(extra_context={**context, **context_combination})
     assert result.exit_code == 0
     assert result.exception is None
     assert result.project.basename == context["project_slug"]
@@ -60,33 +97,24 @@ def test_default_configuration(cookies, context):
     check_paths(paths)
 
 
-@pytest.fixture(params=["use_mailhog", "use_celery", "windows"])
-def feature_context(request, context):
-    context.update({request.param: "y"})
-    return context
+def test_linting_passes(cookies, context_combination):
+    """
+    Generated project should pass flake8 & black.
 
-
-def test_enabled_features(cookies, feature_context):
-    result = cookies.bake(extra_context=feature_context)
-    assert result.exit_code == 0
-    assert result.exception is None
-    assert result.project.basename == feature_context["project_slug"]
-    assert result.project.isdir()
-
-    paths = build_files_list(str(result.project))
-    assert paths
-    check_paths(paths)
-
-
-def test_flake8_compliance(cookies):
-    """generated project should pass flake8"""
-    result = cookies.bake()
+    This is parametrized for each combination from ``context_combination`` fixture
+    """
+    result = cookies.bake(extra_context=context_combination)
 
     try:
         sh.flake8(str(result.project))
     except sh.ErrorReturnCode as e:
         pytest.fail(e)
 
+    try:
+        sh.black("--check", "--diff", "--exclude", "migrations", f"{result.project}/")
+    except sh.ErrorReturnCode as e:
+        pytest.fail(e)
+
 
 def test_travis_invokes_pytest(cookies, context):
     context.update({"use_travisci": "y"})
diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 848af8e89..f8d223771 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -43,9 +43,7 @@ USE_TZ = True
 DATABASES = {"default": env.db("DATABASE_URL")}
 {%- else %}
 DATABASES = {
-    "default": env.db(
-        "DATABASE_URL", default="postgres://{% if cookiecutter.windows == 'y' %}localhost{% endif %}/{{cookiecutter.project_slug}}"
-    ),
+    "default": env.db("DATABASE_URL", default="postgres://{% if cookiecutter.windows == 'y' %}localhost{% endif %}/{{cookiecutter.project_slug}}")
 }
 {%- endif %}
 DATABASES["default"]["ATOMIC_REQUESTS"] = True
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 546f2364f..3db964b66 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -182,7 +182,7 @@ COMPRESS_ENABLED = env.bool("COMPRESS_ENABLED", default=True)
 # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_STORAGE
 COMPRESS_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
 # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_URL
-COMPRESS_URL = STATIC_URL
+COMPRESS_URL = STATIC_URL{% if cookiecutter.use_whitenoise == 'y' %}  # noqa F405{% endif %}
 {% endif %}
 {%- if cookiecutter.use_whitenoise == 'n' -%}
 # Collectfast
diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index e0a762327..a1fa9b062 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -2,7 +2,7 @@ pytz==2018.9  # https://github.com/stub42/pytz
 python-slugify==3.0.1  # https://github.com/un33k/python-slugify
 Pillow==5.4.1  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
-rcssmin==1.0.6{% if cookiecutter.windows == 'y' and use_docker == 'n' %} --install-option="--without-c-extensions"{% endif %}  # https://github.com/ndparker/rcssmin
+rcssmin==1.0.6{% if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} --install-option="--without-c-extensions"{% endif %}  # https://github.com/ndparker/rcssmin
 {%- endif %}
 argon2-cffi==19.1.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}

From e55d76529be5133b8bdd10275c615a2f0de93dd7 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 1 Apr 2019 00:47:56 -0700
Subject: [PATCH 0090/2840] Update pytest from 4.3.1 to 4.4.0

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

diff --git a/requirements.txt b/requirements.txt
index a44e1fe40..85c7fd03f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8==3.7.6
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.8.3
-pytest==4.3.1
+pytest==4.4.0
 pytest_cases==1.5.1
 pytest-cookies==0.3.0
 pyyaml==5.1

From 22801fe30e579f3749aa546652a2207cbbc8693b Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 1 Apr 2019 12:00:32 +0100
Subject: [PATCH 0091/2840] Update python-slugify from 3.0.1 to 3.0.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 a1fa9b062..f09448cc7 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,5 +1,5 @@
 pytz==2018.9  # https://github.com/stub42/pytz
-python-slugify==3.0.1  # https://github.com/un33k/python-slugify
+python-slugify==3.0.2  # https://github.com/un33k/python-slugify
 Pillow==5.4.1  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
 rcssmin==1.0.6{% if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} --install-option="--without-c-extensions"{% endif %}  # https://github.com/ndparker/rcssmin

From e10aafe802aa40067c199a924903adab05c62b79 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 1 Apr 2019 12:00:35 +0100
Subject: [PATCH 0092/2840] Update celery from 4.2.1 to 4.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 a1fa9b062..cb422dd94 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -10,7 +10,7 @@ whitenoise==4.1.2  # https://github.com/evansd/whitenoise
 {%- endif %}
 redis==3.2.1  # https://github.com/antirez/redis
 {%- if cookiecutter.use_celery == "y" %}
-celery==4.2.1  # pyup: < 5.0  # https://github.com/celery/celery
+celery==4.3.0  # pyup: < 5.0  # https://github.com/celery/celery
 kombu==4.4.0  # https://github.com/celery/kombu
 {%- if cookiecutter.use_docker == 'y' %}
 flower==0.9.3  # https://github.com/mher/flower

From faf0e0bc7ef833cb4e3cc99f3c193a82ec4851fe Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 1 Apr 2019 12:00:43 +0100
Subject: [PATCH 0093/2840] Update pytest from 4.3.1 to 4.4.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 baac837c7..028886b02 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -12,7 +12,7 @@ psycopg2-binary==2.7.7  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.670  # https://github.com/python/mypy
-pytest==4.3.1  # https://github.com/pytest-dev/pytest
+pytest==4.4.0  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From b3680c8d723c704c05d5c58f49f954f214a9d78c Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 1 Apr 2019 12:59:05 +0100
Subject: [PATCH 0094/2840] Remove Kombu from direct dependencies

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

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index cb422dd94..10f69c574 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -11,7 +11,6 @@ whitenoise==4.1.2  # https://github.com/evansd/whitenoise
 redis==3.2.1  # https://github.com/antirez/redis
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.3.0  # pyup: < 5.0  # https://github.com/celery/celery
-kombu==4.4.0  # https://github.com/celery/kombu
 {%- if cookiecutter.use_docker == 'y' %}
 flower==0.9.3  # https://github.com/mher/flower
 {%- endif %}

From 96934ab3e4c31e48c810aea70b28c93c84abc9af Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 1 Apr 2019 20:07:42 -0700
Subject: [PATCH 0095/2840] Update tox from 3.8.3 to 3.8.4

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

diff --git a/requirements.txt b/requirements.txt
index 85c7fd03f..aebe0e540 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ flake8==3.7.6
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.8.3
+tox==3.8.4
 pytest==4.4.0
 pytest_cases==1.5.1
 pytest-cookies==0.3.0

From 6d48275e5fd66c412f097f05e7125b5e76b46052 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 2 Apr 2019 10:33:38 +0100
Subject: [PATCH 0096/2840] Fix Heroku docs

---
 docs/deployment-on-heroku.rst |  5 ++++-
 tests/test_docker.sh          | 16 ++++------------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/docs/deployment-on-heroku.rst b/docs/deployment-on-heroku.rst
index 8cc3a6b56..4a16123a0 100644
--- a/docs/deployment-on-heroku.rst
+++ b/docs/deployment-on-heroku.rst
@@ -3,6 +3,9 @@ Deployment on Heroku
 
 .. index:: Heroku
 
+Commands to run
+---------------
+
 Run these commands to deploy the project to Heroku:
 
 .. code-block:: bash
@@ -115,4 +118,4 @@ About Heroku & Docker
 Although Heroku has some sort of `Docker support`_, it's not supported by cookiecutter-django.
 We invite you to follow Heroku documentation about it.
 
-.. _Docker support:: https://devcenter.heroku.com/articles/build-docker-images-heroku-yml
+.. _Docker support: https://devcenter.heroku.com/articles/build-docker-images-heroku-yml
diff --git a/tests/test_docker.sh b/tests/test_docker.sh
index 55771c14c..018ad85f2 100755
--- a/tests/test_docker.sh
+++ b/tests/test_docker.sh
@@ -16,17 +16,9 @@ cd .cache/docker
 cookiecutter ../../ --no-input --overwrite-if-exists use_docker=y $@
 cd my_awesome_project
 
-# run the project's type checks
-docker-compose -f local.yml run django mypy my_awesome_project
+# run migrations
+docker-compose -f local.yml run django python manage.py migrate
 
-# Run black with --check option
-docker-compose -f local.yml run django black --check --diff  --exclude 'migrations' ./
+# view backups
+docker-compose -f local.yml exec postgres backups
 
-# run the project's tests
-docker-compose -f local.yml run django pytest
-
-# return non-zero status code if there are migrations that have not been created
-docker-compose -f local.yml run django python manage.py makemigrations --dry-run --check || { echo "ERROR: there were changes in the models, but migration listed above have not been created and are not saved in version control"; exit 1; }
-
-# Test support for translations
-docker-compose -f local.yml run django python manage.py makemessages

From edf2eba6af19af60befb9741d5c0223eb74834ef Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 2 Apr 2019 10:36:42 +0100
Subject: [PATCH 0097/2840] Remove outdated warning in Local docker docs

---
 docs/developing-locally-docker.rst | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index 108154198..da4e67aa7 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -17,17 +17,6 @@ Prerequisites
 .. _`installation guide`: https://docs.docker.com/compose/install/
 
 
-Attention, Windows Users
-------------------------
-
-Currently PostgreSQL (``psycopg2`` python package) is not installed inside Docker containers for Windows users, while it is required by the generated Django project. To fix this, add ``psycopg2`` to the list of requirements inside ``requirements/base.txt``::
-
-    # Python-PostgreSQL Database Adapter
-    psycopg2==2.6.2
-
-Doing this will prevent the project from being installed in an Windows-only environment (thus without usage of Docker). If you want to use this project without Docker, make sure to remove ``psycopg2`` from the requirements again.
-
-
 Build the Stack
 ---------------
 

From fbce0c8ba14baa77a5d080f816a0902069b5f491 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 2 Apr 2019 12:00:29 +0100
Subject: [PATCH 0098/2840] Update pillow from 5.4.1 to 6.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 e9cade35e..9d4aec7dc 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,6 +1,6 @@
 pytz==2018.9  # https://github.com/stub42/pytz
 python-slugify==3.0.2  # https://github.com/un33k/python-slugify
-Pillow==5.4.1  # https://github.com/python-pillow/Pillow
+Pillow==6.0.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
 rcssmin==1.0.6{% if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} --install-option="--without-c-extensions"{% endif %}  # https://github.com/ndparker/rcssmin
 {%- endif %}

From 17e7d603cf8ccea58dfc8e29873abae5b2f4c26a Mon Sep 17 00:00:00 2001
From: Jelmert <jelmerdraaijer@gmail.com>
Date: Tue, 2 Apr 2019 15:08:51 +0200
Subject: [PATCH 0099/2840] Added the MAILGUN_API_URL variable to the ANYMAIL
 configuration so we can easily switch to the EU region for mailgun

---
 {{cookiecutter.project_slug}}/config/settings/production.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 3db964b66..3b61b470e 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -161,6 +161,7 @@ EMAIL_BACKEND = "anymail.backends.mailgun.EmailBackend"
 ANYMAIL = {
     "MAILGUN_API_KEY": env("MAILGUN_API_KEY"),
     "MAILGUN_SENDER_DOMAIN": env("MAILGUN_DOMAIN"),
+    "MAILGUN_API_URL": env("MAILGUN_API_URL", default="https://api.mailgun.net/v3"),
 }
 
 # Gunicorn

From 4efba872cc4ee316cc955e7e742868c40a9e97c3 Mon Sep 17 00:00:00 2001
From: Jelmert <jelmerdraaijer@gmail.com>
Date: Tue, 2 Apr 2019 15:11:56 +0200
Subject: [PATCH 0100/2840] Added myself to CONTRIBUTORS.rst

---
 CONTRIBUTORS.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 154fa1ac5..9486b3a00 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -114,6 +114,7 @@ Listed in alphabetical order.
   Irfan Ahmad              `@erfaan`_                    @erfaan
   Jan Van Bruggen          `@jvanbrug`_
   Jens Nilsson             `@phiberjenz`_
+  Jelmer Draaijer          `@foarsitter`_
   Jerome Leclanche         `@jleclanche`_                @Adys
   Jimmy Gitonga            `@afrowave`_                  @afrowave
   John Cass                `@jcass77`_                   @cass_john
@@ -231,6 +232,7 @@ Listed in alphabetical order.
 .. _@eriol: https://github.com/eriol
 .. _@eyadsibai: https://github.com/eyadsibai
 .. _@flyudvik: https://github.com/flyudvik
+.. _@foarsitter: https://github.com/foarsitter
 .. _@garry-cairns: https://github.com/garry-cairns
 .. _@garrypolley: https://github.com/garrypolley
 .. _@goldhand: https://github.com/goldhand

From f6f2942a91612b0691fe650d843810662acf229d Mon Sep 17 00:00:00 2001
From: Jelmert <jelmerdraaijer@gmail.com>
Date: Tue, 2 Apr 2019 15:17:22 +0200
Subject: [PATCH 0101/2840] Listed MAILGUN_API_URL in settings docs

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

diff --git a/docs/settings.rst b/docs/settings.rst
index 705add877..6e4b363c3 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -48,6 +48,7 @@ SENTRY_DSN                              SENTRY_DSN                  n/a
 DJANGO_SENTRY_LOG_LEVEL                 SENTRY_LOG_LEVEL            n/a                                            logging.INFO
 MAILGUN_API_KEY                         MAILGUN_ACCESS_KEY          n/a                                            raises error
 MAILGUN_DOMAIN                          MAILGUN_SENDER_DOMAIN       n/a                                            raises error
+MAILGUN_API_URL                         n/a                         n/a                                            "https://api.mailgun.net/v3"
 ======================================= =========================== ============================================== ======================================================================
 
 --------------------------

From 8851ac13ef84d15f07d69ab107038956f79f5e9a Mon Sep 17 00:00:00 2001
From: Jelmert <jelmerdraaijer@gmail.com>
Date: Thu, 8 Nov 2018 11:14:58 +0100
Subject: [PATCH 0102/2840] Added the awscli container for uploading and
 downloading backups from and to Amazon S3

---
 CONTRIBUTORS.rst                              |  2 ++
 docs/docker-postgres-backups.rst              |  8 +++++
 .../compose/production/aws/Dockerfile         |  9 ++++++
 .../production/aws/maintenance/download       | 24 +++++++++++++++
 .../compose/production/aws/maintenance/upload | 30 +++++++++++++++++++
 {{cookiecutter.project_slug}}/production.yml  |  8 +++++
 6 files changed, 81 insertions(+)
 create mode 100644 {{cookiecutter.project_slug}}/compose/production/aws/Dockerfile
 create mode 100644 {{cookiecutter.project_slug}}/compose/production/aws/maintenance/download
 create mode 100644 {{cookiecutter.project_slug}}/compose/production/aws/maintenance/upload

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 154fa1ac5..9486b3a00 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -114,6 +114,7 @@ Listed in alphabetical order.
   Irfan Ahmad              `@erfaan`_                    @erfaan
   Jan Van Bruggen          `@jvanbrug`_
   Jens Nilsson             `@phiberjenz`_
+  Jelmer Draaijer          `@foarsitter`_
   Jerome Leclanche         `@jleclanche`_                @Adys
   Jimmy Gitonga            `@afrowave`_                  @afrowave
   John Cass                `@jcass77`_                   @cass_john
@@ -231,6 +232,7 @@ Listed in alphabetical order.
 .. _@eriol: https://github.com/eriol
 .. _@eyadsibai: https://github.com/eyadsibai
 .. _@flyudvik: https://github.com/flyudvik
+.. _@foarsitter: https://github.com/foarsitter
 .. _@garry-cairns: https://github.com/garry-cairns
 .. _@garrypolley: https://github.com/garrypolley
 .. _@goldhand: https://github.com/goldhand
diff --git a/docs/docker-postgres-backups.rst b/docs/docker-postgres-backups.rst
index c1a8a5e0c..246ae403a 100644
--- a/docs/docker-postgres-backups.rst
+++ b/docs/docker-postgres-backups.rst
@@ -85,3 +85,11 @@ You will see something like ::
     # ...
     ALTER TABLE
     SUCCESS: The 'my_project' database has been restored from the '/backups/backup_2018_03_13T09_05_07.sql.gz' backup.
+
+
+Backup to Amazon S3
+----------------------------------
+For uploading your backups to Amazon S3 you can use the aws cli container. There is a upload command for uploading the postgres /backups directory recursively and there is a download command for downloading a specific backup. The default S3 environment variables are used. ::
+
+    $ docker-compose -f production.yml run --rm awscli upload
+    $ docker-compose -f production.yml run --rm awscli download backup_2018_03_13T09_05_07.sql.gz
diff --git a/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile
new file mode 100644
index 000000000..8282047b3
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile
@@ -0,0 +1,9 @@
+FROM garland/aws-cli-docker:1.15.47
+
+COPY ./compose/production/aws/maintenance /usr/local/bin/maintenance
+COPY ./compose/production/postgres/maintenance/_sourced /usr/local/bin/maintenance/_sourced
+
+RUN chmod +x /usr/local/bin/maintenance/*
+
+RUN mv /usr/local/bin/maintenance/* /usr/local/bin \
+    && rmdir /usr/local/bin/maintenance
diff --git a/{{cookiecutter.project_slug}}/compose/production/aws/maintenance/download b/{{cookiecutter.project_slug}}/compose/production/aws/maintenance/download
new file mode 100644
index 000000000..8d5ea091f
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/compose/production/aws/maintenance/download
@@ -0,0 +1,24 @@
+#!/bin/sh
+
+### Download a file from your Amazon S3 bucket to the postgres /backups folder
+###
+### Usage:
+###     $ docker-compose -f production.yml run --rm awscli <1>
+
+set -o errexit
+set -o pipefail
+set -o nounset
+
+working_dir="$(dirname ${0})"
+source "${working_dir}/_sourced/constants.sh"
+source "${working_dir}/_sourced/messages.sh"
+
+export AWS_ACCESS_KEY_ID="${DJANGO_AWS_ACCESS_KEY_ID}"
+export AWS_SECRET_ACCESS_KEY="${DJANGO_AWS_SECRET_ACCESS_KEY}"
+export AWS_STORAGE_BUCKET_NAME="${DJANGO_AWS_STORAGE_BUCKET_NAME}"
+
+
+aws s3 cp s3://${AWS_STORAGE_BUCKET_NAME}${BACKUP_DIR_PATH}/${1} ${BACKUP_DIR_PATH}/${1}
+
+message_success "Finished downloading ${1}."
+
diff --git a/{{cookiecutter.project_slug}}/compose/production/aws/maintenance/upload b/{{cookiecutter.project_slug}}/compose/production/aws/maintenance/upload
new file mode 100644
index 000000000..4a89dcb5a
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/compose/production/aws/maintenance/upload
@@ -0,0 +1,30 @@
+#!/bin/sh
+
+### Upload the /backups folder to Amazon S3
+###
+### Usage:
+###     $ docker-compose -f production.yml run --rm awscli upload
+
+set -o errexit
+set -o pipefail
+set -o nounset
+
+working_dir="$(dirname ${0})"
+source "${working_dir}/_sourced/constants.sh"
+source "${working_dir}/_sourced/messages.sh"
+
+export AWS_ACCESS_KEY_ID="${DJANGO_AWS_ACCESS_KEY_ID}"
+export AWS_SECRET_ACCESS_KEY="${DJANGO_AWS_SECRET_ACCESS_KEY}"
+export AWS_STORAGE_BUCKET_NAME="${DJANGO_AWS_STORAGE_BUCKET_NAME}"
+
+
+message_info "Upload the backups directory to S3 bucket {$AWS_STORAGE_BUCKET_NAME}"
+
+aws s3 cp ${BACKUP_DIR_PATH} s3://${AWS_STORAGE_BUCKET_NAME}${BACKUP_DIR_PATH} --recursive
+
+message_info "Cleaning the directory ${BACKUP_DIR_PATH}"
+
+rm -rf ${BACKUP_DIR_PATH}/*
+
+message_success "Finished uploading and cleaning."
+
diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index 88cf8773c..a24ba8297 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -65,3 +65,11 @@ services:
     command: /start-flower
 
   {%- endif %}
+  awscli:
+    build:
+      context: .
+      dockerfile: ./compose/production/aws/Dockerfile
+    env_file:
+      - ./.envs/.production/.django
+    volumes:
+      - production_postgres_data_backups:/backups

From 27d806fab11734440cb97e987ea2886182fc3811 Mon Sep 17 00:00:00 2001
From: Jelmert <jelmerdraaijer@gmail.com>
Date: Fri, 23 Nov 2018 11:19:54 +0100
Subject: [PATCH 0103/2840] Typo

---
 docs/docker-postgres-backups.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/docker-postgres-backups.rst b/docs/docker-postgres-backups.rst
index 246ae403a..6ccb7cf1e 100644
--- a/docs/docker-postgres-backups.rst
+++ b/docs/docker-postgres-backups.rst
@@ -89,7 +89,7 @@ You will see something like ::
 
 Backup to Amazon S3
 ----------------------------------
-For uploading your backups to Amazon S3 you can use the aws cli container. There is a upload command for uploading the postgres /backups directory recursively and there is a download command for downloading a specific backup. The default S3 environment variables are used. ::
+For uploading your backups to Amazon S3 you can use the aws cli container. There is an upload command for uploading the postgres /backups directory recursively and there is a download command for downloading a specific backup. The default S3 environment variables are used. ::
 
     $ docker-compose -f production.yml run --rm awscli upload
     $ docker-compose -f production.yml run --rm awscli download backup_2018_03_13T09_05_07.sql.gz

From d1bf4f48152ec00c3fbdd45888e4963e302f36e4 Mon Sep 17 00:00:00 2001
From: Jelmert <jelmerdraaijer@gmail.com>
Date: Tue, 2 Apr 2019 15:43:48 +0200
Subject: [PATCH 0104/2840] Added AWS_S3_REGION_NAME to production settings

---
 {{cookiecutter.project_slug}}/config/settings/production.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 3db964b66..236c6c9fe 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -86,6 +86,8 @@ AWS_S3_OBJECT_PARAMETERS = {
 }
 #  https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
 AWS_DEFAULT_ACL = None
+# https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
+AWS_S3_REGION_NAME = env("DJANGO_AWS_S3_REGION_NAME", default=None)
 
 # STATIC
 # ------------------------

From 7e23327fe2c705b6e858bd6fbbc7b40e3b2e2e74 Mon Sep 17 00:00:00 2001
From: Jelmert <jelmerdraaijer@gmail.com>
Date: Tue, 2 Apr 2019 15:45:58 +0200
Subject: [PATCH 0105/2840] Added DJANG_AWS_S3_REGION_NAME to settings docs

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

diff --git a/docs/settings.rst b/docs/settings.rst
index 705add877..212527cfd 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -44,6 +44,7 @@ CELERY_BROKER_URL                       CELERY_BROKER_URL           auto w/ Dock
 DJANGO_AWS_ACCESS_KEY_ID                AWS_ACCESS_KEY_ID           n/a                                            raises error
 DJANGO_AWS_SECRET_ACCESS_KEY            AWS_SECRET_ACCESS_KEY       n/a                                            raises error
 DJANGO_AWS_STORAGE_BUCKET_NAME          AWS_STORAGE_BUCKET_NAME     n/a                                            raises error
+DJANGO_AWS_S3_REGION_NAME               AWS_S3_REGION_NAME          n/a                                            None
 SENTRY_DSN                              SENTRY_DSN                  n/a                                            raises error
 DJANGO_SENTRY_LOG_LEVEL                 SENTRY_LOG_LEVEL            n/a                                            logging.INFO
 MAILGUN_API_KEY                         MAILGUN_ACCESS_KEY          n/a                                            raises error

From d8271fae21cd8a15e8ec40cdd8825eb4081d208f Mon Sep 17 00:00:00 2001
From: Jelmert <jelmerdraaijer@gmail.com>
Date: Tue, 2 Apr 2019 15:47:18 +0200
Subject: [PATCH 0106/2840] Added myself to CONTRIBUTORS.rst

---
 CONTRIBUTORS.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 154fa1ac5..9486b3a00 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -114,6 +114,7 @@ Listed in alphabetical order.
   Irfan Ahmad              `@erfaan`_                    @erfaan
   Jan Van Bruggen          `@jvanbrug`_
   Jens Nilsson             `@phiberjenz`_
+  Jelmer Draaijer          `@foarsitter`_
   Jerome Leclanche         `@jleclanche`_                @Adys
   Jimmy Gitonga            `@afrowave`_                  @afrowave
   John Cass                `@jcass77`_                   @cass_john
@@ -231,6 +232,7 @@ Listed in alphabetical order.
 .. _@eriol: https://github.com/eriol
 .. _@eyadsibai: https://github.com/eyadsibai
 .. _@flyudvik: https://github.com/flyudvik
+.. _@foarsitter: https://github.com/foarsitter
 .. _@garry-cairns: https://github.com/garry-cairns
 .. _@garrypolley: https://github.com/garrypolley
 .. _@goldhand: https://github.com/goldhand

From 1d420157c10f0c25839e186b0c1b13f6eb35fe1f Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 2 Apr 2019 15:10:14 +0100
Subject: [PATCH 0107/2840] Revert accidental commit

---
 tests/test_docker.sh | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/tests/test_docker.sh b/tests/test_docker.sh
index 018ad85f2..55771c14c 100755
--- a/tests/test_docker.sh
+++ b/tests/test_docker.sh
@@ -16,9 +16,17 @@ cd .cache/docker
 cookiecutter ../../ --no-input --overwrite-if-exists use_docker=y $@
 cd my_awesome_project
 
-# run migrations
-docker-compose -f local.yml run django python manage.py migrate
+# run the project's type checks
+docker-compose -f local.yml run django mypy my_awesome_project
 
-# view backups
-docker-compose -f local.yml exec postgres backups
+# Run black with --check option
+docker-compose -f local.yml run django black --check --diff  --exclude 'migrations' ./
 
+# run the project's tests
+docker-compose -f local.yml run django pytest
+
+# return non-zero status code if there are migrations that have not been created
+docker-compose -f local.yml run django python manage.py makemigrations --dry-run --check || { echo "ERROR: there were changes in the models, but migration listed above have not been created and are not saved in version control"; exit 1; }
+
+# Test support for translations
+docker-compose -f local.yml run django python manage.py makemessages

From 895298c28f77857743415ca8675a8c38f36bf153 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 2 Apr 2019 15:26:55 +0100
Subject: [PATCH 0108/2840] Refactor Celery integration according to current
 best practices

- Change celery app to not be a Django app, more like a WSGI app
- Define a Celery task in the Django users app
- Write a test to execute the task
- Update scripts to use the new app to start workers
- Update documentation

Fix #865
---
 hooks/post_gen_project.py                     | 14 +++++--
 {{cookiecutter.project_slug}}/Procfile        |  2 +-
 {{cookiecutter.project_slug}}/README.rst      |  2 +-
 .../compose/local/django/celery/beat/start    |  2 +-
 .../compose/local/django/celery/flower/start  |  2 +-
 .../compose/local/django/celery/worker/start  |  2 +-
 .../production/django/celery/beat/start       |  2 +-
 .../production/django/celery/flower/start     |  2 +-
 .../production/django/celery/worker/start     |  2 +-
 .../config/__init__.py                        |  7 ++++
 .../config/celery_app.py                      | 16 ++++++++
 .../config/settings/base.py                   |  1 -
 .../taskapp/__init__.py                       |  0
 .../taskapp/celery.py                         | 38 -------------------
 .../users/tasks.py                            | 11 ++++++
 .../users/tests/test_tasks.py                 | 16 ++++++++
 16 files changed, 69 insertions(+), 50 deletions(-)
 create mode 100644 {{cookiecutter.project_slug}}/config/celery_app.py
 delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/__init__.py
 delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tasks.py
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_tasks.py

diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index ab05b375a..292f6e7f6 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -89,8 +89,16 @@ def remove_packagejson_file():
         os.remove(file_name)
 
 
-def remove_celery_app():
-    shutil.rmtree(os.path.join("{{ cookiecutter.project_slug }}", "taskapp"))
+def remove_celery_files():
+    file_names = [
+        os.path.join("config", "celery_app.py"),
+        os.path.join("{{ cookiecutter.project_slug }}", "users", "tasks.py"),
+        os.path.join(
+            "{{ cookiecutter.project_slug }}", "users", "tests", "test_tasks.py"
+        ),
+    ]
+    for file_name in file_names:
+        os.remove(file_name)
 
 
 def remove_dottravisyml_file():
@@ -321,7 +329,7 @@ def main():
             remove_node_dockerfile()
 
     if "{{ cookiecutter.use_celery }}".lower() == "n":
-        remove_celery_app()
+        remove_celery_files()
         if "{{ cookiecutter.use_docker }}".lower() == "y":
             remove_celery_compose_dirs()
 
diff --git a/{{cookiecutter.project_slug}}/Procfile b/{{cookiecutter.project_slug}}/Procfile
index d9319f5cc..5b8e9eaf8 100644
--- a/{{cookiecutter.project_slug}}/Procfile
+++ b/{{cookiecutter.project_slug}}/Procfile
@@ -1,5 +1,5 @@
 release: python manage.py migrate
 web: gunicorn config.wsgi:application
 {% if cookiecutter.use_celery == "y" -%}
-worker: celery worker --app={{cookiecutter.project_slug}}.taskapp --loglevel=info
+worker: celery worker --app=config.celery_app --loglevel=info
 {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/README.rst b/{{cookiecutter.project_slug}}/README.rst
index 6ef3b63c4..b8fdd0ddf 100644
--- a/{{cookiecutter.project_slug}}/README.rst
+++ b/{{cookiecutter.project_slug}}/README.rst
@@ -79,7 +79,7 @@ To run a celery worker:
 .. code-block:: bash
 
     cd {{cookiecutter.project_slug}}
-    celery -A {{cookiecutter.project_slug}}.taskapp worker -l info
+    celery -A config.celery_app worker -l info
 
 Please note: For Celery's import magic to work, it is important *where* the celery commands are run. If you are in the same folder with *manage.py*, you should be right.
 
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
index 4e2493f3b..389e2baf1 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
@@ -5,4 +5,4 @@ set -o nounset
 
 
 rm -f './celerybeat.pid'
-celery -A {{cookiecutter.project_slug}}.taskapp beat -l INFO
+celery -A config.celery_app beat -l INFO
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start
index f0abae7ef..be67050da 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start
@@ -5,6 +5,6 @@ set -o nounset
 
 
 celery flower \
-    --app={{cookiecutter.project_slug}}.taskapp \
+    --app=config.celery_app \
     --broker="${CELERY_BROKER_URL}" \
     --basic_auth="${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}"
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
index c8bc31d3a..072c6ae62 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
@@ -4,4 +4,4 @@ set -o errexit
 set -o nounset
 
 
-celery -A {{cookiecutter.project_slug}}.taskapp worker -l INFO
+celery -A config.celery_app worker -l INFO
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start b/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
index def83076c..0e793e38e 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
+++ b/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
@@ -5,4 +5,4 @@ set -o pipefail
 set -o nounset
 
 
-celery -A {{cookiecutter.project_slug}}.taskapp beat -l INFO
+celery -A config.celery_app beat -l INFO
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start b/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start
index f0abae7ef..be67050da 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start
+++ b/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start
@@ -5,6 +5,6 @@ set -o nounset
 
 
 celery flower \
-    --app={{cookiecutter.project_slug}}.taskapp \
+    --app=config.celery_app \
     --broker="${CELERY_BROKER_URL}" \
     --basic_auth="${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}"
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/worker/start b/{{cookiecutter.project_slug}}/compose/production/django/celery/worker/start
index 10f0d20c5..4e519c3fc 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/celery/worker/start
+++ b/{{cookiecutter.project_slug}}/compose/production/django/celery/worker/start
@@ -5,4 +5,4 @@ set -o pipefail
 set -o nounset
 
 
-celery -A {{cookiecutter.project_slug}}.taskapp worker -l INFO
+celery -A config.celery_app worker -l INFO
diff --git a/{{cookiecutter.project_slug}}/config/__init__.py b/{{cookiecutter.project_slug}}/config/__init__.py
index e69de29bb..480655af1 100644
--- a/{{cookiecutter.project_slug}}/config/__init__.py
+++ b/{{cookiecutter.project_slug}}/config/__init__.py
@@ -0,0 +1,7 @@
+{% if cookiecutter.use_celery == 'y' -%}
+# This will make sure the app is always imported when
+# Django starts so that shared_task will use this app.
+from .celery_app import app as celery_app
+
+__all__ = ("celery_app",)
+{% endif -%}
diff --git a/{{cookiecutter.project_slug}}/config/celery_app.py b/{{cookiecutter.project_slug}}/config/celery_app.py
new file mode 100644
index 000000000..e275f054f
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/config/celery_app.py
@@ -0,0 +1,16 @@
+import os
+from celery import Celery
+
+# set the default Django settings module for the 'celery' program.
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local")
+
+app = Celery("{{cookiecutter.project_slug}}")
+
+# Using a string here means the worker doesn't have to serialize
+# the configuration object to child processes.
+# - namespace='CELERY' means all celery-related configuration keys
+#   should have a `CELERY_` prefix.
+app.config_from_object("django.conf:settings", namespace="CELERY")
+
+# Load task modules from all registered Django app configs.
+app.autodiscover_tasks()
diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index f8d223771..b4d064fe5 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -225,7 +225,6 @@ MANAGERS = ADMINS
 {% if cookiecutter.use_celery == 'y' -%}
 # Celery
 # ------------------------------------------------------------------------------
-INSTALLED_APPS += ["{{cookiecutter.project_slug}}.taskapp.celery.CeleryAppConfig"]
 if USE_TZ:
     # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-timezone
     CELERY_TIMEZONE = TIME_ZONE
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/__init__.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/__init__.py
deleted file mode 100644
index e69de29bb..000000000
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py
deleted file mode 100644
index 529da1ae0..000000000
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py
+++ /dev/null
@@ -1,38 +0,0 @@
-{% if cookiecutter.use_celery == 'y' -%}
-import os
-from celery import Celery
-from django.apps import apps, AppConfig
-from django.conf import settings
-
-
-if not settings.configured:
-    # set the default Django settings module for the 'celery' program.
-    os.environ.setdefault(
-        "DJANGO_SETTINGS_MODULE", "config.settings.local"
-    )  # pragma: no cover
-
-
-app = Celery("{{cookiecutter.project_slug}}")
-# Using a string here means the worker will not have to
-# pickle the object when using Windows.
-# - namespace='CELERY' means all celery-related configuration keys
-#   should have a `CELERY_` prefix.
-app.config_from_object("django.conf:settings", namespace="CELERY")
-
-
-class CeleryAppConfig(AppConfig):
-    name = "{{cookiecutter.project_slug}}.taskapp"
-    verbose_name = "Celery Config"
-
-    def ready(self):
-        installed_apps = [app_config.name for app_config in apps.get_app_configs()]
-        app.autodiscover_tasks(lambda: installed_apps, force=True)
-
-
-@app.task(bind=True)
-def debug_task(self):
-    print(f"Request: {self.request!r}")  # pragma: no cover
-{% else %}
-# Use this as a starting point for your project with celery.
-# If you are not using celery, you can remove this app
-{% endif -%}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tasks.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tasks.py
new file mode 100644
index 000000000..c99341c5f
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tasks.py
@@ -0,0 +1,11 @@
+from django.contrib.auth import get_user_model
+
+from config import celery_app
+
+User = get_user_model()
+
+
+@celery_app.task()
+def get_users_count():
+    """A pointless Celery task to demonstrate usage."""
+    return User.objects.count()
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_tasks.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_tasks.py
new file mode 100644
index 000000000..addb091db
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_tasks.py
@@ -0,0 +1,16 @@
+import pytest
+from celery.result import EagerResult
+
+
+from {{ cookiecutter.project_slug }}.users.tasks import get_users_count
+from {{ cookiecutter.project_slug }}.users.tests.factories import UserFactory
+
+
+@pytest.mark.django_db
+def test_user_count(settings):
+    """A basic test to execute the get_users_count Celery task."""
+    UserFactory.create_batch(3)
+    settings.CELERY_TASK_ALWAYS_EAGER = True
+    task_result = get_users_count.delay()
+    assert isinstance(task_result, EagerResult)
+    assert task_result.result == 3

From f6e84cb2115cce1e2017c3011c0303adc915eaab Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 2 Apr 2019 19:11:47 +0100
Subject: [PATCH 0109/2840] Upgrade Django to 2.1.8

---
 {{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 9d4aec7dc..6c70c367f 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -18,7 +18,7 @@ flower==0.9.3  # https://github.com/mher/flower
 
 # Django
 # ------------------------------------------------------------------------------
-django==2.0.13  # pyup: < 2.1  # https://www.djangoproject.com/
+django==2.1.8  # pyup: < 2.2  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==3.1.2  # https://github.com/jazzband/django-model-utils
 django-allauth==0.39.1  # https://github.com/pennersr/django-allauth

From 57dd157c4ae604c58bd754fb9d769f8081eedbbf Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 2 Apr 2019 19:37:12 +0100
Subject: [PATCH 0110/2840] Remove deprecated password hasher

---
 {{cookiecutter.project_slug}}/config/settings/base.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index f8d223771..026c88cf5 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -109,7 +109,6 @@ PASSWORD_HASHERS = [
     "django.contrib.auth.hashers.PBKDF2PasswordHasher",
     "django.contrib.auth.hashers.PBKDF2SHA1PasswordHasher",
     "django.contrib.auth.hashers.BCryptSHA256PasswordHasher",
-    "django.contrib.auth.hashers.BCryptPasswordHasher",
 ]
 # https://docs.djangoproject.com/en/dev/ref/settings/#auth-password-validators
 AUTH_PASSWORD_VALIDATORS = [

From dd284bc8c998cf43c9ea8b4c52b10280c43628c6 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 2 Apr 2019 19:37:59 +0100
Subject: [PATCH 0111/2840] Remove Postgres 9.3 as it's not supported by Django
 2.1

---
 cookiecutter.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/cookiecutter.json b/cookiecutter.json
index b5dda0c70..11e4456f7 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -25,8 +25,7 @@
     "10.1",
     "9.6",
     "9.5",
-    "9.4",
-    "9.3"
+    "9.4"
   ],
   "js_task_runner": [
     "None",

From 2dcbaca3ee292d3dbcc0271f9add1bd7b3361037 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 2 Apr 2019 19:38:23 +0100
Subject: [PATCH 0112/2840] Update documentation

---
 README.rst                               | 25 ++++++++++++------------
 docs/project-generation-options.rst      | 15 +++++++-------
 {{cookiecutter.project_slug}}/README.rst |  2 +-
 3 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/README.rst b/README.rst
index 2c037e51f..002150928 100644
--- a/README.rst
+++ b/README.rst
@@ -36,10 +36,10 @@ production-ready Django projects quickly.
 Features
 ---------
 
-* For Django 2.0
+* For Django 2.1
 * Works with Python 3.6
 * Renders Django projects with 100% starting test coverage
-* Twitter Bootstrap_ v4.1.1 (`maintained Foundation fork`_ also available)
+* Twitter Bootstrap_ v4 (`maintained Foundation fork`_ also available)
 * 12-Factor_ based settings via django-environ_
 * Secure by default. We believe in SSL.
 * Optimized development and production settings
@@ -89,8 +89,8 @@ Constraints
 -----------
 
 * Only maintained 3rd party libraries are used.
-* Uses PostgreSQL everywhere (9.2+)
-* Environment variables for configuration (This won't work with Apache/mod_wsgi except on AWS ELB).
+* Uses PostgreSQL everywhere (9.4 - 10.5)
+* Environment variables for configuration (This won't work with Apache/mod_wsgi).
 
 Support this Project!
 ----------------------
@@ -169,14 +169,15 @@ Answer the prompts with your own desired options_. For example::
     use_heroku [n]: y
     use_compressor [n]: y
     Select postgresql_version:
-    1 - 10.3
-    2 - 10.2
-    3 - 10.1
-    4 - 9.6
-    5 - 9.5
-    6 - 9.4
-    7 - 9.3
-    Choose from 1, 2, 3, 4 [1]: 1
+    1 - 10.5
+    2 - 10.4
+    3 - 10.3
+    4 - 10.2
+    5 - 10.1
+    6 - 9.6
+    7 - 9.5
+    8 - 9.4
+    Choose from 1, 2, 3, 4, 5, 6, 7, 8 [1]: 1
     Select js_task_runner:
     1 - None
     2 - Gulp
diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index a54837979..f9824a6d2 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -49,13 +49,14 @@ use_docker:
 postgresql_version:
     Select a PostgreSQL_ version to use. The choices are:
 
-    1. 10.3
-    2. 10.2
-    3. 10.1
-    4. 9.6
-    5. 9.5
-    6. 9.4
-    7. 9.3
+    1. 10.5
+    2. 10.4
+    3. 10.3
+    4. 10.2
+    5. 10.1
+    6. 9.6
+    7. 9.5
+    8. 9.4
 
 js_task_runner:
     Select a JavaScript task runner. The choices are:
diff --git a/{{cookiecutter.project_slug}}/README.rst b/{{cookiecutter.project_slug}}/README.rst
index 6ef3b63c4..b9dbf218a 100644
--- a/{{cookiecutter.project_slug}}/README.rst
+++ b/{{cookiecutter.project_slug}}/README.rst
@@ -159,7 +159,7 @@ Custom Bootstrap Compilation
 ^^^^^^
 
 The generated CSS is set up with automatic Bootstrap recompilation with variables of your choice.
-Bootstrap v4.1.1 is installed using npm and customised by tweaking your variables in ``static/sass/custom_bootstrap_vars``.
+Bootstrap v4 is installed using npm and customised by tweaking your variables in ``static/sass/custom_bootstrap_vars``.
 
 You can find a list of available variables `in the bootstrap source`_, or get explanations on them in the `Bootstrap docs`_.
 

From e7115fcee93b6d3d0f82a97bb9d97ab2fe28efc9 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 3 Apr 2019 12:00:30 +0100
Subject: [PATCH 0113/2840] Update werkzeug from 0.15.1 to 0.15.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 028886b02..01bb6d2f4 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,6 +1,6 @@
 -r ./base.txt
 
-Werkzeug==0.15.1  # https://github.com/pallets/werkzeug
+Werkzeug==0.15.2  # https://github.com/pallets/werkzeug
 ipdb==0.12  # https://github.com/gotcha/ipdb
 Sphinx==2.0.0  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}

From 0aafad16dd5f7d93f02dee9cb268dee9fa8ce2b0 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 3 Apr 2019 10:24:10 -0700
Subject: [PATCH 0114/2840] Update tox from 3.8.4 to 3.8.6

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

diff --git a/requirements.txt b/requirements.txt
index aebe0e540..c38f06503 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ flake8==3.7.6
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.8.4
+tox==3.8.6
 pytest==4.4.0
 pytest_cases==1.5.1
 pytest-cookies==0.3.0

From c80bcb8932856c405cb01862340a18ffe2a90d06 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 3 Apr 2019 10:24:15 -0700
Subject: [PATCH 0115/2840] Update pytest_cases from 1.5.1 to 1.6.1

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

diff --git a/requirements.txt b/requirements.txt
index aebe0e540..efeb48f41 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,6 +11,6 @@ flake8==3.7.6
 # ------------------------------------------------------------------------------
 tox==3.8.4
 pytest==4.4.0
-pytest_cases==1.5.1
+pytest_cases==1.6.1
 pytest-cookies==0.3.0
 pyyaml==5.1

From ea749071c2b681b5b7a576eb62279d8c8c53f6dd Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 4 Apr 2019 12:00:30 +0100
Subject: [PATCH 0116/2840] Update psycopg2-binary from 2.7.7 to 2.8

---
 {{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 01bb6d2f4..05ddb714e 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -6,7 +6,7 @@ Sphinx==2.0.0  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.7.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}
-psycopg2-binary==2.7.7  # https://github.com/psycopg/psycopg2
+psycopg2-binary==2.8  # https://github.com/psycopg/psycopg2
 {%- endif %}
 
 # Testing

From 63f5ad028039da2ad52b659046e87f66de571686 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 4 Apr 2019 12:00:33 +0100
Subject: [PATCH 0117/2840] Update mypy from 0.670 to 0.700

---
 {{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 01bb6d2f4..7e1cc25a1 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -11,7 +11,7 @@ psycopg2-binary==2.7.7  # https://github.com/psycopg/psycopg2
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.670  # https://github.com/python/mypy
+mypy==0.700  # https://github.com/python/mypy
 pytest==4.4.0  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 

From b9c5ca2b86dd5c347d8317fe59597a4a9d59aa15 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 4 Apr 2019 15:03:49 +0200
Subject: [PATCH 0118/2840] Also update psycopg2 no-binary

---
 {{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 05ddb714e..2d7e3ba1d 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -4,7 +4,7 @@ Werkzeug==0.15.2  # https://github.com/pallets/werkzeug
 ipdb==0.12  # https://github.com/gotcha/ipdb
 Sphinx==2.0.0  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
-psycopg2==2.7.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
+psycopg2==2.8 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}
 psycopg2-binary==2.8  # https://github.com/psycopg/psycopg2
 {%- endif %}

From b30b9795d2f142bd06bf8e431105cf97f68163bd Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 4 Apr 2019 15:04:57 +0200
Subject: [PATCH 0119/2840] Update psycopg2 to 2.8 in production

---
 {{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 035cefd7f..5a40f07af 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -3,7 +3,7 @@
 -r ./base.txt
 
 gunicorn==19.9.0  # https://github.com/benoitc/gunicorn
-psycopg2==2.7.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
+psycopg2==2.8 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
 Collectfast==0.6.2  # https://github.com/antonagestam/collectfast
 {%- endif %}

From cad0b7765878fdb2f8b19230d6ce9a52f3143c07 Mon Sep 17 00:00:00 2001
From: anuj <highlightanuj@gmail.com>
Date: Tue, 2 Apr 2019 11:43:31 +0530
Subject: [PATCH 0120/2840] Added support for GCE Media storage

---
 cookiecutter.json                             |  4 ++++
 .../.envs/.production/.django                 |  9 ++++++--
 .../config/settings/production.py             | 23 ++++++++++++-------
 .../requirements/production.txt               |  4 ++++
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/cookiecutter.json b/cookiecutter.json
index b5dda0c70..eabf7d142 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -32,6 +32,10 @@
     "None",
     "Gulp"
   ],
+  "cloud_provider": [
+    "AWS",
+    "GCE"
+  ],
   "custom_bootstrap_compilation": "n",
   "use_compressor": "n",
   "use_celery": "n",
diff --git a/{{cookiecutter.project_slug}}/.envs/.production/.django b/{{cookiecutter.project_slug}}/.envs/.production/.django
index 4175f8944..a938ada68 100644
--- a/{{cookiecutter.project_slug}}/.envs/.production/.django
+++ b/{{cookiecutter.project_slug}}/.envs/.production/.django
@@ -16,13 +16,18 @@ DJANGO_SECURE_SSL_REDIRECT=False
 MAILGUN_API_KEY=
 DJANGO_SERVER_EMAIL=
 MAILGUN_DOMAIN=
-
+{% if cookiecutter.cloud_provider == 'AWS' %}
 # AWS
 # ------------------------------------------------------------------------------
 DJANGO_AWS_ACCESS_KEY_ID=
 DJANGO_AWS_SECRET_ACCESS_KEY=
 DJANGO_AWS_STORAGE_BUCKET_NAME=
-
+{% elif cookiecutter.cloud_provider == 'GCE' %}
+# GCE
+# ------------------------------------------------------------------------------
+GOOGLE_APPLICATION_CREDENTIALS=
+DJANGO_GCE_STORAGE_BUCKET_NAME=
+{% endif %}
 # django-allauth
 # ------------------------------------------------------------------------------
 DJANGO_ACCOUNT_ALLOW_REGISTRATION=True
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 236c6c9fe..26fa6294a 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -69,7 +69,8 @@ SECURE_CONTENT_TYPE_NOSNIFF = env.bool(
 # STORAGES
 # ------------------------------------------------------------------------------
 # https://django-storages.readthedocs.io/en/latest/#installation
-INSTALLED_APPS += ["storages"]  # noqa F405
+INSTALLED_APPS += ['storages']  # noqa F405
+{% if cookiecutter.cloud_provider == 'AWS' %}
 # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
 AWS_ACCESS_KEY_ID = env("DJANGO_AWS_ACCESS_KEY_ID")
 # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
@@ -88,22 +89,25 @@ AWS_S3_OBJECT_PARAMETERS = {
 AWS_DEFAULT_ACL = None
 # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
 AWS_S3_REGION_NAME = env("DJANGO_AWS_S3_REGION_NAME", default=None)
+{% elif cookiecutter.cloud_provider == 'GCE' %}
+DEFAULT_FILE_STORAGE = 'storages.backends.gcloud.GoogleCloudStorage'
+GS_BUCKET_NAME = env('DJANGO_GCE_STORAGE_BUCKET_NAME')
+GS_DEFAULT_ACL = 'publicRead'
+{% endif %}
 
 # STATIC
 # ------------------------
 {% if cookiecutter.use_whitenoise == 'y' -%}
 STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
-{%- else %}
-STATICFILES_STORAGE = "config.settings.production.StaticRootS3Boto3Storage"
-STATIC_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/static/"
+{%- endif -%}
+{%- if cookiecutter.cloud_provider == 'AWS' %}
+STATICFILES_STORAGE = 'config.settings.production.StaticRootS3Boto3Storage'
+STATIC_URL = f'https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/static/'
 {%- endif %}
 
 # MEDIA
 # ------------------------------------------------------------------------------
-{% if cookiecutter.use_whitenoise == 'y' -%}
-DEFAULT_FILE_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
-MEDIA_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/"
-{%- else %}
+{%- if cookiecutter.cloud_provider == 'AWS' %}
 # region http://stackoverflow.com/questions/10390244/
 # Full-fledge class: https://stackoverflow.com/a/18046120/104731
 from storages.backends.s3boto3 import S3Boto3Storage  # noqa E402
@@ -121,6 +125,9 @@ class MediaRootS3Boto3Storage(S3Boto3Storage):
 # endregion
 DEFAULT_FILE_STORAGE = "config.settings.production.MediaRootS3Boto3Storage"
 MEDIA_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/media/"
+{%- elif cookiecutter.cloud_provider == 'GCE' %}
+MEDIA_URL = 'https://storage.googleapis.com/{}/'.format(GS_BUCKET_NAME)
+MEDIA_ROOT = 'https://storage.googleapis.com/{}/'.format(GS_BUCKET_NAME)
 {%- endif %}
 
 # TEMPLATES
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 5a40f07af..b1758194a 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -13,5 +13,9 @@ sentry-sdk==0.7.9  # https://github.com/getsentry/sentry-python
 
 # Django
 # ------------------------------------------------------------------------------
+{%- if cookiecutter.cloud_provider == 'AWS' %}
 django-storages[boto3]==1.7.1  # https://github.com/jschneier/django-storages
+{%- elif cookiecutter.cloud_provider == 'GCE' %}
+django-storages[google]==1.7.1  # https://github.com/jschneier/django-storages
+{%- endif %}
 django-anymail[mailgun]==6.0  # https://github.com/anymail/django-anymail

From 749920e81cd4e382b06cd1bcb32a17201fe44853 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 6 Apr 2019 13:00:29 +0200
Subject: [PATCH 0121/2840] Update pytest_cases from 1.6.1 to 1.6.2

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

diff --git a/requirements.txt b/requirements.txt
index 2b2c55f3d..25b0135b4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,6 +11,6 @@ flake8==3.7.6
 # ------------------------------------------------------------------------------
 tox==3.8.6
 pytest==4.4.0
-pytest_cases==1.6.1
+pytest_cases==1.6.2
 pytest-cookies==0.3.0
 pyyaml==5.1

From c582ac48ec5bc61a849b3ceb6d5d4b6f0c854f7c Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 6 Apr 2019 13:00:32 +0200
Subject: [PATCH 0122/2840] Update sentry-sdk from 0.7.9 to 0.7.10

---
 {{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 5a40f07af..ea4b376ff 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==0.6.2  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.7.9  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.7.10  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From b5e030b78439c1118d8e64c1ee582bcb6595059e Mon Sep 17 00:00:00 2001
From: anuj <highlightanuj@gmail.com>
Date: Sun, 7 Apr 2019 00:34:22 +0530
Subject: [PATCH 0123/2840] Corrected quotes, added parameter in tests

---
 tests/test_cookiecutter_generation.py            |  4 ++++
 .../config/settings/production.py                | 16 ++++++++--------
 2 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 36395627f..17375b1cf 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -11,6 +11,7 @@ PATTERN = "{{(\s?cookiecutter)[.](.*?)}}"
 RE_OBJ = re.compile(PATTERN)
 
 YN_CHOICES = ["y", "n"]
+CLOUD_CHOICES = ["AWS", "GCE"]
 
 
 @pytest.fixture
@@ -35,6 +36,7 @@ def context():
 @pytest.mark.parametrize("use_sentry", YN_CHOICES, ids=lambda yn: f"sentry:{yn}")
 @pytest.mark.parametrize("use_compressor", YN_CHOICES, ids=lambda yn: f"cmpr:{yn}")
 @pytest.mark.parametrize("use_whitenoise", YN_CHOICES, ids=lambda yn: f"wnoise:{yn}")
+@pytest.mark.parametrize("cloud_provider", CLOUD_CHOICES, ids=lambda yn: f"cloud:{yn}")
 def context_combination(
     windows,
     use_docker,
@@ -43,6 +45,7 @@ def context_combination(
     use_sentry,
     use_compressor,
     use_whitenoise,
+    cloud_provider,
 ):
     """Fixture that parametrize the function where it's used."""
     return {
@@ -53,6 +56,7 @@ def context_combination(
         "use_mailhog": use_mailhog,
         "use_sentry": use_sentry,
         "use_whitenoise": use_whitenoise,
+        "cloud_provider": cloud_provider,
     }
 
 
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 26fa6294a..61f90104a 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -69,7 +69,7 @@ SECURE_CONTENT_TYPE_NOSNIFF = env.bool(
 # STORAGES
 # ------------------------------------------------------------------------------
 # https://django-storages.readthedocs.io/en/latest/#installation
-INSTALLED_APPS += ['storages']  # noqa F405
+INSTALLED_APPS += ["storages"]  # noqa F405
 {% if cookiecutter.cloud_provider == 'AWS' %}
 # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
 AWS_ACCESS_KEY_ID = env("DJANGO_AWS_ACCESS_KEY_ID")
@@ -90,9 +90,9 @@ AWS_DEFAULT_ACL = None
 # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
 AWS_S3_REGION_NAME = env("DJANGO_AWS_S3_REGION_NAME", default=None)
 {% elif cookiecutter.cloud_provider == 'GCE' %}
-DEFAULT_FILE_STORAGE = 'storages.backends.gcloud.GoogleCloudStorage'
-GS_BUCKET_NAME = env('DJANGO_GCE_STORAGE_BUCKET_NAME')
-GS_DEFAULT_ACL = 'publicRead'
+DEFAULT_FILE_STORAGE = "storages.backends.gcloud.GoogleCloudStorage"
+GS_BUCKET_NAME = env("DJANGO_GCE_STORAGE_BUCKET_NAME")
+GS_DEFAULT_ACL = "publicRead"
 {% endif %}
 
 # STATIC
@@ -101,8 +101,8 @@ GS_DEFAULT_ACL = 'publicRead'
 STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
 {%- endif -%}
 {%- if cookiecutter.cloud_provider == 'AWS' %}
-STATICFILES_STORAGE = 'config.settings.production.StaticRootS3Boto3Storage'
-STATIC_URL = f'https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/static/'
+STATICFILES_STORAGE = "config.settings.production.StaticRootS3Boto3Storage"
+STATIC_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/static/"
 {%- endif %}
 
 # MEDIA
@@ -126,8 +126,8 @@ class MediaRootS3Boto3Storage(S3Boto3Storage):
 DEFAULT_FILE_STORAGE = "config.settings.production.MediaRootS3Boto3Storage"
 MEDIA_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/media/"
 {%- elif cookiecutter.cloud_provider == 'GCE' %}
-MEDIA_URL = 'https://storage.googleapis.com/{}/'.format(GS_BUCKET_NAME)
-MEDIA_ROOT = 'https://storage.googleapis.com/{}/'.format(GS_BUCKET_NAME)
+MEDIA_URL = "https://storage.googleapis.com/{}/".format(GS_BUCKET_NAME)
+MEDIA_ROOT = "https://storage.googleapis.com/{}/".format(GS_BUCKET_NAME)
 {%- endif %}
 
 # TEMPLATES

From 2b141e646434396dbb40a2accd224c42dc105ce3 Mon Sep 17 00:00:00 2001
From: anuj <highlightanuj@gmail.com>
Date: Sun, 7 Apr 2019 00:54:46 +0530
Subject: [PATCH 0124/2840] Add support for GCE static

---
 {{cookiecutter.project_slug}}/config/settings/production.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 61f90104a..4adbdb9c4 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -103,6 +103,8 @@ STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
 {%- if cookiecutter.cloud_provider == 'AWS' %}
 STATICFILES_STORAGE = "config.settings.production.StaticRootS3Boto3Storage"
 STATIC_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/static/"
+{%- elif cookiecutter.cloud_provider == 'GCE' %}
+STATIC_URL = "https://storage.googleapis.com/{}/static".format(GS_BUCKET_NAME)
 {%- endif %}
 
 # MEDIA
@@ -126,8 +128,8 @@ class MediaRootS3Boto3Storage(S3Boto3Storage):
 DEFAULT_FILE_STORAGE = "config.settings.production.MediaRootS3Boto3Storage"
 MEDIA_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/media/"
 {%- elif cookiecutter.cloud_provider == 'GCE' %}
-MEDIA_URL = "https://storage.googleapis.com/{}/".format(GS_BUCKET_NAME)
-MEDIA_ROOT = "https://storage.googleapis.com/{}/".format(GS_BUCKET_NAME)
+MEDIA_URL = "https://storage.googleapis.com/{}/media".format(GS_BUCKET_NAME)
+MEDIA_ROOT = "https://storage.googleapis.com/{}/media".format(GS_BUCKET_NAME)
 {%- endif %}
 
 # TEMPLATES

From 020933d336c09a7946edd69c92c2562f085c2ff2 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 9 Apr 2019 13:00:39 +0200
Subject: [PATCH 0125/2840] Update sphinx from 2.0.0 to 2.0.1

---
 {{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 eb81e7d02..1c90cd840 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -2,7 +2,7 @@
 
 Werkzeug==0.15.2  # https://github.com/pallets/werkzeug
 ipdb==0.12  # https://github.com/gotcha/ipdb
-Sphinx==2.0.0  # https://github.com/sphinx-doc/sphinx
+Sphinx==2.0.1  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}

From 6d906721fc74593c56b70a10ad9804c5ea6afb32 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 10 Apr 2019 13:00:32 +0200
Subject: [PATCH 0126/2840] Update pytz from 2018.9 to 2019.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 9d4aec7dc..39bec2d45 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,4 +1,4 @@
-pytz==2018.9  # https://github.com/stub42/pytz
+pytz==2019.1  # https://github.com/stub42/pytz
 python-slugify==3.0.2  # https://github.com/un33k/python-slugify
 Pillow==6.0.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}

From 56aa332e0146ef94306ebac3f0fdacbd64fcb4fc Mon Sep 17 00:00:00 2001
From: Vlad <dosterm@wit.edu>
Date: Sun, 14 Apr 2019 11:43:05 -0500
Subject: [PATCH 0127/2840] Documented Google Cloud Storage integration as an
 alternative to AWS S3

---
 README.rst                          | 8 ++++++--
 docs/project-generation-options.rst | 6 ++++++
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index 2c037e51f..fccbdaf96 100644
--- a/README.rst
+++ b/README.rst
@@ -47,7 +47,7 @@ Features
 * Comes with custom user model ready to go
 * Optional custom static build using Gulp and livereload
 * Send emails via Anymail_ (using Mailgun_ by default, but switchable)
-* Media storage using Amazon S3
+* Media storage using Amazon S3 or Google Cloud Storage
 * Docker support using docker-compose_ for development and production (using Traefik_ with LetsEncrypt_ support)
 * Procfile_ for deploying to Heroku
 * Instructions for deploying to PythonAnywhere_
@@ -62,7 +62,7 @@ Optional Integrations
 
 *These features can be enabled during initial project setup.*
 
-* Serve static files from Amazon S3 or Whitenoise_
+* Serve static files from Amazon S3, Google Cloud Storage or Whitenoise_
 * Configuration for Celery_ and Flower_ (the latter in Docker setup only)
 * Integration with MailHog_ for local email testing
 * Integration with Sentry_ for error logging
@@ -181,6 +181,10 @@ Answer the prompts with your own desired options_. For example::
     1 - None
     2 - Gulp
     Choose from 1, 2 [1]: 1
+    Select cloud_provider:
+    1 - AWS
+    2 - GCS
+    Choose from 1, 2 [1]: 1
     custom_bootstrap_compilation [n]: n
     Select open_source_license:
     1 - MIT
diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index a54837979..82e9edc07 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -63,6 +63,12 @@ js_task_runner:
     1. None
     2. Gulp_
 
+cloud_provider:
+    Select a cloud provider for static files. The choices are:
+
+    1. AWS_
+    2. GCS_
+
 custom_bootstrap_compilation:
     Indicates whether the project should support Bootstrap recompilation
     via the selected JavaScript task runner's task. This can be useful

From 7c8a473460f6c90a9773357aaec955b4591f5f65 Mon Sep 17 00:00:00 2001
From: Vlad <dosterm@wit.edu>
Date: Sun, 14 Apr 2019 11:57:48 -0500
Subject: [PATCH 0128/2840] Updated settings.rst to reflect new GS env variable

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

diff --git a/docs/settings.rst b/docs/settings.rst
index 212527cfd..dd698a0d2 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -45,6 +45,7 @@ DJANGO_AWS_ACCESS_KEY_ID                AWS_ACCESS_KEY_ID           n/a
 DJANGO_AWS_SECRET_ACCESS_KEY            AWS_SECRET_ACCESS_KEY       n/a                                            raises error
 DJANGO_AWS_STORAGE_BUCKET_NAME          AWS_STORAGE_BUCKET_NAME     n/a                                            raises error
 DJANGO_AWS_S3_REGION_NAME               AWS_S3_REGION_NAME          n/a                                            None
+DJANGO_GCE_STORAGE_BUCKET_NAME          GS_BUCKET_NAME              n/a                                            raises error
 SENTRY_DSN                              SENTRY_DSN                  n/a                                            raises error
 DJANGO_SENTRY_LOG_LEVEL                 SENTRY_LOG_LEVEL            n/a                                            logging.INFO
 MAILGUN_API_KEY                         MAILGUN_ACCESS_KEY          n/a                                            raises error

From c041453bef94930c658edffe3f009b799d459a7d Mon Sep 17 00:00:00 2001
From: Vlad <dosterm@wit.edu>
Date: Sun, 14 Apr 2019 12:07:37 -0500
Subject: [PATCH 0129/2840] Updated project-generation-options.rst to provide
 helpful links in case a user needs to decide between AWS s3 and GCS and added
 myself to contributors.rst

---
 CONTRIBUTORS.rst                    | 2 ++
 docs/project-generation-options.rst | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 9486b3a00..ded1606b2 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -177,6 +177,7 @@ Listed in alphabetical order.
   Travis McNeill           `@Travistock`_               @tavistock_esq
   Tubo Shi                 `@Tubo`_
   Umair Ashraf             `@umrashrf`_                 @fabumair
+  Vlad Doster              `@vladdoster`_
   Vitaly Babiy
   Vivian Guillen           `@viviangb`_
   Will Farley              `@goldhand`_                 @g01dhand
@@ -315,6 +316,7 @@ Listed in alphabetical order.
 .. _@mrcoles: https://github.com/mrcoles
 .. _@ericgroom: https://github.com/ericgroom
 .. _@hanaquadara: https://github.com/hanaquadara
+.. _@vladdoster: https://github.com/vladdoster
 
 Special Thanks
 ~~~~~~~~~~~~~~
diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index 82e9edc07..470ef9499 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -121,6 +121,9 @@ debug:
 
 .. _Gulp: https://github.com/gulpjs/gulp
 
+.. _AWS: https://aws.amazon.com/s3/
+.. _GCS: https://cloud.google.com/storage/
+
 .. _Django Compressor: https://github.com/django-compressor/django-compressor
 
 .. _Celery: https://github.com/celery/celery

From 9137bb561fc1a7fbe83a6ca61e5c0fffe0c10146 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 16 Apr 2019 12:00:29 +0100
Subject: [PATCH 0130/2840] Update pytest from 4.4.0 to 4.4.1

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

diff --git a/requirements.txt b/requirements.txt
index 25b0135b4..cfd0c8476 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8==3.7.6
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.8.6
-pytest==4.4.0
+pytest==4.4.1
 pytest_cases==1.6.2
 pytest-cookies==0.3.0
 pyyaml==5.1

From 026dd6ed575d53d2af49b0878b8080b793c388c0 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 16 Apr 2019 12:00:30 +0100
Subject: [PATCH 0131/2840] Update pytest from 4.4.0 to 4.4.1

---
 {{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 1c90cd840..60c68dd1c 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -12,7 +12,7 @@ psycopg2-binary==2.8  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.700  # https://github.com/python/mypy
-pytest==4.4.0  # https://github.com/pytest-dev/pytest
+pytest==4.4.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From f6cac35b8743407b788ea98b8b2c0444ed25df04 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 16 Apr 2019 11:23:41 -0500
Subject: [PATCH 0132/2840] Update docs/project-generation-options.rst

Clearer diction describing cloud provider roles

Co-Authored-By: vladdoster <Dosterm@wit.edu>
---
 docs/project-generation-options.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index 470ef9499..c9b3dff8a 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -64,7 +64,7 @@ js_task_runner:
     2. Gulp_
 
 cloud_provider:
-    Select a cloud provider for static files. The choices are:
+    Select a cloud provider for static & media files. The choices are:
 
     1. AWS_
     2. GCS_

From cd13ab4c823e3c9619c9deac5ca368b9af477a9a Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 16 Apr 2019 11:30:22 -0500
Subject: [PATCH 0133/2840] Update docs/settings.rst

Documented GOOGLE_APPLICATION_CREDENTIALS env var

Co-Authored-By: vladdoster <Dosterm@wit.edu>
---
 docs/settings.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index dd698a0d2..1830a47c7 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -46,6 +46,7 @@ DJANGO_AWS_SECRET_ACCESS_KEY            AWS_SECRET_ACCESS_KEY       n/a
 DJANGO_AWS_STORAGE_BUCKET_NAME          AWS_STORAGE_BUCKET_NAME     n/a                                            raises error
 DJANGO_AWS_S3_REGION_NAME               AWS_S3_REGION_NAME          n/a                                            None
 DJANGO_GCE_STORAGE_BUCKET_NAME          GS_BUCKET_NAME              n/a                                            raises error
+GOOGLE_APPLICATION_CREDENTIALS          n/a                         n/a                                            raises error
 SENTRY_DSN                              SENTRY_DSN                  n/a                                            raises error
 DJANGO_SENTRY_LOG_LEVEL                 SENTRY_LOG_LEVEL            n/a                                            logging.INFO
 MAILGUN_API_KEY                         MAILGUN_ACCESS_KEY          n/a                                            raises error

From 6f2a652c2b5be918a67294522e7fdeb04924b539 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?=
 <bnafta@gmail.com>
Date: Tue, 16 Apr 2019 19:42:57 -0300
Subject: [PATCH 0134/2840] update PostgreSQL versions in the example

---
 README.rst | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/README.rst b/README.rst
index fccbdaf96..5a0fc5fb9 100644
--- a/README.rst
+++ b/README.rst
@@ -169,13 +169,15 @@ Answer the prompts with your own desired options_. For example::
     use_heroku [n]: y
     use_compressor [n]: y
     Select postgresql_version:
-    1 - 10.3
-    2 - 10.2
-    3 - 10.1
-    4 - 9.6
-    5 - 9.5
-    6 - 9.4
-    7 - 9.3
+    1 - 10.5
+    2 - 10.4
+    3 - 10.3
+    4 - 10.2
+    5 - 10.1
+    6 - 9.6
+    7 - 9.5
+    8 - 9.4
+    9 - 9.3
     Choose from 1, 2, 3, 4 [1]: 1
     Select js_task_runner:
     1 - None

From 4d8e3c8c137a9bd2e54a4a408d27ee0e65e9f57e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?=
 <bnafta@gmail.com>
Date: Tue, 16 Apr 2019 20:24:05 -0300
Subject: [PATCH 0135/2840] update "description" in the example

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 5a0fc5fb9..91fbe3ef1 100644
--- a/README.rst
+++ b/README.rst
@@ -155,7 +155,7 @@ Answer the prompts with your own desired options_. For example::
     project_slug [reddit_clone]: reddit
     author_name [Daniel Roy Greenfeld]: Daniel Greenfeld
     email [you@example.com]: pydanny@gmail.com
-    description [A short description of the project.]: A reddit clone.
+    description [Behold My Awesome Project!]: A reddit clone.
     domain_name [example.com]: myreddit.com
     version [0.1.0]: 0.0.1
     timezone [UTC]: America/Los_Angeles

From 93d5426cb4cf63122364fd52da97296d40d9d78a Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Wed, 17 Apr 2019 08:37:45 +0100
Subject: [PATCH 0136/2840] Small updates in the READMEs

---
 README.rst                               | 6 +++---
 {{cookiecutter.project_slug}}/README.rst | 2 +-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/README.rst b/README.rst
index 91fbe3ef1..9e76d8025 100644
--- a/README.rst
+++ b/README.rst
@@ -39,7 +39,7 @@ Features
 * For Django 2.0
 * Works with Python 3.6
 * Renders Django projects with 100% starting test coverage
-* Twitter Bootstrap_ v4.1.1 (`maintained Foundation fork`_ also available)
+* Twitter Bootstrap_ v4 (`maintained Foundation fork`_ also available)
 * 12-Factor_ based settings via django-environ_
 * Secure by default. We believe in SSL.
 * Optimized development and production settings
@@ -51,7 +51,7 @@ Features
 * Docker support using docker-compose_ for development and production (using Traefik_ with LetsEncrypt_ support)
 * Procfile_ for deploying to Heroku
 * Instructions for deploying to PythonAnywhere_
-* Run tests with unittest or py.test
+* Run tests with unittest or pytest
 * Customizable PostgreSQL version
 
 .. _`maintained Foundation fork`: https://github.com/Parbhat/cookiecutter-django-foundation
@@ -90,7 +90,7 @@ Constraints
 
 * Only maintained 3rd party libraries are used.
 * Uses PostgreSQL everywhere (9.2+)
-* Environment variables for configuration (This won't work with Apache/mod_wsgi except on AWS ELB).
+* Environment variables for configuration (This won't work with Apache/mod_wsgi).
 
 Support this Project!
 ----------------------
diff --git a/{{cookiecutter.project_slug}}/README.rst b/{{cookiecutter.project_slug}}/README.rst
index 6ef3b63c4..b9dbf218a 100644
--- a/{{cookiecutter.project_slug}}/README.rst
+++ b/{{cookiecutter.project_slug}}/README.rst
@@ -159,7 +159,7 @@ Custom Bootstrap Compilation
 ^^^^^^
 
 The generated CSS is set up with automatic Bootstrap recompilation with variables of your choice.
-Bootstrap v4.1.1 is installed using npm and customised by tweaking your variables in ``static/sass/custom_bootstrap_vars``.
+Bootstrap v4 is installed using npm and customised by tweaking your variables in ``static/sass/custom_bootstrap_vars``.
 
 You can find a list of available variables `in the bootstrap source`_, or get explanations on them in the `Bootstrap docs`_.
 

From 352be0eec947cff860ddd289cbe05ba709bbf03b Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 17 Apr 2019 12:00:31 +0100
Subject: [PATCH 0137/2840] Update mypy from 0.700 to 0.701

---
 {{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 60c68dd1c..a2f72eda9 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -11,7 +11,7 @@ psycopg2-binary==2.8  # https://github.com/psycopg/psycopg2
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.700  # https://github.com/python/mypy
+mypy==0.701  # https://github.com/python/mypy
 pytest==4.4.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 

From 5a3d9050a4d6274f206bb2c2979d89188feaebcf Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 17 Apr 2019 12:00:36 +0100
Subject: [PATCH 0138/2840] Update pylint-django from 2.0.6 to 2.0.7

---
 {{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 60c68dd1c..d0e909e53 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -20,7 +20,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 flake8==3.7.5  # https://github.com/PyCQA/flake8
 coverage==4.5.3  # https://github.com/nedbat/coveragepy
 black==19.3b0  # https://github.com/ambv/black
-pylint-django==2.0.6  # https://github.com/PyCQA/pylint-django
+pylint-django==2.0.7  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}

From a1692ef5410b98583def7703d156305800d9e95c Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 17 Apr 2019 19:13:06 -0700
Subject: [PATCH 0139/2840] Update tox from 3.8.6 to 3.9.0

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

diff --git a/requirements.txt b/requirements.txt
index cfd0c8476..ea10eaa53 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ flake8==3.7.6
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.8.6
+tox==3.9.0
 pytest==4.4.1
 pytest_cases==1.6.2
 pytest-cookies==0.3.0

From 113f1ed53095a7439d40e10d625019eab248e122 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 18 Apr 2019 12:00:29 +0100
Subject: [PATCH 0140/2840] Update pylint-django from 2.0.7 to 2.0.8

---
 {{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 bd2d58ad3..5d85b6ff2 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -20,7 +20,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 flake8==3.7.5  # https://github.com/PyCQA/flake8
 coverage==4.5.3  # https://github.com/nedbat/coveragepy
 black==19.3b0  # https://github.com/ambv/black
-pylint-django==2.0.7  # https://github.com/PyCQA/pylint-django
+pylint-django==2.0.8  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}

From 7358fef56af367dac58bd9691128ddc416542b93 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 24 Apr 2019 12:00:28 +0100
Subject: [PATCH 0141/2840] Update sentry-sdk from 0.7.10 to 0.7.11

---
 {{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 d9fa2550d..c430e436c 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==0.6.2  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.7.10  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.7.11  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From 2f77d48496c98a52eadec4fec82c52f13b035243 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 26 Apr 2019 12:00:28 +0100
Subject: [PATCH 0142/2840] Update sentry-sdk from 0.7.11 to 0.7.12

---
 {{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 c430e436c..21e4cc8dc 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==0.6.2  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.7.11  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.7.12  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From 09735eadfd3e36a67800a0e80bbd0d206032972a Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 26 Apr 2019 12:00:32 +0100
Subject: [PATCH 0143/2840] Update pylint-django from 2.0.8 to 2.0.9

---
 {{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 5d85b6ff2..85f60a4ac 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -20,7 +20,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 flake8==3.7.5  # https://github.com/PyCQA/flake8
 coverage==4.5.3  # https://github.com/nedbat/coveragepy
 black==19.3b0  # https://github.com/ambv/black
-pylint-django==2.0.8  # https://github.com/PyCQA/pylint-django
+pylint-django==2.0.9  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}

From bf6f17b1b9924672022d0c99475e5dbb834e7d1f Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 30 Apr 2019 12:00:31 +0100
Subject: [PATCH 0144/2840] Update sentry-sdk from 0.7.12 to 0.7.14

---
 {{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 21e4cc8dc..4ae99be3f 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==0.6.2  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.7.12  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.7.14  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From 07a685326c973e8559c5e0d88ae6863079e618c3 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 30 Apr 2019 12:00:34 +0100
Subject: [PATCH 0145/2840] Update djangorestframework from 3.9.2 to 3.9.3

---
 {{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 39bec2d45..a6031c884 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,5 +29,5 @@ django-compressor==2.2  # https://github.com/django-compressor/django-compressor
 django-redis==4.10.0  # https://github.com/niwinz/django-redis
 
 # Django REST Framework
-djangorestframework==3.9.2  # https://github.com/encode/django-rest-framework
+djangorestframework==3.9.3  # https://github.com/encode/django-rest-framework
 coreapi==2.3.3  # https://github.com/core-api/python-client

From 964662742a63035da4a31839b991cf62a0a5f1d3 Mon Sep 17 00:00:00 2001
From: Craig Margieson <cmargieson@gmail.com>
Date: Mon, 6 May 2019 15:10:18 +0930
Subject: [PATCH 0146/2840] Add to contributors.

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index ded1606b2..41bf6f653 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -84,6 +84,7 @@ Listed in alphabetical order.
   Christopher Clarke       `@chrisdev`_
   Cole Mackenzie           `@cmackenzie1`_
   Collederas               `@Collederas`_
+  Craig Margieson          `@cmargieson`_
   Cristian Vargas          `@cdvv7788`_
   Cullen Rhodes            `@c-rhodes`_
   Dan Shultz               `@shultz`_

From 5ab5285e5f741e1c7d87bf0a176ebb8de131aba6 Mon Sep 17 00:00:00 2001
From: Craig Margieson <cmargieson@gmail.com>
Date: Mon, 6 May 2019 15:13:01 +0930
Subject: [PATCH 0147/2840] Edit STATIC and MEDIA urls for GCE production.

---
 {{cookiecutter.project_slug}}/config/settings/production.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 4adbdb9c4..63225bee9 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -104,7 +104,7 @@ STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
 STATICFILES_STORAGE = "config.settings.production.StaticRootS3Boto3Storage"
 STATIC_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/static/"
 {%- elif cookiecutter.cloud_provider == 'GCE' %}
-STATIC_URL = "https://storage.googleapis.com/{}/static".format(GS_BUCKET_NAME)
+STATIC_URL = "https://storage.googleapis.com/{}/static/".format(GS_BUCKET_NAME)
 {%- endif %}
 
 # MEDIA
@@ -128,8 +128,8 @@ class MediaRootS3Boto3Storage(S3Boto3Storage):
 DEFAULT_FILE_STORAGE = "config.settings.production.MediaRootS3Boto3Storage"
 MEDIA_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/media/"
 {%- elif cookiecutter.cloud_provider == 'GCE' %}
-MEDIA_URL = "https://storage.googleapis.com/{}/media".format(GS_BUCKET_NAME)
-MEDIA_ROOT = "https://storage.googleapis.com/{}/media".format(GS_BUCKET_NAME)
+MEDIA_URL = "https://storage.googleapis.com/{}/media/".format(GS_BUCKET_NAME)
+MEDIA_ROOT = "https://storage.googleapis.com/{}/media/".format(GS_BUCKET_NAME)
 {%- endif %}
 
 # TEMPLATES

From 1646daa277372fb0dc5a215e7f12edfb362d248c Mon Sep 17 00:00:00 2001
From: Craig Margieson <cmargieson@gmail.com>
Date: Mon, 6 May 2019 15:30:02 +0930
Subject: [PATCH 0148/2840] Added link in contributors.

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 41bf6f653..6fa9e1c0d 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -318,6 +318,7 @@ Listed in alphabetical order.
 .. _@ericgroom: https://github.com/ericgroom
 .. _@hanaquadara: https://github.com/hanaquadara
 .. _@vladdoster: https://github.com/vladdoster
+.. _@cmargieson: https://github.com/cmargieson
 
 Special Thanks
 ~~~~~~~~~~~~~~

From 07f2a25219db1d1a69017a1e5cae3193e1771904 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 7 May 2019 06:52:01 +0100
Subject: [PATCH 0149/2840] Update psycopg2-binary from 2.8 to 2.8.2 (#2034)

---
 {{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 85f60a4ac..7095af3df 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -6,7 +6,7 @@ Sphinx==2.0.1  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}
-psycopg2-binary==2.8  # https://github.com/psycopg/psycopg2
+psycopg2-binary==2.8.2  # https://github.com/psycopg/psycopg2
 {%- endif %}
 
 # Testing

From 642521dc5e80de72bc3a8d7e2bd7127e933ced2e Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 9 May 2019 12:00:32 +0100
Subject: [PATCH 0150/2840] Update pytest from 4.4.1 to 4.4.2

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

diff --git a/requirements.txt b/requirements.txt
index ea10eaa53..3644de168 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8==3.7.6
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.9.0
-pytest==4.4.1
+pytest==4.4.2
 pytest_cases==1.6.2
 pytest-cookies==0.3.0
 pyyaml==5.1

From 42fc45d38afb9f81e4f5ae40b9f5782f2ce5f2c8 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 9 May 2019 12:00:33 +0100
Subject: [PATCH 0151/2840] Update pytest from 4.4.1 to 4.4.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 7095af3df..3ef434e98 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -12,7 +12,7 @@ psycopg2-binary==2.8.2  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.701  # https://github.com/python/mypy
-pytest==4.4.1  # https://github.com/pytest-dev/pytest
+pytest==4.4.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From 8933aa17c08462d4ef0994f963b6ba2a04071b17 Mon Sep 17 00:00:00 2001
From: shireenrao <shireenrao@gmail.com>
Date: Fri, 10 May 2019 11:42:07 -0400
Subject: [PATCH 0152/2840] The signal should be imported from project_slug

I am getting an error if I create a signal.py file under users model. Here is the stacktrace
Tracking file by folder pattern:  migrations
Unhandled exception in thread started by <function check_errors.<locals>.wrapper at 0x000002663A074048>
Traceback (most recent call last):
  File "C:\Apps\Anaconda3\envs\registration\lib\site-packages\django\utils\autoreload.py", line 225, in wrapper
    fn(*args, **kwargs)
  File "C:\Apps\Anaconda3\envs\registration\lib\site-packages\django\core\management\commands\runserver.py", line 109, in inner_run
    autoreload.raise_last_exception()
  File "C:\Apps\Anaconda3\envs\registration\lib\site-packages\django\utils\autoreload.py", line 248, in raise_last_exception
    raise _exception[1]
  File "C:\Apps\Anaconda3\envs\registration\lib\site-packages\django\core\management\__init__.py", line 337, in execute
    autoreload.check_errors(django.setup)()
  File "C:\Apps\Anaconda3\envs\registration\lib\site-packages\django\utils\autoreload.py", line 225, in wrapper
    fn(*args, **kwargs)
  File "C:\Apps\Anaconda3\envs\registration\lib\site-packages\django\__init__.py", line 24, in setup
    apps.populate(settings.INSTALLED_APPS)
  File "C:\Apps\Anaconda3\envs\registration\lib\site-packages\django\apps\registry.py", line 120, in populate
    app_config.ready()
  File "C:\Users\srao\projects\kbs\kbs\users\apps.py", line 11, in ready
    import users.signals  # noqa F401
  File "C:\Users\srao\projects\kbs\kbs\users\signals.py", line 3, in <module>
    from .models import User
  File "C:\Users\srao\projects\kbs\kbs\users\models.py", line 8, in <module>
    class User(AbstractUser):
  File "C:\Apps\Anaconda3\envs\registration\lib\site-packages\django\db\models\base.py", line 95, in __new__
    "INSTALLED_APPS." % (module, name)
RuntimeError: Model class users.models.User doesn't declare an explicit app_label and isn't in an application in INSTALLED_APPS.
Having the signal be imported from project_slug.users.signal fixes the issue.
---
 .../{{cookiecutter.project_slug}}/users/apps.py                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/apps.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/apps.py
index 854665fd3..ded2072ff 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/apps.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/apps.py
@@ -8,6 +8,6 @@ class UsersAppConfig(AppConfig):
 
     def ready(self):
         try:
-            import users.signals  # noqa F401
+            import {{ cookiecutter.project_slug }}.users.signals  # noqa F401
         except ImportError:
             pass

From 4bca52c835050485a4036d2a451bcc27bddef3ee Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 11 May 2019 12:00:28 +0100
Subject: [PATCH 0153/2840] Update djangorestframework from 3.9.3 to 3.9.4

---
 {{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 dc54eb33b..29e7f2b94 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,5 +29,5 @@ django-compressor==2.2  # https://github.com/django-compressor/django-compressor
 django-redis==4.10.0  # https://github.com/niwinz/django-redis
 
 # Django REST Framework
-djangorestframework==3.9.3  # https://github.com/encode/django-rest-framework
+djangorestframework==3.9.4  # https://github.com/encode/django-rest-framework
 coreapi==2.3.3  # https://github.com/core-api/python-client

From bad8e972c58872cf6593593544d99ce191a125ed Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sun, 12 May 2019 12:00:29 +0100
Subject: [PATCH 0154/2840] Update pytest from 4.4.2 to 4.5.0

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

diff --git a/requirements.txt b/requirements.txt
index 3644de168..9391b0c6f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8==3.7.6
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.9.0
-pytest==4.4.2
+pytest==4.5.0
 pytest_cases==1.6.2
 pytest-cookies==0.3.0
 pyyaml==5.1

From 4373e205a8cf53f6e4e3916c16a4c6278b2e8059 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sun, 12 May 2019 12:00:30 +0100
Subject: [PATCH 0155/2840] Update pytest from 4.4.2 to 4.5.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 3ef434e98..1f8ab08dc 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -12,7 +12,7 @@ psycopg2-binary==2.8.2  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.701  # https://github.com/python/mypy
-pytest==4.4.2  # https://github.com/pytest-dev/pytest
+pytest==4.5.0  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From 4e20733b6a2f52db012a57fcdd59c5cd0e972a5f Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sun, 12 May 2019 12:00:33 +0100
Subject: [PATCH 0156/2840] Update factory-boy from 2.11.1 to 2.12.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 3ef434e98..8f26f0e62 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -27,7 +27,7 @@ pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 
 # Django
 # ------------------------------------------------------------------------------
-factory-boy==2.11.1  # https://github.com/FactoryBoy/factory_boy
+factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==1.11  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==2.1.6  # https://github.com/django-extensions/django-extensions

From 64727f5096a36d6b99587d0218be90a95839d035 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sun, 12 May 2019 20:26:46 +0100
Subject: [PATCH 0157/2840] Update changelog with main changes from the past 15
 months

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 304732b9f..0e59b3b4a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,171 @@
 All enhancements and patches to Cookiecutter Django will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2019-05-08]
+### Changed
+- Upgraded to Django 2.1 (@browniebroke)
+
+## [2019-04-07]
+### Added
+- Support for Google Cloud Storage (@ahhda)
+
+## [2019-04-03]
+### Added
+- Command to backup Db to AWS S3 (@foarsitter)
+
+## [2019-03-25]
+### Added
+- Node image to run Gulp with Docker (@browniebroke)
+
+## [2019-03-19]
+### Changed
+- Replaced Caddy with Traefik (@demestav)
+
+## [2019-03-11]
+### Changed
+- Sentry integration from Raven to Sentry-SDK (@gfabricio)
+- Made Redis config conditional on Celery locally (@demestav) 
+
+## [2019-03-11]
+### Added
+- Automatic migrations on Heroku (@yunti)
+
+## [2019-03-06]
+### Fixed
+- Missing script tag in Travis config (@btknu)
+
+## [2019-03-02]
+### Changed
+- Celery eager setting in local setting with Docker (@keithjeb)
+
+## [2019-03-01]
+### Updated
+- All NPM dependencies (@takkaria)
+
+## [2018-11-13]
+### Changed
+- Security settings in Dev (@carlmjohnson)
+
+## [2018-11-20]
+### Fixed
+- Passing the CSRF header from the reverse proxy to Django server for DRF (@hpbruna)
+
+## [2018-11-12]
+### Fixed
+- Initialisation of Celery app (@glasslion)
+
+## [2018-10-24]
+### Fixed
+- Persisting of iPython history between sessions (@davitovmasyan)
+
+### Added
+- Postgres 10.5 option (@jleclanche)
+
+## [2018-09-18]
+### Added
+- Included `mypy` in dependencies and run it in tests (@apirobot)
+
+## [2018-09-18]
+### Fixed
+- Avoid `$` in environment variables to workaround a bug from django-environ (@browniebroke)
+
+## [2018-09-16]
+### Fixed
+- Bug in ordering of Middleware for production config (@ChrisPappalardo)
+
+## [2018-09-12]
+### Fixed
+- URLs for Static and Media for S3 buckets in regions other than N. Virginia (@umrashrf)
+
+## [2018-09-09]
+### Changed
+- Name of static and media storage classes (@sfdye)
+
+## [2018-09-01]
+### Changed
+- Make static and media storage fully-fledged classes (@erfaan)
+
+## [2018-08-28]
+### Fixed
+- Running tests in docker test script (@apirobot)
+
+## [2018-07-23]
+### Changed
+- Test commands to use pytest (@jcass77)
+
+### Removed 
+- Some hacks leftovers from Bootstrap v4 beta in `project.js` (@hendrikschneider)
+
+## [2018-07-12]
+### Changed
+- Upgraded to Bootstrap 4.1.1 (@mostaszewski)
+
+## [2018-06-25]
+### Added
+- Flower integration with Docker (@webyneter)
+
+## [2018-06-25]
+### Changed
+- Rewrite user app test to use a pytest style (@webyneter)
+
+## [2018-06-21]
+### Added
+- Extend & update Celery config (@webyneter & @apirobot)
+
+## [2018-05-25]
+### Fixed
+- Build issues due to incompatibility between libressl & openssl (@SassanoM)
+
+## [2018-05-21]
+### Changed
+- Updated Caddy to 0.11 and pin its version (@webyneter)
+
+## [2018-05-14]
+### Changed
+- Replace `awesome-slugify` by `python-slugify` (@hongquan)
+- Migrate to Django 2.0+ URL style (@saschalalala)
+
+## [2018-05-05]
+### Fixed
+- Postgres backup & restore commands (@webyneter)
+
+## [2018-04-10]
+### Changed
+- Simplify configuration (@danidee10)
+
+## [2018-04-08]
+### Added
+- Adopt Black code style (@pydanny)
+
+## [2018-03-27]
+### Fixed
+- Simplified extra Celery config generated when opted out (@webyneter)
+
+## [2018-03-21]
+### Removed
+- Remove Opbeat support (@sfdye)
+
+## [2018-03-16]
+### Fixed
+- Install `psycopg2-binary` when using Docker locally (@browniebroke)
+
+## [2018-03-14]
+### Fixed
+- Fixed and improved Postgres backup & restore scripts (@webyneter)
+
+## [2018-03-10]
+### Changed
+- Simplify Mailgun setting (@browniebroke)
+
+## [2018-03-06]
+### Changed
+- Convert string formatting to f-strings (@sfdye)
+
+## [2018-03-01]
+### Changed
+- Celery to use JSON serialization by default (@adammsteele)
+- Use Docker version from Travis to run tests (@browniebroke)
+
 ## [2018-02-16]
 ### Changed
 - Upgraded to Django 2.0 (@epicwhale)

From 3b96afc559302d9ebf91bae5bd776281bda4471e Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sun, 12 May 2019 21:57:16 +0100
Subject: [PATCH 0158/2840] Deduplicate troubleshooting sections about Mailgun

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

diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst
index 68db2fb08..b6a93ffca 100644
--- a/docs/troubleshooting.rst
+++ b/docs/troubleshooting.rst
@@ -9,9 +9,9 @@ This page contains some advice about errors and problems commonly encountered du
 
 #. Internal server error on user registration: make sure you have configured the mail backend (e.g. Mailgun) by adding the API key and sender domain
 
-#. New apps not getting created in project root: This is the expected behavior, because cookiecutter-django does not change the way that django startapp works, you'll have to fix this manually (see `#1725`_)
+   .. include:: mailgun.rst
 
-#. .. include:: mailgun.rst
+#. New apps not getting created in project root: This is the expected behavior, because cookiecutter-django does not change the way that django startapp works, you'll have to fix this manually (see `#1725`_)
 
 .. _#528: https://github.com/pydanny/cookiecutter-django/issues/528#issuecomment-212650373
 .. _#1725: https://github.com/pydanny/cookiecutter-django/issues/1725#issuecomment-407493176

From dac16d6c404af93ab054506fd246dae5461a3fa7 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 13 May 2019 16:15:56 -0700
Subject: [PATCH 0159/2840] Update tox from 3.9.0 to 3.10.0

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

diff --git a/requirements.txt b/requirements.txt
index 9391b0c6f..42dd9ee6a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ flake8==3.7.6
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.9.0
+tox==3.10.0
 pytest==4.5.0
 pytest_cases==1.6.2
 pytest-cookies==0.3.0

From 74aaa3022c1a84a0fc0329c89e527b0c0b993e70 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 15 May 2019 12:00:38 +0100
Subject: [PATCH 0160/2840] Update werkzeug from 0.15.2 to 0.15.4

---
 {{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 6327cf8c5..5fc26c15e 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,6 +1,6 @@
 -r ./base.txt
 
-Werkzeug==0.15.2  # https://github.com/pallets/werkzeug
+Werkzeug==0.15.4  # https://github.com/pallets/werkzeug
 ipdb==0.12  # https://github.com/gotcha/ipdb
 Sphinx==2.0.1  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}

From a245651f668bc411576039f54cf43220b4c29693 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Wed, 15 May 2019 12:37:17 +0100
Subject: [PATCH 0161/2840] Increase test parallelism

- Split out tests and add markers to control where they are run in Travis
- Run each marker on a separate Travis task
- Install pytest-xdist to increase parallelism inside each worker
- Set xdist parallelism to 3
---
 .travis.yml                           |  8 ++++++--
 requirements.txt                      |  1 +
 tests/test_cookiecutter_generation.py | 15 +++++++++++++--
 tox.ini                               | 12 ++++++++++--
 4 files changed, 30 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index a74090b28..f16c65820 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,10 +13,14 @@ before_install:
 
 matrix:
   include:
-    - name: Tox Test
+    - name: Test results
       script: tox -e py36
-    - name: Black template
+    - name: Run flake8 on result
+      script: tox -e flake8
+    - name: Run black on result
       script: tox -e black
+    - name: Black template
+      script: tox -e black-template
     - name: Basic Docker
       script: sh tests/test_docker.sh
     - name: Docker with Celery
diff --git a/requirements.txt b/requirements.txt
index 42dd9ee6a..121ba87f0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,4 +13,5 @@ tox==3.10.0
 pytest==4.5.0
 pytest_cases==1.6.2
 pytest-cookies==0.3.0
+pytest-xdist==1.28.0
 pyyaml==5.1
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 17375b1cf..2be23b86a 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -101,9 +101,10 @@ def test_project_generation(cookies, context, context_combination):
     check_paths(paths)
 
 
-def test_linting_passes(cookies, context_combination):
+@pytest.mark.flake8
+def test_flake8_passes(cookies, context_combination):
     """
-    Generated project should pass flake8 & black.
+    Generated project should pass flake8.
 
     This is parametrized for each combination from ``context_combination`` fixture
     """
@@ -114,6 +115,16 @@ def test_linting_passes(cookies, context_combination):
     except sh.ErrorReturnCode as e:
         pytest.fail(e)
 
+
+@pytest.mark.black
+def test_black_passes(cookies, context_combination):
+    """
+    Generated project should pass black.
+
+    This is parametrized for each combination from ``context_combination`` fixture
+    """
+    result = cookies.bake(extra_context=context_combination)
+
     try:
         sh.black("--check", "--diff", "--exclude", "migrations", f"{result.project}/")
     except sh.ErrorReturnCode as e:
diff --git a/tox.ini b/tox.ini
index cef3efc78..8306ccf2f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,11 +1,19 @@
 [tox]
 skipsdist = true
-envlist = py36,black
+envlist = py36,flake8,black,black-template
 
 [testenv]
 deps = -rrequirements.txt
-commands = pytest {posargs:./tests}
+commands = pytest -n 3 -m "not flake8" -m "not black" {posargs:./tests}
+
+[testenv:flake8]
+deps = -rrequirements.txt
+commands = pytest -n 3 -m flake8 {posargs:./tests}
 
 [testenv:black]
+deps = -rrequirements.txt
+commands = pytest -n 3 -m black {posargs:./tests}
+
+[testenv:black-template]
 deps = black
 commands = black --check hooks tests setup.py docs

From 0fef8283755fe5e89e44c3e4287f5c2f7ab3f534 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Fri, 12 Apr 2019 16:59:34 +0100
Subject: [PATCH 0162/2840] Create a logging config in base settings & add a
 root logger to existing ones

---
 .../config/settings/base.py                   | 24 +++++++++++++++++++
 .../config/settings/production.py             |  2 ++
 2 files changed, 26 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 026c88cf5..734c1c807 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -221,6 +221,30 @@ ADMINS = [("""{{cookiecutter.author_name}}""", "{{cookiecutter.email}}")]
 # https://docs.djangoproject.com/en/dev/ref/settings/#managers
 MANAGERS = ADMINS
 
+# LOGGING
+# ------------------------------------------------------------------------------
+# https://docs.djangoproject.com/en/dev/ref/settings/#logging
+# See https://docs.djangoproject.com/en/dev/topics/logging for
+# more details on how to customize your logging configuration.
+LOGGING = {
+    "version": 1,
+    "disable_existing_loggers": False,
+    "formatters": {
+        "verbose": {
+            "format": "%(levelname)s %(asctime)s %(module)s "
+            "%(process)d %(thread)d %(message)s"
+        }
+    },
+    "handlers": {
+        "console": {
+            "level": "DEBUG",
+            "class": "logging.StreamHandler",
+            "formatter": "verbose",
+        }
+    },
+    "root": {"level": "INFO", "handlers": ["console"]},
+}
+
 {% if cookiecutter.use_celery == 'y' -%}
 # Celery
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 63225bee9..61fb38d6e 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -233,6 +233,7 @@ LOGGING = {
             "formatter": "verbose",
         },
     },
+    "root": {"level": "INFO", "handlers": ["console"]},
     "loggers": {
         "django.request": {
             "handlers": ["mail_admins"],
@@ -263,6 +264,7 @@ LOGGING = {
             "formatter": "verbose",
         }
     },
+    "root": {"level": "INFO", "handlers": ["console"]},
     "loggers": {
         "django.db.backends": {
             "level": "ERROR",

From 78d81d6f87803cca64e9f693f9b32ab7f39a7070 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 15 May 2019 10:45:37 -0700
Subject: [PATCH 0163/2840] Update tox from 3.10.0 to 3.11.0

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

diff --git a/requirements.txt b/requirements.txt
index 121ba87f0..608cd6b52 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ flake8==3.7.6
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.10.0
+tox==3.11.0
 pytest==4.5.0
 pytest_cases==1.6.2
 pytest-cookies==0.3.0

From d00517252c42c6d038356fff42a2056392de2d77 Mon Sep 17 00:00:00 2001
From: Tano Abeleyra <tano@abeleyra.com>
Date: Wed, 15 May 2019 13:11:16 -0300
Subject: [PATCH 0164/2840] UsersAppConfig improvements

+ Rename to UsersConfig to follow Django naming convention
+ Translate verbose_name
---
 {{cookiecutter.project_slug}}/config/settings/base.py       | 2 +-
 .../{{cookiecutter.project_slug}}/users/apps.py             | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 026c88cf5..3d51729f5 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -75,7 +75,7 @@ THIRD_PARTY_APPS = [
     "rest_framework",
 ]
 LOCAL_APPS = [
-    "{{ cookiecutter.project_slug }}.users.apps.UsersAppConfig",
+    "{{ cookiecutter.project_slug }}.users.apps.UsersConfig",
     # Your stuff: custom apps go here
 ]
 # https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/apps.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/apps.py
index ded2072ff..2241e5eb5 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/apps.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/apps.py
@@ -1,10 +1,10 @@
 from django.apps import AppConfig
+from django.utils.translation import gettext_lazy as _
 
 
-class UsersAppConfig(AppConfig):
-
+class UsersConfig(AppConfig):
     name = "{{ cookiecutter.project_slug }}.users"
-    verbose_name = "Users"
+    verbose_name = _("Users")
 
     def ready(self):
         try:

From 6d0d33865c33cca7f002b1caf8aa835c6dd46623 Mon Sep 17 00:00:00 2001
From: Tano Abeleyra <tano@abeleyra.com>
Date: Wed, 15 May 2019 19:22:08 -0300
Subject: [PATCH 0165/2840] Add myself as contributor and sort the list

---
 CONTRIBUTORS.rst | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 6fa9e1c0d..af974d5ee 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -64,6 +64,7 @@ Listed in alphabetical order.
   Areski Belaid            `@areski`_
   Ashley Camba
   Barclay Gauld            `@yunti`_
+  Bartek                   `@btknu`_
   Ben Warren               `@bwarren2`_
   Ben Lopatin
   Benjamin Abel
@@ -71,7 +72,6 @@ Listed in alphabetical order.
   Bo Lopker                `@blopker`_
   Bouke Haarsma
   Brent Payne              `@brentpayne`_               @brentpayne
-  Bartek                   `@btknu`_
   Burhan Khalid            `@burhan`_                   @burhan
   Carl Johnson             `@carlmjohnson`_             @carlmjohnson
   Catherine Devlin         `@catherinedevlin`_
@@ -95,6 +95,7 @@ Listed in alphabetical order.
   Davur Clementsen         `@dsclementsen`_              @davur
   Delio Castillo           `@jangeador`_                 @jangeador
   Demetris Stavrou         `@demestav`_
+  Denis Bobrov             `@delneg`_
   Denis Orehovsky          `@apirobot`_
   Dónal Adams              `@epileptic-fish`_
   Diane Chen               `@purplediane`_               @purplediane88
@@ -114,8 +115,8 @@ Listed in alphabetical order.
   Ian Lee                  `@IanLee1521`_
   Irfan Ahmad              `@erfaan`_                    @erfaan
   Jan Van Bruggen          `@jvanbrug`_
-  Jens Nilsson             `@phiberjenz`_
   Jelmer Draaijer          `@foarsitter`_
+  Jens Nilsson             `@phiberjenz`_
   Jerome Leclanche         `@jleclanche`_                @Adys
   Jimmy Gitonga            `@afrowave`_                  @afrowave
   John Cass                `@jcass77`_                   @cass_john
@@ -124,9 +125,10 @@ Listed in alphabetical order.
   Kaido Kert               `@kaidokert`_
   kappataumu               `@kappataumu`_                @kappataumu
   Kaveh                    `@ka7eh`_
+  Keith Bailey             `@keithjeb`_
+  Keith Webber             `@townie`_
   Kevin A. Stone
   Kevin Ndung'u            `@kevgathuku`_
-  Keith Webber             `@townie`_
   Krzysztof Szumny         `@noisy`_
   Krzysztof Żuraw          `@krzysztofzuraw`_
   Leonardo Jimenez         `@xpostudio4`_
@@ -154,22 +156,24 @@ Listed in alphabetical order.
   Parbhat Puri             `@parbhat`_
   Peter Bittner            `@bittner`_
   Peter Coles              `@mrcoles`_
+  Philipp Matthies         `@canonnervio`_
   Pierre Chiquet           `@pchiquet`_
-  Raphael Pierzina         `@hackebrot`_
   Raony Guimarães Corrêa   `@raonyguimaraes`_
+  Raphael Pierzina         `@hackebrot`_
   Reggie Riser             `@reggieriser`_
   René Muhl                `@rm--`_
   Roman Afanaskin          `@siauPatrick`_
   Roman Osipenko           `@romanosipenko`_
   Russell Davies
-  Sascha                   `@saschalalala`_             @saschalalala
   Sam Collins              `@MightySCollins`_
+  Sascha                   `@saschalalala`_             @saschalalala
   Shupeyko Nikita          `@webyneter`_
   Sławek Ehlert            `@slafs`_
   Srinivas Nyayapati       `@shireenrao`_
   stepmr                   `@stepmr`_
   Steve Steiner            `@ssteinerX`_
   Sule Marshall            `@suledev`_
+  Tano Abeleyra            `@tanoabeleyra`_
   Taylor Baldwin
   Théo Segonds             `@show0k`_
   Tim Freund               `@timfreund`_
@@ -178,16 +182,13 @@ Listed in alphabetical order.
   Travis McNeill           `@Travistock`_               @tavistock_esq
   Tubo Shi                 `@Tubo`_
   Umair Ashraf             `@umrashrf`_                 @fabumair
-  Vlad Doster              `@vladdoster`_
+  Vadim Iskuchekov         `@Egregors`_                 @egregors
   Vitaly Babiy
   Vivian Guillen           `@viviangb`_
+  Vlad Doster              `@vladdoster`_
   Will Farley              `@goldhand`_                 @g01dhand
   William Archinal         `@archinal`_
   Yaroslav Halchenko
-  Denis Bobrov             `@delneg`_
-  Philipp Matthies         `@canonnervio`_
-  Vadim Iskuchekov         `@Egregors`_                 @egregors
-  Keith Bailey             `@keithjeb`_
 ========================== ============================ ==============
 
 .. _@a7p: https://github.com/a7p

From c3f6df2eae4604305cb22e22d6bd5dc403cbb15e Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 16 May 2019 12:00:38 +0100
Subject: [PATCH 0166/2840] Update tox from 3.11.0 to 3.11.1

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

diff --git a/requirements.txt b/requirements.txt
index 608cd6b52..53d143788 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ flake8==3.7.6
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.11.0
+tox==3.11.1
 pytest==4.5.0
 pytest_cases==1.6.2
 pytest-cookies==0.3.0

From 04cf607166a31c2b534d753b37b1e6d75702373f Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 16 May 2019 13:27:51 +0100
Subject: [PATCH 0167/2840] Add recent changes to changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0e59b3b4a..e4eadd221 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 All enhancements and patches to Cookiecutter Django will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2019-05-16]
+### Changed
+- Users app to have a translated verbose name (@tanoabeleyra)
+- Logging configuration for local (@browniebroke)
+
 ## [2019-05-08]
 ### Changed
 - Upgraded to Django 2.1 (@browniebroke)

From dc55a3cdd41adb2d97639cc5560b09b85d10eecd Mon Sep 17 00:00:00 2001
From: Tano Abeleyra <tano@abeleyra.com>
Date: Thu, 16 May 2019 21:18:41 -0300
Subject: [PATCH 0168/2840] Add missing link in CONTRIBUTORS (#2058)

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index af974d5ee..d11f99050 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -320,6 +320,7 @@ Listed in alphabetical order.
 .. _@hanaquadara: https://github.com/hanaquadara
 .. _@vladdoster: https://github.com/vladdoster
 .. _@cmargieson: https://github.com/cmargieson
+.. _@tanoabeleyra: https://github.com/tanoabeleyra
 
 Special Thanks
 ~~~~~~~~~~~~~~

From ecc5a73affa458c4e6088653156f3662e3295d4b Mon Sep 17 00:00:00 2001
From: Tano Abeleyra <tano@abeleyra.com>
Date: Fri, 17 May 2019 11:57:13 -0300
Subject: [PATCH 0169/2840] Add LocaleMiddleware

---
 {{cookiecutter.project_slug}}/config/settings/base.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 01881b366..22a08b5ab 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -126,6 +126,7 @@ AUTH_PASSWORD_VALIDATORS = [
 MIDDLEWARE = [
     "django.middleware.security.SecurityMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
+    "django.middleware.locale.LocaleMiddleware",
     "django.middleware.common.CommonMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",

From 63a184f07247752de53082bf2a2a5a61d637390d Mon Sep 17 00:00:00 2001
From: Tano Abeleyra <tano@abeleyra.com>
Date: Fri, 17 May 2019 12:34:32 -0300
Subject: [PATCH 0170/2840] Set LOCALE_PATHS

---
 {{cookiecutter.project_slug}}/config/settings/base.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 22a08b5ab..0e0d96160 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -35,6 +35,8 @@ USE_I18N = True
 USE_L10N = True
 # https://docs.djangoproject.com/en/dev/ref/settings/#use-tz
 USE_TZ = True
+# https://docs.djangoproject.com/en/dev/ref/settings/#locale-paths
+LOCALE_PATHS = [ROOT_DIR.path("locale")]
 
 # DATABASES
 # ------------------------------------------------------------------------------

From dc664b355615fdb1f0f5db8d5fc784f52611dd23 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 17 May 2019 21:37:14 +0100
Subject: [PATCH 0171/2840] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4eadd221..89e5d0153 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 All enhancements and patches to Cookiecutter Django will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2019-05-17]
+### Fixed
+- Added `LocaleMiddleware` to the list of middlewares (@tanoabeleyra)
+- Added `LOCALE_PATH` to settings (@tanoabeleyra)
+
 ## [2019-05-16]
 ### Changed
 - Users app to have a translated verbose name (@tanoabeleyra)

From 219062cb2b8b3ae5b83bedb4827b8e529bfba8b4 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sun, 12 May 2019 21:55:22 +0100
Subject: [PATCH 0172/2840] Update to Django 2.2.1

---
 README.rst                                          | 2 +-
 setup.py                                            | 6 +++---
 {{cookiecutter.project_slug}}/requirements/base.txt | 2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.rst b/README.rst
index 8a92eddae..3434e09d5 100644
--- a/README.rst
+++ b/README.rst
@@ -36,7 +36,7 @@ production-ready Django projects quickly.
 Features
 ---------
 
-* For Django 2.1
+* For Django 2.2
 * Works with Python 3.6
 * Renders Django projects with 100% starting test coverage
 * Twitter Bootstrap_ v4 (`maintained Foundation fork`_ also available)
diff --git a/setup.py b/setup.py
index 65bcd8fcf..46c84b712 100644
--- a/setup.py
+++ b/setup.py
@@ -10,10 +10,10 @@ 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 = "2.0.2"
+version = "2.2.1"
 
 if sys.argv[-1] == "tag":
-    os.system('git tag -a %s -m "version %s"' % (version, version))
+    os.system(f'git tag -a {version} -m "version {version}"')
     os.system("git push --tags")
     sys.exit()
 
@@ -34,7 +34,7 @@ setup(
     classifiers=[
         "Development Status :: 4 - Beta",
         "Environment :: Console",
-        "Framework :: Django :: 2.0",
+        "Framework :: Django :: 2.2",
         "Intended Audience :: Developers",
         "Natural Language :: English",
         "License :: OSI Approved :: BSD License",
diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 29e7f2b94..ddd8f041c 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -18,7 +18,7 @@ flower==0.9.3  # https://github.com/mher/flower
 
 # Django
 # ------------------------------------------------------------------------------
-django==2.1.8  # pyup: < 2.2  # https://www.djangoproject.com/
+django==2.2.1  # pyup: < 3.0  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==3.1.2  # https://github.com/jazzband/django-model-utils
 django-allauth==0.39.1  # https://github.com/pennersr/django-allauth

From 872204527f39386d687edf1e8ceffea56f76d211 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Fri, 17 May 2019 22:33:30 +0100
Subject: [PATCH 0173/2840] Remove user list view

---
 .../users/tests/test_urls.py                         |  5 -----
 .../{{cookiecutter.project_slug}}/users/urls.py      |  2 --
 .../{{cookiecutter.project_slug}}/users/views.py     | 12 +-----------
 3 files changed, 1 insertion(+), 18 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
index 20bd3dbad..c6361920d 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
@@ -13,11 +13,6 @@ def test_detail(user: settings.AUTH_USER_MODEL):
     assert resolve(f"/users/{user.username}/").view_name == "users:detail"
 
 
-def test_list():
-    assert reverse("users:list") == "/users/"
-    assert resolve("/users/").view_name == "users:list"
-
-
 def test_update():
     assert reverse("users:update") == "/users/~update/"
     assert resolve("/users/~update/").view_name == "users:update"
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py
index 2502a0c0c..eff24dd04 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py
@@ -1,7 +1,6 @@
 from django.urls import path
 
 from {{ cookiecutter.project_slug }}.users.views import (
-    user_list_view,
     user_redirect_view,
     user_update_view,
     user_detail_view,
@@ -9,7 +8,6 @@ from {{ cookiecutter.project_slug }}.users.views import (
 
 app_name = "users"
 urlpatterns = [
-    path("", view=user_list_view, name="list"),
     path("~redirect/", view=user_redirect_view, name="redirect"),
     path("~update/", view=user_update_view, name="update"),
     path("<str:username>/", view=user_detail_view, name="detail"),
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
index 35e26e94f..a24427416 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
@@ -1,7 +1,7 @@
 from django.contrib.auth import get_user_model
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.urls import reverse
-from django.views.generic import DetailView, ListView, RedirectView, UpdateView
+from django.views.generic import DetailView, RedirectView, UpdateView
 
 User = get_user_model()
 
@@ -16,16 +16,6 @@ class UserDetailView(LoginRequiredMixin, DetailView):
 user_detail_view = UserDetailView.as_view()
 
 
-class UserListView(LoginRequiredMixin, ListView):
-
-    model = User
-    slug_field = "username"
-    slug_url_kwarg = "username"
-
-
-user_list_view = UserListView.as_view()
-
-
 class UserUpdateView(LoginRequiredMixin, UpdateView):
 
     model = User

From e6458d7c0732860479399d4429163af727ddfe00 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Fri, 17 May 2019 22:37:35 +0100
Subject: [PATCH 0174/2840] Update flake8 from 3.7.6 to 3.7.7

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

diff --git a/requirements.txt b/requirements.txt
index 53d143788..02caf6eba 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==19.3b0
-flake8==3.7.6
+flake8==3.7.7
 
 # Testing
 # ------------------------------------------------------------------------------

From 99df05d8b0dc3b0b82167537e000b40cf67fc876 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 18 May 2019 12:00:28 +0100
Subject: [PATCH 0175/2840] Update sentry-sdk from 0.7.14 to 0.8.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 4ae99be3f..67c44c8fa 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==0.6.2  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.7.14  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.8.0  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From 093455a120cf6e23b11816c588b60518e6b8e3f3 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 18 May 2019 12:00:31 +0100
Subject: [PATCH 0176/2840] Update flake8 from 3.7.5 to 3.7.7

---
 {{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 5fc26c15e..ddab6ab1d 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -17,7 +17,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality
 # ------------------------------------------------------------------------------
-flake8==3.7.5  # https://github.com/PyCQA/flake8
+flake8==3.7.7  # https://github.com/PyCQA/flake8
 coverage==4.5.3  # https://github.com/nedbat/coveragepy
 black==19.3b0  # https://github.com/ambv/black
 pylint-django==2.0.9  # https://github.com/PyCQA/pylint-django

From 88243d088d443c5fb9036cbe74f7f1d8ab4b6e0e Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 18 May 2019 13:08:30 +0100
Subject: [PATCH 0177/2840] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89e5d0153..449ce643b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,10 @@
 All enhancements and patches to Cookiecutter Django will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2019-05-18]
+### Removed
+- Remove the user list view (@browniebroke)
+
 ## [2019-05-17]
 ### Fixed
 - Added `LocaleMiddleware` to the list of middlewares (@tanoabeleyra)

From 642c28792c0e697dfa618169e37722b185ade224 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sat, 18 May 2019 13:22:50 +0100
Subject: [PATCH 0178/2840] Update Redis version to 5.0

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

diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index c6dd654e5..60f8f9228 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -45,7 +45,7 @@ services:
   {%- if cookiecutter.use_celery == 'y' %}
 
   redis:
-    image: redis:3.2
+    image: redis:5.0
 
   celeryworker:
     <<: *django
diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index a24ba8297..331cbba68 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -44,7 +44,7 @@ services:
       - "0.0.0.0:443:443"
 
   redis:
-    image: redis:3.2
+    image: redis:5.0
   {%- if cookiecutter.use_celery == 'y' %}
 
   celeryworker:

From d90406c3c3489c896407b09fada43ccfbae544a7 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sat, 18 May 2019 14:06:05 +0100
Subject: [PATCH 0179/2840] Make the static storage use public ACL

---
 {{cookiecutter.project_slug}}/config/settings/production.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 61fb38d6e..6b79b0af7 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -117,6 +117,7 @@ from storages.backends.s3boto3 import S3Boto3Storage  # noqa E402
 
 class StaticRootS3Boto3Storage(S3Boto3Storage):
     location = "static"
+    default_acl = "public-read"
 
 
 class MediaRootS3Boto3Storage(S3Boto3Storage):

From e74e2a8ad39dfde2712e5f508a294f9a0defb654 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 18 May 2019 14:08:02 +0100
Subject: [PATCH 0180/2840] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 449ce643b..51ad4472f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,9 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 ### Removed
 - Remove the user list view (@browniebroke)
 
+### Fixed 
+- Static storage default ACL (@browniebroke)
+
 ## [2019-05-17]
 ### Fixed
 - Added `LocaleMiddleware` to the list of middlewares (@tanoabeleyra)

From 98012829f3c5a2dbfa7962f744590685513de956 Mon Sep 17 00:00:00 2001
From: Matt Knapper <m@oddular.com>
Date: Sat, 18 May 2019 10:10:45 -0400
Subject: [PATCH 0181/2840] storageFile is deprecated, use storage instead

---
 CONTRIBUTORS.rst                                                | 2 ++
 .../compose/production/traefik/traefik.toml                     | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index d11f99050..bd748062d 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -143,6 +143,7 @@ Listed in alphabetical order.
   Mateusz Ostaszewski      `@mostaszewski`_
   Mathijs Hoogland         `@MathijsHoogland`_
   Matt Braymer-Hayes       `@mattayes`_                  @mattayes
+  Matt Knapper             `@mknapper1`_
   Matt Linares
   Matt Menzenski           `@menzenski`_
   Matt Warren              `@mfwarren`_
@@ -260,6 +261,7 @@ Listed in alphabetical order.
 .. _@msaizar: https://github.com/msaizar
 .. _@MathijsHoogland: https://github.com/MathijsHoogland
 .. _@mattayes: https://github.com/mattayes
+.. _@mknapper1: https://github.com/mknapper1
 .. _@menzenski: https://github.com/menzenski
 .. _@mostaszewski: https://github.com/mostaszewski
 .. _@mfwarren: https://github.com/mfwarren
diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.toml b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.toml
index ad1f20e9e..0f2abe8a1 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.toml
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.toml
@@ -17,7 +17,7 @@ defaultEntryPoints = ["http", "https"]
 [acme]
 # Email address used for registration
 email = "{{ cookiecutter.email }}"
-storageFile = "/etc/traefik/acme/acme.json"
+storage = "/etc/traefik/acme/acme.json"
 entryPoint = "https"
 onDemand = false
 OnHostRule = true

From 570930ef135ce4d195b02167764ecbc74d27fb69 Mon Sep 17 00:00:00 2001
From: shireenrao <shireenrao@gmail.com>
Date: Sat, 18 May 2019 22:49:10 -0400
Subject: [PATCH 0182/2840] If using whitenoise disable AWS and GCE for static

If using whitenoise disable AWS and GCE for static setting.
---
 {{cookiecutter.project_slug}}/config/settings/production.py | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 6b79b0af7..0c94b2d8c 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -99,11 +99,10 @@ GS_DEFAULT_ACL = "publicRead"
 # ------------------------
 {% if cookiecutter.use_whitenoise == 'y' -%}
 STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
-{%- endif -%}
-{%- if cookiecutter.cloud_provider == 'AWS' %}
+{%- elif cookiecutter.cloud_provider == 'AWS' and cookiecutter.use_whitenoise == 'n' %}
 STATICFILES_STORAGE = "config.settings.production.StaticRootS3Boto3Storage"
 STATIC_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/static/"
-{%- elif cookiecutter.cloud_provider == 'GCE' %}
+{%- elif cookiecutter.cloud_provider == 'GCE' and cookiecutter.use_whitenoise == 'n' %}
 STATIC_URL = "https://storage.googleapis.com/{}/static/".format(GS_BUCKET_NAME)
 {%- endif %}
 

From 0b732298e5d4e4be6569c3903aeef9f697fc4b69 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sun, 19 May 2019 12:00:27 +0100
Subject: [PATCH 0183/2840] Update django-extensions from 2.1.6 to 2.1.7

---
 {{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 ddab6ab1d..24cedfda3 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,6 +30,6 @@ pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==1.11  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==2.1.6  # https://github.com/django-extensions/django-extensions
+django-extensions==2.1.7  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.6.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.4.8  # https://github.com/pytest-dev/pytest-django

From adcc5d0b2889a59aa7e79f8d17e521ed92bee32c Mon Sep 17 00:00:00 2001
From: shireenrao <shireenrao@gmail.com>
Date: Sun, 19 May 2019 08:27:14 -0400
Subject: [PATCH 0184/2840] Update
 {{cookiecutter.project_slug}}/config/settings/production.py

Co-Authored-By: Bruno Alla <browniebroke@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/config/settings/production.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 0c94b2d8c..203612ca1 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -99,7 +99,7 @@ GS_DEFAULT_ACL = "publicRead"
 # ------------------------
 {% if cookiecutter.use_whitenoise == 'y' -%}
 STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
-{%- elif cookiecutter.cloud_provider == 'AWS' and cookiecutter.use_whitenoise == 'n' %}
+{%- elif cookiecutter.cloud_provider == 'AWS' %}
 STATICFILES_STORAGE = "config.settings.production.StaticRootS3Boto3Storage"
 STATIC_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/static/"
 {%- elif cookiecutter.cloud_provider == 'GCE' and cookiecutter.use_whitenoise == 'n' %}

From 8c69a1203f22ca996c5f2b47ea65e3c51f874ce0 Mon Sep 17 00:00:00 2001
From: shireenrao <shireenrao@gmail.com>
Date: Sun, 19 May 2019 08:27:28 -0400
Subject: [PATCH 0185/2840] Update
 {{cookiecutter.project_slug}}/config/settings/production.py

Co-Authored-By: Bruno Alla <browniebroke@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/config/settings/production.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 203612ca1..1a5889d5d 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -102,7 +102,7 @@ STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
 {%- elif cookiecutter.cloud_provider == 'AWS' %}
 STATICFILES_STORAGE = "config.settings.production.StaticRootS3Boto3Storage"
 STATIC_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/static/"
-{%- elif cookiecutter.cloud_provider == 'GCE' and cookiecutter.use_whitenoise == 'n' %}
+{%- elif cookiecutter.cloud_provider == 'GCE' %}
 STATIC_URL = "https://storage.googleapis.com/{}/static/".format(GS_BUCKET_NAME)
 {%- endif %}
 

From de7be3652a82172a45197ab92394e1bd0fa15500 Mon Sep 17 00:00:00 2001
From: Tano Abeleyra <tano@abeleyra.com>
Date: Sat, 18 May 2019 20:23:48 -0300
Subject: [PATCH 0186/2840] Make cloud_provider optional

Some projects may not need AWS or GCS
---
 README.rst                                                  | 3 ++-
 cookiecutter.json                                           | 3 ++-
 docs/project-generation-options.rst                         | 1 +
 hooks/post_gen_project.py                                   | 6 ++++++
 tests/test_cookiecutter_generation.py                       | 2 +-
 {{cookiecutter.project_slug}}/config/settings/production.py | 4 +++-
 6 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/README.rst b/README.rst
index 8a92eddae..efcfd506a 100644
--- a/README.rst
+++ b/README.rst
@@ -185,7 +185,8 @@ Answer the prompts with your own desired options_. For example::
     Select cloud_provider:
     1 - AWS
     2 - GCS
-    Choose from 1, 2 [1]: 1
+    3 - None
+    Choose from 1, 2, 3 [1]: 1
     custom_bootstrap_compilation [n]: n
     Select open_source_license:
     1 - MIT
diff --git a/cookiecutter.json b/cookiecutter.json
index a66bb732a..d4a977bb1 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -33,7 +33,8 @@
   ],
   "cloud_provider": [
     "AWS",
-    "GCE"
+    "GCE",
+    "None"
   ],
   "custom_bootstrap_compilation": "n",
   "use_compressor": "n",
diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index c3c4d3a2d..3e4ac47c4 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -69,6 +69,7 @@ cloud_provider:
 
     1. AWS_
     2. GCS_
+    3. None
 
 custom_bootstrap_compilation:
     Indicates whether the project should support Bootstrap recompilation
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index 292f6e7f6..ff84f1806 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -328,6 +328,12 @@ def main():
         if "{{ cookiecutter.use_docker }}".lower() == "y":
             remove_node_dockerfile()
 
+    if "{{ cookiecutter.cloud_provider}}".lower() == "none":
+        print(
+            WARNING + "You chose not to use a cloud provider, "
+            "media files won't be served in production." + TERMINATOR
+        )
+
     if "{{ cookiecutter.use_celery }}".lower() == "n":
         remove_celery_files()
         if "{{ cookiecutter.use_docker }}".lower() == "y":
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 2be23b86a..be05e79b1 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -11,7 +11,7 @@ PATTERN = "{{(\s?cookiecutter)[.](.*?)}}"
 RE_OBJ = re.compile(PATTERN)
 
 YN_CHOICES = ["y", "n"]
-CLOUD_CHOICES = ["AWS", "GCE"]
+CLOUD_CHOICES = ["AWS", "GCE", "None"]
 
 
 @pytest.fixture
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 1a5889d5d..c2fcd5750 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -68,8 +68,10 @@ SECURE_CONTENT_TYPE_NOSNIFF = env.bool(
 
 # STORAGES
 # ------------------------------------------------------------------------------
+{% if cookiecutter.cloud_provider != 'None' -%}
 # https://django-storages.readthedocs.io/en/latest/#installation
 INSTALLED_APPS += ["storages"]  # noqa F405
+{%- endif -%}
 {% if cookiecutter.cloud_provider == 'AWS' %}
 # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
 AWS_ACCESS_KEY_ID = env("DJANGO_AWS_ACCESS_KEY_ID")
@@ -193,7 +195,7 @@ COMPRESS_ENABLED = env.bool("COMPRESS_ENABLED", default=True)
 # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_STORAGE
 COMPRESS_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
 # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_URL
-COMPRESS_URL = STATIC_URL{% if cookiecutter.use_whitenoise == 'y' %}  # noqa F405{% endif %}
+COMPRESS_URL = STATIC_URL{% if cookiecutter.use_whitenoise == 'y' or cookiecutter.cloud_provider == 'None' %}  # noqa F405{% endif %}
 {% endif %}
 {%- if cookiecutter.use_whitenoise == 'n' -%}
 # Collectfast

From 2116f997bcb11e6ca00b4c09e07546b606f677b3 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 20 May 2019 12:00:32 +0100
Subject: [PATCH 0187/2840] Update django-anymail from 6.0 to 6.0.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 67c44c8fa..e62eeb73c 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -18,4 +18,4 @@ django-storages[boto3]==1.7.1  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCE' %}
 django-storages[google]==1.7.1  # https://github.com/jschneier/django-storages
 {%- endif %}
-django-anymail[mailgun]==6.0  # https://github.com/anymail/django-anymail
+django-anymail[mailgun]==6.0.1  # https://github.com/anymail/django-anymail

From 4bf795a908d49cf0135625990006baa568393fdb Mon Sep 17 00:00:00 2001
From: Curtis St Pierre <curtisstpierre@gmail.com>
Date: Sun, 19 May 2019 21:29:15 -0700
Subject: [PATCH 0188/2840] 1989 - reworked postgres version options

---
 CONTRIBUTORS.rst                    | 26 ++++++++++++++------------
 README.rst                          | 17 +++++++----------
 cookiecutter.json                   |  7 ++-----
 docs/project-generation-options.rst | 15 ++++++---------
 4 files changed, 29 insertions(+), 36 deletions(-)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index bd748062d..7a9dbf79c 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -7,19 +7,19 @@ Core Developers
 These contributors have commit flags for the repository,
 and are able to accept and merge pull requests.
 
-=========================== ================ ===========
-Name                        Github           Twitter
-=========================== ================ ===========
-Daniel Roy Greenfeld        `@pydanny`_      @pydanny
-Audrey Roy Greenfeld*       `@audreyr`_      @audreyr
-Fábio C. Barrionuevo da Luz `@luzfcb`_       @luzfcb
-Saurabh Kumar               `@theskumar`_    @_theskumar
+=========================== ================= ===========
+Name                        Github            Twitter
+=========================== ================= ===========
+Daniel Roy Greenfeld        `@pydanny`_        @pydanny
+Audrey Roy Greenfeld*       `@audreyr`_        @audreyr
+Fábio C. Barrionuevo da Luz `@luzfcb`_         @luzfcb
+Saurabh Kumar               `@theskumar`_      @_theskumar
 Jannis Gebauer              `@jayfk`_
-Burhan Khalid               `@burhan`_       @burhan
-Nikita Shupeyko             `@webyneter`_    @webyneter
-Bruno Alla                  `@browniebroke`_ @_BrunoAlla
-Wan Liuyang                 `@sfdye`_        @sfdye
-=========================== ================ ===========
+Burhan Khalid               `@burhan`_         @burhan
+Nikita Shupeyko             `@webyneter`_      @webyneter
+Bruno Alla                  `@browniebroke`_   @_BrunoAlla
+Wan Liuyang                 `@sfdye`_          @sfdye
+=========================== ================= ===========
 
 *Audrey is also the creator of Cookiecutter. Audrey and
 Daniel are on the Cookiecutter core team.*
@@ -87,6 +87,7 @@ Listed in alphabetical order.
   Craig Margieson          `@cmargieson`_
   Cristian Vargas          `@cdvv7788`_
   Cullen Rhodes            `@c-rhodes`_
+  Curtis St Pierre         `@curtisstpierre`_            @cstpierre1388
   Dan Shultz               `@shultz`_
   Daniel Hepper            `@dhepper`_                   @danielhepper
   Daniele Tricoli          `@eriol`_
@@ -222,6 +223,7 @@ Listed in alphabetical order.
 .. _@chuckus: https://github.com/chuckus
 .. _@cmackenzie1: https://github.com/cmackenzie1
 .. _@Collederas: https://github.com/Collederas
+.. _@curtisstpierre: https://github.com/curtisstpierre
 .. _@davitovmasyan: https://github.com/davitovmasyan
 .. _@ddiazpinto: https://github.com/ddiazpinto
 .. _@demestav: https://github.com/demestav
diff --git a/README.rst b/README.rst
index 8a92eddae..d6372de68 100644
--- a/README.rst
+++ b/README.rst
@@ -89,7 +89,7 @@ Constraints
 -----------
 
 * Only maintained 3rd party libraries are used.
-* Uses PostgreSQL everywhere (9.4 - 10.5)
+* Uses PostgreSQL everywhere (9.4 - 11.3)
 * Environment variables for configuration (This won't work with Apache/mod_wsgi).
 
 Support this Project!
@@ -169,15 +169,12 @@ Answer the prompts with your own desired options_. For example::
     use_heroku [n]: y
     use_compressor [n]: y
     Select postgresql_version:
-    1 - 10.5
-    2 - 10.4
-    3 - 10.3
-    4 - 10.2
-    5 - 10.1
-    6 - 9.6
-    7 - 9.5
-    8 - 9.4
-    Choose from 1, 2, 3, 4, 5, 6, 7, 8 [1]: 1
+    1 - 11.3
+    2 - 10.8
+    3 - 9.6
+    4 - 9.5
+    5 - 9.4
+    Choose from 1, 2, 3, 4, 5 [1]: 1
     Select js_task_runner:
     1 - None
     2 - Gulp
diff --git a/cookiecutter.json b/cookiecutter.json
index a66bb732a..cfb20f6be 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -18,11 +18,8 @@
   "use_pycharm": "n",
   "use_docker": "n",
   "postgresql_version": [
-    "10.5",
-    "10.4",
-    "10.3",
-    "10.2",
-    "10.1",
+    "11.3",
+    "10.8",
     "9.6",
     "9.5",
     "9.4"
diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index c3c4d3a2d..6f2a2f224 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -49,14 +49,11 @@ use_docker:
 postgresql_version:
     Select a PostgreSQL_ version to use. The choices are:
 
-    1. 10.5
-    2. 10.4
-    3. 10.3
-    4. 10.2
-    5. 10.1
-    6. 9.6
-    7. 9.5
-    8. 9.4
+    1. 11.3
+    2. 10.8
+    3. 9.6
+    4. 9.5
+    5. 9.4
 
 js_task_runner:
     Select a JavaScript task runner. The choices are:
@@ -100,7 +97,7 @@ use_travisci:
 keep_local_envs_in_vcs:
     Indicates whether the project's ``.envs/.local/`` should be kept in VCS
     (comes in handy when working in teams where local environment reproducibility
-    is strongly encouraged). 
+    is strongly encouraged).
     Note: .env(s) are only utilized when Docker Compose and/or Heroku support is enabled.
 
 debug:

From 38b2c2dfcd44fa7e103c12a276fdc1db4bc1b728 Mon Sep 17 00:00:00 2001
From: Demetris Stavrou <1180929+demestav@users.noreply.github.com>
Date: Tue, 21 May 2019 22:04:03 +0300
Subject: [PATCH 0189/2840] Errors are now sent to Sentry

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

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 1a5889d5d..a132b3b2a 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -288,7 +288,7 @@ SENTRY_LOG_LEVEL = env.int("DJANGO_SENTRY_LOG_LEVEL", logging.INFO)
 
 sentry_logging = LoggingIntegration(
     level=SENTRY_LOG_LEVEL,  # Capture info and above as breadcrumbs
-    event_level=None,  # Send no events from log messages
+    event_level=logging.ERROR  # Send errors as events
 )
 
 {%- if cookiecutter.use_celery == 'y' %}

From 7cc94c139c81c5ab10e708a23e1e64c086a5fabe Mon Sep 17 00:00:00 2001
From: Demetris Stavrou <1180929+demestav@users.noreply.github.com>
Date: Tue, 21 May 2019 22:44:10 +0300
Subject: [PATCH 0190/2840] Updated documentation

---
 docs/deployment-with-docker.rst | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/docs/deployment-with-docker.rst b/docs/deployment-with-docker.rst
index aad549327..e69abc010 100644
--- a/docs/deployment-with-docker.rst
+++ b/docs/deployment-with-docker.rst
@@ -35,7 +35,15 @@ Configuring the Stack
 
 The majority of services above are configured through the use of environment variables. Just check out :ref:`envs` and you will know the drill.
 
-To obtain logs and information about crashes in a production setup, make sure that you have access to an external Sentry instance (e.g. by creating an account with `sentry.io`_), and set the ``SENTRY_DSN`` variable.
+To obtain logs and information about crashes in a production setup, make sure that you have access to an external Sentry instance (e.g. by creating an account with `sentry.io`_), and set the ``SENTRY_DSN`` variable. Logs of level `logging.ERROR` are sent as Sentry events. Therefore, in order to send a Sentry even use:
+
+.. code-block:: python
+
+    import logging
+    logging.error("This event is sent to Sentry", extra={"<example_key>": "<example_value>"})
+
+The `extra` parameter allows you to send additional information about the context of this error.
+
 
 You will probably also need to setup the Mail backend, for example by adding a `Mailgun`_ API key and a `Mailgun`_ sender domain, otherwise, the account creation view will crash and result in a 500 error when the backend attempts to send an email to the account owner.
 

From a37046d1ef9a64642138998a9239023ccd7097b6 Mon Sep 17 00:00:00 2001
From: shireenrao <shireenrao@gmail.com>
Date: Tue, 21 May 2019 18:17:19 -0400
Subject: [PATCH 0191/2840] Revert Werkzeug back to 0.14

reverting back Werkzeug to version 0.14 based on discussion on #2070
I did the change locally on my windows laptop and can confirm that this is now working.
---
 {{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 24cedfda3..57a262c96 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,6 +1,6 @@
 -r ./base.txt
 
-Werkzeug==0.15.4  # https://github.com/pallets/werkzeug
+Werkzeug==0.14  # https://github.com/pallets/werkzeug
 ipdb==0.12  # https://github.com/gotcha/ipdb
 Sphinx==2.0.1  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}

From a636d454f619018333d4fd9cd32918fc3ea2beaa Mon Sep 17 00:00:00 2001
From: Demetris Stavrou <1180929+demestav@users.noreply.github.com>
Date: Wed, 22 May 2019 09:46:20 +0300
Subject: [PATCH 0192/2840] Update
 {{cookiecutter.project_slug}}/config/settings/production.py

Co-Authored-By: Bruno Alla <browniebroke@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/config/settings/production.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index a132b3b2a..85b17f1b4 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -288,7 +288,7 @@ SENTRY_LOG_LEVEL = env.int("DJANGO_SENTRY_LOG_LEVEL", logging.INFO)
 
 sentry_logging = LoggingIntegration(
     level=SENTRY_LOG_LEVEL,  # Capture info and above as breadcrumbs
-    event_level=logging.ERROR  # Send errors as events
+    event_level=logging.ERROR,  # Send errors as events
 )
 
 {%- if cookiecutter.use_celery == 'y' %}

From 61c842cd9dd919c33ea927b836660a68ad4bf391 Mon Sep 17 00:00:00 2001
From: Demetris Stavrou <1180929+demestav@users.noreply.github.com>
Date: Wed, 22 May 2019 09:47:03 +0300
Subject: [PATCH 0193/2840] Update docs/deployment-with-docker.rst

Co-Authored-By: Bruno Alla <browniebroke@users.noreply.github.com>
---
 docs/deployment-with-docker.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/deployment-with-docker.rst b/docs/deployment-with-docker.rst
index e69abc010..038778cfb 100644
--- a/docs/deployment-with-docker.rst
+++ b/docs/deployment-with-docker.rst
@@ -35,7 +35,7 @@ Configuring the Stack
 
 The majority of services above are configured through the use of environment variables. Just check out :ref:`envs` and you will know the drill.
 
-To obtain logs and information about crashes in a production setup, make sure that you have access to an external Sentry instance (e.g. by creating an account with `sentry.io`_), and set the ``SENTRY_DSN`` variable. Logs of level `logging.ERROR` are sent as Sentry events. Therefore, in order to send a Sentry even use:
+To obtain logs and information about crashes in a production setup, make sure that you have access to an external Sentry instance (e.g. by creating an account with `sentry.io`_), and set the ``SENTRY_DSN`` variable. Logs of level `logging.ERROR` are sent as Sentry events. Therefore, in order to send a Sentry event use:
 
 .. code-block:: python
 

From 9e27e853f2c20e319559b39b715e346dbe901779 Mon Sep 17 00:00:00 2001
From: shireenrao <shireenrao@gmail.com>
Date: Wed, 22 May 2019 09:44:36 -0400
Subject: [PATCH 0194/2840] update Werkzeug to 0.14.1 and add pyup filter

---
 {{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 57a262c96..7f856f28c 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,6 +1,6 @@
 -r ./base.txt
 
-Werkzeug==0.14  # https://github.com/pallets/werkzeug
+Werkzeug==0.14.1  # pyup: < 0.15 # https://github.com/pallets/werkzeug
 ipdb==0.12  # https://github.com/gotcha/ipdb
 Sphinx==2.0.1  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}

From 4054105d63b04fc938073c039c6e43765ffd5c7e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 23 May 2019 20:33:13 -0700
Subject: [PATCH 0195/2840] Update tox from 3.11.1 to 3.12.1

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

diff --git a/requirements.txt b/requirements.txt
index 02caf6eba..4a6b4b598 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ flake8==3.7.7
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.11.1
+tox==3.12.1
 pytest==4.5.0
 pytest_cases==1.6.2
 pytest-cookies==0.3.0

From a67587bb24cbbd87505fefdf9d62b81408eab00b Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 25 May 2019 16:53:08 +0200
Subject: [PATCH 0196/2840] Bring psycopg2 versions in line

---
 {{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 7f856f28c..2e2228c39 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -4,7 +4,7 @@ Werkzeug==0.14.1  # pyup: < 0.15 # https://github.com/pallets/werkzeug
 ipdb==0.12  # https://github.com/gotcha/ipdb
 Sphinx==2.0.1  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
-psycopg2==2.8 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
+psycopg2==2.8.2 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}
 psycopg2-binary==2.8.2  # https://github.com/psycopg/psycopg2
 {%- endif %}

From 729dddcab6afacdce49f5ce200af1c1b97ebbbea Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 25 May 2019 16:53:34 +0200
Subject: [PATCH 0197/2840] Bring psycopg2 versions in line

---
 {{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 e62eeb73c..43b20513d 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -3,7 +3,7 @@
 -r ./base.txt
 
 gunicorn==19.9.0  # https://github.com/benoitc/gunicorn
-psycopg2==2.8 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
+psycopg2==2.8.2 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
 Collectfast==0.6.2  # https://github.com/antonagestam/collectfast
 {%- endif %}

From c96c932111442aaf336f0649b6445561d39961d9 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 27 May 2019 14:46:07 +0100
Subject: [PATCH 0198/2840] Correct name for Celery worker-related settings -
 fix #2080

The settings which are normally prefixed `CELERYD_` are for worker-related config, but since we instantiate the Celery app with a namespace, the prefix for these config should actually be `CELERY_`.
---
 {{cookiecutter.project_slug}}/config/settings/base.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index b72b7f00d..4a522fdda 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -266,10 +266,10 @@ CELERY_TASK_SERIALIZER = "json"
 CELERY_RESULT_SERIALIZER = "json"
 # http://docs.celeryproject.org/en/latest/userguide/configuration.html#task-time-limit
 # TODO: set to whatever value is adequate in your circumstances
-CELERYD_TASK_TIME_LIMIT = 5 * 60
+CELERY_TASK_TIME_LIMIT = 5 * 60
 # http://docs.celeryproject.org/en/latest/userguide/configuration.html#task-soft-time-limit
 # TODO: set to whatever value is adequate in your circumstances
-CELERYD_TASK_SOFT_TIME_LIMIT = 60
+CELERY_TASK_SOFT_TIME_LIMIT = 60
 
 {%- endif %}
 # django-allauth

From b4cea81f260b686be0678706fa60da4067c86669 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 27 May 2019 15:55:41 +0100
Subject: [PATCH 0199/2840] Fix some comment and empty lines in settings

---
 {{cookiecutter.project_slug}}/config/settings/production.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index d9771e598..476e0dff1 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -66,9 +66,9 @@ SECURE_CONTENT_TYPE_NOSNIFF = env.bool(
     "DJANGO_SECURE_CONTENT_TYPE_NOSNIFF", default=True
 )
 
+{% if cookiecutter.cloud_provider != 'None' -%}
 # STORAGES
 # ------------------------------------------------------------------------------
-{% if cookiecutter.cloud_provider != 'None' -%}
 # https://django-storages.readthedocs.io/en/latest/#installation
 INSTALLED_APPS += ["storages"]  # noqa F405
 {%- endif -%}
@@ -101,10 +101,10 @@ GS_DEFAULT_ACL = "publicRead"
 # ------------------------
 {% if cookiecutter.use_whitenoise == 'y' -%}
 STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
-{%- elif cookiecutter.cloud_provider == 'AWS' %}
+{% elif cookiecutter.cloud_provider == 'AWS' -%}
 STATICFILES_STORAGE = "config.settings.production.StaticRootS3Boto3Storage"
 STATIC_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/static/"
-{%- elif cookiecutter.cloud_provider == 'GCE' %}
+{% elif cookiecutter.cloud_provider == 'GCE' -%}
 STATIC_URL = "https://storage.googleapis.com/{}/static/".format(GS_BUCKET_NAME)
 {%- endif %}
 

From 881a6fd681abe83dd2a6b4f83782312e7e8ee96f Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 27 May 2019 15:58:56 +0100
Subject: [PATCH 0200/2840] Change GCP settings to f-strings

---
 {{cookiecutter.project_slug}}/config/settings/production.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 476e0dff1..6fd0eac9d 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -105,7 +105,7 @@ STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
 STATICFILES_STORAGE = "config.settings.production.StaticRootS3Boto3Storage"
 STATIC_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/static/"
 {% elif cookiecutter.cloud_provider == 'GCE' -%}
-STATIC_URL = "https://storage.googleapis.com/{}/static/".format(GS_BUCKET_NAME)
+STATIC_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/static/"
 {%- endif %}
 
 # MEDIA
@@ -130,8 +130,8 @@ class MediaRootS3Boto3Storage(S3Boto3Storage):
 DEFAULT_FILE_STORAGE = "config.settings.production.MediaRootS3Boto3Storage"
 MEDIA_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/media/"
 {%- elif cookiecutter.cloud_provider == 'GCE' %}
-MEDIA_URL = "https://storage.googleapis.com/{}/media/".format(GS_BUCKET_NAME)
-MEDIA_ROOT = "https://storage.googleapis.com/{}/media/".format(GS_BUCKET_NAME)
+MEDIA_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/media/"
+MEDIA_ROOT = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/media/"
 {%- endif %}
 
 # TEMPLATES

From 4b1239426cff1dc380e60ad3cc264cde193856b5 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 27 May 2019 16:20:29 +0100
Subject: [PATCH 0201/2840] Add custom markers to pytest config

---
 pytest.ini | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/pytest.ini b/pytest.ini
index c5b301991..01c7b1bfc 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,3 +1,6 @@
 [pytest]
 python_paths = .
 norecursedirs = .tox .git */migrations/* */static/* docs venv */{{cookiecutter.project_slug}}/*
+markers =
+    flake8: Run flake8 on all possible template combinations
+    black: Run black on all possible template combinations

From b56071f516e9201d957dd9bc5691af339d15fbde Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 27 May 2019 16:33:07 +0100
Subject: [PATCH 0202/2840] Fix comments and empty lines in prod settings

---
 {{cookiecutter.project_slug}}/config/settings/production.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 6fd0eac9d..1dbd28801 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -95,10 +95,12 @@ AWS_S3_REGION_NAME = env("DJANGO_AWS_S3_REGION_NAME", default=None)
 DEFAULT_FILE_STORAGE = "storages.backends.gcloud.GoogleCloudStorage"
 GS_BUCKET_NAME = env("DJANGO_GCE_STORAGE_BUCKET_NAME")
 GS_DEFAULT_ACL = "publicRead"
-{% endif %}
+{% endif -%}
 
+{% if cookiecutter.cloud_provider != 'None' or cookiecutter.use_whitenoise == 'y' -%}
 # STATIC
 # ------------------------
+{% endif -%}
 {% if cookiecutter.use_whitenoise == 'y' -%}
 STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
 {% elif cookiecutter.cloud_provider == 'AWS' -%}
@@ -106,7 +108,7 @@ STATICFILES_STORAGE = "config.settings.production.StaticRootS3Boto3Storage"
 STATIC_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/static/"
 {% elif cookiecutter.cloud_provider == 'GCE' -%}
 STATIC_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/static/"
-{%- endif %}
+{% endif -%}
 
 # MEDIA
 # ------------------------------------------------------------------------------

From 47937fce7984bc7c5f0e83d4b24f96dbedef5d86 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 27 May 2019 16:54:08 +0100
Subject: [PATCH 0203/2840] Fix deprecation warning in tests

---
 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 be05e79b1..4292f989b 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -7,7 +7,7 @@ import sh
 import yaml
 from binaryornot.check import is_binary
 
-PATTERN = "{{(\s?cookiecutter)[.](.*?)}}"
+PATTERN = r"{{(\s?cookiecutter)[.](.*?)}}"
 RE_OBJ = re.compile(PATTERN)
 
 YN_CHOICES = ["y", "n"]

From 761720bce79e8f68db6e0e409d74e906b35d9c0e Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 27 May 2019 16:57:55 +0100
Subject: [PATCH 0204/2840] Prepare 2.1.8-01 tag

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

diff --git a/setup.py b/setup.py
index 65bcd8fcf..e46cdb883 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 = "2.0.2"
+version = "2.1.8-01"
 
 if sys.argv[-1] == "tag":
     os.system('git tag -a %s -m "version %s"' % (version, version))

From c245c1ab09ca9b57c506e3e38a7d6df7eade67e1 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 27 May 2019 17:19:24 +0100
Subject: [PATCH 0205/2840] Update copyright year in the docs

---
 docs/conf.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index e3ddae9a6..469aa12d4 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -42,7 +42,7 @@ master_doc = "index"
 
 # General information about the project.
 project = "Cookiecutter Django"
-copyright = "2013-2018, Daniel Roy Greenfeld".format(now.year)
+copyright = "2013-{}, Daniel Roy Greenfeld".format(now.year)
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the

From 650acf1299f4f3f95186ae8a16a07ce24ad34d2c Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 27 May 2019 17:59:13 +0100
Subject: [PATCH 0206/2840] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51ad4472f..f013aec9f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,14 @@
 All enhancements and patches to Cookiecutter Django will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2019-05-27]
+### Changed
+- Made cloud provider optional (@tanoabeleyra)
+- Updated to Django 2.2.1 (@browniebroke)
+
+### Fixed
+- Celery worker-related setting names (@browniebroke)
+
 ## [2019-05-18]
 ### Removed
 - Remove the user list view (@browniebroke)

From 2d1befe8e2eb66a71c7049e1a8eaa3d83469886a Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 27 May 2019 18:16:00 +0100
Subject: [PATCH 0207/2840] Update docs about settings

---
 docs/settings.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 1830a47c7..0234ac85c 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -49,7 +49,7 @@ DJANGO_GCE_STORAGE_BUCKET_NAME          GS_BUCKET_NAME              n/a
 GOOGLE_APPLICATION_CREDENTIALS          n/a                         n/a                                            raises error
 SENTRY_DSN                              SENTRY_DSN                  n/a                                            raises error
 DJANGO_SENTRY_LOG_LEVEL                 SENTRY_LOG_LEVEL            n/a                                            logging.INFO
-MAILGUN_API_KEY                         MAILGUN_ACCESS_KEY          n/a                                            raises error
+MAILGUN_API_KEY                         MAILGUN_API_KEY             n/a                                            raises error
 MAILGUN_DOMAIN                          MAILGUN_SENDER_DOMAIN       n/a                                            raises error
 ======================================= =========================== ============================================== ======================================================================
 

From 007f3ffb31ec7c48d6aeaa564548dc5cfe8d7039 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 27 May 2019 18:16:51 +0100
Subject: [PATCH 0208/2840] Docs update

---
 docs/project-generation-options.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index 48a60dbc0..423686908 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -68,6 +68,8 @@ cloud_provider:
     2. GCS_
     3. None
 
+    Note that if you choose no cloud provider, media files won't work.
+
 custom_bootstrap_compilation:
     Indicates whether the project should support Bootstrap recompilation
     via the selected JavaScript task runner's task. This can be useful

From 1c5392d334c920eb42f05d09908f1256ef7fe06b Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 27 May 2019 21:28:36 +0100
Subject: [PATCH 0209/2840] Remove deprecated sudo from Travis & use Xenial on
 CI

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index f16c65820..1be0b743b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,4 +1,4 @@
-sudo: required
+dist: xenial
 
 services:
   - docker

From 9a3a796a89293c5129cfa9f5bb9d69ad54e54c8b Mon Sep 17 00:00:00 2001
From: Tano Abeleyra <tano@abeleyra.com>
Date: Sat, 18 May 2019 20:24:29 -0300
Subject: [PATCH 0210/2840] Use GCP acronym for Google Cloud Platform

---
 README.rst                                                | 2 +-
 cookiecutter.json                                         | 2 +-
 docs/project-generation-options.rst                       | 4 ++--
 docs/settings.rst                                         | 2 +-
 {{cookiecutter.project_slug}}/.envs/.production/.django   | 6 +++---
 .../config/settings/production.py                         | 8 ++++----
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 7 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/README.rst b/README.rst
index 7468981c3..30a3a2db4 100644
--- a/README.rst
+++ b/README.rst
@@ -181,7 +181,7 @@ Answer the prompts with your own desired options_. For example::
     Choose from 1, 2 [1]: 1
     Select cloud_provider:
     1 - AWS
-    2 - GCS
+    2 - GCP
     3 - None
     Choose from 1, 2, 3 [1]: 1
     custom_bootstrap_compilation [n]: n
diff --git a/cookiecutter.json b/cookiecutter.json
index 15e0aac69..d6d217ca4 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -30,7 +30,7 @@
   ],
   "cloud_provider": [
     "AWS",
-    "GCE",
+    "GCP",
     "None"
   ],
   "custom_bootstrap_compilation": "n",
diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index 423686908..afa9b8aff 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -65,7 +65,7 @@ cloud_provider:
     Select a cloud provider for static & media files. The choices are:
 
     1. AWS_
-    2. GCS_
+    2. GCP_
     3. None
 
     Note that if you choose no cloud provider, media files won't work.
@@ -123,7 +123,7 @@ debug:
 .. _Gulp: https://github.com/gulpjs/gulp
 
 .. _AWS: https://aws.amazon.com/s3/
-.. _GCS: https://cloud.google.com/storage/
+.. _GCP: https://cloud.google.com/storage/
 
 .. _Django Compressor: https://github.com/django-compressor/django-compressor
 
diff --git a/docs/settings.rst b/docs/settings.rst
index 0234ac85c..d0edce31f 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -45,7 +45,7 @@ DJANGO_AWS_ACCESS_KEY_ID                AWS_ACCESS_KEY_ID           n/a
 DJANGO_AWS_SECRET_ACCESS_KEY            AWS_SECRET_ACCESS_KEY       n/a                                            raises error
 DJANGO_AWS_STORAGE_BUCKET_NAME          AWS_STORAGE_BUCKET_NAME     n/a                                            raises error
 DJANGO_AWS_S3_REGION_NAME               AWS_S3_REGION_NAME          n/a                                            None
-DJANGO_GCE_STORAGE_BUCKET_NAME          GS_BUCKET_NAME              n/a                                            raises error
+DJANGO_GCP_STORAGE_BUCKET_NAME          GS_BUCKET_NAME              n/a                                            raises error
 GOOGLE_APPLICATION_CREDENTIALS          n/a                         n/a                                            raises error
 SENTRY_DSN                              SENTRY_DSN                  n/a                                            raises error
 DJANGO_SENTRY_LOG_LEVEL                 SENTRY_LOG_LEVEL            n/a                                            logging.INFO
diff --git a/{{cookiecutter.project_slug}}/.envs/.production/.django b/{{cookiecutter.project_slug}}/.envs/.production/.django
index a938ada68..2c2e94f2d 100644
--- a/{{cookiecutter.project_slug}}/.envs/.production/.django
+++ b/{{cookiecutter.project_slug}}/.envs/.production/.django
@@ -22,11 +22,11 @@ MAILGUN_DOMAIN=
 DJANGO_AWS_ACCESS_KEY_ID=
 DJANGO_AWS_SECRET_ACCESS_KEY=
 DJANGO_AWS_STORAGE_BUCKET_NAME=
-{% elif cookiecutter.cloud_provider == 'GCE' %}
-# GCE
+{% elif cookiecutter.cloud_provider == 'GCP' %}
+# GCP
 # ------------------------------------------------------------------------------
 GOOGLE_APPLICATION_CREDENTIALS=
-DJANGO_GCE_STORAGE_BUCKET_NAME=
+DJANGO_GCP_STORAGE_BUCKET_NAME=
 {% endif %}
 # django-allauth
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 1dbd28801..2c7b7a121 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -91,9 +91,9 @@ AWS_S3_OBJECT_PARAMETERS = {
 AWS_DEFAULT_ACL = None
 # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
 AWS_S3_REGION_NAME = env("DJANGO_AWS_S3_REGION_NAME", default=None)
-{% elif cookiecutter.cloud_provider == 'GCE' %}
+{% elif cookiecutter.cloud_provider == 'GCP' %}
 DEFAULT_FILE_STORAGE = "storages.backends.gcloud.GoogleCloudStorage"
-GS_BUCKET_NAME = env("DJANGO_GCE_STORAGE_BUCKET_NAME")
+GS_BUCKET_NAME = env("DJANGO_GCP_STORAGE_BUCKET_NAME")
 GS_DEFAULT_ACL = "publicRead"
 {% endif -%}
 
@@ -106,7 +106,7 @@ STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
 {% elif cookiecutter.cloud_provider == 'AWS' -%}
 STATICFILES_STORAGE = "config.settings.production.StaticRootS3Boto3Storage"
 STATIC_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/static/"
-{% elif cookiecutter.cloud_provider == 'GCE' -%}
+{% elif cookiecutter.cloud_provider == 'GCP' -%}
 STATIC_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/static/"
 {% endif -%}
 
@@ -131,7 +131,7 @@ class MediaRootS3Boto3Storage(S3Boto3Storage):
 # endregion
 DEFAULT_FILE_STORAGE = "config.settings.production.MediaRootS3Boto3Storage"
 MEDIA_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/media/"
-{%- elif cookiecutter.cloud_provider == 'GCE' %}
+{%- elif cookiecutter.cloud_provider == 'GCP' %}
 MEDIA_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/media/"
 MEDIA_ROOT = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/media/"
 {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 43b20513d..e8636fb8f 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -15,7 +15,7 @@ sentry-sdk==0.8.0  # https://github.com/getsentry/sentry-python
 # ------------------------------------------------------------------------------
 {%- if cookiecutter.cloud_provider == 'AWS' %}
 django-storages[boto3]==1.7.1  # https://github.com/jschneier/django-storages
-{%- elif cookiecutter.cloud_provider == 'GCE' %}
+{%- elif cookiecutter.cloud_provider == 'GCP' %}
 django-storages[google]==1.7.1  # https://github.com/jschneier/django-storages
 {%- endif %}
 django-anymail[mailgun]==6.0.1  # https://github.com/anymail/django-anymail

From 4196d7e52fc5a14df7443195b3cf28bf19d045d3 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 29 May 2019 12:00:37 +0100
Subject: [PATCH 0211/2840] Update pytest_cases from 1.6.2 to 1.6.3

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

diff --git a/requirements.txt b/requirements.txt
index 4a6b4b598..5089594cc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8==3.7.7
 # ------------------------------------------------------------------------------
 tox==3.12.1
 pytest==4.5.0
-pytest_cases==1.6.2
+pytest_cases==1.6.3
 pytest-cookies==0.3.0
 pytest-xdist==1.28.0
 pyyaml==5.1

From 3de1715b121dbe6665f793e330499a7cf10a150c Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Wed, 29 May 2019 14:54:18 +0100
Subject: [PATCH 0212/2840] Add troubleshooting section regarding Posgres auth
 issues - fixes #1678

---
 docs/developing-locally-docker.rst |  6 +++++
 docs/troubleshooting.rst           | 42 +++++++++++++++++++++++++++---
 2 files changed, 44 insertions(+), 4 deletions(-)

diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index da4e67aa7..562dc439f 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -6,6 +6,12 @@ Getting Up and Running Locally With Docker
 The steps below will get you up and running with a local development environment.
 All of these commands assume you are in the root of your generated project.
 
+.. note::
+
+    If you're new to Docker, please be aware that some resources are cached system-wide
+    and might reappear if you generate a project multiple times with the same name (e.g.
+    :ref:`this issue with Postgres <docker-posgres-auth-failed>`).
+
 
 Prerequisites
 -------------
diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst
index b6a93ffca..baabd494f 100644
--- a/docs/troubleshooting.rst
+++ b/docs/troubleshooting.rst
@@ -3,14 +3,48 @@ Troubleshooting
 
 This page contains some advice about errors and problems commonly encountered during the development of Cookiecutter Django applications.
 
+Server Error on sign-up/log-in
+------------------------------
+
+Make sure you have configured the mail backend (e.g. Mailgun) by adding the API key and sender domain
+
+.. include:: mailgun.rst
+
+.. _docker-posgres-auth-failed:
+
+Docker: Postgres authentication failed
+--------------------------------------
+
+Examples of logs::
+
+    postgres_1      | 2018-06-07 19:11:23.963 UTC [81] FATAL:  password authentication failed for user "pydanny"
+    postgres_1      | 2018-06-07 19:11:23.963 UTC [81] DETAIL:  Password does not match for user "pydanny".
+    postgres_1      | 	Connection matched pg_hba.conf line 95: "host all all all md5"
+
+If you recreate the project multiple times with the same name, Docker would preserve the volumes for the postgres container between projects. Here is what happens:
+
+#. You generate the project the first time. The .env postgres file is populated with the random password
+#. You run the docker-compose and the containers are created. The postgres container creates the database based on the .env file credentials
+#. You "regenerate" the project with the same name, so the postgres .env file is populated with a new random password
+#. You run docker-compose. Since the names of the containers are the same, docker will try to start them (not create them from scratch i.e. it won't execute the Dockerfile to recreate the database). When this happens, it tries to start the database based on the new credentials which do not match the ones that the database was created with, and you get the error message above.
+
+To fix this, you can either:
+
+- Clear your project-related Docker cache with ``docker-compose -f local.yml down --volumes --rmi all``.
+- Use the Docker volume sub-commands to find volumes (`ls`_) and remove them (`rm`_).
+- Use the `prune`_ command to clear system-wide (use with care!).
+
+.. _ls: https://docs.docker.com/engine/reference/commandline/volume_ls/
+.. _rm: https://docs.docker.com/engine/reference/commandline/volume_rm/
+.. _prune: https://docs.docker.com/v17.09/engine/reference/commandline/system_prune/
+
+Others
+------
+
 #. ``project_slug`` must be a valid Python module name or you will have issues on imports.
 
 #. ``jinja2.exceptions.TemplateSyntaxError: Encountered unknown tag 'now'.``: please upgrade your cookiecutter version to >= 1.4 (see `#528`_)
 
-#. Internal server error on user registration: make sure you have configured the mail backend (e.g. Mailgun) by adding the API key and sender domain
-
-   .. include:: mailgun.rst
-
 #. New apps not getting created in project root: This is the expected behavior, because cookiecutter-django does not change the way that django startapp works, you'll have to fix this manually (see `#1725`_)
 
 .. _#528: https://github.com/pydanny/cookiecutter-django/issues/528#issuecomment-212650373

From d04b128e0fb508b1832e271f09dbe45d1875e837 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Wed, 29 May 2019 14:55:38 +0100
Subject: [PATCH 0213/2840] Typo in doc reference

---
 docs/developing-locally-docker.rst | 2 +-
 docs/troubleshooting.rst           | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index 562dc439f..09e684986 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -10,7 +10,7 @@ All of these commands assume you are in the root of your generated project.
 
     If you're new to Docker, please be aware that some resources are cached system-wide
     and might reappear if you generate a project multiple times with the same name (e.g.
-    :ref:`this issue with Postgres <docker-posgres-auth-failed>`).
+    :ref:`this issue with Postgres <docker-postgres-auth-failed>`).
 
 
 Prerequisites
diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst
index baabd494f..8aa1b1f9b 100644
--- a/docs/troubleshooting.rst
+++ b/docs/troubleshooting.rst
@@ -10,7 +10,7 @@ Make sure you have configured the mail backend (e.g. Mailgun) by adding the API
 
 .. include:: mailgun.rst
 
-.. _docker-posgres-auth-failed:
+.. _docker-postgres-auth-failed:
 
 Docker: Postgres authentication failed
 --------------------------------------

From 87b6180142d90aca51748600aaf8415e0d331107 Mon Sep 17 00:00:00 2001
From: Keyvan Mosharraf <keyvan@keyvanm.com>
Date: Thu, 30 May 2019 03:28:57 -0700
Subject: [PATCH 0214/2840] Use DatabaseScheduler for celery beat

---
 .../compose/local/django/celery/beat/start                      | 2 +-
 .../compose/production/django/celery/beat/start                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
index 389e2baf1..f954960fe 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
@@ -5,4 +5,4 @@ set -o nounset
 
 
 rm -f './celerybeat.pid'
-celery -A config.celery_app beat -l INFO
+celery -A config.celery_app beat -l INFO --scheduler django_celery_beat.schedulers:DatabaseScheduler
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start b/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
index 0e793e38e..a549c6b2b 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
+++ b/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
@@ -5,4 +5,4 @@ set -o pipefail
 set -o nounset
 
 
-celery -A config.celery_app beat -l INFO
+celery -A config.celery_app beat -l INFO --scheduler django_celery_beat.schedulers:DatabaseScheduler

From 915848e279fcbb64f7419018c5c571594fd867eb Mon Sep 17 00:00:00 2001
From: Keyvan Mosharraf <keyvan@keyvanm.com>
Date: Thu, 30 May 2019 03:34:57 -0700
Subject: [PATCH 0215/2840] Add name to CONTRIBUTORS.rst

---
 CONTRIBUTORS.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 7a9dbf79c..6f6d4c32c 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -191,6 +191,7 @@ Listed in alphabetical order.
   Will Farley              `@goldhand`_                 @g01dhand
   William Archinal         `@archinal`_
   Yaroslav Halchenko
+  Keyvan Mosharraf         `@keyvanm`_
 ========================== ============================ ==============
 
 .. _@a7p: https://github.com/a7p
@@ -325,6 +326,7 @@ Listed in alphabetical order.
 .. _@vladdoster: https://github.com/vladdoster
 .. _@cmargieson: https://github.com/cmargieson
 .. _@tanoabeleyra: https://github.com/tanoabeleyra
+.. _@keyvanm: https://github.com/keyvanm
 
 Special Thanks
 ~~~~~~~~~~~~~~

From 631bddc8114861cdafc2af56ff109b176599ea57 Mon Sep 17 00:00:00 2001
From: Keyvan Mosharraf <keyvan@keyvanm.com>
Date: Thu, 30 May 2019 16:42:19 -0700
Subject: [PATCH 0216/2840] Set celery beat scheduler using settings + install
 django_celery_beat if use_celery

---
 .../compose/local/django/celery/beat/start                   | 2 +-
 .../compose/production/django/celery/beat/start              | 2 +-
 {{cookiecutter.project_slug}}/config/settings/base.py        | 5 +++++
 {{cookiecutter.project_slug}}/requirements/base.txt          | 1 +
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
index f954960fe..389e2baf1 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
@@ -5,4 +5,4 @@ set -o nounset
 
 
 rm -f './celerybeat.pid'
-celery -A config.celery_app beat -l INFO --scheduler django_celery_beat.schedulers:DatabaseScheduler
+celery -A config.celery_app beat -l INFO
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start b/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
index a549c6b2b..0e793e38e 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
+++ b/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
@@ -5,4 +5,4 @@ set -o pipefail
 set -o nounset
 
 
-celery -A config.celery_app beat -l INFO --scheduler django_celery_beat.schedulers:DatabaseScheduler
+celery -A config.celery_app beat -l INFO
diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 4a522fdda..5f489389b 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -75,6 +75,9 @@ THIRD_PARTY_APPS = [
     "allauth.account",
     "allauth.socialaccount",
     "rest_framework",
+{% if cookiecutter.use_celery == 'y' -%}
+    "django_celery_beat",
+{%- endif %}
 ]
 LOCAL_APPS = [
     "{{ cookiecutter.project_slug }}.users.apps.UsersConfig",
@@ -270,6 +273,8 @@ CELERY_TASK_TIME_LIMIT = 5 * 60
 # http://docs.celeryproject.org/en/latest/userguide/configuration.html#task-soft-time-limit
 # TODO: set to whatever value is adequate in your circumstances
 CELERY_TASK_SOFT_TIME_LIMIT = 60
+# http://docs.celeryproject.org/en/latest/userguide/configuration.html#beat-scheduler
+CELERY_BEAT_SCHEDULER = "django_celery_beat.schedulers:DatabaseScheduler"
 
 {%- endif %}
 # django-allauth
diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index ddd8f041c..2ec5fdf44 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -11,6 +11,7 @@ whitenoise==4.1.2  # https://github.com/evansd/whitenoise
 redis==3.2.1  # https://github.com/antirez/redis
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.3.0  # pyup: < 5.0  # https://github.com/celery/celery
+django-celery-beat==1.5.0  # https://github.com/celery/django-celery-beat
 {%- if cookiecutter.use_docker == 'y' %}
 flower==0.9.3  # https://github.com/mher/flower
 {%- endif %}

From aee9f3ecfa8df143d2a5036098d1e701b15f4213 Mon Sep 17 00:00:00 2001
From: Keyvan Mosharraf <keyvan@keyvanm.com>
Date: Thu, 30 May 2019 16:59:58 -0700
Subject: [PATCH 0217/2840] Install django_celery_beat in the proper way

---
 {{cookiecutter.project_slug}}/config/settings/base.py | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 5f489389b..94fd384f4 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -75,10 +75,12 @@ THIRD_PARTY_APPS = [
     "allauth.account",
     "allauth.socialaccount",
     "rest_framework",
-{% if cookiecutter.use_celery == 'y' -%}
-    "django_celery_beat",
-{%- endif %}
 ]
+# http://docs.celeryproject.org/en/latest/userguide/periodic-tasks.html#using-custom-scheduler-classes
+{% if cookiecutter.use_celery == 'y' -%}
+THIRD_PARTY_APPS += ["django_celery_beat"]
+{%- endif %}
+
 LOCAL_APPS = [
     "{{ cookiecutter.project_slug }}.users.apps.UsersConfig",
     # Your stuff: custom apps go here

From f8d2eb11a958823689f8f6aac4590ae1b4edaf4f Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Fri, 31 May 2019 10:02:42 +0100
Subject: [PATCH 0218/2840] Improve error reporting by pytest inside of Tox

---
 pytest.ini | 1 +
 tox.ini    | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/pytest.ini b/pytest.ini
index 01c7b1bfc..89aeb302c 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,4 +1,5 @@
 [pytest]
+addopts = -x --tb=short
 python_paths = .
 norecursedirs = .tox .git */migrations/* */static/* docs venv */{{cookiecutter.project_slug}}/*
 markers =
diff --git a/tox.ini b/tox.ini
index 8306ccf2f..7ee939158 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,15 +4,15 @@ envlist = py36,flake8,black,black-template
 
 [testenv]
 deps = -rrequirements.txt
-commands = pytest -n 3 -m "not flake8" -m "not black" {posargs:./tests}
+commands = pytest -m "not flake8" -m "not black" {posargs:./tests}
 
 [testenv:flake8]
 deps = -rrequirements.txt
-commands = pytest -n 3 -m flake8 {posargs:./tests}
+commands = pytest -m flake8 {posargs:./tests}
 
 [testenv:black]
 deps = -rrequirements.txt
-commands = pytest -n 3 -m black {posargs:./tests}
+commands = pytest -m black {posargs:./tests}
 
 [testenv:black-template]
 deps = black

From e9e79428d3789622b31522ef0810147c6aa645be Mon Sep 17 00:00:00 2001
From: Keyvan Mosharraf <keyvan@keyvanm.com>
Date: Fri, 31 May 2019 03:45:59 -0700
Subject: [PATCH 0219/2840] Better way to include django_celery_beat in
 INSTALLED_APPS

---
 {{cookiecutter.project_slug}}/config/settings/base.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 94fd384f4..2745058d3 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -75,11 +75,10 @@ THIRD_PARTY_APPS = [
     "allauth.account",
     "allauth.socialaccount",
     "rest_framework",
-]
-# http://docs.celeryproject.org/en/latest/userguide/periodic-tasks.html#using-custom-scheduler-classes
-{% if cookiecutter.use_celery == 'y' -%}
-THIRD_PARTY_APPS += ["django_celery_beat"]
+{%- if cookiecutter.use_celery == 'y' %}
+    "django_celery_beat",
 {%- endif %}
+]
 
 LOCAL_APPS = [
     "{{ cookiecutter.project_slug }}.users.apps.UsersConfig",

From 3e7b60c8937ce8940f3ea135daf37c80c64f170e Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 31 May 2019 12:00:33 +0100
Subject: [PATCH 0220/2840] Update django-compressor from 2.2 to 2.3

---
 {{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 ddd8f041c..88331996e 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -24,7 +24,7 @@ django-model-utils==3.1.2  # https://github.com/jazzband/django-model-utils
 django-allauth==0.39.1  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.7.2  # https://github.com/django-crispy-forms/django-crispy-forms
 {%- if cookiecutter.use_compressor == "y" %}
-django-compressor==2.2  # https://github.com/django-compressor/django-compressor
+django-compressor==2.3  # https://github.com/django-compressor/django-compressor
 {%- endif %}
 django-redis==4.10.0  # https://github.com/niwinz/django-redis
 

From 53994b4f1668b6560e2f592b20f32bbea7c86877 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sun, 2 Jun 2019 12:00:29 +0100
Subject: [PATCH 0221/2840] Update pytest from 4.5.0 to 4.6.0

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

diff --git a/requirements.txt b/requirements.txt
index 5089594cc..d6049ecbb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8==3.7.7
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.12.1
-pytest==4.5.0
+pytest==4.6.0
 pytest_cases==1.6.3
 pytest-cookies==0.3.0
 pytest-xdist==1.28.0

From cd7bf6af04de1251bdc1b2459424b57804b87dad Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sun, 2 Jun 2019 12:00:30 +0100
Subject: [PATCH 0222/2840] Update pytest from 4.5.0 to 4.6.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 2e2228c39..e08cfc97d 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -12,7 +12,7 @@ psycopg2-binary==2.8.2  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.701  # https://github.com/python/mypy
-pytest==4.5.0  # https://github.com/pytest-dev/pytest
+pytest==4.6.0  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From 8e007111da9efe72f804d556580888d154dcf9a4 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sun, 2 Jun 2019 12:00:33 +0100
Subject: [PATCH 0223/2840] Update sentry-sdk from 0.8.0 to 0.8.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 e8636fb8f..2d76c011e 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.2 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==0.6.2  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.8.0  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.8.1  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From d7699315774ed79e68ef51610561e65d80662216 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 3 Jun 2019 12:01:41 +0100
Subject: [PATCH 0224/2840] Update sentry-sdk from 0.8.1 to 0.9.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 2d76c011e..8cf1f1c47 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.2 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==0.6.2  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.8.1  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.9.0  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From 78ec608f14f6cdab845076ed3a7ac14cd7cffe22 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 3 Jun 2019 12:01:44 +0100
Subject: [PATCH 0225/2840] Update django from 2.2.1 to 2.2.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 88331996e..00845cc25 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -18,7 +18,7 @@ flower==0.9.3  # https://github.com/mher/flower
 
 # Django
 # ------------------------------------------------------------------------------
-django==2.2.1  # pyup: < 3.0  # https://www.djangoproject.com/
+django==2.2.2  # pyup: < 3.0  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==3.1.2  # https://github.com/jazzband/django-model-utils
 django-allauth==0.39.1  # https://github.com/pennersr/django-allauth

From 53f6e07dd5329a38119af303b7ffd8a1af8df1be Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 3 Jun 2019 12:01:48 +0100
Subject: [PATCH 0226/2840] Update sphinx from 2.0.1 to 2.1.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 e08cfc97d..c5cd6d9f3 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -2,7 +2,7 @@
 
 Werkzeug==0.14.1  # pyup: < 0.15 # https://github.com/pallets/werkzeug
 ipdb==0.12  # https://github.com/gotcha/ipdb
-Sphinx==2.0.1  # https://github.com/sphinx-doc/sphinx
+Sphinx==2.1.0  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.2 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}

From 32e683f637510d5e416acf0efc5c0476271a108f Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 3 Jun 2019 13:45:32 -0700
Subject: [PATCH 0227/2840] Update pytest from 4.6.0 to 4.6.2

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

diff --git a/requirements.txt b/requirements.txt
index d6049ecbb..aa634c97f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8==3.7.7
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.12.1
-pytest==4.6.0
+pytest==4.6.2
 pytest_cases==1.6.3
 pytest-cookies==0.3.0
 pytest-xdist==1.28.0

From 987e958c9b9d7067e890bb464e73cfc18d2cf433 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 4 Jun 2019 12:00:33 +0100
Subject: [PATCH 0228/2840] Update pytest from 4.6.0 to 4.6.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 c5cd6d9f3..b29a6ea49 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -12,7 +12,7 @@ psycopg2-binary==2.8.2  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.701  # https://github.com/python/mypy
-pytest==4.6.0  # https://github.com/pytest-dev/pytest
+pytest==4.6.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From 28ba260e0325a780be59d1e77c8f4bcf4ade752f Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 4 Jun 2019 12:00:40 +0100
Subject: [PATCH 0229/2840] Update pytest-django from 3.4.8 to 3.5.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 c5cd6d9f3..216e3f0d2 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -32,4 +32,4 @@ factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 django-debug-toolbar==1.11  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==2.1.7  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.6.0  # https://github.com/nedbat/django_coverage_plugin
-pytest-django==3.4.8  # https://github.com/pytest-dev/pytest-django
+pytest-django==3.5.0  # https://github.com/pytest-dev/pytest-django

From ef59ffad94298a13f19c99bbe8d7bd29e058fbcf Mon Sep 17 00:00:00 2001
From: "Xaver Y.R. Chen" <yrchen@ATCity.org>
Date: Wed, 5 Jun 2019 20:21:37 +0800
Subject: [PATCH 0230/2840] Update Travis config, using new xenial distribution
 to support the newer version of SQLite to satisfy the requirement of Django
 2.2

---
 CONTRIBUTORS.rst                          | 2 ++
 {{cookiecutter.project_slug}}/.travis.yml | 3 ++-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 6f6d4c32c..af81c4510 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -190,6 +190,7 @@ Listed in alphabetical order.
   Vlad Doster              `@vladdoster`_
   Will Farley              `@goldhand`_                 @g01dhand
   William Archinal         `@archinal`_
+  Xaver Y.R. Chen          `@yrchen`_                   @yrchen
   Yaroslav Halchenko
   Keyvan Mosharraf         `@keyvanm`_
 ========================== ============================ ==============
@@ -327,6 +328,7 @@ Listed in alphabetical order.
 .. _@cmargieson: https://github.com/cmargieson
 .. _@tanoabeleyra: https://github.com/tanoabeleyra
 .. _@keyvanm: https://github.com/keyvanm
+.. _@yrchen: https://github.com/yrchen
 
 Special Thanks
 ~~~~~~~~~~~~~~
diff --git a/{{cookiecutter.project_slug}}/.travis.yml b/{{cookiecutter.project_slug}}/.travis.yml
index 3072f75f3..257056031 100644
--- a/{{cookiecutter.project_slug}}/.travis.yml
+++ b/{{cookiecutter.project_slug}}/.travis.yml
@@ -1,8 +1,9 @@
+dist: xenial
 sudo: true
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq build-essential gettext python-dev zlib1g-dev libpq-dev xvfb
-  - sudo apt-get install -qq libtiff4-dev libjpeg8-dev libfreetype6-dev liblcms1-dev libwebp-dev
+  - sudo apt-get install -qq libjpeg8-dev libfreetype6-dev libwebp-dev
   - sudo apt-get install -qq graphviz-dev python-setuptools python3-dev python-virtualenv python-pip
   - sudo apt-get install -qq firefox automake libtool libreadline6 libreadline6-dev libreadline-dev
   - sudo apt-get install -qq libsqlite3-dev libxml2 libxml2-dev libssl-dev libbz2-dev wget curl llvm

From 2103cf2f9d5f60117ed5b47c7a166ee544015717 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Wed, 5 Jun 2019 19:00:43 +0100
Subject: [PATCH 0231/2840] Add a pre-generation hook to avoid non-lowercase
 slugs - fixes #2042

---
 hooks/pre_gen_project.py              |  4 ++++
 tests/test_cookiecutter_generation.py | 12 ++++++++++++
 2 files changed, 16 insertions(+)

diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py
index e7bc1e39a..91332f144 100644
--- a/hooks/pre_gen_project.py
+++ b/hooks/pre_gen_project.py
@@ -22,6 +22,10 @@ if hasattr(project_slug, "isidentifier"):
         project_slug.isidentifier()
     ), "'{}' project slug is not a valid Python identifier.".format(project_slug)
 
+assert (
+    project_slug == project_slug.lower()
+), "'{}' project slug should be all lowercase".format(project_slug)
+
 assert (
     "\\" not in "{{ cookiecutter.author_name }}"
 ), "Don't include backslashes in author name."
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 4292f989b..77f71df5b 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -2,6 +2,7 @@ import os
 import re
 
 import pytest
+from cookiecutter.exceptions import FailedHookException
 from pytest_cases import pytest_fixture_plus
 import sh
 import yaml
@@ -145,3 +146,14 @@ def test_travis_invokes_pytest(cookies, context):
             assert yaml.load(travis_yml)["script"] == ["pytest"]
         except yaml.YAMLError as e:
             pytest.fail(e)
+
+
+@pytest.mark.parametrize("slug", ["project slug", "Project_Slug"])
+def test_invalid_slug(cookies, context, slug):
+    """Invalid slug should failed pre-generation hook."""
+    context.update({"project_slug": slug})
+
+    result = cookies.bake(extra_context=context)
+
+    assert result.exit_code != 0
+    assert isinstance(result.exception, FailedHookException)

From 611373cac24cae480a0ad5ded780d7db078497aa Mon Sep 17 00:00:00 2001
From: "Xaver Y.R. Chen" <yrchen@ATCity.org>
Date: Thu, 6 Jun 2019 14:48:48 +0800
Subject: [PATCH 0232/2840] Update Travis config, remove the deprecated sudo
 keyword

---
 {{cookiecutter.project_slug}}/.travis.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/.travis.yml b/{{cookiecutter.project_slug}}/.travis.yml
index 257056031..83101d1db 100644
--- a/{{cookiecutter.project_slug}}/.travis.yml
+++ b/{{cookiecutter.project_slug}}/.travis.yml
@@ -1,5 +1,4 @@
 dist: xenial
-sudo: true
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq build-essential gettext python-dev zlib1g-dev libpq-dev xvfb

From 6f9e57618d0e454dcd1ee2fb9281eb268b341304 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 6 Jun 2019 17:23:37 +0100
Subject: [PATCH 0233/2840] Add Postgres service to Travis config

---
 {{cookiecutter.project_slug}}/.travis.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/.travis.yml b/{{cookiecutter.project_slug}}/.travis.yml
index 83101d1db..2d86ac31c 100644
--- a/{{cookiecutter.project_slug}}/.travis.yml
+++ b/{{cookiecutter.project_slug}}/.travis.yml
@@ -1,4 +1,6 @@
 dist: xenial
+services:
+  - postgresql
 before_install:
   - sudo apt-get update -qq
   - sudo apt-get install -qq build-essential gettext python-dev zlib1g-dev libpq-dev xvfb

From 59fcf9359b34f327c483e6fcb3077491abce74a5 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 7 Jun 2019 00:19:38 -0700
Subject: [PATCH 0234/2840] Update pyyaml from 5.1 to 5.1.1

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

diff --git a/requirements.txt b/requirements.txt
index aa634c97f..e14a4565a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,4 +14,4 @@ pytest==4.6.2
 pytest_cases==1.6.3
 pytest-cookies==0.3.0
 pytest-xdist==1.28.0
-pyyaml==5.1
+pyyaml==5.1.1

From d55a3f09aa4a64a065d2a437728425669a91fcaf Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 11 Jun 2019 12:00:31 +0100
Subject: [PATCH 0235/2840] Update sphinx from 2.1.0 to 2.1.1

---
 {{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 0e686786e..0df75780e 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -2,7 +2,7 @@
 
 Werkzeug==0.14.1  # pyup: < 0.15 # https://github.com/pallets/werkzeug
 ipdb==0.12  # https://github.com/gotcha/ipdb
-Sphinx==2.1.0  # https://github.com/sphinx-doc/sphinx
+Sphinx==2.1.1  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.2 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}

From 06a9cadf0cf238115bb1097d7ce6dd7e2a01d34f Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 11 Jun 2019 12:00:34 +0100
Subject: [PATCH 0236/2840] Update django-extensions from 2.1.7 to 2.1.9

---
 {{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 0e686786e..56e482239 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,6 +30,6 @@ pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==1.11  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==2.1.7  # https://github.com/django-extensions/django-extensions
+django-extensions==2.1.9  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.6.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.5.0  # https://github.com/pytest-dev/pytest-django

From 44688b2d43c2af968286d51751d3bb6c28496a39 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 12 Jun 2019 12:00:29 +0100
Subject: [PATCH 0237/2840] Update pytest from 4.6.2 to 4.6.3

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

diff --git a/requirements.txt b/requirements.txt
index e14a4565a..5555c34c3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8==3.7.7
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.12.1
-pytest==4.6.2
+pytest==4.6.3
 pytest_cases==1.6.3
 pytest-cookies==0.3.0
 pytest-xdist==1.28.0

From 0b5f8b4891c082d4e29ae7724571ae95692e2295 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 12 Jun 2019 12:00:30 +0100
Subject: [PATCH 0238/2840] Update pytest from 4.6.2 to 4.6.3

---
 {{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 7a2ca8859..2e4f9ab1c 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -12,7 +12,7 @@ psycopg2-binary==2.8.2  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.701  # https://github.com/python/mypy
-pytest==4.6.2  # https://github.com/pytest-dev/pytest
+pytest==4.6.3  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From 9e10eb7ae50abd7545064fec6a77431f2f05ca5a Mon Sep 17 00:00:00 2001
From: Jelmert <jelmerdraaijer@gmail.com>
Date: Thu, 6 Jun 2019 11:45:43 +0200
Subject: [PATCH 0239/2840] Added DATABASE_URL & CELERY_BROKER_URL (when
 selected) to the django console startup script of pycharm. Fixes #1766.

---
 {{cookiecutter.project_slug}}/.idea/workspace.xml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)
 create mode 100644 {{cookiecutter.project_slug}}/.idea/workspace.xml

diff --git a/{{cookiecutter.project_slug}}/.idea/workspace.xml b/{{cookiecutter.project_slug}}/.idea/workspace.xml
new file mode 100644
index 000000000..a5d73c185
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/.idea/workspace.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+    {%- if cookiecutter.use_celery == 'y' %}
+        <component name="DjangoConsoleOptions"
+                   custom-start-script="import sys; print('Python %s on %s' % (sys.version, sys.platform))&#10;import django; print('Django %s' % django.get_version())&#10;import os&#10;os.environ.setdefault(&quot;DATABASE_URL&quot;,&quot;postgres://{}:{}@{}:{}/{}&quot;.format(os.environ['POSTGRES_USER'], os.environ['POSTGRES_PASSWORD'], os.environ['POSTGRES_HOST'], os.environ['POSTGRES_PORT'], os.environ['POSTGRES_DB']))&#10;os.environ.setdefault(&quot;CELERY_BROKER_URL&quot;, os.environ['REDIS_URL'])&#10;sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS])&#10;if 'setup' in dir(django): django.setup()&#10;import django_manage_shell; django_manage_shell.run(PROJECT_ROOT)"
+                   module-name="{{ cookiecutter.project_slug }}" is-module-sdk="true">
+        </component>
+    {%- else %}
+        <component name="DjangoConsoleOptions"
+                   custom-start-script="import sys; print('Python %s on %s' % (sys.version, sys.platform))&#10;import django; print('Django %s' % django.get_version())&#10;import os&#10;os.environ.setdefault(&quot;DATABASE_URL&quot;,&quot;postgres://{}:{}@{}:{}/{}&quot;.format(os.environ['POSTGRES_USER'], os.environ['POSTGRES_PASSWORD'], os.environ['POSTGRES_HOST'], os.environ['POSTGRES_PORT'], os.environ['POSTGRES_DB']))&#10;sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS])&#10;if 'setup' in dir(django): django.setup()&#10;import django_manage_shell; django_manage_shell.run(PROJECT_ROOT)"
+                   module-name="{{ cookiecutter.project_slug }}" is-module-sdk="true">
+        </component>
+    {%- endif %}
+</project>

From 94d0b7b776ba08bf79e2b089373f70e15dc9933a Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 14 Jun 2019 12:00:30 +0100
Subject: [PATCH 0240/2840] Update pytest_cases from 1.6.3 to 1.7.0

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

diff --git a/requirements.txt b/requirements.txt
index 5555c34c3..fcdca8380 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8==3.7.7
 # ------------------------------------------------------------------------------
 tox==3.12.1
 pytest==4.6.3
-pytest_cases==1.6.3
+pytest_cases==1.7.0
 pytest-cookies==0.3.0
 pytest-xdist==1.28.0
 pyyaml==5.1.1

From de91817704ade2057cd2b9550ca733eefc183cde Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 14 Jun 2019 12:00:33 +0100
Subject: [PATCH 0241/2840] Update psycopg2-binary from 2.8.2 to 2.8.3

---
 {{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 2e4f9ab1c..d28774d4d 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -6,7 +6,7 @@ Sphinx==2.1.1  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.2 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}
-psycopg2-binary==2.8.2  # https://github.com/psycopg/psycopg2
+psycopg2-binary==2.8.3  # https://github.com/psycopg/psycopg2
 {%- endif %}
 
 # Testing

From 36bccb0e28e0a6e2b0a48b8a705f0c92dd011a31 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 14 Jun 2019 12:49:02 +0100
Subject: [PATCH 0242/2840] Update psycopg2 with --no-binary to 2.8.3

---
 {{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 d28774d4d..46b602e62 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -4,7 +4,7 @@ Werkzeug==0.14.1  # pyup: < 0.15 # https://github.com/pallets/werkzeug
 ipdb==0.12  # https://github.com/gotcha/ipdb
 Sphinx==2.1.1  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
-psycopg2==2.8.2 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
+psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}
 psycopg2-binary==2.8.3  # https://github.com/psycopg/psycopg2
 {%- endif %}

From 12b527ff5d39db2c5db8c5cb8798ad601395f487 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 14 Jun 2019 12:49:39 +0100
Subject: [PATCH 0243/2840] Update psycopg2 with --no-binary to 2.8.3 in prod
 requirements

---
 {{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 8cf1f1c47..39998f7a9 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -3,7 +3,7 @@
 -r ./base.txt
 
 gunicorn==19.9.0  # https://github.com/benoitc/gunicorn
-psycopg2==2.8.2 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
+psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
 Collectfast==0.6.2  # https://github.com/antonagestam/collectfast
 {%- endif %}

From 62df724c8c1586af9ac7bebf459821af67f801b3 Mon Sep 17 00:00:00 2001
From: Min ho Kim <minho42@gmail.com>
Date: Sat, 15 Jun 2019 06:37:58 +1000
Subject: [PATCH 0244/2840] Fix typo

---
 docs/deployment-on-heroku.rst                    | 16 ++++++++--------
 docs/deployment-on-pythonanywhere.rst            |  4 ++--
 docs/testing.rst                                 |  8 ++++----
 .../docs/pycharm/configuration.rst               |  2 +-
 4 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/docs/deployment-on-heroku.rst b/docs/deployment-on-heroku.rst
index 4a16123a0..53e980379 100644
--- a/docs/deployment-on-heroku.rst
+++ b/docs/deployment-on-heroku.rst
@@ -23,25 +23,25 @@ Run these commands to deploy the project to Heroku:
     heroku addons:create mailgun:starter
 
     heroku config:set PYTHONHASHSEED=random
-    
+
     heroku config:set WEB_CONCURRENCY=4
-    
+
     heroku config:set DJANGO_DEBUG=False
     heroku config:set DJANGO_SETTINGS_MODULE=config.settings.production
     heroku config:set DJANGO_SECRET_KEY="$(openssl rand -base64 64)"
-    
-    # Generating a 32 character-long random string without any of the visually similiar characters "IOl01":
+
+    # Generating a 32 character-long random string without any of the visually similar characters "IOl01":
     heroku config:set DJANGO_ADMIN_URL="$(openssl rand -base64 4096 | tr -dc 'A-HJ-NP-Za-km-z2-9' | head -c 32)/"
-    
+
     # Set this to your Heroku app url, e.g. 'bionic-beaver-28392.herokuapp.com'
     heroku config:set DJANGO_ALLOWED_HOSTS=
-    
+
     # Assign with AWS_ACCESS_KEY_ID
     heroku config:set DJANGO_AWS_ACCESS_KEY_ID=
-    
+
     # Assign with AWS_SECRET_ACCESS_KEY
     heroku config:set DJANGO_AWS_SECRET_ACCESS_KEY=
-    
+
     # Assign with AWS_STORAGE_BUCKET_NAME
     heroku config:set DJANGO_AWS_STORAGE_BUCKET_NAME=
 
diff --git a/docs/deployment-on-pythonanywhere.rst b/docs/deployment-on-pythonanywhere.rst
index ea25b3ae5..83b23b27a 100644
--- a/docs/deployment-on-pythonanywhere.rst
+++ b/docs/deployment-on-pythonanywhere.rst
@@ -29,7 +29,7 @@ Once you've been through this one-off config, future deployments are much simple
 Getting your code and dependencies installed on PythonAnywhere
 --------------------------------------------------------------
 
-Make sure your project is fully commited and pushed up to Bitbucket or Github or wherever it may be.  Then, log into your PythonAnywhere account, open up a **Bash** console, clone your repo, and create a virtualenv:
+Make sure your project is fully committed and pushed up to Bitbucket or Github or wherever it may be.  Then, log into your PythonAnywhere account, open up a **Bash** console, clone your repo, and create a virtualenv:
 
 .. code-block:: bash
 
@@ -153,7 +153,7 @@ Back on the Web tab, hit **Reload**, and your app should be live!
 
 
 **NOTE:** *you may see security warnings until you set up your SSL certificates. If you
-want to supress them temporarily, set DJANGO_SECURE_SSL_REDIRECT to blank.  Follow
+want to suppress them temporarily, set DJANGO_SECURE_SSL_REDIRECT to blank.  Follow
 the instructions here to get SSL set up: https://help.pythonanywhere.com/pages/SSLOwnDomains/*
 
 
diff --git a/docs/testing.rst b/docs/testing.rst
index 6ca213883..63cb9e186 100644
--- a/docs/testing.rst
+++ b/docs/testing.rst
@@ -19,9 +19,9 @@ You will get a readout of the `users` app that has already been set up with test
 
 If you set up your project to `develop locally with docker`_, run the following command: ::
 
-   $ docker-compose -f local.yml run django pytest 
+   $ docker-compose -f local.yml run django pytest
 
-Targetting particular apps for testing in ``docker`` follows a similar pattern as previously shown above.
+Targeting particular apps for testing in ``docker`` follows a similar pattern as previously shown above.
 
 Coverage
 --------
@@ -36,9 +36,9 @@ Once the tests are complete, in order to see the code coverage, run the followin
 
 .. note::
 
-   At the root of the project folder, you will find the `pytest.ini` file. You can use this to customize_ the ``pytest`` to your liking. 
+   At the root of the project folder, you will find the `pytest.ini` file. You can use this to customize_ the ``pytest`` to your liking.
 
-   There is also the `.coveragerc`. This is the configuration file for the ``coverage`` tool. You can find out more about `configuring`_ ``coverage``. 
+   There is also the `.coveragerc`. This is the configuration file for the ``coverage`` tool. You can find out more about `configuring`_ ``coverage``.
 
 .. seealso::
 
diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/configuration.rst b/{{cookiecutter.project_slug}}/docs/pycharm/configuration.rst
index af3b826a7..c1d4f4b98 100644
--- a/{{cookiecutter.project_slug}}/docs/pycharm/configuration.rst
+++ b/{{cookiecutter.project_slug}}/docs/pycharm/configuration.rst
@@ -14,7 +14,7 @@ This repository comes with already prepared "Run/Debug Configurations" for docke
 
 .. image:: images/2.png
 
-But as you can see, at the beggining there is something wrong with them. They have red X on django icon, and they cannot be used, without configuring remote python interpteter. To do that, you have to go to *Settings > Build, Execution, Deployment* first.
+But as you can see, at the beginning there is something wrong with them. They have red X on django icon, and they cannot be used, without configuring remote python interpteter. To do that, you have to go to *Settings > Build, Execution, Deployment* first.
 
 
 Next, you have to add new remote python interpreter, based on already tested deployment settings. Go to *Settings > Project > Project Interpreter*. Click on the cog icon, and click *Add Remote*.

From 53a6349e9223f1bc95737c9c95caf2df94bf0828 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 14 Jun 2019 14:16:20 -0700
Subject: [PATCH 0245/2840] Update pytest-xdist from 1.28.0 to 1.29.0

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

diff --git a/requirements.txt b/requirements.txt
index 5555c34c3..320620004 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,5 +13,5 @@ tox==3.12.1
 pytest==4.6.3
 pytest_cases==1.6.3
 pytest-cookies==0.3.0
-pytest-xdist==1.28.0
+pytest-xdist==1.29.0
 pyyaml==5.1.1

From 69fa49036461c4717bcb88dd7c226a91619e4d12 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 14 Jun 2019 23:18:20 +0100
Subject: [PATCH 0246/2840] Add minho42 to contributors

---
 CONTRIBUTORS.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index af81c4510..e34def454 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -152,6 +152,7 @@ Listed in alphabetical order.
   Meghan Heintz            `@dot2dotseurat`_
   Mesut Yılmaz             `@myilmaz`_
   Michael Gecht            `@mimischi`_                  @_mischi
+  Min ho Kim               `@minho42`_
   mozillazg                `@mozillazg`_
   Oleg Russkin             `@rolep`_
   Pablo                    `@oubiga`_
@@ -270,6 +271,7 @@ Listed in alphabetical order.
 .. _@mostaszewski: https://github.com/mostaszewski
 .. _@mfwarren: https://github.com/mfwarren
 .. _@mimischi: https://github.com/mimischi
+.. _@minho42: https://github.com/minho42
 .. _@mjsisley: https://github.com/mjsisley
 .. _@myilmaz: https://github.com/myilmaz
 .. _@mozillazg: https://github.com/mozillazg

From f3b85708c365ab897a738308d31bc1c9af15ced0 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 15 Jun 2019 11:31:13 +0100
Subject: [PATCH 0247/2840] Sort contributors list

---
 CONTRIBUTORS.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index e34def454..275b707fd 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -130,6 +130,7 @@ Listed in alphabetical order.
   Keith Webber             `@townie`_
   Kevin A. Stone
   Kevin Ndung'u            `@kevgathuku`_
+  Keyvan Mosharraf         `@keyvanm`_
   Krzysztof Szumny         `@noisy`_
   Krzysztof Żuraw          `@krzysztofzuraw`_
   Leonardo Jimenez         `@xpostudio4`_
@@ -193,7 +194,6 @@ Listed in alphabetical order.
   William Archinal         `@archinal`_
   Xaver Y.R. Chen          `@yrchen`_                   @yrchen
   Yaroslav Halchenko
-  Keyvan Mosharraf         `@keyvanm`_
 ========================== ============================ ==============
 
 .. _@a7p: https://github.com/a7p

From a321a5833da8a80bb0d3434ef8fd3dfaafaca280 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sat, 15 Jun 2019 11:48:26 +0100
Subject: [PATCH 0248/2840] Cleanup trailing spaces

---
 .../.idea/{{cookiecutter.project_slug}}.iml    | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/.idea/{{cookiecutter.project_slug}}.iml b/{{cookiecutter.project_slug}}/.idea/{{cookiecutter.project_slug}}.iml
index 8ff6e3883..079c7b4e3 100644
--- a/{{cookiecutter.project_slug}}/.idea/{{cookiecutter.project_slug}}.iml
+++ b/{{cookiecutter.project_slug}}/.idea/{{cookiecutter.project_slug}}.iml
@@ -5,10 +5,10 @@
       <configuration>
         <option name="rootFolder" value="$MODULE_DIR$" />
         <option name="settingsModule" value="config/settings/local.py" />
-        <option name="manageScript" value="$MODULE_DIR$/manage.py" />  
+        <option name="manageScript" value="$MODULE_DIR$/manage.py" />
         <option name="environment" value="&lt;map/&gt;" />
-        <option name="doNotUseTestRunner" value="false" /> 
-        <option name="trackFilePattern" value="migrations" /> 
+        <option name="doNotUseTestRunner" value="false" />
+        <option name="trackFilePattern" value="migrations" />
       </configuration>
     </facet>
   </component>
@@ -25,12 +25,12 @@
   <component name="PackageRequirementsSettings">
     <option name="requirementsPath" value="$MODULE_DIR$/requirements/local.txt" />
   </component>
-   <component name="PyDocumentationSettings"> 
-    <option name="renderExternalDocumentation" value="true" /> 
-  </component> 
-  <component name="ReSTService"> 
-    <option name="workdir" value="$MODULE_DIR$/docs" /> 
-    <option name="DOC_DIR" value="$MODULE_DIR$/docs" /> 
+   <component name="PyDocumentationSettings">
+    <option name="renderExternalDocumentation" value="true" />
+  </component>
+  <component name="ReSTService">
+    <option name="workdir" value="$MODULE_DIR$/docs" />
+    <option name="DOC_DIR" value="$MODULE_DIR$/docs" />
   </component>
   <component name="TemplatesService">
     <option name="TEMPLATE_CONFIGURATION" value="Django" />

From d2f3891fe1d965dc5f0bfc6f208ddb2bd444d4dc Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sat, 15 Jun 2019 11:48:50 +0100
Subject: [PATCH 0249/2840] Rename py.test to pytest in PyCharm config

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

diff --git a/{{cookiecutter.project_slug}}/.idea/{{cookiecutter.project_slug}}.iml b/{{cookiecutter.project_slug}}/.idea/{{cookiecutter.project_slug}}.iml
index 079c7b4e3..d408765a5 100644
--- a/{{cookiecutter.project_slug}}/.idea/{{cookiecutter.project_slug}}.iml
+++ b/{{cookiecutter.project_slug}}/.idea/{{cookiecutter.project_slug}}.iml
@@ -41,7 +41,7 @@
     </option>
   </component>
   <component name="TestRunnerService">
-    <option name="projectConfiguration" value="py.test" />
-    <option name="PROJECT_TEST_RUNNER" value="py.test" />
+    <option name="projectConfiguration" value="pytest" />
+    <option name="PROJECT_TEST_RUNNER" value="pytest" />
   </component>
 </module>

From 7166b92bf0cdf4d0d391f69a07b9aaa322fc1e4d Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 17 Jun 2019 11:03:35 -0400
Subject: [PATCH 0250/2840] Update pytest_cases from 1.7.0 to 1.9.0

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

diff --git a/requirements.txt b/requirements.txt
index f5c234c4a..0db0861ca 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8==3.7.7
 # ------------------------------------------------------------------------------
 tox==3.12.1
 pytest==4.6.3
-pytest_cases==1.7.0
+pytest_cases==1.9.0
 pytest-cookies==0.3.0
 pytest-xdist==1.29.0
 pyyaml==5.1.1

From dd32fb2c1390cd4108e43d06feaa2c6dbd6c7828 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 18 Jun 2019 20:50:17 +0100
Subject: [PATCH 0251/2840] Tweak formatting in docs

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

diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index 3434f68b6..8694dde7a 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -120,12 +120,12 @@ In production, we have Mailgun_ configured to have your back!
 
 Celery
 ------
+
 If the project is configured to use Celery as a task scheduler then by default tasks are set to run on the main thread
-when developing locally. If you have the appropriate setup on your local machine then set
+when developing locally. If you have the appropriate setup on your local machine then set the following
+in ``config/settings/local.py``::
 
-CELERY_TASK_ALWAYS_EAGER = False
-
-in /config/settings/local.py
+    CELERY_TASK_ALWAYS_EAGER = False
 
 
 Sass Compilation & Live Reloading

From aaf5d8d8f5381b82454c5420051d14f9b6c34a0f Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 18 Jun 2019 20:31:47 +0100
Subject: [PATCH 0252/2840] Run tests on bare metal

Install with Celery and compressor as it requires compilation

closes #1677
---
 .travis.yml        |  7 +++++++
 tests/test_bare.sh | 26 ++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100755 tests/test_bare.sh

diff --git a/.travis.yml b/.travis.yml
index 1be0b743b..c2bcdf42c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -25,6 +25,13 @@ matrix:
       script: sh tests/test_docker.sh
     - name: Docker with Celery
       script: sh tests/test_docker.sh use_celery=y
+    - name: Bare metal
+      script: sh tests/test_bare.sh use_celery=y use_compressor=y
+      services:
+        - postgresql
+        - redis-server
+      env:
+        - CELERY_BROKER_URL=redis://localhost:6379/0
 
 install:
   - pip install tox
diff --git a/tests/test_bare.sh b/tests/test_bare.sh
new file mode 100755
index 000000000..7021a7e47
--- /dev/null
+++ b/tests/test_bare.sh
@@ -0,0 +1,26 @@
+#!/bin/sh
+# this is a very simple script that tests the docker configuration for cookiecutter-django
+# it is meant to be run from the root directory of the repository, eg:
+# sh tests/test_docker.sh
+
+set -o errexit
+
+# install test requirements
+pip install -r requirements.txt
+
+# create a cache directory
+mkdir -p .cache/bare
+cd .cache/bare
+
+# create the project using the default settings in cookiecutter.json
+cookiecutter ../../ --no-input --overwrite-if-exists use_docker=n $@
+cd my_awesome_project
+
+# Install OS deps
+sudo utility/install_os_dependencies.sh install
+
+# Install Python deps
+pip install -r requirements/local.txt
+
+# run the project's tests
+pytest

From 9b48f922edccadb54b1a08a95a748b3c48805470 Mon Sep 17 00:00:00 2001
From: Tim Claessens <tim.claessens@qnh.nl>
Date: Wed, 19 Jun 2019 09:46:10 +0200
Subject: [PATCH 0253/2840] Remove all end-of-line carriage returns and not
 just the first occurrence

---
 .../compose/local/django/Dockerfile                    | 10 +++++-----
 .../compose/production/django/Dockerfile               | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index e2e9e5f3c..679378223 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -20,23 +20,23 @@ COPY ./requirements /requirements
 RUN pip install -r /requirements/local.txt
 
 COPY ./compose/production/django/entrypoint /entrypoint
-RUN sed -i 's/\r//' /entrypoint
+RUN sed -i 's/\r$//g' /entrypoint
 RUN chmod +x /entrypoint
 
 COPY ./compose/local/django/start /start
-RUN sed -i 's/\r//' /start
+RUN sed -i 's/\r$//g' /start
 RUN chmod +x /start
 {% if cookiecutter.use_celery == "y" %}
 COPY ./compose/local/django/celery/worker/start /start-celeryworker
-RUN sed -i 's/\r//' /start-celeryworker
+RUN sed -i 's/\r$//g' /start-celeryworker
 RUN chmod +x /start-celeryworker
 
 COPY ./compose/local/django/celery/beat/start /start-celerybeat
-RUN sed -i 's/\r//' /start-celerybeat
+RUN sed -i 's/\r$//g' /start-celerybeat
 RUN chmod +x /start-celerybeat
 
 COPY ./compose/local/django/celery/flower/start /start-flower
-RUN sed -i 's/\r//' /start-flower
+RUN sed -i 's/\r$//g' /start-flower
 RUN chmod +x /start-flower
 {% endif %}
 WORKDIR /app
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index 80b5bc2cf..37f66ec78 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -31,28 +31,28 @@ RUN pip install --no-cache-dir -r /requirements/production.txt \
     && rm -rf /requirements
 
 COPY ./compose/production/django/entrypoint /entrypoint
-RUN sed -i 's/\r//' /entrypoint
+RUN sed -i 's/\r$//g' /entrypoint
 RUN chmod +x /entrypoint
 RUN chown django /entrypoint
 
 COPY ./compose/production/django/start /start
-RUN sed -i 's/\r//' /start
+RUN sed -i 's/\r$//g' /start
 RUN chmod +x /start
 RUN chown django /start
 
 {%- if cookiecutter.use_celery == "y" %}
 COPY ./compose/production/django/celery/worker/start /start-celeryworker
-RUN sed -i 's/\r//' /start-celeryworker
+RUN sed -i 's/\r$//g' /start-celeryworker
 RUN chmod +x /start-celeryworker
 RUN chown django /start-celeryworker
 
 COPY ./compose/production/django/celery/beat/start /start-celerybeat
-RUN sed -i 's/\r//' /start-celerybeat
+RUN sed -i 's/\r$//g' /start-celerybeat
 RUN chmod +x /start-celerybeat
 RUN chown django /start-celerybeat
 
 COPY ./compose/production/django/celery/flower/start /start-flower
-RUN sed -i 's/\r//' /start-flower
+RUN sed -i 's/\r$//g' /start-flower
 RUN chmod +x /start-flower
 {%- endif %}
 

From 13868c42c865d8c3e7a8d8499a47ed47fa795a93 Mon Sep 17 00:00:00 2001
From: Tim Claessens <tim.claessens@qnh.nl>
Date: Tue, 18 Jun 2019 11:57:55 +0200
Subject: [PATCH 0254/2840] Add name to contributors

---
 CONTRIBUTORS.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 275b707fd..2c812f4f1 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -180,6 +180,7 @@ Listed in alphabetical order.
   Tano Abeleyra            `@tanoabeleyra`_
   Taylor Baldwin
   Théo Segonds             `@show0k`_
+  Tim Claessens            `@timclaessens`
   Tim Freund               `@timfreund`_
   Tom Atkins               `@knitatoms`_
   Tom Offermann
@@ -292,6 +293,7 @@ Listed in alphabetical order.
 .. _@stepmr: https://github.com/stepmr
 .. _@suledev: https://github.com/suledev
 .. _@takkaria: https://github.com/takkaria
+.. _@timclaessens: https://github.com/timclaessens
 .. _@timfreund: https://github.com/timfreund
 .. _@Travistock: https://github.com/Tavistock
 .. _@trungdong: https://github.com/trungdong

From b1135ccb255c24fdd6df59721a8c4a07c41eb66b Mon Sep 17 00:00:00 2001
From: Tim Claessens <tim.claessens@qnh.nl>
Date: Wed, 19 Jun 2019 14:23:51 +0200
Subject: [PATCH 0255/2840] Sorting the names (firstname, lastname)

---
 CONTRIBUTORS.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 2c812f4f1..9d09d308c 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -65,8 +65,8 @@ Listed in alphabetical order.
   Ashley Camba
   Barclay Gauld            `@yunti`_
   Bartek                   `@btknu`_
-  Ben Warren               `@bwarren2`_
   Ben Lopatin
+  Ben Warren               `@bwarren2`_
   Benjamin Abel
   Bert de Miranda          `@bertdemiranda`_
   Bo Lopker                `@blopker`_
@@ -98,8 +98,8 @@ Listed in alphabetical order.
   Demetris Stavrou         `@demestav`_
   Denis Bobrov             `@delneg`_
   Denis Orehovsky          `@apirobot`_
-  Dónal Adams              `@epileptic-fish`_
   Diane Chen               `@purplediane`_               @purplediane88
+  Dónal Adams              `@epileptic-fish`_
   Dong Huynh               `@trungdong`_
   Emanuel Calso            `@bloodpet`_                  @bloodpet
   Eraldo Energy            `@eraldo`_
@@ -133,8 +133,8 @@ Listed in alphabetical order.
   Keyvan Mosharraf         `@keyvanm`_
   Krzysztof Szumny         `@noisy`_
   Krzysztof Żuraw          `@krzysztofzuraw`_
-  Leonardo Jimenez         `@xpostudio4`_
   Leo Zhou                 `@glasslion`_
+  Leonardo Jimenez         `@xpostudio4`_
   Lin Xianyi               `@iynaix`_
   Luis Nell                `@originell`_
   Lukas Klein

From 07f9256a8b4e67211c32e81efb78aecf4c262fa2 Mon Sep 17 00:00:00 2001
From: Tim Claessens <tim.claessens@qnh.nl>
Date: Wed, 19 Jun 2019 14:24:31 +0200
Subject: [PATCH 0256/2840] Sorting the links

---
 CONTRIBUTORS.rst | 72 ++++++++++++++++++++++++------------------------
 1 file changed, 36 insertions(+), 36 deletions(-)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 9d09d308c..a580400c3 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -201,22 +201,30 @@ Listed in alphabetical order.
 .. _@ad-m: https://github.com/ad-m
 .. _@adammsteele: https://github.com/adammsteele
 .. _@aeikenberry: https://github.com/aeikenberry
+.. _@afrowave: https://github.com/afrowave
+.. _@ahhda: https://github.com/ahhda
 .. _@alb3rto: https://github.com/alb3rto
 .. _@ameistad: https://github.com/ameistad
 .. _@amjith: https://github.com/amjith
 .. _@andor-pierdelacabeza: https://github.com/andor-pierdelacabeza
+.. _@andresgz: https://github.com/andresgz
 .. _@antoniablair: https://github.com/antoniablair
 .. _@apirobot: https://github.com/apirobot
 .. _@archinal: https://github.com/archinal
 .. _@areski: https://github.com/areski
 .. _@arruda: https://github.com/arruda
+.. _@bertdemiranda: https://github.com/bertdemiranda
 .. _@bittner: https://github.com/bittner
 .. _@bloodpet: https://github.com/bloodpet
 .. _@blopker: https://github.com/blopker
 .. _@bogdal: https://github.com/bogdal
+.. _@brentpayne: https://github.com/brentpayne
+.. _@btknu: https://github.com/btknu
 .. _@burhan: https://github.com/burhan
+.. _@bwarren2: https://github.com/bwarren2
 .. _@c-rhodes: https://github.com/c-rhodes
 .. _@caffodian: https://github.com/caffodian
+.. _@canonnervio: https://github.com/canonnervio
 .. _@carlmjohnson: https://github.com/carlmjohnson
 .. _@catherinedevlin: https://github.com/catherinedevlin
 .. _@ccurvey: https://github.com/ccurvey
@@ -226,113 +234,105 @@ Listed in alphabetical order.
 .. _@ChrisPappalardo: https://github.com/ChrisPappalardo
 .. _@chuckus: https://github.com/chuckus
 .. _@cmackenzie1: https://github.com/cmackenzie1
+.. _@cmargieson: https://github.com/cmargieson
 .. _@Collederas: https://github.com/Collederas
 .. _@curtisstpierre: https://github.com/curtisstpierre
+.. _@dadokkio: https://github.com/dadokkio
 .. _@davitovmasyan: https://github.com/davitovmasyan
 .. _@ddiazpinto: https://github.com/ddiazpinto
+.. _@delneg: https://github.com/delneg
 .. _@demestav: https://github.com/demestav
 .. _@dezoito: https://github.com/dezoito
 .. _@dhepper: https://github.com/dhepper
 .. _@dot2dotseurat: https://github.com/dot2dotseurat
 .. _@dsclementsen: https://github.com/dsclementsen
 .. _@durkode: https://github.com/durkode
+.. _@Egregors: https://github.com/Egregors
 .. _@epileptic-fish: https://gihub.com/epileptic-fish
 .. _@eraldo: https://github.com/eraldo
 .. _@erfaan: https://github.com/erfaan
+.. _@ericgroom: https://github.com/ericgroom
 .. _@eriol: https://github.com/eriol
 .. _@eyadsibai: https://github.com/eyadsibai
 .. _@flyudvik: https://github.com/flyudvik
 .. _@foarsitter: https://github.com/foarsitter
 .. _@garry-cairns: https://github.com/garry-cairns
 .. _@garrypolley: https://github.com/garrypolley
-.. _@goldhand: https://github.com/goldhand
 .. _@glasslion: https://github.com/glasslion
+.. _@goldhand: https://github.com/goldhand
 .. _@hackebrot: https://github.com/hackebrot
 .. _@hairychris: https://github.com/hairychris
+.. _@hanaquadara: https://github.com/hanaquadara
 .. _@hendrikschneider: https://github.com/hendrikschneider
 .. _@hjwp: https://github.com/hjwp
 .. _@IanLee1521: https://github.com/IanLee1521
 .. _@ikkebr: https://github.com/ikkebr
 .. _@iynaix: https://github.com/iynaix
+.. _@jangeador: https://github.com/jangeador
 .. _@jazztpt: https://github.com/jazztpt
+.. _@jcass77: https://github.com/jcass77
 .. _@jleclanche: https://github.com/jleclanche
 .. _@juliocc: https://github.com/juliocc
 .. _@jvanbrug: https://github.com/jvanbrug
 .. _@ka7eh: https://github.com/ka7eh
 .. _@kaidokert: https://github.com/kaidokert
 .. _@kappataumu: https://github.com/kappataumu
+.. _@keithjeb: https://github.com/keithjeb
 .. _@kevgathuku: https://github.com/kevgathuku
+.. _@keyvanm: https://github.com/keyvanm
 .. _@knitatoms: https://github.com/knitatoms
 .. _@krzysztofzuraw: https://github.com/krzysztofzuraw
-.. _@msaizar: https://github.com/msaizar
 .. _@MathijsHoogland: https://github.com/MathijsHoogland
 .. _@mattayes: https://github.com/mattayes
-.. _@mknapper1: https://github.com/mknapper1
 .. _@menzenski: https://github.com/menzenski
-.. _@mostaszewski: https://github.com/mostaszewski
 .. _@mfwarren: https://github.com/mfwarren
+.. _@MightySCollins: https://github.com/MightySCollins
 .. _@mimischi: https://github.com/mimischi
 .. _@minho42: https://github.com/minho42
 .. _@mjsisley: https://github.com/mjsisley
-.. _@myilmaz: https://github.com/myilmaz
+.. _@mknapper1: https://github.com/mknapper1
+.. _@mostaszewski: https://github.com/mostaszewski
 .. _@mozillazg: https://github.com/mozillazg
+.. _@mrcoles: https://github.com/mrcoles
+.. _@msaizar: https://github.com/msaizar
+.. _@myilmaz: https://github.com/myilmaz
 .. _@noisy: https://github.com/noisy
 .. _@originell: https://github.com/originell
 .. _@oubiga: https://github.com/oubiga
 .. _@parbhat: https://github.com/parbhat
+.. _@pchiquet: https://github.com/pchiquet
+.. _@phiberjenz: https://github.com/phiberjenz
+.. _@purplediane: https://github.com/purplediane
 .. _@raonyguimaraes: https://github.com/raonyguimaraes
 .. _@reggieriser: https://github.com/reggieriser
 .. _@rm--: https://github.com/rm--
+.. _@rolep: https://github.com/rolep
 .. _@romanosipenko: https://github.com/romanosipenko
+.. _@saschalalala: https://github.com/saschalalala
 .. _@shireenrao: https://github.com/shireenrao
 .. _@show0k: https://github.com/show0k
 .. _@shultz: https://github.com/shultz
 .. _@siauPatrick: https://github.com/siauPatrick
+.. _@sladinji: https://github.com/sladinji
 .. _@slafs: https://github.com/slafs
 .. _@ssteinerX: https://github.com/ssteinerx
 .. _@stepmr: https://github.com/stepmr
 .. _@suledev: https://github.com/suledev
 .. _@takkaria: https://github.com/takkaria
+.. _@tanoabeleyra: https://github.com/tanoabeleyra
 .. _@timclaessens: https://github.com/timclaessens
 .. _@timfreund: https://github.com/timfreund
+.. _@townie: https://github.com/townie
 .. _@Travistock: https://github.com/Tavistock
 .. _@trungdong: https://github.com/trungdong
 .. _@Tubo: https://github.com/tubo
+.. _@umrashrf: https://github.com/umrashrf
 .. _@viviangb: https://github.com/viviangb
+.. _@vladdoster: https://github.com/vladdoster
 .. _@xpostudio4: https://github.com/xpostudio4
+.. _@yrchen: https://github.com/yrchen
 .. _@yunti: https://github.com/yunti
 .. _@zcho: https://github.com/zcho
-.. _@phiberjenz: https://github.com/phiberjenz
-.. _@sladinji: https://github.com/sladinji
-.. _@andresgz: https://github.com/andresgz
-.. _@jangeador: https://github.com/jangeador
-.. _@townie: https://github.com/townie
-.. _@MightySCollins: https://github.com/MightySCollins
-.. _@dadokkio: https://github.com/dadokkio
-.. _@bwarren2: https://github.com/bwarren2
-.. _@bertdemiranda: https://github.com/bertdemiranda
-.. _@brentpayne: https://github.com/brentpayne
-.. _@afrowave: https://github.com/afrowave
-.. _@pchiquet: https://github.com/pchiquet
-.. _@delneg: https://github.com/delneg
-.. _@purplediane: https://github.com/purplediane
-.. _@umrashrf: https://github.com/umrashrf
-.. _@ahhda: https://github.com/ahhda
-.. _@keithjeb: https://github.com/keithjeb
-.. _@btknu: https://github.com/btknu
-.. _@rolep: https://github.com/rolep
-.. _@canonnervio: https://github.com/canonnervio
-.. _@jcass77: https://github.com/jcass77
-.. _@Egregors: https://github.com/Egregors
-.. _@saschalalala: https://github.com/saschalalala
-.. _@mrcoles: https://github.com/mrcoles
-.. _@ericgroom: https://github.com/ericgroom
-.. _@hanaquadara: https://github.com/hanaquadara
-.. _@vladdoster: https://github.com/vladdoster
-.. _@cmargieson: https://github.com/cmargieson
-.. _@tanoabeleyra: https://github.com/tanoabeleyra
-.. _@keyvanm: https://github.com/keyvanm
-.. _@yrchen: https://github.com/yrchen
 
 Special Thanks
 ~~~~~~~~~~~~~~

From fe49871dc83a72eab8454efbab926c2e9ff8fdbd Mon Sep 17 00:00:00 2001
From: Tim Claessens <tim.claessens@qnh.nl>
Date: Wed, 19 Jun 2019 14:24:46 +0200
Subject: [PATCH 0257/2840] Fix link

---
 CONTRIBUTORS.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index a580400c3..bb5196138 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -180,7 +180,7 @@ Listed in alphabetical order.
   Tano Abeleyra            `@tanoabeleyra`_
   Taylor Baldwin
   Théo Segonds             `@show0k`_
-  Tim Claessens            `@timclaessens`
+  Tim Claessens            `@timclaessens`_
   Tim Freund               `@timfreund`_
   Tom Atkins               `@knitatoms`_
   Tom Offermann

From b3e7e5045a0b938db89e7bf673a082f14dd51a8a Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 20 Jun 2019 12:00:29 +0100
Subject: [PATCH 0258/2840] Update sphinx from 2.1.1 to 2.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 46b602e62..1938e283c 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -2,7 +2,7 @@
 
 Werkzeug==0.14.1  # pyup: < 0.15 # https://github.com/pallets/werkzeug
 ipdb==0.12  # https://github.com/gotcha/ipdb
-Sphinx==2.1.1  # https://github.com/sphinx-doc/sphinx
+Sphinx==2.1.2  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}

From cba392bf9557d75759240c504f8de72beef73ffd Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 20 Jun 2019 12:00:34 +0100
Subject: [PATCH 0259/2840] Update mypy from 0.701 to 0.710

---
 {{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 46b602e62..dc2c4376d 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -11,7 +11,7 @@ psycopg2-binary==2.8.3  # https://github.com/psycopg/psycopg2
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.701  # https://github.com/python/mypy
+mypy==0.710  # https://github.com/python/mypy
 pytest==4.6.3  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 

From 81fd240b6c7df95012363b49985d47e7fc04dbb5 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 20 Jun 2019 12:00:37 +0100
Subject: [PATCH 0260/2840] Update django-debug-toolbar from 1.11 to 2.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 46b602e62..6908eb254 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -29,7 +29,7 @@ pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 # ------------------------------------------------------------------------------
 factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 
-django-debug-toolbar==1.11  # https://github.com/jazzband/django-debug-toolbar
+django-debug-toolbar==2.0  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==2.1.9  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.6.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.5.0  # https://github.com/pytest-dev/pytest-django

From 87a8acbae22b1e5fd4ad66b3ac637a4ac2077f2b Mon Sep 17 00:00:00 2001
From: Dani Hodovic <dani.hodovic@gmail.com>
Date: Thu, 20 Jun 2019 23:35:46 +0800
Subject: [PATCH 0261/2840] Remove redundant template debug setting

> 'debug': a boolean that turns on/off template debug mode. If it is
> True, the fancy error page will display a detailed report for any
> exception raised during template rendering. This report contains the
> relevant snippet of the template with the appropriate line highlighted.

> It defaults to the value of the DEBUG setting.

https://docs.djangoproject.com/en/2.2/topics/templates/#module-django.template.backends.django

I could be wrong about this, but it seems like setting the template
DEBUG setting is redundant, since it should follow whatever the DEBUG
variable is set to.
---
 CONTRIBUTORS.rst                                       | 2 ++
 {{cookiecutter.project_slug}}/config/settings/base.py  | 2 --
 {{cookiecutter.project_slug}}/config/settings/local.py | 5 -----
 {{cookiecutter.project_slug}}/config/settings/test.py  | 2 --
 4 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index bb5196138..5a650b909 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -89,6 +89,7 @@ Listed in alphabetical order.
   Cullen Rhodes            `@c-rhodes`_
   Curtis St Pierre         `@curtisstpierre`_            @cstpierre1388
   Dan Shultz               `@shultz`_
+  Dani Hodovic             `@danihodovic`
   Daniel Hepper            `@dhepper`_                   @danielhepper
   Daniele Tricoli          `@eriol`_
   David Díaz               `@ddiazpinto`_                @DavidDiazPinto
@@ -238,6 +239,7 @@ Listed in alphabetical order.
 .. _@Collederas: https://github.com/Collederas
 .. _@curtisstpierre: https://github.com/curtisstpierre
 .. _@dadokkio: https://github.com/dadokkio
+.. _@danihodovic: https://github.com/danihodovic
 .. _@davitovmasyan: https://github.com/davitovmasyan
 .. _@ddiazpinto: https://github.com/ddiazpinto
 .. _@delneg: https://github.com/delneg
diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 2745058d3..4ffa50218 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -171,8 +171,6 @@ TEMPLATES = [
         # https://docs.djangoproject.com/en/dev/ref/settings/#template-dirs
         "DIRS": [str(APPS_DIR.path("templates"))],
         "OPTIONS": {
-            # https://docs.djangoproject.com/en/dev/ref/settings/#template-debug
-            "debug": DEBUG,
             # https://docs.djangoproject.com/en/dev/ref/settings/#template-loaders
             # https://docs.djangoproject.com/en/dev/ref/templates/api/#loader-types
             "loaders": [
diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py
index 0c0588bd4..bbc9ab357 100644
--- a/{{cookiecutter.project_slug}}/config/settings/local.py
+++ b/{{cookiecutter.project_slug}}/config/settings/local.py
@@ -23,11 +23,6 @@ CACHES = {
     }
 }
 
-# TEMPLATES
-# ------------------------------------------------------------------------------
-# https://docs.djangoproject.com/en/dev/ref/settings/#templates
-TEMPLATES[0]["OPTIONS"]["debug"] = DEBUG  # noqa F405
-
 # EMAIL
 # ------------------------------------------------------------------------------
 {% if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'y' -%}
diff --git a/{{cookiecutter.project_slug}}/config/settings/test.py b/{{cookiecutter.project_slug}}/config/settings/test.py
index 2ade134a2..35e1a0109 100644
--- a/{{cookiecutter.project_slug}}/config/settings/test.py
+++ b/{{cookiecutter.project_slug}}/config/settings/test.py
@@ -34,8 +34,6 @@ PASSWORD_HASHERS = ["django.contrib.auth.hashers.MD5PasswordHasher"]
 
 # TEMPLATES
 # ------------------------------------------------------------------------------
-# https://docs.djangoproject.com/en/dev/ref/settings/#templates
-TEMPLATES[0]["OPTIONS"]["debug"] = DEBUG  # noqa F405
 TEMPLATES[0]["OPTIONS"]["loaders"] = [  # noqa F405
     (
         "django.template.loaders.cached.Loader",

From 7b9ed36fac0fd3062545a33f8012d359e671daf3 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 22 Jun 2019 12:00:28 +0100
Subject: [PATCH 0262/2840] Update sentry-sdk from 0.9.0 to 0.9.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 39998f7a9..978a76ecc 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==0.6.2  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.9.0  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.9.1  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From 6b45fd08e6f497dfca675c2d7bde2ff36e85969b Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 24 Jun 2019 12:00:28 +0100
Subject: [PATCH 0263/2840] Update sentry-sdk from 0.9.1 to 0.9.2

---
 {{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 978a76ecc..a36c0d221 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==0.6.2  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.9.1  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.9.2  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From e1c9f57624b17bf7717cb84e6633d08925a53daa Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 25 Jun 2019 12:00:31 +0100
Subject: [PATCH 0264/2840] Update django-model-utils from 3.1.2 to 3.2.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 f469aa928..d0ef213dd 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -21,7 +21,7 @@ flower==0.9.3  # https://github.com/mher/flower
 # ------------------------------------------------------------------------------
 django==2.2.2  # pyup: < 3.0  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
-django-model-utils==3.1.2  # https://github.com/jazzband/django-model-utils
+django-model-utils==3.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.39.1  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.7.2  # https://github.com/django-crispy-forms/django-crispy-forms
 {%- if cookiecutter.use_compressor == "y" %}

From 2f95bedc139bc594ac0a5b30022fa27af0fdf1b0 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 25 Jun 2019 12:00:34 +0100
Subject: [PATCH 0265/2840] Update mypy from 0.710 to 0.711

---
 {{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 60a813636..16469b5a0 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -11,7 +11,7 @@ psycopg2-binary==2.8.3  # https://github.com/psycopg/psycopg2
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.710  # https://github.com/python/mypy
+mypy==0.711  # https://github.com/python/mypy
 pytest==4.6.3  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 

From 784075e4d4c59adafcb1bd417360867063287bdc Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 25 Jun 2019 04:28:27 -0700
Subject: [PATCH 0266/2840] Update pytest_cases from 1.9.0 to 1.9.1

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

diff --git a/requirements.txt b/requirements.txt
index 0db0861ca..5e2e27f59 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8==3.7.7
 # ------------------------------------------------------------------------------
 tox==3.12.1
 pytest==4.6.3
-pytest_cases==1.9.0
+pytest_cases==1.9.1
 pytest-cookies==0.3.0
 pytest-xdist==1.29.0
 pyyaml==5.1.1

From 541b2f2fc0dd9c59f3b2d8ca3951efb22347f2d5 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 26 Jun 2019 03:46:17 -0700
Subject: [PATCH 0267/2840] Update tox from 3.12.1 to 3.13.1

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

diff --git a/requirements.txt b/requirements.txt
index 5e2e27f59..c870c953b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ flake8==3.7.7
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.12.1
+tox==3.13.1
 pytest==4.6.3
 pytest_cases==1.9.1
 pytest-cookies==0.3.0

From 64169d0a350e10ff9c0db7b6c127aadc5d0d0b16 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 26 Jun 2019 12:00:29 +0100
Subject: [PATCH 0268/2840] Update pytest_cases from 1.9.1 to 1.9.2

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

diff --git a/requirements.txt b/requirements.txt
index 5e2e27f59..4b12cf57d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8==3.7.7
 # ------------------------------------------------------------------------------
 tox==3.12.1
 pytest==4.6.3
-pytest_cases==1.9.1
+pytest_cases==1.9.2
 pytest-cookies==0.3.0
 pytest-xdist==1.29.0
 pyyaml==5.1.1

From 48cfa4e5ea6ccf73d938ab525bbcba79079763cd Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 28 Jun 2019 12:00:29 +0100
Subject: [PATCH 0269/2840] Update pytest_cases from 1.9.2 to 1.9.3

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

diff --git a/requirements.txt b/requirements.txt
index 2bead95cc..d232c8b7f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8==3.7.7
 # ------------------------------------------------------------------------------
 tox==3.13.1
 pytest==4.6.3
-pytest_cases==1.9.2
+pytest_cases==1.9.3
 pytest-cookies==0.3.0
 pytest-xdist==1.29.0
 pyyaml==5.1.1

From 46f4567b958832a0f74144b327fce24895443417 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 29 Jun 2019 12:00:32 +0100
Subject: [PATCH 0270/2840] Update sentry-sdk from 0.9.2 to 0.9.5

---
 {{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 a36c0d221..f5a23f933 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==0.6.2  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.9.2  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.9.5  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From 7be0c231b778827f5e0d14861dae626976544544 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sun, 30 Jun 2019 13:00:29 +0200
Subject: [PATCH 0271/2840] Update pytest-django from 3.5.0 to 3.5.1

---
 {{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 16469b5a0..725c59ad7 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -32,4 +32,4 @@ factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 django-debug-toolbar==2.0  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==2.1.9  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.6.0  # https://github.com/nedbat/django_coverage_plugin
-pytest-django==3.5.0  # https://github.com/pytest-dev/pytest-django
+pytest-django==3.5.1  # https://github.com/pytest-dev/pytest-django

From dff4693869d225a58966dab35d5902269b66de0f Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 30 Jun 2019 07:07:30 -0700
Subject: [PATCH 0272/2840] Update pytest from 4.6.3 to 5.0.0

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

diff --git a/requirements.txt b/requirements.txt
index d232c8b7f..5426efc48 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8==3.7.7
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.13.1
-pytest==4.6.3
+pytest==5.0.0
 pytest_cases==1.9.3
 pytest-cookies==0.3.0
 pytest-xdist==1.29.0

From cbd3a59d4b2ab13eaf5477112f8098066389cdc5 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 1 Jul 2019 13:00:29 +0200
Subject: [PATCH 0273/2840] Update django from 2.2.2 to 2.2.3

---
 {{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 d0ef213dd..04ddb90d4 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -19,7 +19,7 @@ flower==0.9.3  # https://github.com/mher/flower
 
 # Django
 # ------------------------------------------------------------------------------
-django==2.2.2  # pyup: < 3.0  # https://www.djangoproject.com/
+django==2.2.3  # pyup: < 3.0  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==3.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.39.1  # https://github.com/pennersr/django-allauth

From 5c83f2416f06fefe21339e98e0b9ad6ab333e86c Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 1 Jul 2019 13:00:32 +0200
Subject: [PATCH 0274/2840] Update pytest from 4.6.3 to 5.0.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 725c59ad7..b379825e6 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -12,7 +12,7 @@ psycopg2-binary==2.8.3  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.711  # https://github.com/python/mypy
-pytest==4.6.3  # https://github.com/pytest-dev/pytest
+pytest==5.0.0  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From ba83326a78da44034240748357547683091ea416 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 2 Jul 2019 12:00:28 +0100
Subject: [PATCH 0275/2840] Update tox from 3.13.1 to 3.13.2

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

diff --git a/requirements.txt b/requirements.txt
index 5426efc48..4b4df651f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ flake8==3.7.7
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.13.1
+tox==3.13.2
 pytest==5.0.0
 pytest_cases==1.9.3
 pytest-cookies==0.3.0

From 93930913981631a9b731c1c08d9eadc419938959 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 3 Jul 2019 12:00:28 +0100
Subject: [PATCH 0276/2840] Update pillow from 6.0.0 to 6.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 04ddb90d4..574a6df16 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,6 +1,6 @@
 pytz==2019.1  # https://github.com/stub42/pytz
 python-slugify==3.0.2  # https://github.com/un33k/python-slugify
-Pillow==6.0.0  # https://github.com/python-pillow/Pillow
+Pillow==6.1.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
 rcssmin==1.0.6{% if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} --install-option="--without-c-extensions"{% endif %}  # https://github.com/ndparker/rcssmin
 {%- endif %}

From f557d26ee54560eccf3674762b571e912505bc16 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 4 Jul 2019 12:00:29 +0100
Subject: [PATCH 0277/2840] Update pytest_cases from 1.9.3 to 1.10.1

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

diff --git a/requirements.txt b/requirements.txt
index 4b4df651f..49aab81dd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8==3.7.7
 # ------------------------------------------------------------------------------
 tox==3.13.2
 pytest==5.0.0
-pytest_cases==1.9.3
+pytest_cases==1.10.1
 pytest-cookies==0.3.0
 pytest-xdist==1.29.0
 pyyaml==5.1.1

From d3e50de3b7583b036a382464a65a58981521483d Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 5 Jul 2019 12:00:28 +0100
Subject: [PATCH 0278/2840] Update pytest-cookies from 0.3.0 to 0.4.0

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

diff --git a/requirements.txt b/requirements.txt
index 49aab81dd..3ee716135 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,6 +12,6 @@ flake8==3.7.7
 tox==3.13.2
 pytest==5.0.0
 pytest_cases==1.10.1
-pytest-cookies==0.3.0
+pytest-cookies==0.4.0
 pytest-xdist==1.29.0
 pyyaml==5.1.1

From ed9fcb90924fa35526404797c613a96e5cc852eb Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 6 Jul 2019 12:00:29 +0100
Subject: [PATCH 0279/2840] Update pytest from 5.0.0 to 5.0.1

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

diff --git a/requirements.txt b/requirements.txt
index 3ee716135..501af714f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8==3.7.7
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.13.2
-pytest==5.0.0
+pytest==5.0.1
 pytest_cases==1.10.1
 pytest-cookies==0.4.0
 pytest-xdist==1.29.0

From bd071be43ebf7d8b3a95cec01b39a156fa62d77d Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 6 Jul 2019 12:00:30 +0100
Subject: [PATCH 0280/2840] Update pytest from 5.0.0 to 5.0.1

---
 {{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 b379825e6..02e9acb02 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -12,7 +12,7 @@ psycopg2-binary==2.8.3  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.711  # https://github.com/python/mypy
-pytest==5.0.0  # https://github.com/pytest-dev/pytest
+pytest==5.0.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From 8f31052d7e647bc4e5830087e534611f9b1d1e4c Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 6 Jul 2019 12:00:33 +0100
Subject: [PATCH 0281/2840] Update sentry-sdk from 0.9.5 to 0.10.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 f5a23f933..2abdba840 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==0.6.2  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.9.5  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.10.0  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From 0026e98c1457719293ddaf46a342806927331f72 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 8 Jul 2019 12:00:29 +0100
Subject: [PATCH 0282/2840] Update django-anymail from 6.0.1 to 6.1.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 2abdba840..7c217e748 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -18,4 +18,4 @@ django-storages[boto3]==1.7.1  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
 django-storages[google]==1.7.1  # https://github.com/jschneier/django-storages
 {%- endif %}
-django-anymail[mailgun]==6.0.1  # https://github.com/anymail/django-anymail
+django-anymail[mailgun]==6.1.0  # https://github.com/anymail/django-anymail

From f00c1f6f70d0af23085ab7d468f54dc8b71086dc Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 8 Jul 2019 12:00:32 +0100
Subject: [PATCH 0283/2840] Update pylint-django from 2.0.9 to 2.0.10

---
 {{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 02e9acb02..ec2cf2c4f 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -20,7 +20,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 flake8==3.7.7  # https://github.com/PyCQA/flake8
 coverage==4.5.3  # https://github.com/nedbat/coveragepy
 black==19.3b0  # https://github.com/ambv/black
-pylint-django==2.0.9  # https://github.com/PyCQA/pylint-django
+pylint-django==2.0.10  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}

From f02aa463a7eeb66fb8d22d744f40e962b51e7ef9 Mon Sep 17 00:00:00 2001
From: Dani Hodovic <dani.hodovic@gmail.com>
Date: Mon, 8 Jul 2019 14:14:59 +0800
Subject: [PATCH 0284/2840] Always use test settings in pytest

You can alternatively use DJANGO_SETTINGS_MODULE, but this is overridden
by the environment variable of the same name. In order to always run it
with test settings, regardless of the environment variable use --ds.

https://pytest-django.readthedocs.io/en/latest/configuring_django.html
---
 {{cookiecutter.project_slug}}/pytest.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/pytest.ini b/{{cookiecutter.project_slug}}/pytest.ini
index 690c78f10..9fb488cbc 100644
--- a/{{cookiecutter.project_slug}}/pytest.ini
+++ b/{{cookiecutter.project_slug}}/pytest.ini
@@ -1,5 +1,5 @@
 [pytest]
-DJANGO_SETTINGS_MODULE=config.settings.test
+addopts = --ds=config.settings.test
 {%- if cookiecutter.js_task_runner != 'None' %}
 norecursedirs = node_modules
 {%- endif %}

From a25c406975ee2bcd35f2b70b3c9eacb8c69759e7 Mon Sep 17 00:00:00 2001
From: Dani Hodovic <dani.hodovic@gmail.com>
Date: Tue, 9 Jul 2019 09:00:31 +0800
Subject: [PATCH 0285/2840] Remove gunicorn from installed apps

I can't find the requirement of adding it to INSTALLED_APPS on the
Django or the Gunicorn docs.

https://docs.gunicorn.org/en/latest/run.html?highlight=django#django
https://docs.djangoproject.com/en/2.2/howto/deployment/wsgi/gunicorn/
---
 {{cookiecutter.project_slug}}/config/settings/production.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index d838dc4ff..214353deb 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -179,10 +179,6 @@ ANYMAIL = {
     "MAILGUN_API_URL": env("MAILGUN_API_URL", default="https://api.mailgun.net/v3"),
 }
 
-# Gunicorn
-# ------------------------------------------------------------------------------
-INSTALLED_APPS += ["gunicorn"]  # noqa F405
-
 {% if cookiecutter.use_whitenoise == 'y' -%}
 # WhiteNoise
 # ------------------------------------------------------------------------------

From 14697391095ba211e53a22c648ad691c4eeebd67 Mon Sep 17 00:00:00 2001
From: Dani Hodovic <dani.hodovic@gmail.com>
Date: Tue, 9 Jul 2019 09:07:38 +0800
Subject: [PATCH 0286/2840] Remove EMAIL_HOST & EMAIL_PORT with locmem backend

These settings should not be required since Django never connects to an
external component when sending email. Instead it's stored in memory.

https://docs.djangoproject.com/en/2.2/topics/email/#in-memory-backend
---
 {{cookiecutter.project_slug}}/config/settings/test.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/test.py b/{{cookiecutter.project_slug}}/config/settings/test.py
index 35e1a0109..89660a3ff 100644
--- a/{{cookiecutter.project_slug}}/config/settings/test.py
+++ b/{{cookiecutter.project_slug}}/config/settings/test.py
@@ -48,10 +48,6 @@ TEMPLATES[0]["OPTIONS"]["loaders"] = [  # noqa F405
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#email-backend
 EMAIL_BACKEND = "django.core.mail.backends.locmem.EmailBackend"
-# https://docs.djangoproject.com/en/dev/ref/settings/#email-host
-EMAIL_HOST = "localhost"
-# https://docs.djangoproject.com/en/dev/ref/settings/#email-port
-EMAIL_PORT = 1025
 
 # Your stuff...
 # ------------------------------------------------------------------------------

From 35b201a2b39402f479aa05c585334c2562afc581 Mon Sep 17 00:00:00 2001
From: Dani Hodovic <dani.hodovic@gmail.com>
Date: Tue, 9 Jul 2019 09:11:50 +0800
Subject: [PATCH 0287/2840] Add EMAIL_TIMEOUT

Adds EMAIL_TIMEOUT to prevent a blocking send on the tcp socket from
halting the thread handling the request.
---
 {{cookiecutter.project_slug}}/config/settings/base.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 4ffa50218..7def8f489 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -216,6 +216,8 @@ X_FRAME_OPTIONS = "DENY"
 EMAIL_BACKEND = env(
     "DJANGO_EMAIL_BACKEND", default="django.core.mail.backends.smtp.EmailBackend"
 )
+# https://docs.djangoproject.com/en/2.2/ref/settings/#email-timeout
+EMAIL_TIMEOUT = 5
 
 # ADMIN
 # ------------------------------------------------------------------------------

From 6fa463d0a1e20fcd0df2fc287cbaf7bf0c9485c1 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 9 Jul 2019 12:00:28 +0100
Subject: [PATCH 0288/2840] Update flake8 from 3.7.7 to 3.7.8

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

diff --git a/requirements.txt b/requirements.txt
index 501af714f..e5d371ed1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==19.3b0
-flake8==3.7.7
+flake8==3.7.8
 
 # Testing
 # ------------------------------------------------------------------------------

From e0aacb328e105d519522c94aefc0c0c6c0e905c9 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 9 Jul 2019 12:00:29 +0100
Subject: [PATCH 0289/2840] Update flake8 from 3.7.7 to 3.7.8

---
 {{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 ec2cf2c4f..1a91d131b 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -17,7 +17,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality
 # ------------------------------------------------------------------------------
-flake8==3.7.7  # https://github.com/PyCQA/flake8
+flake8==3.7.8  # https://github.com/PyCQA/flake8
 coverage==4.5.3  # https://github.com/nedbat/coveragepy
 black==19.3b0  # https://github.com/ambv/black
 pylint-django==2.0.10  # https://github.com/PyCQA/pylint-django

From c8b557753616f45887a5e811b0423e0b612c29e5 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 10 Jul 2019 12:00:28 +0100
Subject: [PATCH 0290/2840] Update sentry-sdk from 0.10.0 to 0.10.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 7c217e748..bb95373b6 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==0.6.2  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.10.0  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.10.1  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From ec80a05671b31cd8359a0189ec96b26026278972 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jules=20Ch=C3=A9ron?= <jules.cheron@gmail.com>
Date: Mon, 8 Jul 2019 00:35:09 +0200
Subject: [PATCH 0291/2840] Handle path with pathlib

- Update config/settings/base.py
- Update merge_production_dotenvs_in_dotenv.py
- Update wsgi.py
- Update manage.py
---
 CONTRIBUTORS.rst                              |  2 ++
 .../config/settings/base.py                   | 22 +++++++++----------
 {{cookiecutter.project_slug}}/config/wsgi.py  |  7 +++---
 {{cookiecutter.project_slug}}/manage.py       |  5 +++--
 .../merge_production_dotenvs_in_dotenv.py     | 17 +++++++-------
 5 files changed, 28 insertions(+), 25 deletions(-)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 5a650b909..d45d79e89 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -122,6 +122,7 @@ Listed in alphabetical order.
   Jerome Leclanche         `@jleclanche`_                @Adys
   Jimmy Gitonga            `@afrowave`_                  @afrowave
   John Cass                `@jcass77`_                   @cass_john
+  Jules Cheron             `@jules-ch`_
   Julien Almarcha          `@sladinji`_
   Julio Castillo           `@juliocc`_
   Kaido Kert               `@kaidokert`_
@@ -274,6 +275,7 @@ Listed in alphabetical order.
 .. _@jazztpt: https://github.com/jazztpt
 .. _@jcass77: https://github.com/jcass77
 .. _@jleclanche: https://github.com/jleclanche
+.. _@jules-ch: https://github.com/jules-ch
 .. _@juliocc: https://github.com/juliocc
 .. _@jvanbrug: https://github.com/jvanbrug
 .. _@ka7eh: https://github.com/ka7eh
diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 7def8f489..67c524185 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -4,17 +4,17 @@ Base settings to build other settings files upon.
 
 import environ
 
-ROOT_DIR = (
-    environ.Path(__file__) - 3
-)  # ({{ cookiecutter.project_slug }}/config/settings/base.py - 3 = {{ cookiecutter.project_slug }}/)
-APPS_DIR = ROOT_DIR.path("{{ cookiecutter.project_slug }}")
+from pathlib import Path
 
+ROOT_DIR = Path(__file__).parents[2]
+# {{ cookiecutter.project_slug }}/)
+APPS_DIR = ROOT_DIR / "{{ cookiecutter.project_slug }}"
 env = environ.Env()
 
 READ_DOT_ENV_FILE = env.bool("DJANGO_READ_DOT_ENV_FILE", default=False)
 if READ_DOT_ENV_FILE:
     # OS environment variables take precedence over variables from .env
-    env.read_env(str(ROOT_DIR.path(".env")))
+    env.read_env(str(ROOT_DIR / ".env"))
 
 # GENERAL
 # ------------------------------------------------------------------------------
@@ -36,7 +36,7 @@ USE_L10N = True
 # https://docs.djangoproject.com/en/dev/ref/settings/#use-tz
 USE_TZ = True
 # https://docs.djangoproject.com/en/dev/ref/settings/#locale-paths
-LOCALE_PATHS = [ROOT_DIR.path("locale")]
+LOCALE_PATHS = [str(ROOT_DIR / "locale")]
 
 # DATABASES
 # ------------------------------------------------------------------------------
@@ -143,11 +143,11 @@ MIDDLEWARE = [
 # STATIC
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#static-root
-STATIC_ROOT = str(ROOT_DIR("staticfiles"))
+STATIC_ROOT = str(ROOT_DIR / "staticfiles")
 # https://docs.djangoproject.com/en/dev/ref/settings/#static-url
 STATIC_URL = "/static/"
 # https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#std:setting-STATICFILES_DIRS
-STATICFILES_DIRS = [str(APPS_DIR.path("static"))]
+STATICFILES_DIRS = [str(APPS_DIR / "static")]
 # https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#staticfiles-finders
 STATICFILES_FINDERS = [
     "django.contrib.staticfiles.finders.FileSystemFinder",
@@ -157,7 +157,7 @@ STATICFILES_FINDERS = [
 # MEDIA
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#media-root
-MEDIA_ROOT = str(APPS_DIR("media"))
+MEDIA_ROOT = str(APPS_DIR / "media")
 # https://docs.djangoproject.com/en/dev/ref/settings/#media-url
 MEDIA_URL = "/media/"
 
@@ -169,7 +169,7 @@ TEMPLATES = [
         # https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-TEMPLATES-BACKEND
         "BACKEND": "django.template.backends.django.DjangoTemplates",
         # https://docs.djangoproject.com/en/dev/ref/settings/#template-dirs
-        "DIRS": [str(APPS_DIR.path("templates"))],
+        "DIRS": [str(APPS_DIR / "templates")],
         "OPTIONS": {
             # https://docs.djangoproject.com/en/dev/ref/settings/#template-loaders
             # https://docs.djangoproject.com/en/dev/ref/templates/api/#loader-types
@@ -197,7 +197,7 @@ CRISPY_TEMPLATE_PACK = "bootstrap4"
 # FIXTURES
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#fixture-dirs
-FIXTURE_DIRS = (str(APPS_DIR.path("fixtures")),)
+FIXTURE_DIRS = (str(APPS_DIR / "fixtures"),)
 
 # SECURITY
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/config/wsgi.py b/{{cookiecutter.project_slug}}/config/wsgi.py
index 1899a30ca..b5755c5ce 100644
--- a/{{cookiecutter.project_slug}}/config/wsgi.py
+++ b/{{cookiecutter.project_slug}}/config/wsgi.py
@@ -17,13 +17,12 @@ import os
 import sys
 
 from django.core.wsgi import get_wsgi_application
+from pathlib import Path
 
 # This allows easy placement of apps within the interior
 # {{ cookiecutter.project_slug }} directory.
-app_path = os.path.abspath(
-    os.path.join(os.path.dirname(os.path.abspath(__file__)), os.pardir)
-)
-sys.path.append(os.path.join(app_path, "{{ cookiecutter.project_slug }}"))
+app_path = Path(__file__).parents[1].resolve()
+sys.path.append(str(app_path / "{{ cookiecutter.project_slug }}"))
 # We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks
 # if running multiple sites in the same mod_wsgi process. To fix this, use
 # mod_wsgi daemon mode with each site in its own daemon process, or use
diff --git a/{{cookiecutter.project_slug}}/manage.py b/{{cookiecutter.project_slug}}/manage.py
index 7e9c99e04..c44cc826d 100755
--- a/{{cookiecutter.project_slug}}/manage.py
+++ b/{{cookiecutter.project_slug}}/manage.py
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 import os
 import sys
+from pathlib import Path
 
 if __name__ == "__main__":
     os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local")
@@ -24,7 +25,7 @@ if __name__ == "__main__":
 
     # This allows easy placement of apps within the interior
     # {{ cookiecutter.project_slug }} directory.
-    current_path = os.path.dirname(os.path.abspath(__file__))
-    sys.path.append(os.path.join(current_path, "{{ cookiecutter.project_slug }}"))
+    current_path = Path(__file__).parent.resolve()
+    sys.path.append(str(current_path / "{{ cookiecutter.project_slug }}"))
 
     execute_from_command_line(sys.argv)
diff --git a/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py b/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py
index 4e70e2adb..b204494eb 100644
--- a/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py
+++ b/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py
@@ -1,15 +1,16 @@
 import os
 from typing import Sequence
+from pathlib import Path
 
 import pytest
 
-ROOT_DIR_PATH = os.path.dirname(os.path.realpath(__file__))
-PRODUCTION_DOTENVS_DIR_PATH = os.path.join(ROOT_DIR_PATH, ".envs", ".production")
+ROOT_DIR_PATH = Path(__file__).parent.resolve()
+PRODUCTION_DOTENVS_DIR_PATH = ROOT_DIR_PATH.joinpath(".envs", ".production")
 PRODUCTION_DOTENV_FILE_PATHS = [
-    os.path.join(PRODUCTION_DOTENVS_DIR_PATH, ".django"),
-    os.path.join(PRODUCTION_DOTENVS_DIR_PATH, ".postgres"),
+    PRODUCTION_DOTENVS_DIR_PATH / ".django",
+    PRODUCTION_DOTENVS_DIR_PATH / ".postgres",
 ]
-DOTENV_FILE_PATH = os.path.join(ROOT_DIR_PATH, ".env")
+DOTENV_FILE_PATH = ROOT_DIR_PATH / ".env"
 
 
 def merge(
@@ -31,9 +32,9 @@ def main():
 @pytest.mark.parametrize("merged_file_count", range(3))
 @pytest.mark.parametrize("append_linesep", [True, False])
 def test_merge(tmpdir_factory, merged_file_count: int, append_linesep: bool):
-    tmp_dir_path = str(tmpdir_factory.getbasetemp())
+    tmp_dir_path = Path(str(tmpdir_factory.getbasetemp()))
 
-    output_file_path = os.path.join(tmp_dir_path, ".env")
+    output_file_path = tmp_dir_path / ".env"
 
     expected_output_file_content = ""
     merged_file_paths = []
@@ -41,7 +42,7 @@ def test_merge(tmpdir_factory, merged_file_count: int, append_linesep: bool):
         merged_file_ord = i + 1
 
         merged_filename = ".service{}".format(merged_file_ord)
-        merged_file_path = os.path.join(tmp_dir_path, merged_filename)
+        merged_file_path = tmp_dir_path / merged_filename
 
         merged_file_content = merged_filename * merged_file_ord
 

From 2ab85f4303bc0ac70e2c5c232c4b283c889c60ae Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 11 Jul 2019 12:00:28 +0100
Subject: [PATCH 0292/2840] Update pylint-django from 2.0.10 to 2.0.11

---
 {{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 1a91d131b..0f8aaac19 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -20,7 +20,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 flake8==3.7.8  # https://github.com/PyCQA/flake8
 coverage==4.5.3  # https://github.com/nedbat/coveragepy
 black==19.3b0  # https://github.com/ambv/black
-pylint-django==2.0.10  # https://github.com/PyCQA/pylint-django
+pylint-django==2.0.11  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}

From 3abf0fec3aef6f455baf89d4b4d9b194ac429df5 Mon Sep 17 00:00:00 2001
From: 2O4 <>
Date: Thu, 11 Jul 2019 13:44:38 +0200
Subject: [PATCH 0293/2840] fixed buttons

---
 .../templates/account/password_reset_from_key.html              | 2 +-
 .../templates/account/password_set.html                         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

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 2171144d8..671eb12c9 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
@@ -15,7 +15,7 @@
             <form method="POST" action=".">
                 {% csrf_token %}
                 {{ form|crispy }}
-                <input type="submit" name="action" value="{% trans 'change password' %}"/>
+                <input class="btn btn-primary" type="submit" name="action" value="{% trans 'change password' %}"/>
             </form>
         {% else %}
             <p>{% trans 'Your password is now changed.' %}</p>
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 c98277157..563a0b185 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
@@ -11,7 +11,7 @@
     <form method="POST" action="{% url 'account_set_password' %}" class="password_set">
         {% csrf_token %}
         {{ form|crispy }}
-        <input type="submit" name="action" value="{% trans 'Set Password' %}"/>
+        <input class="btn btn-primary" type="submit" name="action" value="{% trans 'Set Password' %}"/>
     </form>
 {% endblock %}
 {% endraw %}

From 2c3ce19f4bc901a0ade4f48cc748e94c70fa2ad6 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Fri, 12 Jul 2019 11:52:32 +0100
Subject: [PATCH 0294/2840] Add 2O4 to list of contributors

---
 CONTRIBUTORS.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 5a650b909..725f49c99 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -42,6 +42,7 @@ Listed in alphabetical order.
   Name                     Github                        Twitter
 ========================== ============================ ==============
   18                       `@dezoito`_
+  2O4                      `@2O4`_
   a7p                      `@a7p`_
   Aaron Eikenberry         `@aeikenberry`_
   Adam Bogdał              `@bogdal`_
@@ -199,6 +200,7 @@ Listed in alphabetical order.
 ========================== ============================ ==============
 
 .. _@a7p: https://github.com/a7p
+.. _@2O4: https://github.com/2O4
 .. _@ad-m: https://github.com/ad-m
 .. _@adammsteele: https://github.com/adammsteele
 .. _@aeikenberry: https://github.com/aeikenberry

From f2035ec617dd0a4da1c204b4b82545bd4c9172a4 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Fri, 12 Jul 2019 12:05:48 +0100
Subject: [PATCH 0295/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f013aec9f..5df2d3a32 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,39 @@
 All enhancements and patches to Cookiecutter Django will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2019-07-09]
+### Fixed
+- Always use test settings in pytest (@danihodovic)
+- Remove gunicorn from `INSTALLED_APPS` (@danihodovic)
+- Remove `EMAIL_HOST` and `EMAIL_PORT` with locmem backend (@danihodovic)
+
+### Added
+- Add `EMAIL_TIMEOUT` (@danihodovic)
+
+## [2019-06-22]
+### Fixed
+- Remove redundant template debug setting (@danihodovic)
+
+## [2019-06-19]
+### Fixed
+- Fix removal carriage returns in docker scripts (@timclaessens)
+
+## [2019-06-15]
+### Fixed
+- Issue with Pycharm setup for running things in Docker compose (@foarsitter)
+
+## [2019-06-06]
+### Changed
+- Update generated Travis config (@browniebroke)
+
+## [2019-06-03]
+### Added
+- Installed `django-celery-beat` to keep scheduled tasks in DB (@keyvanm)
+
+## [2019-05-28]
+### Changed
+- Use GCP acronym rather than inconsistent GCE/GCS (@tanoabeleyra)
+
 ## [2019-05-27]
 ### Changed
 - Made cloud provider optional (@tanoabeleyra)

From 28ddd76b25e7e9937b78b7338bf19ac4be7ae1b4 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Fri, 12 Jul 2019 12:06:19 +0100
Subject: [PATCH 0296/2840] Fix missing link in contributors list

---
 CONTRIBUTORS.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 725f49c99..0f9feea6f 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -90,7 +90,7 @@ Listed in alphabetical order.
   Cullen Rhodes            `@c-rhodes`_
   Curtis St Pierre         `@curtisstpierre`_            @cstpierre1388
   Dan Shultz               `@shultz`_
-  Dani Hodovic             `@danihodovic`
+  Dani Hodovic             `@danihodovic`_
   Daniel Hepper            `@dhepper`_                   @danielhepper
   Daniele Tricoli          `@eriol`_
   David Díaz               `@ddiazpinto`_                @DavidDiazPinto

From 80e7df010c27bef34d2e8482fd9cca000f5dc587 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 13 Jul 2019 12:00:29 +0100
Subject: [PATCH 0297/2840] Update mypy from 0.711 to 0.720

---
 {{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 0f8aaac19..cfb2d28f7 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -11,7 +11,7 @@ psycopg2-binary==2.8.3  # https://github.com/psycopg/psycopg2
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.711  # https://github.com/python/mypy
+mypy==0.720  # https://github.com/python/mypy
 pytest==5.0.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 

From e15965bd1955fc3ce2f18ef2899d5a5cb24e03bf Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sun, 14 Jul 2019 12:00:29 +0100
Subject: [PATCH 0298/2840] Update whitenoise from 4.1.2 to 4.1.3

---
 {{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 574a6df16..19ab7e209 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -6,7 +6,7 @@ rcssmin==1.0.6{% if cookiecutter.windows == 'y' and cookiecutter.use_docker == '
 {%- endif %}
 argon2-cffi==19.1.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
-whitenoise==4.1.2  # https://github.com/evansd/whitenoise
+whitenoise==4.1.3  # https://github.com/evansd/whitenoise
 {%- endif %}
 redis==3.2.1  # https://github.com/antirez/redis
 {%- if cookiecutter.use_celery == "y" %}

From c49acc64f91dd3a77c74fc33d9f394370071cbd7 Mon Sep 17 00:00:00 2001
From: 2O4 <35725720+2O4@users.noreply.github.com>
Date: Sun, 14 Jul 2019 15:22:36 +0200
Subject: [PATCH 0299/2840] Update views.py

added message wich will be shown when a user update his infos
---
 .../{{cookiecutter.project_slug}}/users/views.py           | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
index a24427416..db2534f1b 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
@@ -2,6 +2,8 @@ from django.contrib.auth import get_user_model
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.urls import reverse
 from django.views.generic import DetailView, RedirectView, UpdateView
+from django.contrib import messages
+from django.utils.translation import ugettext_lazy as _
 
 User = get_user_model()
 
@@ -27,6 +29,11 @@ class UserUpdateView(LoginRequiredMixin, UpdateView):
     def get_object(self):
         return User.objects.get(username=self.request.user.username)
 
+    def form_valid(self, form):
+        form.save()
+        messages.add_message(self.request, messages.INFO, _("Infos succefully updated"))
+        return super(UserUpdateView, self).form_valid(form)
+
 
 user_update_view = UserUpdateView.as_view()
 

From 3aa7181a4606426ade2e6180ac421a10ba3a31ce Mon Sep 17 00:00:00 2001
From: 2O4 <35725720+2O4@users.noreply.github.com>
Date: Sun, 14 Jul 2019 15:55:50 +0200
Subject: [PATCH 0300/2840] Delete user_list.html

Following on Remove user list view #2062
---
 .../templates/users/user_list.html              | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_list.html

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_list.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_list.html
deleted file mode 100644
index c1d83251a..000000000
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_list.html
+++ /dev/null
@@ -1,17 +0,0 @@
-{% raw %}{% extends "base.html" %}
-{% load static i18n %}
-{% block title %}Members{% endblock %}
-
-{% block content %}
-<div class="container">
-  <h2>Users</h2>
-
-  <div class="list-group">
-    {% for user in user_list %}
-      <a href="{% url 'users:detail' user.username %}" class="list-group-item">
-        <h4 class="list-group-item-heading">{{ user.username }}</h4>
-      </a>
-    {% endfor %}
-  </div>
-</div>
-{% endblock content %}{% endraw %}

From 5312d9b914b8049acab116f44a2f51d9e68d6a13 Mon Sep 17 00:00:00 2001
From: 2O4 <35725720+2O4@users.noreply.github.com>
Date: Sun, 14 Jul 2019 16:37:37 +0200
Subject: [PATCH 0301/2840] Added a button to close the message

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

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
index 9caab43aa..cba1b7cf7 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -80,7 +80,7 @@
 
       {% if messages %}
           {% for message in messages %}
-              <div class="alert {% if message.tags %}alert-{{ message.tags }}{% endif %}">{{ message }}</div>
+              <div class="alert {% if message.tags %}alert-{{ message.tags }}{% endif %}">{{ message }}<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>
           {% endfor %}
       {% endif %}
 

From e99d27c1273ad14898a6d7f46b411b15eb60ace0 Mon Sep 17 00:00:00 2001
From: 2O4 <35725720+2O4@users.noreply.github.com>
Date: Mon, 15 Jul 2019 18:10:27 +0200
Subject: [PATCH 0302/2840] Update
 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py

Co-Authored-By: Bruno Alla <browniebroke@users.noreply.github.com>
---
 .../{{cookiecutter.project_slug}}/users/views.py                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
index db2534f1b..0a00f0c6e 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
@@ -31,7 +31,7 @@ class UserUpdateView(LoginRequiredMixin, UpdateView):
 
     def form_valid(self, form):
         form.save()
-        messages.add_message(self.request, messages.INFO, _("Infos succefully updated"))
+        messages.add_message(self.request, messages.INFO, _("Infos successfully updated"))
         return super(UserUpdateView, self).form_valid(form)
 
 

From 9da2a193673a064a93a57eca657ec48be9a9da13 Mon Sep 17 00:00:00 2001
From: 2O4 <35725720+2O4@users.noreply.github.com>
Date: Mon, 15 Jul 2019 18:10:33 +0200
Subject: [PATCH 0303/2840] Update
 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py

Co-Authored-By: Bruno Alla <browniebroke@users.noreply.github.com>
---
 .../{{cookiecutter.project_slug}}/users/views.py                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
index 0a00f0c6e..b1c94a5ed 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
@@ -32,7 +32,7 @@ class UserUpdateView(LoginRequiredMixin, UpdateView):
     def form_valid(self, form):
         form.save()
         messages.add_message(self.request, messages.INFO, _("Infos successfully updated"))
-        return super(UserUpdateView, self).form_valid(form)
+        return super().form_valid(form)
 
 
 user_update_view = UserUpdateView.as_view()

From a41c841613b4f0d2ec8405a774dc7057064bd55c Mon Sep 17 00:00:00 2001
From: 2O4 <35725720+2O4@users.noreply.github.com>
Date: Mon, 15 Jul 2019 18:19:07 +0200
Subject: [PATCH 0304/2840] Update views.py

---
 .../{{cookiecutter.project_slug}}/users/views.py                 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
index b1c94a5ed..1364568e6 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
@@ -30,7 +30,6 @@ class UserUpdateView(LoginRequiredMixin, UpdateView):
         return User.objects.get(username=self.request.user.username)
 
     def form_valid(self, form):
-        form.save()
         messages.add_message(self.request, messages.INFO, _("Infos successfully updated"))
         return super().form_valid(form)
 

From f8b4f32c7a496e217bfc9cfe660213153a05146e Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 16 Jul 2019 12:00:29 +0100
Subject: [PATCH 0305/2840] Update sentry-sdk from 0.10.1 to 0.10.2

---
 {{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 bb95373b6..f5e5ffea0 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==0.6.2  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.10.1  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.10.2  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From b0cd6e40723e7870e643a00963f8b3b0b7b6daa0 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 16 Jul 2019 12:00:32 +0100
Subject: [PATCH 0306/2840] Update djangorestframework from 3.9.4 to 3.10.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 19ab7e209..9513b2238 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -30,5 +30,5 @@ django-compressor==2.3  # https://github.com/django-compressor/django-compressor
 django-redis==4.10.0  # https://github.com/niwinz/django-redis
 
 # Django REST Framework
-djangorestframework==3.9.4  # https://github.com/encode/django-rest-framework
+djangorestframework==3.10.0  # https://github.com/encode/django-rest-framework
 coreapi==2.3.3  # https://github.com/core-api/python-client

From c0853452533aa178179c9fe622de782e9cd6a3b9 Mon Sep 17 00:00:00 2001
From: step21 <step21@users.noreply.github.com>
Date: Wed, 17 Jul 2019 15:14:16 +0200
Subject: [PATCH 0307/2840] Rename 403_csrf.html to 403.html

403.html is the name that django expects, unless it is overriden. 403_csrf is a separate case, which according to django docs and mailing list should get a separate view/template. Fixes #2163
Docs: https://docs.djangoproject.com/en/2.1/ref/csrf/#rejected-requests
Mailing list: https://groups.google.com/forum/#!msg/django-developers/O2raF0RVGA0/44-3Jz0jCwAJ
Stackoverflow: https://stackoverflow.com/questions/31981239/django-custom-403-template
---
 .../templates/{403_csrf.html => 403.html}                         | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/{403_csrf.html => 403.html} (100%)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/403_csrf.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/403.html
similarity index 100%
rename from {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/403_csrf.html
rename to {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/403.html

From 525739dcb5c89a1a29851f5ade0597b14f25c02d Mon Sep 17 00:00:00 2001
From: step21 <step21@users.noreply.github.com>
Date: Wed, 17 Jul 2019 16:19:11 +0200
Subject: [PATCH 0308/2840] Update CONTRIBUTORS.rst

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 0f9feea6f..a36d59a7f 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -108,6 +108,7 @@ Listed in alphabetical order.
   Eric Groom               `@ericgroom`_
   Eyad Al Sibai            `@eyadsibai`_
   Felipe Arruda            `@arruda`_
+  Florian Idelberger       `@step21`_                    @windrush
   Garry Cairns             `@garry-cairns`_
   Garry Polley             `@garrypolley`_
   Hamish Durkin            `@durkode`_

From eac8ae626a632482fa901ca9c605267ae107823f Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 17 Jul 2019 15:52:46 +0100
Subject: [PATCH 0309/2840] Fix broken link

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index a36d59a7f..4c3ad8a04 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -321,6 +321,7 @@ Listed in alphabetical order.
 .. _@sladinji: https://github.com/sladinji
 .. _@slafs: https://github.com/slafs
 .. _@ssteinerX: https://github.com/ssteinerx
+.. _@step21: https://github.com/step21
 .. _@stepmr: https://github.com/stepmr
 .. _@suledev: https://github.com/suledev
 .. _@takkaria: https://github.com/takkaria

From 566cc3f3e4b3cc3d4d0ce86354e47657fbf880e0 Mon Sep 17 00:00:00 2001
From: 2O4 <35725720+2O4@users.noreply.github.com>
Date: Wed, 17 Jul 2019 19:31:53 +0200
Subject: [PATCH 0310/2840] Update
 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py

Co-Authored-By: Bruno Alla <browniebroke@users.noreply.github.com>
---
 .../{{cookiecutter.project_slug}}/users/views.py              | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
index 1364568e6..5c0d5b5c2 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
@@ -30,7 +30,9 @@ class UserUpdateView(LoginRequiredMixin, UpdateView):
         return User.objects.get(username=self.request.user.username)
 
     def form_valid(self, form):
-        messages.add_message(self.request, messages.INFO, _("Infos successfully updated"))
+        messages.add_message(
+            self.request, messages.INFO, _("Infos successfully updated")
+        )
         return super().form_valid(form)
 
 

From fbacfa95e0eb7116f0e785207e8e704e994d535e Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 18 Jul 2019 12:00:29 +0100
Subject: [PATCH 0311/2840] Update djangorestframework from 3.10.0 to 3.10.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 9513b2238..74245c5c7 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -30,5 +30,5 @@ django-compressor==2.3  # https://github.com/django-compressor/django-compressor
 django-redis==4.10.0  # https://github.com/niwinz/django-redis
 
 # Django REST Framework
-djangorestframework==3.10.0  # https://github.com/encode/django-rest-framework
+djangorestframework==3.10.1  # https://github.com/encode/django-rest-framework
 coreapi==2.3.3  # https://github.com/core-api/python-client

From cc47ee39e9b37d4eb642c0a7643d5011600f8f09 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 20 Jul 2019 12:00:29 +0100
Subject: [PATCH 0312/2840] Update django-extensions from 2.1.9 to 2.2.1

---
 {{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 cfb2d28f7..8ca3232fa 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,6 +30,6 @@ pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==2.0  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==2.1.9  # https://github.com/django-extensions/django-extensions
+django-extensions==2.2.1  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.6.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.5.1  # https://github.com/pytest-dev/pytest-django

From f0546612a28275f888fa684e9148a03e48ac0079 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 27 Jul 2019 13:00:29 +0200
Subject: [PATCH 0313/2840] Update ipdb from 0.12 to 0.12.1

---
 {{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 cfb2d28f7..ef0d90af6 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,7 +1,7 @@
 -r ./base.txt
 
 Werkzeug==0.14.1  # pyup: < 0.15 # https://github.com/pallets/werkzeug
-ipdb==0.12  # https://github.com/gotcha/ipdb
+ipdb==0.12.1  # https://github.com/gotcha/ipdb
 Sphinx==2.1.2  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2

From 541374e27b16d8744a6b0a3d33cbc3b05e8e054f Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sun, 28 Jul 2019 13:00:29 +0200
Subject: [PATCH 0314/2840] Update python-slugify from 3.0.2 to 3.0.3

---
 {{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 9513b2238..203168656 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,5 +1,5 @@
 pytz==2019.1  # https://github.com/stub42/pytz
-python-slugify==3.0.2  # https://github.com/un33k/python-slugify
+python-slugify==3.0.3  # https://github.com/un33k/python-slugify
 Pillow==6.1.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
 rcssmin==1.0.6{% if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} --install-option="--without-c-extensions"{% endif %}  # https://github.com/ndparker/rcssmin

From 3bf19e93f2067ae876f1f6f74a3cbe673e8b5dd0 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 29 Jul 2019 13:00:28 +0200
Subject: [PATCH 0315/2840] Update redis from 3.2.1 to 3.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 9513b2238..b3bc9c2e9 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -8,7 +8,7 @@ argon2-cffi==19.1.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==4.1.3  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==3.2.1  # https://github.com/antirez/redis
+redis==3.3.0  # https://github.com/antirez/redis
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.3.0  # pyup: < 5.0  # https://github.com/celery/celery
 django-celery-beat==1.5.0  # https://github.com/celery/django-celery-beat

From ff182ce997de8a3174c9cb166e49bd93632872a3 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 30 Jul 2019 12:00:29 +0100
Subject: [PATCH 0316/2840] Update redis from 3.3.0 to 3.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 bca54bc2e..9c99245b0 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -8,7 +8,7 @@ argon2-cffi==19.1.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==4.1.3  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==3.3.0  # https://github.com/antirez/redis
+redis==3.3.2  # https://github.com/antirez/redis
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.3.0  # pyup: < 5.0  # https://github.com/celery/celery
 django-celery-beat==1.5.0  # https://github.com/celery/django-celery-beat

From 57ba93c69c2cbed9777154a86a8161445be8e2bb Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 30 Jul 2019 12:00:32 +0100
Subject: [PATCH 0317/2840] Update djangorestframework from 3.10.1 to 3.10.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 bca54bc2e..5ec1644f1 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -30,5 +30,5 @@ django-compressor==2.3  # https://github.com/django-compressor/django-compressor
 django-redis==4.10.0  # https://github.com/niwinz/django-redis
 
 # Django REST Framework
-djangorestframework==3.10.1  # https://github.com/encode/django-rest-framework
+djangorestframework==3.10.2  # https://github.com/encode/django-rest-framework
 coreapi==2.3.3  # https://github.com/core-api/python-client

From f540784c35034306f01f1a9bb839fa5b49f3a956 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 30 Jul 2019 12:00:36 +0100
Subject: [PATCH 0318/2840] Update coverage from 4.5.3 to 4.5.4

---
 {{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 5bfb15360..6d95b5b1b 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -18,7 +18,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 # Code quality
 # ------------------------------------------------------------------------------
 flake8==3.7.8  # https://github.com/PyCQA/flake8
-coverage==4.5.3  # https://github.com/nedbat/coveragepy
+coverage==4.5.4  # https://github.com/nedbat/coveragepy
 black==19.3b0  # https://github.com/ambv/black
 pylint-django==2.0.11  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 2a373ebeff4e1b346d15deeb293f8ad8cda81c0f Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 31 Jul 2019 12:00:29 +0100
Subject: [PATCH 0319/2840] Update redis from 3.3.0 to 3.3.4

---
 {{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 bca54bc2e..5c3199a06 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -8,7 +8,7 @@ argon2-cffi==19.1.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==4.1.3  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==3.3.0  # https://github.com/antirez/redis
+redis==3.3.4  # https://github.com/antirez/redis
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.3.0  # pyup: < 5.0  # https://github.com/celery/celery
 django-celery-beat==1.5.0  # https://github.com/celery/django-celery-beat

From ba05c40cfb6862c1801aa37c1916e86d869119a9 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 31 Jul 2019 12:00:32 +0100
Subject: [PATCH 0320/2840] Update ipdb from 0.12.1 to 0.12.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 5bfb15360..bb8ca83dc 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,7 +1,7 @@
 -r ./base.txt
 
 Werkzeug==0.14.1  # pyup: < 0.15 # https://github.com/pallets/werkzeug
-ipdb==0.12.1  # https://github.com/gotcha/ipdb
+ipdb==0.12.2  # https://github.com/gotcha/ipdb
 Sphinx==2.1.2  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2

From 5e9f6f3aac856ddcaaa41964dada04235926b24a Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 31 Jul 2019 17:45:48 -0700
Subject: [PATCH 0321/2840] Update pyyaml from 5.1.1 to 5.1.2

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

diff --git a/requirements.txt b/requirements.txt
index e5d371ed1..6f4445a77 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,4 +14,4 @@ pytest==5.0.1
 pytest_cases==1.10.1
 pytest-cookies==0.4.0
 pytest-xdist==1.29.0
-pyyaml==5.1.1
+pyyaml==5.1.2

From ffbc44a3302308a48cc1151d9429e2f1d1e4c34f Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 1 Aug 2019 12:00:30 +0100
Subject: [PATCH 0322/2840] Update pytz from 2019.1 to 2019.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 bca54bc2e..d2a8f7af3 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,4 +1,4 @@
-pytz==2019.1  # https://github.com/stub42/pytz
+pytz==2019.2  # https://github.com/stub42/pytz
 python-slugify==3.0.3  # https://github.com/un33k/python-slugify
 Pillow==6.1.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}

From b562008a6c7223b90f8454c7cc9b7d2e61d20175 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 1 Aug 2019 12:00:33 +0100
Subject: [PATCH 0323/2840] Update django from 2.2.3 to 2.2.4

---
 {{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 bca54bc2e..780bee5ab 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -19,7 +19,7 @@ flower==0.9.3  # https://github.com/mher/flower
 
 # Django
 # ------------------------------------------------------------------------------
-django==2.2.3  # pyup: < 3.0  # https://www.djangoproject.com/
+django==2.2.4  # pyup: < 3.0  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==3.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.39.1  # https://github.com/pennersr/django-allauth

From b4349cafdc665364bd97459069930ab91c81389d Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 2 Aug 2019 12:00:29 +0100
Subject: [PATCH 0324/2840] Update pytest_cases from 1.10.1 to 1.11.1

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

diff --git a/requirements.txt b/requirements.txt
index 6f4445a77..003b4a1fe 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8==3.7.8
 # ------------------------------------------------------------------------------
 tox==3.13.2
 pytest==5.0.1
-pytest_cases==1.10.1
+pytest_cases==1.11.1
 pytest-cookies==0.4.0
 pytest-xdist==1.29.0
 pyyaml==5.1.2

From 0d3fb0509e0f2fb18c6b5d18a7cc7de871d088ec Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 3 Aug 2019 12:00:29 +0100
Subject: [PATCH 0325/2840] Update redis from 3.3.4 to 3.3.5

---
 {{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 a7e03a364..207236719 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -8,7 +8,7 @@ argon2-cffi==19.1.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==4.1.3  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==3.3.4  # https://github.com/antirez/redis
+redis==3.3.5  # https://github.com/antirez/redis
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.3.0  # pyup: < 5.0  # https://github.com/celery/celery
 django-celery-beat==1.5.0  # https://github.com/celery/django-celery-beat

From 406f51ac172f5606b7f5a077b78084c0c0f9e9cc Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 7 Aug 2019 12:00:29 +0100
Subject: [PATCH 0326/2840] Update redis from 3.3.5 to 3.3.6

---
 {{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 207236719..0fb72f41d 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -8,7 +8,7 @@ argon2-cffi==19.1.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==4.1.3  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==3.3.5  # https://github.com/antirez/redis
+redis==3.3.6  # https://github.com/antirez/redis
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.3.0  # pyup: < 5.0  # https://github.com/celery/celery
 django-celery-beat==1.5.0  # https://github.com/celery/django-celery-beat

From 5a8c6c28c69fb95cd2657f44c7c3854fcb16c7e5 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 13 Aug 2019 12:00:28 +0100
Subject: [PATCH 0327/2840] Update collectfast from 0.6.2 to 1.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 f5e5ffea0..b48de34a3 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -5,7 +5,7 @@
 gunicorn==19.9.0  # https://github.com/benoitc/gunicorn
 psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
-Collectfast==0.6.2  # https://github.com/antonagestam/collectfast
+Collectfast==1.0.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
 sentry-sdk==0.10.2  # https://github.com/getsentry/sentry-python

From 081accfafbc985cb38a0ce4d9a5ecbeaa64b9853 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 14 Aug 2019 12:00:29 +0100
Subject: [PATCH 0328/2840] Update redis from 3.3.6 to 3.3.7

---
 {{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 0fb72f41d..631048f77 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -8,7 +8,7 @@ argon2-cffi==19.1.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==4.1.3  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==3.3.6  # https://github.com/antirez/redis
+redis==3.3.7  # https://github.com/antirez/redis
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.3.0  # pyup: < 5.0  # https://github.com/celery/celery
 django-celery-beat==1.5.0  # https://github.com/celery/django-celery-beat

From 7594b4f03025dae5954358fa47d1e897c0157793 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 16 Aug 2019 12:00:28 +0100
Subject: [PATCH 0329/2840] Update pytest from 5.0.1 to 5.1.0

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

diff --git a/requirements.txt b/requirements.txt
index 003b4a1fe..c3f21bd40 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8==3.7.8
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.13.2
-pytest==5.0.1
+pytest==5.1.0
 pytest_cases==1.11.1
 pytest-cookies==0.4.0
 pytest-xdist==1.29.0

From cc0ff897b247461cd31952c181b211e2682da938 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 16 Aug 2019 12:00:29 +0100
Subject: [PATCH 0330/2840] Update pytest from 5.0.1 to 5.1.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 17c47bb27..85328c039 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -12,7 +12,7 @@ psycopg2-binary==2.8.3  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.720  # https://github.com/python/mypy
-pytest==5.0.1  # https://github.com/pytest-dev/pytest
+pytest==5.1.0  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From c1fb6e078b969893f265f641264fc1e6e19227f6 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 17 Aug 2019 13:00:31 +0200
Subject: [PATCH 0331/2840] Update sentry-sdk from 0.10.2 to 0.11.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 b48de34a3..c21fb992c 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==1.0.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.10.2  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.11.0  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From b42d000b56ce5a87092ba8c56d3b397ea693e0a2 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 19 Aug 2019 13:00:34 +0200
Subject: [PATCH 0332/2840] Update sphinx from 2.1.2 to 2.2.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 85328c039..03441394f 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -2,7 +2,7 @@
 
 Werkzeug==0.14.1  # pyup: < 0.15 # https://github.com/pallets/werkzeug
 ipdb==0.12.2  # https://github.com/gotcha/ipdb
-Sphinx==2.1.2  # https://github.com/sphinx-doc/sphinx
+Sphinx==2.2.0  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}

From 5ddadc0afac5c25fe54132e1130d7c97b70da3b0 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 20 Aug 2019 13:00:29 +0200
Subject: [PATCH 0333/2840] Update sentry-sdk from 0.11.0 to 0.11.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 c21fb992c..eadd410d0 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==1.0.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.11.0  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.11.1  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From ac294b8515e17f1d07b15e5172318bf5411d0e51 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 20 Aug 2019 13:00:32 +0200
Subject: [PATCH 0334/2840] Update redis from 3.3.7 to 3.3.8

---
 {{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 631048f77..f5c4f3384 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -8,7 +8,7 @@ argon2-cffi==19.1.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==4.1.3  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==3.3.7  # https://github.com/antirez/redis
+redis==3.3.8  # https://github.com/antirez/redis
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.3.0  # pyup: < 5.0  # https://github.com/celery/celery
 django-celery-beat==1.5.0  # https://github.com/celery/django-celery-beat

From e82a7d0fb29044b93601d8357e95af3822987fd3 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 21 Aug 2019 13:00:29 +0200
Subject: [PATCH 0335/2840] Update pytest from 5.1.0 to 5.1.1

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

diff --git a/requirements.txt b/requirements.txt
index c3f21bd40..2f85a7009 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8==3.7.8
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.13.2
-pytest==5.1.0
+pytest==5.1.1
 pytest_cases==1.11.1
 pytest-cookies==0.4.0
 pytest-xdist==1.29.0

From 72b222d52dd01bdd639467806a79f0fba8fc3020 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 21 Aug 2019 13:00:30 +0200
Subject: [PATCH 0336/2840] Update pytest from 5.1.0 to 5.1.1

---
 {{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 03441394f..0a4175756 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -12,7 +12,7 @@ psycopg2-binary==2.8.3  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.720  # https://github.com/python/mypy
-pytest==5.1.0  # https://github.com/pytest-dev/pytest
+pytest==5.1.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From 7ad879193782c2933722dfbcb3ea273a88aa62f1 Mon Sep 17 00:00:00 2001
From: Dani Hodovic <dani.hodovic@gmail.com>
Date: Wed, 21 Aug 2019 17:28:55 +0200
Subject: [PATCH 0337/2840] Remove EMAIL_HOST, EMAIL_PORT for console backend

django.core.mail.backends.console.EmailBackend is an in memory backend
so EMAIL_HOST and EMAIL_PORT does not need to be specified in this case.
---
 {{cookiecutter.project_slug}}/config/settings/local.py | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py
index bbc9ab357..2ab0a7cb4 100644
--- a/{{cookiecutter.project_slug}}/config/settings/local.py
+++ b/{{cookiecutter.project_slug}}/config/settings/local.py
@@ -28,19 +28,19 @@ CACHES = {
 {% if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'y' -%}
 # https://docs.djangoproject.com/en/dev/ref/settings/#email-host
 EMAIL_HOST = env("EMAIL_HOST", default="mailhog")
+# https://docs.djangoproject.com/en/dev/ref/settings/#email-port
+EMAIL_PORT = 1025
 {%- elif cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'n' -%}
 # https://docs.djangoproject.com/en/dev/ref/settings/#email-host
 EMAIL_HOST = "localhost"
+# https://docs.djangoproject.com/en/dev/ref/settings/#email-port
+EMAIL_PORT = 1025
 {%- else -%}
 # https://docs.djangoproject.com/en/dev/ref/settings/#email-backend
 EMAIL_BACKEND = env(
     "DJANGO_EMAIL_BACKEND", default="django.core.mail.backends.console.EmailBackend"
 )
-# https://docs.djangoproject.com/en/dev/ref/settings/#email-host
-EMAIL_HOST = "localhost"
 {%- endif %}
-# https://docs.djangoproject.com/en/dev/ref/settings/#email-port
-EMAIL_PORT = 1025
 
 # django-debug-toolbar
 # ------------------------------------------------------------------------------

From d4d8f1b5be114ce840ac863c4fdd725ebd436261 Mon Sep 17 00:00:00 2001
From: Dani Hodovic <dani.hodovic@gmail.com>
Date: Sun, 25 Aug 2019 14:08:28 +0200
Subject: [PATCH 0338/2840] Remove AWS_PRELOAD_METADATA

https://github.com/antonagestam/collectfast/pull/140
---
 {{cookiecutter.project_slug}}/config/settings/production.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 214353deb..e37411653 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -201,7 +201,6 @@ COMPRESS_URL = STATIC_URL{% if cookiecutter.use_whitenoise == 'y' or cookiecutte
 # ------------------------------------------------------------------------------
 # https://github.com/antonagestam/collectfast#installation
 INSTALLED_APPS = ["collectfast"] + INSTALLED_APPS  # noqa F405
-AWS_PRELOAD_METADATA = True
 {% endif %}
 # LOGGING
 # ------------------------------------------------------------------------------

From 180ab9bbb192fc0e648c67e52f3d7701792b552f Mon Sep 17 00:00:00 2001
From: Dani Hodovic <dani.hodovic@gmail.com>
Date: Mon, 26 Aug 2019 16:25:36 +0200
Subject: [PATCH 0339/2840] Remove redundant DEBUG = False in test.py

This is already set to False by default in base.py
---
 {{cookiecutter.project_slug}}/config/settings/test.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/test.py b/{{cookiecutter.project_slug}}/config/settings/test.py
index 89660a3ff..fad41afdd 100644
--- a/{{cookiecutter.project_slug}}/config/settings/test.py
+++ b/{{cookiecutter.project_slug}}/config/settings/test.py
@@ -7,8 +7,6 @@ from .base import env
 
 # GENERAL
 # ------------------------------------------------------------------------------
-# https://docs.djangoproject.com/en/dev/ref/settings/#debug
-DEBUG = False
 # https://docs.djangoproject.com/en/dev/ref/settings/#secret-key
 SECRET_KEY = env(
     "DJANGO_SECRET_KEY",

From 58a2262190a2025065ddedd09141a54883ac52b9 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 30 Aug 2019 13:00:28 +0200
Subject: [PATCH 0340/2840] Update django-allauth from 0.39.1 to 0.40.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 f5c4f3384..be85fb2ee 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -22,7 +22,7 @@ flower==0.9.3  # https://github.com/mher/flower
 django==2.2.4  # pyup: < 3.0  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==3.2.0  # https://github.com/jazzband/django-model-utils
-django-allauth==0.39.1  # https://github.com/pennersr/django-allauth
+django-allauth==0.40.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.7.2  # https://github.com/django-crispy-forms/django-crispy-forms
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==2.3  # https://github.com/django-compressor/django-compressor

From c0554db343ed79197422a27e3d7da82fe20966c9 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 31 Aug 2019 13:00:33 +0200
Subject: [PATCH 0341/2840] Update sentry-sdk from 0.11.1 to 0.11.2

---
 {{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 eadd410d0..1714398f4 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==1.0.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.11.1  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.11.2  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From df36bf1f550a95103def6b667f5de893867fc0db Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 2 Sep 2019 12:00:29 +0100
Subject: [PATCH 0342/2840] Update django from 2.2.4 to 2.2.5

---
 {{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 f5c4f3384..170a888f4 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -19,7 +19,7 @@ flower==0.9.3  # https://github.com/mher/flower
 
 # Django
 # ------------------------------------------------------------------------------
-django==2.2.4  # pyup: < 3.0  # https://www.djangoproject.com/
+django==2.2.5  # pyup: < 3.0  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==3.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.39.1  # https://github.com/pennersr/django-allauth

From 7fd095a926f9768ecdd11732ff17156e55345248 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 3 Sep 2019 21:17:42 -0700
Subject: [PATCH 0343/2840] Update tox from 3.13.2 to 3.14.0

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

diff --git a/requirements.txt b/requirements.txt
index 2f85a7009..b9cff3034 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ flake8==3.7.8
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.13.2
+tox==3.14.0
 pytest==5.1.1
 pytest_cases==1.11.1
 pytest-cookies==0.4.0

From c6bd37adcc51f2c22cb06bf8d504163da01fc803 Mon Sep 17 00:00:00 2001
From: Dani Hodovic <dani.hodovic@gmail.com>
Date: Wed, 4 Sep 2019 15:58:20 +0200
Subject: [PATCH 0344/2840] Add default tests.py file pattern to pytest

`./manage.py startapp` generates a tests.py file by default. This is
ignored by pytest unless specified.
---
 {{cookiecutter.project_slug}}/pytest.ini | 1 +
 1 file changed, 1 insertion(+)

diff --git a/{{cookiecutter.project_slug}}/pytest.ini b/{{cookiecutter.project_slug}}/pytest.ini
index 9fb488cbc..52b48ab03 100644
--- a/{{cookiecutter.project_slug}}/pytest.ini
+++ b/{{cookiecutter.project_slug}}/pytest.ini
@@ -1,5 +1,6 @@
 [pytest]
 addopts = --ds=config.settings.test
+python_files = tests.py test_*.py
 {%- if cookiecutter.js_task_runner != 'None' %}
 norecursedirs = node_modules
 {%- endif %}

From 1c98ff011b212ad385699fe5d437bac41f130a0b Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 4 Sep 2019 11:05:03 -0700
Subject: [PATCH 0345/2840] Update pytest from 5.1.1 to 5.1.2

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

diff --git a/requirements.txt b/requirements.txt
index b9cff3034..4e265809c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8==3.7.8
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.14.0
-pytest==5.1.1
+pytest==5.1.2
 pytest_cases==1.11.1
 pytest-cookies==0.4.0
 pytest-xdist==1.29.0

From f1a04205e70bf7a4bbe14968839207ad05a7edcf Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Wed, 4 Sep 2019 19:08:56 +0100
Subject: [PATCH 0346/2840] Update pytest from 5.1.1 to 5.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 0a4175756..c1df0b84b 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -12,7 +12,7 @@ psycopg2-binary==2.8.3  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.720  # https://github.com/python/mypy
-pytest==5.1.1  # https://github.com/pytest-dev/pytest
+pytest==5.1.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From c29795b1dc7e2d125bf07b027b88a2d853fb9966 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 5 Sep 2019 13:00:31 +0200
Subject: [PATCH 0347/2840] Update djangorestframework from 3.10.2 to 3.10.3

---
 {{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 3fe638e69..24198e557 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -30,5 +30,5 @@ django-compressor==2.3  # https://github.com/django-compressor/django-compressor
 django-redis==4.10.0  # https://github.com/niwinz/django-redis
 
 # Django REST Framework
-djangorestframework==3.10.2  # https://github.com/encode/django-rest-framework
+djangorestframework==3.10.3  # https://github.com/encode/django-rest-framework
 coreapi==2.3.3  # https://github.com/core-api/python-client

From 69566f54561cd5f7d0f7954a0423d4ad759337d6 Mon Sep 17 00:00:00 2001
From: Dani Hodovic <dani.hodovic@gmail.com>
Date: Thu, 22 Aug 2019 14:57:00 +0200
Subject: [PATCH 0348/2840] Add context processor for settings variables

This allows for usage of settings variables in templates, e.g

```
{% if settings.USE_ANALYTICS %}
<!-- Google Tag Manager (noscript) -->
<noscript><iframe src="https://www.googletagmanager.com/ns.html?id={{ settings.GOOGLE_TAG_MANAGER_ID }}" style="display:none;visibility:hidden"></iframe></noscript>
<!-- End Google Tag Manager (noscript) -->
{% endif %}
```
---
 {{cookiecutter.project_slug}}/config/settings/base.py        | 1 +
 .../{{cookiecutter.project_slug}}/utils/__init__.py          | 0
 .../utils/context_processors.py                              | 5 +++++
 3 files changed, 6 insertions(+)
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/__init__.py
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/context_processors.py

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 7def8f489..41f0f46cf 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -187,6 +187,7 @@ TEMPLATES = [
                 "django.template.context_processors.static",
                 "django.template.context_processors.tz",
                 "django.contrib.messages.context_processors.messages",
+                "{{ cookiecutter.project_slug }}.utils.context_processors.settings_context",
             ],
         },
     }
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/__init__.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/context_processors.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/context_processors.py
new file mode 100644
index 000000000..de405076f
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/context_processors.py
@@ -0,0 +1,5 @@
+from django.conf import settings
+
+
+def settings_context(_request):
+    return {"settings": settings}

From fb3d4ff25ceb4bb01f0fdb4f40d739435962097d Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 5 Sep 2019 08:35:31 -0700
Subject: [PATCH 0349/2840] Update pytest_cases from 1.11.1 to 1.11.2

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

diff --git a/requirements.txt b/requirements.txt
index b9cff3034..c76528992 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8==3.7.8
 # ------------------------------------------------------------------------------
 tox==3.14.0
 pytest==5.1.1
-pytest_cases==1.11.1
+pytest_cases==1.11.2
 pytest-cookies==0.4.0
 pytest-xdist==1.29.0
 pyyaml==5.1.2

From e5f9dd2c783a6ec63d7b606e8b5cb6b9d3c0eb3c Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sun, 8 Sep 2019 13:00:29 +0200
Subject: [PATCH 0350/2840] Update django-anymail from 6.1.0 to 7.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 1714398f4..1863a493b 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -18,4 +18,4 @@ django-storages[boto3]==1.7.1  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
 django-storages[google]==1.7.1  # https://github.com/jschneier/django-storages
 {%- endif %}
-django-anymail[mailgun]==6.1.0  # https://github.com/anymail/django-anymail
+django-anymail[mailgun]==7.0.0  # https://github.com/anymail/django-anymail

From db777571c457a92d85cbe08d2de12b06f3fede30 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 10 Sep 2019 13:00:29 +0200
Subject: [PATCH 0351/2840] Update django-storages from 1.7.1 to 1.7.2

---
 {{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 1714398f4..379281ab8 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -14,7 +14,7 @@ sentry-sdk==0.11.2  # https://github.com/getsentry/sentry-python
 # Django
 # ------------------------------------------------------------------------------
 {%- if cookiecutter.cloud_provider == 'AWS' %}
-django-storages[boto3]==1.7.1  # https://github.com/jschneier/django-storages
+django-storages[boto3]==1.7.2  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
 django-storages[google]==1.7.1  # https://github.com/jschneier/django-storages
 {%- endif %}

From fab5bf8a040b9d3467581bfadbb1eee4f97bcf56 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 10 Sep 2019 13:00:30 +0200
Subject: [PATCH 0352/2840] Update django-storages from 1.7.1 to 1.7.2

---
 {{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 379281ab8..5b1387e29 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -16,6 +16,6 @@ sentry-sdk==0.11.2  # https://github.com/getsentry/sentry-python
 {%- if cookiecutter.cloud_provider == 'AWS' %}
 django-storages[boto3]==1.7.2  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
-django-storages[google]==1.7.1  # https://github.com/jschneier/django-storages
+django-storages[google]==1.7.2  # https://github.com/jschneier/django-storages
 {%- endif %}
 django-anymail[mailgun]==6.1.0  # https://github.com/anymail/django-anymail

From 548417612fb98ed8d23253ac7dd29ce96f47a64a Mon Sep 17 00:00:00 2001
From: Jerome Caisip <jerome.caisip@gmail.com>
Date: Fri, 13 Sep 2019 14:43:12 +0800
Subject: [PATCH 0353/2840] Additonal option to setup DRF.

---
 CONTRIBUTORS.rst                              |  2 ++
 cookiecutter.json                             |  1 +
 hooks/post_gen_project.py                     |  8 +++++++
 .../config/api_router.py                      | 14 +++++++++++
 .../config/settings/base.py                   | 16 +++++++++++--
 {{cookiecutter.project_slug}}/config/urls.py  | 11 +++++++++
 .../users/api/serializers.py                  | 12 ++++++++++
 .../users/api/views.py                        | 24 +++++++++++++++++++
 8 files changed, 86 insertions(+), 2 deletions(-)
 create mode 100644 {{cookiecutter.project_slug}}/config/api_router.py
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/views.py

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 4c3ad8a04..f1981cbd2 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -120,6 +120,7 @@ Listed in alphabetical order.
   Irfan Ahmad              `@erfaan`_                    @erfaan
   Jan Van Bruggen          `@jvanbrug`_
   Jelmer Draaijer          `@foarsitter`_
+  Jerome Caisip            `@jeromecaisip`_
   Jens Nilsson             `@phiberjenz`_
   Jerome Leclanche         `@jleclanche`_                @Adys
   Jimmy Gitonga            `@afrowave`_                  @afrowave
@@ -276,6 +277,7 @@ Listed in alphabetical order.
 .. _@jangeador: https://github.com/jangeador
 .. _@jazztpt: https://github.com/jazztpt
 .. _@jcass77: https://github.com/jcass77
+.. _@jeromecaisip: https://github.com/jeromecaisip
 .. _@jleclanche: https://github.com/jleclanche
 .. _@juliocc: https://github.com/juliocc
 .. _@jvanbrug: https://github.com/jvanbrug
diff --git a/cookiecutter.json b/cookiecutter.json
index d6d217ca4..5e70bedb0 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -33,6 +33,7 @@
     "GCP",
     "None"
   ],
+  "use_drf": "n",
   "custom_bootstrap_compilation": "n",
   "use_compressor": "n",
   "use_celery": "n",
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index ff84f1806..42d5dcee0 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -279,6 +279,11 @@ def remove_node_dockerfile():
     shutil.rmtree(os.path.join("compose", "local", "node"))
 
 
+def remove_drf_starter_files():
+    os.remove(os.path.join("config", "api_router.py"))
+    shutil.rmtree(os.path.join("{{cookiecutter.project_slug}}", "users", "api"))
+
+
 def main():
     debug = "{{ cookiecutter.debug }}".lower() == "y"
 
@@ -342,6 +347,9 @@ def main():
     if "{{ cookiecutter.use_travisci }}".lower() == "n":
         remove_dottravisyml_file()
 
+    if "{{ cookiecutter.use_drf }}".lower() == "n":
+        remove_drf_starter_files()
+
     print(SUCCESS + "Project initialized, keep up the good work!" + TERMINATOR)
 
 
diff --git a/{{cookiecutter.project_slug}}/config/api_router.py b/{{cookiecutter.project_slug}}/config/api_router.py
new file mode 100644
index 000000000..fc8107b44
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/config/api_router.py
@@ -0,0 +1,14 @@
+from rest_framework.routers import DefaultRouter, SimpleRouter
+from django.conf import settings
+from {{ cookiecutter.project_slug }}.users.api.views import UserViewSet
+
+if settings.DEBUG:
+    router = DefaultRouter()
+else:
+    router = SimpleRouter()
+
+router.register('users', UserViewSet)
+
+
+app_name = 'api'
+urlpatterns = router.urls
diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 41f0f46cf..a6081950e 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -292,14 +292,26 @@ ACCOUNT_EMAIL_VERIFICATION = "mandatory"
 ACCOUNT_ADAPTER = "{{cookiecutter.project_slug}}.users.adapters.AccountAdapter"
 # https://django-allauth.readthedocs.io/en/latest/configuration.html
 SOCIALACCOUNT_ADAPTER = "{{cookiecutter.project_slug}}.users.adapters.SocialAccountAdapter"
-
 {% if cookiecutter.use_compressor == 'y' -%}
 # django-compressor
 # ------------------------------------------------------------------------------
 # https://django-compressor.readthedocs.io/en/latest/quickstart/#installation
 INSTALLED_APPS += ["compressor"]
 STATICFILES_FINDERS += ["compressor.finders.CompressorFinder"]
-
+{%- endif %}
+{% if cookiecutter.use_drf == "y" -%}
+# django-reset-framework
+# -------------------------------------------------------------------------------
+# django-rest-framework - https://www.django-rest-framework.org/api-guide/settings/
+REST_FRAMEWORK = {
+    'DEFAULT_AUTHENTICATION_CLASSES': (
+        'rest_framework.authentication.SessionAuthentication',
+        'rest_framework.authentication.TokenAuthentication',
+    ),
+    'DEFAULT_PERMISSION_CLASSES': (
+        'rest_framework.permissions.IsAuthenticated',
+    )
+}
 {%- endif %}
 # Your stuff...
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/config/urls.py b/{{cookiecutter.project_slug}}/config/urls.py
index 909d5e86e..5382bdb7c 100644
--- a/{{cookiecutter.project_slug}}/config/urls.py
+++ b/{{cookiecutter.project_slug}}/config/urls.py
@@ -4,6 +4,9 @@ from django.conf.urls.static import static
 from django.contrib import admin
 from django.views.generic import TemplateView
 from django.views import defaults as default_views
+{% if cookiecutter.use_drf == 'y' -%}
+from rest_framework.authtoken.views import obtain_auth_token
+{%- endif %}
 
 urlpatterns = [
     path("", TemplateView.as_view(template_name="pages/home.html"), name="home"),
@@ -17,6 +20,14 @@ urlpatterns = [
     path("accounts/", include("allauth.urls")),
     # Your stuff: custom urls includes go here
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+{% if cookiecutter.use_drf == 'y' -%}
+# API URLS
+urlpatterns += [
+    # API base url
+    path("api/", include('config.api_router')),
+    # DRF auth token
+    path("auth-token/", obtain_auth_token)]
+{%- endif %}
 
 if settings.DEBUG:
     # This allows the error pages to be debugged during development, just visit
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py
new file mode 100644
index 000000000..8fc2262ec
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py
@@ -0,0 +1,12 @@
+from rest_framework import serializers
+from {{ cookiecutter.project_slug }}.users.models import User
+
+class UserSerializer(serializers.ModelSerializer):
+    class Meta:
+        model = User
+        fields = ['username', 'email', 'name', 'url']
+
+        extra_kwargs = {
+            'url': {'view_name': 'api:user-detail', 'lookup_field': 'username'}
+        }
+
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/views.py
new file mode 100644
index 000000000..440cc9b24
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/views.py
@@ -0,0 +1,24 @@
+from django.contrib.auth import get_user_model
+from rest_framework import status
+from rest_framework.decorators import action
+from rest_framework.mixins import RetrieveModelMixin, ListModelMixin, UpdateModelMixin
+from rest_framework.response import Response
+from rest_framework.viewsets import GenericViewSet
+
+
+from .serializers import UserSerializer
+User = get_user_model()
+
+
+class UserViewSet(RetrieveModelMixin, ListModelMixin, UpdateModelMixin, GenericViewSet):
+    serializer_class = UserSerializer
+    queryset = User.objects.all()
+    lookup_field = 'username'
+
+    def get_queryset(self, *args, **kwargs):
+        return self.queryset.filter(id=self.request.user.id)
+
+    @action(detail=False, methods=['GET'])
+    def me(self, request):
+        serializer = UserSerializer(request.user, context={'request': request})
+        return Response(status=status.HTTP_200_OK, data=serializer.data)

From f8963e0dd3935ebaff8614c4bde2af04f8e208c0 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 19 Sep 2019 12:00:30 +0100
Subject: [PATCH 0354/2840] Update sentry-sdk from 0.11.2 to 0.12.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 5b1387e29..a602a7007 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==1.0.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.11.2  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.12.0  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From ce3547e890459323d9fbfd3c7c9a4b5e3331b1e2 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 21 Sep 2019 12:00:30 +0100
Subject: [PATCH 0355/2840] Update sentry-sdk from 0.12.0 to 0.12.2

---
 {{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 a602a7007..6dd363714 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==1.0.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.12.0  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.12.2  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From 02689f67e74c5117933174b374b4f6b02f91c80d Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 21 Sep 2019 12:00:33 +0100
Subject: [PATCH 0356/2840] Update python-slugify from 3.0.3 to 3.0.4

---
 {{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 24198e557..ae16b0e8d 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,5 +1,5 @@
 pytz==2019.2  # https://github.com/stub42/pytz
-python-slugify==3.0.3  # https://github.com/un33k/python-slugify
+python-slugify==3.0.4  # https://github.com/un33k/python-slugify
 Pillow==6.1.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
 rcssmin==1.0.6{% if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} --install-option="--without-c-extensions"{% endif %}  # https://github.com/ndparker/rcssmin

From 26ecff778e5bb61e52fb58bff6a745e381e8dae9 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 22 Sep 2019 00:50:31 -0700
Subject: [PATCH 0357/2840] Update pytest from 5.1.2 to 5.1.3

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

diff --git a/requirements.txt b/requirements.txt
index f4d12375d..a4eb4a533 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8==3.7.8
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.14.0
-pytest==5.1.2
+pytest==5.1.3
 pytest_cases==1.11.2
 pytest-cookies==0.4.0
 pytest-xdist==1.29.0

From aa573427948b4cd25c9db74174953fc48b88f732 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 23 Sep 2019 12:00:28 +0100
Subject: [PATCH 0358/2840] Update pytest from 5.1.2 to 5.1.3

---
 {{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 c1df0b84b..2b221294a 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -12,7 +12,7 @@ psycopg2-binary==2.8.3  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.720  # https://github.com/python/mypy
-pytest==5.1.2  # https://github.com/pytest-dev/pytest
+pytest==5.1.3  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From e924a55d7875ea992104b0440f2eda6c725bcb37 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 25 Sep 2019 12:00:29 +0100
Subject: [PATCH 0359/2840] Update whitenoise from 4.1.3 to 4.1.4

---
 {{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 ae16b0e8d..e2871f71d 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -6,7 +6,7 @@ rcssmin==1.0.6{% if cookiecutter.windows == 'y' and cookiecutter.use_docker == '
 {%- endif %}
 argon2-cffi==19.1.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
-whitenoise==4.1.3  # https://github.com/evansd/whitenoise
+whitenoise==4.1.4  # https://github.com/evansd/whitenoise
 {%- endif %}
 redis==3.3.8  # https://github.com/antirez/redis
 {%- if cookiecutter.use_celery == "y" %}

From 9e5343dd31d64e3eea45e1d19dc944fe7f29cb8c Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 27 Sep 2019 12:00:30 +0100
Subject: [PATCH 0360/2840] Update mypy from 0.720 to 0.730

---
 {{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 2b221294a..a96d64b40 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -11,7 +11,7 @@ psycopg2-binary==2.8.3  # https://github.com/psycopg/psycopg2
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.720  # https://github.com/python/mypy
+mypy==0.730  # https://github.com/python/mypy
 pytest==5.1.3  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 

From 7d0f8606edadc082b5f49e5c50af823a80e8b246 Mon Sep 17 00:00:00 2001
From: Nicolas Stefani <nicolas471@gmail.com>
Date: Sun, 29 Sep 2019 09:41:13 -0300
Subject: [PATCH 0361/2840] Update python image to 3.7

---
 {{cookiecutter.project_slug}}/compose/local/django/Dockerfile   | 2 +-
 .../compose/production/django/Dockerfile                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index 679378223..a98547bdd 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.6-alpine
+FROM python:3.7-alpine
 
 ENV PYTHONUNBUFFERED 1
 
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index 37f66ec78..b0861d605 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -9,7 +9,7 @@ RUN npm run build
 
 # Python build stage
 {%- endif %}
-FROM python:3.6-alpine
+FROM python:3.7-alpine
 
 ENV PYTHONUNBUFFERED 1
 

From 1f68e370eef449e0419a425fa4adbd5869a17513 Mon Sep 17 00:00:00 2001
From: Nicolas Stefani <nicolas471@gmail.com>
Date: Sun, 29 Sep 2019 21:04:21 -0300
Subject: [PATCH 0362/2840] Updated python version to 3.7

---
 .travis.yml                               | 4 ++--
 tox.ini                                   | 2 +-
 {{cookiecutter.project_slug}}/.travis.yml | 2 +-
 {{cookiecutter.project_slug}}/runtime.txt | 2 +-
 {{cookiecutter.project_slug}}/setup.cfg   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index c2bcdf42c..925d82e7b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ services:
 
 language: python
 
-python: 3.6
+python: 3.7
 
 before_install:
   - docker-compose -v
@@ -14,7 +14,7 @@ before_install:
 matrix:
   include:
     - name: Test results
-      script: tox -e py36
+      script: tox -e py37
     - name: Run flake8 on result
       script: tox -e flake8
     - name: Run black on result
diff --git a/tox.ini b/tox.ini
index 7ee939158..1c83465cc 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 skipsdist = true
-envlist = py36,flake8,black,black-template
+envlist = py37,flake8,black,black-template
 
 [testenv]
 deps = -rrequirements.txt
diff --git a/{{cookiecutter.project_slug}}/.travis.yml b/{{cookiecutter.project_slug}}/.travis.yml
index 2d86ac31c..31695e419 100644
--- a/{{cookiecutter.project_slug}}/.travis.yml
+++ b/{{cookiecutter.project_slug}}/.travis.yml
@@ -10,7 +10,7 @@ before_install:
   - sudo apt-get install -qq libsqlite3-dev libxml2 libxml2-dev libssl-dev libbz2-dev wget curl llvm
 language: python
 python:
-  - "3.6"
+  - "3.7"
 install:
   - pip install -r requirements/local.txt
 script:
diff --git a/{{cookiecutter.project_slug}}/runtime.txt b/{{cookiecutter.project_slug}}/runtime.txt
index 9fbd3bf0a..6f651a3b1 100644
--- a/{{cookiecutter.project_slug}}/runtime.txt
+++ b/{{cookiecutter.project_slug}}/runtime.txt
@@ -1 +1 @@
-python-3.6.8
+python-3.7.3
diff --git a/{{cookiecutter.project_slug}}/setup.cfg b/{{cookiecutter.project_slug}}/setup.cfg
index c2139f1db..42b638616 100644
--- a/{{cookiecutter.project_slug}}/setup.cfg
+++ b/{{cookiecutter.project_slug}}/setup.cfg
@@ -7,7 +7,7 @@ max-line-length = 120
 exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules
 
 [mypy]
-python_version = 3.6
+python_version = 3.7
 check_untyped_defs = True
 ignore_errors = False
 ignore_missing_imports = True

From ea52a0be251e17b838f0b1f686ae8f578a70b6f6 Mon Sep 17 00:00:00 2001
From: Nicolas Stefani <nicolas471@gmail.com>
Date: Sun, 29 Sep 2019 21:46:34 -0300
Subject: [PATCH 0363/2840] Updated python version in warning message

---
 hooks/pre_gen_project.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py
index 91332f144..5cda07b67 100644
--- a/hooks/pre_gen_project.py
+++ b/hooks/pre_gen_project.py
@@ -35,7 +35,7 @@ if "{{ cookiecutter.use_docker }}".lower() == "n":
     if python_major_version == 2:
         print(
             WARNING + "You're running cookiecutter under Python 2, but the generated "
-            "project requires Python 3.6+. Do you want to proceed (y/n)? " + TERMINATOR
+            "project requires Python 3.7+. Do you want to proceed (y/n)? " + TERMINATOR
         )
         yes_options, no_options = frozenset(["y"]), frozenset(["n"])
         while True:

From 02a092876f0b6e83ddeec43b3987afc1b16da549 Mon Sep 17 00:00:00 2001
From: Nicolas Stefani <nicolas471@gmail.com>
Date: Sun, 29 Sep 2019 21:47:33 -0300
Subject: [PATCH 0364/2840] Updated python version in classifiers

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

diff --git a/setup.py b/setup.py
index 46c84b712..330320096 100644
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,7 @@ setup(
         "License :: OSI Approved :: BSD License",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.6",
+        "Programming Language :: Python :: 3.7",
         "Programming Language :: Python :: Implementation :: CPython",
         "Topic :: Software Development",
     ],

From acb72cb84cbc4f208ae39882dcb329d3b88fc8ec Mon Sep 17 00:00:00 2001
From: Nicolas Stefani <nicolas471@gmail.com>
Date: Sun, 29 Sep 2019 21:48:04 -0300
Subject: [PATCH 0365/2840] Updated docs

---
 CONTRIBUTING.rst                      | 4 ++--
 README.rst                            | 2 +-
 docs/deployment-on-pythonanywhere.rst | 2 +-
 docs/developing-locally.rst           | 4 ++--
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index cfe16740d..cb59ae5f3 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -39,9 +39,9 @@ To run all tests using various versions of python in virtualenvs defined in tox.
 It is possible to test with a specific version of python. To do this, the command
 is::
 
-    $ tox -e py36
+    $ tox -e py37
 
-This will run py.test with the python3.6 interpreter, for example.
+This will run py.test with the python3.7 interpreter, for example.
 
 To run a particular test with tox for against your current Python version::
 
diff --git a/README.rst b/README.rst
index 30a3a2db4..e4f47351a 100644
--- a/README.rst
+++ b/README.rst
@@ -37,7 +37,7 @@ Features
 ---------
 
 * For Django 2.2
-* Works with Python 3.6
+* Works with Python 3.7
 * Renders Django projects with 100% starting test coverage
 * Twitter Bootstrap_ v4 (`maintained Foundation fork`_ also available)
 * 12-Factor_ based settings via django-environ_
diff --git a/docs/deployment-on-pythonanywhere.rst b/docs/deployment-on-pythonanywhere.rst
index 83b23b27a..4738d5a55 100644
--- a/docs/deployment-on-pythonanywhere.rst
+++ b/docs/deployment-on-pythonanywhere.rst
@@ -35,7 +35,7 @@ Make sure your project is fully committed and pushed up to Bitbucket or Github o
 
     git clone <my-repo-url>  # you can also use hg
     cd my-project-name
-    mkvirtualenv --python=/usr/bin/python3.6 my-project-name
+    mkvirtualenv --python=/usr/bin/python3.7 my-project-name
     pip install -r requirements/production.txt  # may take a few minutes
 
 
diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index 8694dde7a..fdab5a900 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -9,7 +9,7 @@ Setting Up Development Environment
 
 Make sure to have the following on your host:
 
-* Python 3.6
+* Python 3.7
 * PostgreSQL_.
 * Redis_, if using Celery
 
@@ -17,7 +17,7 @@ First things first.
 
 #. Create a virtualenv: ::
 
-    $ python3.6 -m venv <virtual env path>
+    $ python3.7 -m venv <virtual env path>
 
 #. Activate the virtualenv you have just created: ::
 

From 51bf90cdcaf64d1e981b721e8338434f6cec990f Mon Sep 17 00:00:00 2001
From: Nicolas Stefani <nicolas471@gmail.com>
Date: Sun, 29 Sep 2019 22:17:06 -0300
Subject: [PATCH 0366/2840] add name to contributors

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 4c3ad8a04..673724910 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -158,6 +158,7 @@ Listed in alphabetical order.
   Michael Gecht            `@mimischi`_                  @_mischi
   Min ho Kim               `@minho42`_
   mozillazg                `@mozillazg`_
+  Nico Stefani             `@nicolas471`_                @moby_dick91
   Oleg Russkin             `@rolep`_
   Pablo                    `@oubiga`_
   Parbhat Puri             `@parbhat`_

From d6b0bf8bb08769fb9cdf2e1d0a4b2a4a9a76de5c Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 30 Sep 2019 00:04:00 -0700
Subject: [PATCH 0367/2840] Update pytest from 5.1.3 to 5.2.0

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

diff --git a/requirements.txt b/requirements.txt
index a4eb4a533..27787f52c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8==3.7.8
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.14.0
-pytest==5.1.3
+pytest==5.2.0
 pytest_cases==1.11.2
 pytest-cookies==0.4.0
 pytest-xdist==1.29.0

From 4aed40d74d7a003037c55a255cede4d0a901716f Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 1 Oct 2019 12:00:29 +0100
Subject: [PATCH 0368/2840] Update django from 2.2.5 to 2.2.6

---
 {{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 e2871f71d..a7620e3ca 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -19,7 +19,7 @@ flower==0.9.3  # https://github.com/mher/flower
 
 # Django
 # ------------------------------------------------------------------------------
-django==2.2.5  # pyup: < 3.0  # https://www.djangoproject.com/
+django==2.2.6  # pyup: < 3.0  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==3.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.40.0  # https://github.com/pennersr/django-allauth

From 7b73c2eb920b4979f42c284072e9de543889bd05 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 1 Oct 2019 12:00:33 +0100
Subject: [PATCH 0369/2840] Update pytest from 5.1.3 to 5.2.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 a96d64b40..fd2f4eb33 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -12,7 +12,7 @@ psycopg2-binary==2.8.3  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.730  # https://github.com/python/mypy
-pytest==5.1.3  # https://github.com/pytest-dev/pytest
+pytest==5.2.0  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From da15657224b08e5cb026863b7dc35b596e62db4c Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 1 Oct 2019 08:29:41 -0700
Subject: [PATCH 0370/2840] Update pytest_cases from 1.11.2 to 1.11.3

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

diff --git a/requirements.txt b/requirements.txt
index 27787f52c..a93b75a32 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8==3.7.8
 # ------------------------------------------------------------------------------
 tox==3.14.0
 pytest==5.2.0
-pytest_cases==1.11.2
+pytest_cases==1.11.3
 pytest-cookies==0.4.0
 pytest-xdist==1.29.0
 pyyaml==5.1.2

From 0e5902027e86eef7886ffcf31ae0c98ba3007506 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 1 Oct 2019 15:06:58 -0700
Subject: [PATCH 0371/2840] Update pytest-xdist from 1.29.0 to 1.30.0

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

diff --git a/requirements.txt b/requirements.txt
index a93b75a32..e9d2afb2f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,5 +13,5 @@ tox==3.14.0
 pytest==5.2.0
 pytest_cases==1.11.3
 pytest-cookies==0.4.0
-pytest-xdist==1.29.0
+pytest-xdist==1.30.0
 pyyaml==5.1.2

From daa0265a39ab9b6e5a52a82c3d02dd7831713c89 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 2 Oct 2019 12:00:29 +0100
Subject: [PATCH 0372/2840] Update pillow from 6.1.0 to 6.2.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 a7620e3ca..d0bce1554 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,6 +1,6 @@
 pytz==2019.2  # https://github.com/stub42/pytz
 python-slugify==3.0.4  # https://github.com/un33k/python-slugify
-Pillow==6.1.0  # https://github.com/python-pillow/Pillow
+Pillow==6.2.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
 rcssmin==1.0.6{% if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} --install-option="--without-c-extensions"{% endif %}  # https://github.com/ndparker/rcssmin
 {%- endif %}

From 8a471c97e8df910f6762b7dc257cf6ec1e867833 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 2 Oct 2019 12:00:33 +0100
Subject: [PATCH 0373/2840] Update django-extensions from 2.2.1 to 2.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 fd2f4eb33..1f5d7a549 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,6 +30,6 @@ pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==2.0  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==2.2.1  # https://github.com/django-extensions/django-extensions
+django-extensions==2.2.2  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.6.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.5.1  # https://github.com/pytest-dev/pytest-django

From 8e1211580f0fbc77dd3394c4c6b91913a45d8c44 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 2 Oct 2019 13:39:16 +0100
Subject: [PATCH 0374/2840] Create FUNDING.yml

---
 .github/FUNDING.yml | 12 ++++++++++++
 1 file changed, 12 insertions(+)
 create mode 100644 .github/FUNDING.yml

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
new file mode 100644
index 000000000..9f4c97f31
--- /dev/null
+++ b/.github/FUNDING.yml
@@ -0,0 +1,12 @@
+# These are supported funding model platforms
+
+github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+patreon: danielroygreenfeld
+open_collective: # Replace with a single Open Collective username
+ko_fi: # Replace with a single Ko-fi username
+tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
+community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
+liberapay: # Replace with a single Liberapay username
+issuehunt: # Replace with a single IssueHunt username
+otechie: # Replace with a single Otechie username
+custom: ['https://www.patreon.com/browniebroke']

From 39e745dddf090aa1f06da1e5f6e12c669c3351a7 Mon Sep 17 00:00:00 2001
From: Caio Ariede <caio.ariede@gmail.com>
Date: Wed, 2 Oct 2019 10:10:32 -0300
Subject: [PATCH 0375/2840] Fix #2250 -- No staticfile storage with GCP without
 Whitenoise

---
 {{cookiecutter.project_slug}}/config/settings/production.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index e37411653..122871b17 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -107,6 +107,7 @@ STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
 STATICFILES_STORAGE = "config.settings.production.StaticRootS3Boto3Storage"
 STATIC_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/static/"
 {% elif cookiecutter.cloud_provider == 'GCP' -%}
+STATICFILES_STORAGE = "storages.backends.gcloud.GoogleCloudStorage"
 STATIC_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/static/"
 {% endif -%}
 

From f3b46ec4251358b7dd5ae24236b7cd9cc0a0b441 Mon Sep 17 00:00:00 2001
From: Caio Ariede <caio.ariede@gmail.com>
Date: Wed, 2 Oct 2019 10:12:31 -0300
Subject: [PATCH 0376/2840] Add to CONTRIBUTORS

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 4c3ad8a04..4bf682ff4 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -74,6 +74,7 @@ Listed in alphabetical order.
   Bouke Haarsma
   Brent Payne              `@brentpayne`_               @brentpayne
   Burhan Khalid            `@burhan`_                   @burhan
+  Caio Ariede              `@caioariede`_               @caioariede
   Carl Johnson             `@carlmjohnson`_             @carlmjohnson
   Catherine Devlin         `@catherinedevlin`_
   Cédric Gaspoz            `@cgaspoz`_

From d0c208d10fcd335b7b37a6a05d4d8ee72b995793 Mon Sep 17 00:00:00 2001
From: Caio Ariede <caio.ariede@gmail.com>
Date: Wed, 2 Oct 2019 12:03:33 -0300
Subject: [PATCH 0377/2840] Fix #2249 -- Broken static files with whitenoise=n
 & cloud_provider=none

---
 hooks/pre_gen_project.py              |  9 +++++++++
 tests/test_cookiecutter_generation.py | 12 ++++++++++++
 2 files changed, 21 insertions(+)

diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py
index 91332f144..7f9bd3eac 100644
--- a/hooks/pre_gen_project.py
+++ b/hooks/pre_gen_project.py
@@ -59,3 +59,12 @@ if "{{ cookiecutter.use_docker }}".lower() == "n":
                     )
                     + TERMINATOR
                 )
+
+if (
+    "{{ cookiecutter.use_whitenoise }}".lower() == "n"
+    and "{{ cookiecutter.cloud_provider }}" == "None"
+):
+    print(
+        "You should either use Whitenoise or select a Cloud Provider to serve static files"
+    )
+    sys.exit(1)
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 77f71df5b..dc729513c 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -49,6 +49,11 @@ def context_combination(
     cloud_provider,
 ):
     """Fixture that parametrize the function where it's used."""
+    if cloud_provider == "None":
+        # Either of the two should be set for serving static files, so if cloud provider
+        # is not set, we force Whitenoise to be set
+        use_whitenoise = "y"
+
     return {
         "windows": windows,
         "use_docker": use_docker,
@@ -157,3 +162,10 @@ def test_invalid_slug(cookies, context, slug):
 
     assert result.exit_code != 0
     assert isinstance(result.exception, FailedHookException)
+
+
+def test_no_whitenoise_and_no_cloud_provider(cookies, context):
+    context.update({"use_whitenoise": "n", "cloud_provider": "None"})
+    result = cookies.bake(extra_context=context)
+
+    assert result.exit_code == 1

From 9fffafc0950e214db263be797249005c35ef7db7 Mon Sep 17 00:00:00 2001
From: Caio Ariede <caio.ariede@gmail.com>
Date: Wed, 2 Oct 2019 12:06:53 -0300
Subject: [PATCH 0378/2840] Add docstring

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

diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index dc729513c..b02bba360 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -165,6 +165,7 @@ def test_invalid_slug(cookies, context, slug):
 
 
 def test_no_whitenoise_and_no_cloud_provider(cookies, context):
+    """It should not generate project if neither whitenoise or cloud provider are set"""
     context.update({"use_whitenoise": "n", "cloud_provider": "None"})
     result = cookies.bake(extra_context=context)
 

From 6e27a8beac7fcf02221041d5dec88ca314dc5452 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 3 Oct 2019 12:00:31 +0100
Subject: [PATCH 0379/2840] Update sentry-sdk from 0.12.2 to 0.12.3

---
 {{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 0d74f6d10..46c1a89e9 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==1.0.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.12.2  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.12.3  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From 9f1821cadfae6a9782fb92e7d044f197413e0833 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 3 Oct 2019 12:00:34 +0100
Subject: [PATCH 0380/2840] Update django-extensions from 2.2.2 to 2.2.3

---
 {{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 1f5d7a549..41813c475 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,6 +30,6 @@ pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==2.0  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==2.2.2  # https://github.com/django-extensions/django-extensions
+django-extensions==2.2.3  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.6.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.5.1  # https://github.com/pytest-dev/pytest-django

From 4f8834c0ebcf67d55fa8ed74b753ab665440d7b4 Mon Sep 17 00:00:00 2001
From: Caio Ariede <caio.ariede@gmail.com>
Date: Thu, 3 Oct 2019 11:54:15 -0300
Subject: [PATCH 0381/2840] Update tests/test_cookiecutter_generation.py

Co-Authored-By: Bruno Alla <browniebroke@users.noreply.github.com>
---
 tests/test_cookiecutter_generation.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index b02bba360..20e4f9ed2 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -169,4 +169,5 @@ def test_no_whitenoise_and_no_cloud_provider(cookies, context):
     context.update({"use_whitenoise": "n", "cloud_provider": "None"})
     result = cookies.bake(extra_context=context)
 
-    assert result.exit_code == 1
+    assert result.exit_code != 0
+    assert isinstance(result.exception, FailedHookException)

From b8248f4758436d6ebb6ba79b7ad5c118de4d56de Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 4 Oct 2019 12:00:29 +0100
Subject: [PATCH 0382/2840] Update collectfast from 1.0.0 to 1.1.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 46c1a89e9..fae99a3f8 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -5,7 +5,7 @@
 gunicorn==19.9.0  # https://github.com/benoitc/gunicorn
 psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
-Collectfast==1.0.0  # https://github.com/antonagestam/collectfast
+Collectfast==1.1.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
 sentry-sdk==0.12.3  # https://github.com/getsentry/sentry-python

From ff8a9de24eb73e70dda87190d6e649ee39ecc180 Mon Sep 17 00:00:00 2001
From: Caio Ariede <caio.ariede@gmail.com>
Date: Fri, 4 Oct 2019 09:32:25 -0300
Subject: [PATCH 0383/2840] Updates

---
 .../config/settings/production.py              | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 122871b17..7a5d5454d 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -92,7 +92,6 @@ AWS_DEFAULT_ACL = None
 # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
 AWS_S3_REGION_NAME = env("DJANGO_AWS_S3_REGION_NAME", default=None)
 {% elif cookiecutter.cloud_provider == 'GCP' %}
-DEFAULT_FILE_STORAGE = "storages.backends.gcloud.GoogleCloudStorage"
 GS_BUCKET_NAME = env("DJANGO_GCP_STORAGE_BUCKET_NAME")
 GS_DEFAULT_ACL = "publicRead"
 {% endif -%}
@@ -107,7 +106,7 @@ STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
 STATICFILES_STORAGE = "config.settings.production.StaticRootS3Boto3Storage"
 STATIC_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/static/"
 {% elif cookiecutter.cloud_provider == 'GCP' -%}
-STATICFILES_STORAGE = "storages.backends.gcloud.GoogleCloudStorage"
+STATICFILES_STORAGE = "config.settings.production.StaticRootGoogleCloudStorage"
 STATIC_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/static/"
 {% endif -%}
 
@@ -133,8 +132,21 @@ class MediaRootS3Boto3Storage(S3Boto3Storage):
 DEFAULT_FILE_STORAGE = "config.settings.production.MediaRootS3Boto3Storage"
 MEDIA_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/media/"
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
+from storages.backends.gcloud import GoogleCloudStorage  # noqa E402
+
+
+class StaticRootGoogleCloudStorage(GoogleCloudStorage):
+    location = "static"
+    default_acl = "publicRead"
+
+
+class MediaRootGoogleCloudStorage(GoogleCloudStorage):
+    location = "media"
+    file_overwrite = False
+
+
+DEFAULT_FILE_STORAGE = "config.settings.production.MediaRootGoogleCloudStorage"
 MEDIA_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/media/"
-MEDIA_ROOT = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/media/"
 {%- endif %}
 
 # TEMPLATES

From 99ccd314d0b4f67f0847fe847838c4afacd7c2e9 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 4 Oct 2019 14:48:02 +0100
Subject: [PATCH 0384/2840] Add missing link

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 4bf682ff4..3a6c7bd0e 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -230,6 +230,7 @@ Listed in alphabetical order.
 .. _@c-rhodes: https://github.com/c-rhodes
 .. _@caffodian: https://github.com/caffodian
 .. _@canonnervio: https://github.com/canonnervio
+.. _@caioariede: https://github.com/caioariede
 .. _@carlmjohnson: https://github.com/carlmjohnson
 .. _@catherinedevlin: https://github.com/catherinedevlin
 .. _@ccurvey: https://github.com/ccurvey

From 5750330ac2674fe6e9ad361b28cb46e1dc5b8772 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sun, 6 Oct 2019 10:28:15 +0100
Subject: [PATCH 0385/2840] Merge whitenoise & cloud provider parametrize in
 tests

---
 tests/test_cookiecutter_generation.py | 34 ++++++++++++++-------------
 1 file changed, 18 insertions(+), 16 deletions(-)

diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 20e4f9ed2..f931bce06 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -11,9 +11,6 @@ from binaryornot.check import is_binary
 PATTERN = r"{{(\s?cookiecutter)[.](.*?)}}"
 RE_OBJ = re.compile(PATTERN)
 
-YN_CHOICES = ["y", "n"]
-CLOUD_CHOICES = ["AWS", "GCE", "None"]
-
 
 @pytest.fixture
 def context():
@@ -30,14 +27,24 @@ def context():
 
 
 @pytest_fixture_plus
-@pytest.mark.parametrize("windows", YN_CHOICES, ids=lambda yn: f"win:{yn}")
-@pytest.mark.parametrize("use_docker", YN_CHOICES, ids=lambda yn: f"docker:{yn}")
-@pytest.mark.parametrize("use_celery", YN_CHOICES, ids=lambda yn: f"celery:{yn}")
-@pytest.mark.parametrize("use_mailhog", YN_CHOICES, ids=lambda yn: f"mailhog:{yn}")
-@pytest.mark.parametrize("use_sentry", YN_CHOICES, ids=lambda yn: f"sentry:{yn}")
-@pytest.mark.parametrize("use_compressor", YN_CHOICES, ids=lambda yn: f"cmpr:{yn}")
-@pytest.mark.parametrize("use_whitenoise", YN_CHOICES, ids=lambda yn: f"wnoise:{yn}")
-@pytest.mark.parametrize("cloud_provider", CLOUD_CHOICES, ids=lambda yn: f"cloud:{yn}")
+@pytest.mark.parametrize("windows", ["y", "n"], ids=lambda yn: f"win:{yn}")
+@pytest.mark.parametrize("use_docker", ["y", "n"], ids=lambda yn: f"docker:{yn}")
+@pytest.mark.parametrize("use_celery", ["y", "n"], ids=lambda yn: f"celery:{yn}")
+@pytest.mark.parametrize("use_mailhog", ["y", "n"], ids=lambda yn: f"mailhog:{yn}")
+@pytest.mark.parametrize("use_sentry", ["y", "n"], ids=lambda yn: f"sentry:{yn}")
+@pytest.mark.parametrize("use_compressor", ["y", "n"], ids=lambda yn: f"cmpr:{yn}")
+@pytest.mark.parametrize(
+    "use_whitenoise,cloud_provider",
+    [
+        ("y", "AWS"),
+        ("y", "GCP"),
+        ("y", "None"),
+        ("n", "AWS"),
+        ("n", "GCP"),
+        # no whitenoise + co cloud provider is not supported
+    ],
+    ids=lambda id: f"wnoise:{id[0]}-cloud:{id[1]}",
+)
 def context_combination(
     windows,
     use_docker,
@@ -49,11 +56,6 @@ def context_combination(
     cloud_provider,
 ):
     """Fixture that parametrize the function where it's used."""
-    if cloud_provider == "None":
-        # Either of the two should be set for serving static files, so if cloud provider
-        # is not set, we force Whitenoise to be set
-        use_whitenoise = "y"
-
     return {
         "windows": windows,
         "use_docker": use_docker,

From 703e8509aa863478e6ba1ee6f20e29aada693d15 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sun, 6 Oct 2019 11:09:13 +0100
Subject: [PATCH 0386/2840] Fix broken link in list of contributors

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index d14afcc9e..3a3930b2e 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -304,6 +304,7 @@ Listed in alphabetical order.
 .. _@mrcoles: https://github.com/mrcoles
 .. _@msaizar: https://github.com/msaizar
 .. _@myilmaz: https://github.com/myilmaz
+.. _@nicolas471: https://github.com/nicolas471
 .. _@noisy: https://github.com/noisy
 .. _@originell: https://github.com/originell
 .. _@oubiga: https://github.com/oubiga

From 058d3a2add08cb337042b3a403251622e4e9baff Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sun, 6 Oct 2019 11:15:28 +0100
Subject: [PATCH 0387/2840] Update changelog with recent changes

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5df2d3a32..2e7d9220d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,18 @@
 All enhancements and patches to Cookiecutter Django will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2019-10-06]
+### Changed
+- Default Python version is now 3.7 (@nicolas471)
+
+## [2019-10-04]
+### Fixed
+- Fix static files handling on GCP (@caioariede)
+
+## [2019-10-03]
+### Fixed
+- Fix incompatible combination between Whitenoise and no cloud provider (@caioariede)
+
 ## [2019-07-09]
 ### Fixed
 - Always use test settings in pytest (@danihodovic)

From 98a443626b7b359b629e5e51502d0bb7ed8519d8 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sun, 6 Oct 2019 13:07:20 +0100
Subject: [PATCH 0388/2840] Update to latest Python 3.7 runtime on Heroku

---
 {{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 6f651a3b1..42731f2fb 100644
--- a/{{cookiecutter.project_slug}}/runtime.txt
+++ b/{{cookiecutter.project_slug}}/runtime.txt
@@ -1 +1 @@
-python-3.7.3
+python-3.7.4

From 973fbfe7a463acf14fb16c39ff5037240a20903d Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 7 Oct 2019 12:00:30 +0100
Subject: [PATCH 0389/2840] Update pytest from 5.2.0 to 5.2.1

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

diff --git a/requirements.txt b/requirements.txt
index e9d2afb2f..efc3d1176 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8==3.7.8
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.14.0
-pytest==5.2.0
+pytest==5.2.1
 pytest_cases==1.11.3
 pytest-cookies==0.4.0
 pytest-xdist==1.30.0

From 86fd35bba6d8b04679f6dba01cae5e32771ea28c Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 7 Oct 2019 12:00:31 +0100
Subject: [PATCH 0390/2840] Update pytest from 5.2.0 to 5.2.1

---
 {{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 41813c475..daa4870c5 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -12,7 +12,7 @@ psycopg2-binary==2.8.3  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.730  # https://github.com/python/mypy
-pytest==5.2.0  # https://github.com/pytest-dev/pytest
+pytest==5.2.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From b338a7490a042ca36d07612a3b1dfdd7eedf1910 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 7 Oct 2019 12:00:34 +0100
Subject: [PATCH 0391/2840] Update collectfast from 1.1.0 to 1.2.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 fae99a3f8..e59644fff 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -5,7 +5,7 @@
 gunicorn==19.9.0  # https://github.com/benoitc/gunicorn
 psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
-Collectfast==1.1.0  # https://github.com/antonagestam/collectfast
+Collectfast==1.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
 sentry-sdk==0.12.3  # https://github.com/getsentry/sentry-python

From ca9addbbefa91654077acfd332150a503bd8e175 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 7 Oct 2019 12:00:36 +0100
Subject: [PATCH 0392/2840] Update pytz from 2019.2 to 2019.3

---
 {{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 d0bce1554..01791e8ce 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,4 +1,4 @@
-pytz==2019.2  # https://github.com/stub42/pytz
+pytz==2019.3  # https://github.com/stub42/pytz
 python-slugify==3.0.4  # https://github.com/un33k/python-slugify
 Pillow==6.2.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}

From 5e196b45e9f6c1b45b30e942df38526b53587f36 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 10 Oct 2019 11:36:48 +0100
Subject: [PATCH 0393/2840] Pin Traefik Docker image to v1

Until we do the required changes to update to v2.

Fixes #2258
---
 .../compose/production/traefik/Dockerfile                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
index 7088e6fe3..d7363a1af 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
@@ -1,4 +1,4 @@
-FROM traefik:alpine
+FROM traefik:1.7-alpine
 RUN mkdir -p /etc/traefik/acme
 RUN touch /etc/traefik/acme/acme.json
 RUN chmod 600 /etc/traefik/acme/acme.json

From 93473cb39adff9c6317ee93b5d7d6becb9a553ce Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 11 Oct 2019 12:00:29 +0100
Subject: [PATCH 0394/2840] Update python-slugify from 3.0.4 to 3.0.6

---
 {{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 01791e8ce..f7b0b4d37 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,5 +1,5 @@
 pytz==2019.3  # https://github.com/stub42/pytz
-python-slugify==3.0.4  # https://github.com/un33k/python-slugify
+python-slugify==3.0.6  # https://github.com/un33k/python-slugify
 Pillow==6.2.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
 rcssmin==1.0.6{% if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} --install-option="--without-c-extensions"{% endif %}  # https://github.com/ndparker/rcssmin

From f26cad1faa9761aded5b214b1688297208b764dc Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 11 Oct 2019 12:00:32 +0100
Subject: [PATCH 0395/2840] Update redis from 3.3.8 to 3.3.10

---
 {{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 01791e8ce..3f96a8984 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -8,7 +8,7 @@ argon2-cffi==19.1.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==4.1.4  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==3.3.8  # https://github.com/antirez/redis
+redis==3.3.10  # https://github.com/antirez/redis
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.3.0  # pyup: < 5.0  # https://github.com/celery/celery
 django-celery-beat==1.5.0  # https://github.com/celery/django-celery-beat

From be8afa27b3a7f02e6ddadaa676915572a5a20b63 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 14 Oct 2019 12:00:29 +0100
Subject: [PATCH 0396/2840] Update redis from 3.3.10 to 3.3.11

---
 {{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 1270a25ed..049d75f11 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -8,7 +8,7 @@ argon2-cffi==19.1.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==4.1.4  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==3.3.10  # https://github.com/antirez/redis
+redis==3.3.11  # https://github.com/antirez/redis
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.3.0  # pyup: < 5.0  # https://github.com/celery/celery
 django-celery-beat==1.5.0  # https://github.com/celery/django-celery-beat

From f8cbea93aa070195bd1beb674755e1f999d1c3e6 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 17 Oct 2019 12:00:29 +0100
Subject: [PATCH 0397/2840] Update mypy from 0.730 to 0.740

---
 {{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 daa4870c5..6f4289c3f 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -11,7 +11,7 @@ psycopg2-binary==2.8.3  # https://github.com/psycopg/psycopg2
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.730  # https://github.com/python/mypy
+mypy==0.740  # https://github.com/python/mypy
 pytest==5.2.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 

From f87757f4abec4dd0e427df72ee3c47bf33a08154 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 17 Oct 2019 12:00:31 +0100
Subject: [PATCH 0398/2840] Update pytest-django from 3.5.1 to 3.6.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 daa4870c5..a0c7b5259 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -32,4 +32,4 @@ factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 django-debug-toolbar==2.0  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==2.2.3  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.6.0  # https://github.com/nedbat/django_coverage_plugin
-pytest-django==3.5.1  # https://github.com/pytest-dev/pytest-django
+pytest-django==3.6.0  # https://github.com/pytest-dev/pytest-django

From c8ebb633cfc2c4b1b8e08aedcf0b7e7fe5876e8d Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 18 Oct 2019 12:00:29 +0100
Subject: [PATCH 0399/2840] Update sentry-sdk from 0.12.3 to 0.13.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 e59644fff..10d1ea5b5 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==1.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.12.3  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.13.0  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From 42e5581198dd3f40448d89d486bcf6c6372ae955 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 18 Oct 2019 12:00:32 +0100
Subject: [PATCH 0400/2840] Update django-crispy-forms from 1.7.2 to 1.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 049d75f11..9bf874070 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -23,7 +23,7 @@ django==2.2.6  # pyup: < 3.0  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==3.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.40.0  # https://github.com/pennersr/django-allauth
-django-crispy-forms==1.7.2  # https://github.com/django-crispy-forms/django-crispy-forms
+django-crispy-forms==1.8.0  # https://github.com/django-crispy-forms/django-crispy-forms
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==2.3  # https://github.com/django-compressor/django-compressor
 {%- endif %}

From 96ade99c66c396ec2cac70f93cb173ef8ec2208c Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sun, 20 Oct 2019 12:00:29 +0100
Subject: [PATCH 0401/2840] Update psycopg2-binary from 2.8.3 to 2.8.4

---
 {{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 dd795609e..c7e9aa924 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -6,7 +6,7 @@ Sphinx==2.2.0  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}
-psycopg2-binary==2.8.3  # https://github.com/psycopg/psycopg2
+psycopg2-binary==2.8.4  # https://github.com/psycopg/psycopg2
 {%- endif %}
 
 # Testing

From 58f41fc97f9fc1ebf6853c7855a9450d9c92e8f1 Mon Sep 17 00:00:00 2001
From: Jelmert <jelmerdraaijer@gmail.com>
Date: Mon, 21 Oct 2019 09:59:37 +0200
Subject: [PATCH 0402/2840] fix: remove the aws Dockerfile and remove the
 awscli definition from production.yml when not selected

---
 hooks/post_gen_project.py                    | 7 +++++++
 {{cookiecutter.project_slug}}/production.yml | 3 +++
 2 files changed, 10 insertions(+)

diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index ff84f1806..95815564f 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -279,6 +279,10 @@ def remove_node_dockerfile():
     shutil.rmtree(os.path.join("compose", "local", "node"))
 
 
+def remove_aws_dockerfile():
+    shutil.rmtree(os.path.join("compose", "production", "aws"))
+
+
 def main():
     debug = "{{ cookiecutter.debug }}".lower() == "y"
 
@@ -302,6 +306,9 @@ def main():
     else:
         remove_docker_files()
 
+    if "{{ cookiecutter.use_docker }}".lower() == "y" and "{{ cookiecutter.cloud_provider}}".lower() != 'aws':
+        remove_aws_dockerfile()
+
     if "{{ cookiecutter.use_heroku }}".lower() == "n":
         remove_heroku_files()
 
diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index 331cbba68..62ec9d829 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -65,6 +65,8 @@ services:
     command: /start-flower
 
   {%- endif %}
+
+  {% if cookiecutter.cloud_provider == 'AWS' %}
   awscli:
     build:
       context: .
@@ -73,3 +75,4 @@ services:
       - ./.envs/.production/.django
     volumes:
       - production_postgres_data_backups:/backups
+  {%- endif %}

From eb8ea447e488df634373e44de36e4aad7fd2dfb3 Mon Sep 17 00:00:00 2001
From: Jelmert <jelmerdraaijer@gmail.com>
Date: Mon, 21 Oct 2019 11:12:53 +0200
Subject: [PATCH 0403/2840] fix: black

---
 hooks/post_gen_project.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index 95815564f..0544f14bc 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -306,7 +306,10 @@ def main():
     else:
         remove_docker_files()
 
-    if "{{ cookiecutter.use_docker }}".lower() == "y" and "{{ cookiecutter.cloud_provider}}".lower() != 'aws':
+    if (
+        "{{ cookiecutter.use_docker }}".lower() == "y"
+        and "{{ cookiecutter.cloud_provider}}".lower() != "aws"
+    ):
         remove_aws_dockerfile()
 
     if "{{ cookiecutter.use_heroku }}".lower() == "n":

From 39c33c550c5e26e2edece8b759ba4fc77cba5b7d Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 21 Oct 2019 12:00:29 +0100
Subject: [PATCH 0404/2840] Update python-slugify from 3.0.6 to 4.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 9bf874070..91b1e79c1 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,5 +1,5 @@
 pytz==2019.3  # https://github.com/stub42/pytz
-python-slugify==3.0.6  # https://github.com/un33k/python-slugify
+python-slugify==4.0.0  # https://github.com/un33k/python-slugify
 Pillow==6.2.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
 rcssmin==1.0.6{% if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} --install-option="--without-c-extensions"{% endif %}  # https://github.com/ndparker/rcssmin

From 8cce6df70aae9ce59ca746dd2419a9d284e254cf Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 21 Oct 2019 12:00:32 +0100
Subject: [PATCH 0405/2840] Update django-extensions from 2.2.3 to 2.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 dd795609e..1068b1947 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,6 +30,6 @@ pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==2.0  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==2.2.3  # https://github.com/django-extensions/django-extensions
+django-extensions==2.2.5  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.6.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.6.0  # https://github.com/pytest-dev/pytest-django

From 400fcc4030fec8cff85cca30082a70977fb14716 Mon Sep 17 00:00:00 2001
From: Yuchen Xie <yuchen.xie@live.com>
Date: Tue, 22 Oct 2019 10:20:00 +0800
Subject: [PATCH 0406/2840] Prevent collectfast from guessing a wrong strategy

If `COLLECTFAST_STRATEGY` is not provided in `settings`, `collectfast` has to guess a "strategy". For the case with AWS, it guesses `BotoStrategy` in stead of `S3Boto3Storage`, which is a wrong decision as we `pip install django-storages[boto3]` (`boto3` in favor of `boto`).

Setting `COLLECTFAST_STRATEGY` is also encouraged as `collectfast` is not going to guess the strategy in the future.

Ref:
* https://github.com/antonagestam/collectfast/blob/f37dd1faa2046a2ebb88c098eb03e56a95534ec6/collectfast/management/commands/collectstatic.py#L33
* https://github.com/antonagestam/collectfast/blob/f37dd1faa2046a2ebb88c098eb03e56a95534ec6/collectfast/strategies/base.py#L170
---
 CONTRIBUTORS.rst                                            | 2 ++
 {{cookiecutter.project_slug}}/config/settings/production.py | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 3a3930b2e..90bb63952 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -200,6 +200,7 @@ Listed in alphabetical order.
   William Archinal         `@archinal`_
   Xaver Y.R. Chen          `@yrchen`_                   @yrchen
   Yaroslav Halchenko
+  Yuchen Xie               `@mapx`_
 ========================== ============================ ==============
 
 .. _@a7p: https://github.com/a7p
@@ -291,6 +292,7 @@ Listed in alphabetical order.
 .. _@knitatoms: https://github.com/knitatoms
 .. _@krzysztofzuraw: https://github.com/krzysztofzuraw
 .. _@MathijsHoogland: https://github.com/MathijsHoogland
+.. _@mapx: https://github.com/mapx
 .. _@mattayes: https://github.com/mattayes
 .. _@menzenski: https://github.com/menzenski
 .. _@mfwarren: https://github.com/mfwarren
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 7a5d5454d..712f2bf4a 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -104,9 +104,11 @@ GS_DEFAULT_ACL = "publicRead"
 STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
 {% elif cookiecutter.cloud_provider == 'AWS' -%}
 STATICFILES_STORAGE = "config.settings.production.StaticRootS3Boto3Storage"
+COLLECTFAST_STRATEGY = "collectfast.strategies.boto3.Boto3Strategy"
 STATIC_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/static/"
 {% elif cookiecutter.cloud_provider == 'GCP' -%}
 STATICFILES_STORAGE = "config.settings.production.StaticRootGoogleCloudStorage"
+COLLECTFAST_STRATEGY = "collectfast.strategies.gcloud.GoogleCloudStrategy"
 STATIC_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/static/"
 {% endif -%}
 

From 998733411c7340a451c4099bd93f4d23c24b8eaf Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 22 Oct 2019 12:00:35 +0100
Subject: [PATCH 0407/2840] Update pillow from 6.2.0 to 6.2.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 9bf874070..efff1c480 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,6 +1,6 @@
 pytz==2019.3  # https://github.com/stub42/pytz
 python-slugify==3.0.6  # https://github.com/un33k/python-slugify
-Pillow==6.2.0  # https://github.com/python-pillow/Pillow
+Pillow==6.2.1  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
 rcssmin==1.0.6{% if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} --install-option="--without-c-extensions"{% endif %}  # https://github.com/ndparker/rcssmin
 {%- endif %}

From 3f0134a64b2dd148af1e59de4ce75780096f5d2b Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 23 Oct 2019 12:00:31 +0100
Subject: [PATCH 0408/2840] Update collectfast from 1.2.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 10d1ea5b5..a036e77ec 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -5,7 +5,7 @@
 gunicorn==19.9.0  # https://github.com/benoitc/gunicorn
 psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
-Collectfast==1.2.0  # https://github.com/antonagestam/collectfast
+Collectfast==1.3.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
 sentry-sdk==0.13.0  # https://github.com/getsentry/sentry-python

From 662ca222054e0acbbfac6aae1fae1dc7e6f5a264 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 24 Oct 2019 12:00:29 +0100
Subject: [PATCH 0409/2840] Update pytest_cases from 1.11.3 to 1.11.4

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

diff --git a/requirements.txt b/requirements.txt
index efc3d1176..c90fb4cd3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8==3.7.8
 # ------------------------------------------------------------------------------
 tox==3.14.0
 pytest==5.2.1
-pytest_cases==1.11.3
+pytest_cases==1.11.4
 pytest-cookies==0.4.0
 pytest-xdist==1.30.0
 pyyaml==5.1.2

From bd61b797325d3545801940ca5a3013d05ede52d4 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 25 Oct 2019 12:00:36 +0100
Subject: [PATCH 0410/2840] Update pytest from 5.2.1 to 5.2.2

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

diff --git a/requirements.txt b/requirements.txt
index efc3d1176..0614fa8f4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8==3.7.8
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.14.0
-pytest==5.2.1
+pytest==5.2.2
 pytest_cases==1.11.3
 pytest-cookies==0.4.0
 pytest-xdist==1.30.0

From c2aa615fdc1c94d8d1a1ef8f33b5859ef7c6d6e4 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 25 Oct 2019 12:00:37 +0100
Subject: [PATCH 0411/2840] Update pytest from 5.2.1 to 5.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 1d08dcb75..5dfff7ea1 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -12,7 +12,7 @@ psycopg2-binary==2.8.4  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.740  # https://github.com/python/mypy
-pytest==5.2.1  # https://github.com/pytest-dev/pytest
+pytest==5.2.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From b7976b9c3623adbac35904928522174035daaf12 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 25 Oct 2019 12:00:40 +0100
Subject: [PATCH 0412/2840] Update sentry-sdk from 0.13.0 to 0.13.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 a036e77ec..00c1a16ce 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==1.3.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.13.0  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.13.1  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From caa8b5a303a20065741193710455b5568f543029 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 26 Oct 2019 12:00:30 +0100
Subject: [PATCH 0413/2840] Update sphinx from 2.2.0 to 2.2.1

---
 {{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 5dfff7ea1..bb60bed0c 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -2,7 +2,7 @@
 
 Werkzeug==0.14.1  # pyup: < 0.15 # https://github.com/pallets/werkzeug
 ipdb==0.12.2  # https://github.com/gotcha/ipdb
-Sphinx==2.2.0  # https://github.com/sphinx-doc/sphinx
+Sphinx==2.2.1  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}

From d006bc610c3d431d9544c4d5b27aa812cc2b93c5 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 28 Oct 2019 11:00:30 +0000
Subject: [PATCH 0414/2840] Update collectfast 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 00c1a16ce..d65a0cbc2 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -5,7 +5,7 @@
 gunicorn==19.9.0  # https://github.com/benoitc/gunicorn
 psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
-Collectfast==1.3.0  # https://github.com/antonagestam/collectfast
+Collectfast==1.3.1  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
 sentry-sdk==0.13.1  # https://github.com/getsentry/sentry-python

From 9b61317682d402c1c232b3f9c486ffebd5a99339 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 28 Oct 2019 11:00:33 +0000
Subject: [PATCH 0415/2840] Update argon2-cffi from 19.1.0 to 19.2.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 efff1c480..33ac3f7b5 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -4,7 +4,7 @@ Pillow==6.2.1  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
 rcssmin==1.0.6{% if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} --install-option="--without-c-extensions"{% endif %}  # https://github.com/ndparker/rcssmin
 {%- endif %}
-argon2-cffi==19.1.0  # https://github.com/hynek/argon2_cffi
+argon2-cffi==19.2.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==4.1.4  # https://github.com/evansd/whitenoise
 {%- endif %}

From bb6188d43111536cbd6767a54c4f12d5a9647be8 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 28 Oct 2019 21:10:07 -0500
Subject: [PATCH 0416/2840] Update black from 19.3b0 to 19.10b0

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

diff --git a/requirements.txt b/requirements.txt
index 39080994f..13398eb35 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-black==19.3b0
+black==19.10b0
 flake8==3.7.8
 
 # Testing

From 10e395f65c1bc8133e99720afe3b1bcfe01edbd5 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 29 Oct 2019 11:00:32 +0000
Subject: [PATCH 0417/2840] Update black from 19.3b0 to 19.10b0

---
 {{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 bb60bed0c..5756ebe4f 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -19,7 +19,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 # ------------------------------------------------------------------------------
 flake8==3.7.8  # https://github.com/PyCQA/flake8
 coverage==4.5.4  # https://github.com/nedbat/coveragepy
-black==19.3b0  # https://github.com/ambv/black
+black==19.10b0  # https://github.com/ambv/black
 pylint-django==2.0.11  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery

From 4a194c6966dcc5157610a175b2fe30646121491b Mon Sep 17 00:00:00 2001
From: leollon <ccsapp.tux@gmail.com>
Date: Tue, 29 Oct 2019 22:47:27 +0800
Subject: [PATCH 0418/2840] Add pre-commit for the generated project. (#2171)

---
 CONTRIBUTORS.rst                              |  2 ++
 README.rst                                    |  2 ++
 docs/developing-locally.rst                   |  6 ++++++
 .../.pre-commit-config.yaml                   | 19 +++++++++++++++++++
 .../requirements/local.txt                    |  1 +
 5 files changed, 30 insertions(+)
 create mode 100644 {{cookiecutter.project_slug}}/.pre-commit-config.yaml

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 90bb63952..5224de1f8 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -137,6 +137,7 @@ Listed in alphabetical order.
   Keyvan Mosharraf         `@keyvanm`_
   Krzysztof Szumny         `@noisy`_
   Krzysztof Żuraw          `@krzysztofzuraw`_
+  Leo won                  `@leollon`_
   Leo Zhou                 `@glasslion`_
   Leonardo Jimenez         `@xpostudio4`_
   Lin Xianyi               `@iynaix`_
@@ -291,6 +292,7 @@ Listed in alphabetical order.
 .. _@keyvanm: https://github.com/keyvanm
 .. _@knitatoms: https://github.com/knitatoms
 .. _@krzysztofzuraw: https://github.com/krzysztofzuraw
+.. _@leollon: https://github.com/leollon
 .. _@MathijsHoogland: https://github.com/MathijsHoogland
 .. _@mapx: https://github.com/mapx
 .. _@mattayes: https://github.com/mattayes
diff --git a/README.rst b/README.rst
index e4f47351a..4be3c4bc8 100644
--- a/README.rst
+++ b/README.rst
@@ -53,6 +53,7 @@ Features
 * Instructions for deploying to PythonAnywhere_
 * Run tests with unittest or pytest
 * Customizable PostgreSQL version
+* Default integration with pre-commit_ for identifying simple issues before submission to code review
 
 .. _`maintained Foundation fork`: https://github.com/Parbhat/cookiecutter-django-foundation
 
@@ -84,6 +85,7 @@ Optional Integrations
 .. _PythonAnywhere: https://www.pythonanywhere.com/
 .. _Traefik: https://traefik.io/
 .. _LetsEncrypt: https://letsencrypt.org/
+.. _pre-commit: https://github.com/pre-commit/pre-commit 
 
 Constraints
 -----------
diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index fdab5a900..7a58d0999 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -26,6 +26,12 @@ First things first.
 #. Install development requirements: ::
 
     $ pip install -r requirements/local.txt
+    $ pre-commit install
+
+     .. note::
+
+        the `pre-commit` exists in the generated project as default.
+        for the details of `pre-commit`, follow the [site of pre-commit](https://pre-commit.com/).
 
 #. Create a new PostgreSQL database using createdb_: ::
 
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
new file mode 100644
index 000000000..b9d69a9a1
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -0,0 +1,19 @@
+exclude: 'docs|node_modules|migrations|.git|.tox'
+default_stages: [commit]
+fail_fast: true
+
+repos:
+-   repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: master
+    hooks:
+      - id: trailing-whitespace
+        files: (^|/)a/.+\.(py|html|sh|css|js)$
+
+-   repo: local
+    hooks:
+      - id: flake8
+        name: flake8
+        entry: flake8
+        language: python
+        types: [python]
+
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index bb60bed0c..73104edab 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -24,6 +24,7 @@ pylint-django==2.0.11  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}
+pre-commit==1.20.0  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From 04f3ae75dc731d72336e648bb4a653f62d7d5757 Mon Sep 17 00:00:00 2001
From: Bruce Olivier <bolivierjr@gmail.com>
Date: Sat, 2 Nov 2019 15:57:05 -0500
Subject: [PATCH 0419/2840] Added more settings to .editorconfig to run isort
 and have black compatibility.

---
 CONTRIBUTORS.rst                            |  2 ++
 {{cookiecutter.project_slug}}/.editorconfig | 14 ++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 90bb63952..8a1d9c454 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -73,6 +73,7 @@ Listed in alphabetical order.
   Bo Lopker                `@blopker`_
   Bouke Haarsma
   Brent Payne              `@brentpayne`_               @brentpayne
+  Bruce Olivier            `@bolivierjr`_
   Burhan Khalid            `@burhan`_                   @burhan
   Caio Ariede              `@caioariede`_               @caioariede
   Carl Johnson             `@carlmjohnson`_             @carlmjohnson
@@ -225,6 +226,7 @@ Listed in alphabetical order.
 .. _@bloodpet: https://github.com/bloodpet
 .. _@blopker: https://github.com/blopker
 .. _@bogdal: https://github.com/bogdal
+.. _@bolivierjr: https://github.com/bolivierjr
 .. _@brentpayne: https://github.com/brentpayne
 .. _@btknu: https://github.com/btknu
 .. _@burhan: https://github.com/burhan
diff --git a/{{cookiecutter.project_slug}}/.editorconfig b/{{cookiecutter.project_slug}}/.editorconfig
index b19266bf3..792dd3b06 100644
--- a/{{cookiecutter.project_slug}}/.editorconfig
+++ b/{{cookiecutter.project_slug}}/.editorconfig
@@ -13,10 +13,16 @@ indent_style = space
 indent_size = 4
 
 [*.py]
-line_length=120
-known_first_party={{ cookiecutter.project_slug }}
-multi_line_output=3
-default_section=THIRDPARTY
+line_length = 120
+known_first_party = {{ cookiecutter.project_slug }}
+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

From 91c6f69a57d4528e749c79f03a0cf2623eca23ab Mon Sep 17 00:00:00 2001
From: Gilbishkosma <gilbeeshkosma15@gmail.com>
Date: Sun, 3 Nov 2019 19:51:56 +0530
Subject: [PATCH 0420/2840] Update deployment-with-docker.rst

---
 docs/deployment-with-docker.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/docs/deployment-with-docker.rst b/docs/deployment-with-docker.rst
index 038778cfb..0df50ff45 100644
--- a/docs/deployment-with-docker.rst
+++ b/docs/deployment-with-docker.rst
@@ -152,6 +152,7 @@ If you are using ``supervisor``, you can use this file as a starting point::
 Move it to ``/etc/supervisor/conf.d/{{cookiecutter.project_slug}}.conf`` and run::
 
     supervisorctl reread
+    supervisorctl update
     supervisorctl start {{cookiecutter.project_slug}}
 
 For status check, run::

From 8f74fdb9423d34c6674b2737d0ddb879eafddffb Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 4 Nov 2019 12:00:33 +0100
Subject: [PATCH 0421/2840] Update django from 2.2.6 to 2.2.7

---
 {{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 b7596f817..dbdee1765 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -19,7 +19,7 @@ flower==0.9.3  # https://github.com/mher/flower
 
 # Django
 # ------------------------------------------------------------------------------
-django==2.2.6  # pyup: < 3.0  # https://www.djangoproject.com/
+django==2.2.7  # pyup: < 3.0  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==3.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.40.0  # https://github.com/pennersr/django-allauth

From cbbbf351d033184c8b6557f5f79c7bcc050b00ca Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 4 Nov 2019 12:34:43 +0000
Subject: [PATCH 0422/2840] Update CONTRIBUTORS.rst

---
 CONTRIBUTORS.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 8a1d9c454..ae4022d51 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -113,6 +113,7 @@ Listed in alphabetical order.
   Florian Idelberger       `@step21`_                    @windrush
   Garry Cairns             `@garry-cairns`_
   Garry Polley             `@garrypolley`_
+  Gilbishkosma             `@Gilbishkosma`_
   Hamish Durkin            `@durkode`_
   Hana Quadara             `@hanaquadara`_
   Harry Percival           `@hjwp`_
@@ -269,6 +270,7 @@ Listed in alphabetical order.
 .. _@foarsitter: https://github.com/foarsitter
 .. _@garry-cairns: https://github.com/garry-cairns
 .. _@garrypolley: https://github.com/garrypolley
+.. _@Gilbishkosma: https://github.com/Gilbishkosma
 .. _@glasslion: https://github.com/glasslion
 .. _@goldhand: https://github.com/goldhand
 .. _@hackebrot: https://github.com/hackebrot

From 9e58bb4e80762cd250feb9b783c990cc482d2375 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 5 Nov 2019 12:00:32 +0100
Subject: [PATCH 0423/2840] Update pylint-django from 2.0.11 to 2.0.12

---
 {{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 e011da637..baee31966 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -20,7 +20,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 flake8==3.7.8  # https://github.com/PyCQA/flake8
 coverage==4.5.4  # https://github.com/nedbat/coveragepy
 black==19.10b0  # https://github.com/ambv/black
-pylint-django==2.0.11  # https://github.com/PyCQA/pylint-django
+pylint-django==2.0.12  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}

From 66c4f630a7d122b8db01bec9f50dae0db6a21df5 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 6 Nov 2019 12:00:34 +0100
Subject: [PATCH 0424/2840] Update pytest_cases from 1.11.4 to 1.11.5

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

diff --git a/requirements.txt b/requirements.txt
index 13398eb35..66786b19a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8==3.7.8
 # ------------------------------------------------------------------------------
 tox==3.14.0
 pytest==5.2.2
-pytest_cases==1.11.4
+pytest_cases==1.11.5
 pytest-cookies==0.4.0
 pytest-xdist==1.30.0
 pyyaml==5.1.2

From 0374f11d099930fa3efd2be278f4d4ffa9dcede7 Mon Sep 17 00:00:00 2001
From: Yuchen Xie <4576282+mapx@users.noreply.github.com>
Date: Thu, 7 Nov 2019 18:59:23 +0800
Subject: [PATCH 0425/2840] Using WhiteNoise in development

---
 {{cookiecutter.project_slug}}/config/settings/base.py    | 3 +++
 {{cookiecutter.project_slug}}/config/settings/local.py   | 8 ++++++++
 .../config/settings/production.py                        | 9 +--------
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 41f0f46cf..935a0d12a 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -131,6 +131,9 @@ AUTH_PASSWORD_VALIDATORS = [
 # https://docs.djangoproject.com/en/dev/ref/settings/#middleware
 MIDDLEWARE = [
     "django.middleware.security.SecurityMiddleware",
+{%- if cookiecutter.use_whitenoise == 'y' %}
+    "whitenoise.middleware.WhiteNoiseMiddleware",
+{%- endif %}
     "django.contrib.sessions.middleware.SessionMiddleware",
     "django.middleware.locale.LocaleMiddleware",
     "django.middleware.common.CommonMiddleware",
diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py
index 2ab0a7cb4..015d8aff8 100644
--- a/{{cookiecutter.project_slug}}/config/settings/local.py
+++ b/{{cookiecutter.project_slug}}/config/settings/local.py
@@ -42,6 +42,14 @@ EMAIL_BACKEND = env(
 )
 {%- endif %}
 
+{%- if cookiecutter.use_whitenoise == 'y' %}
+
+# WhiteNoise
+# ------------------------------------------------------------------------------
+# http://whitenoise.evans.io/en/latest/django.html#using-whitenoise-in-development
+INSTALLED_APPS = ["whitenoise.runserver_nostatic"] + INSTALLED_APPS  # noqa F405
+{% endif %}
+
 # django-debug-toolbar
 # ------------------------------------------------------------------------------
 # https://django-debug-toolbar.readthedocs.io/en/latest/installation.html#prerequisites
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 712f2bf4a..22a2acaef 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -194,14 +194,7 @@ ANYMAIL = {
     "MAILGUN_API_URL": env("MAILGUN_API_URL", default="https://api.mailgun.net/v3"),
 }
 
-{% if cookiecutter.use_whitenoise == 'y' -%}
-# WhiteNoise
-# ------------------------------------------------------------------------------
-# http://whitenoise.evans.io/en/latest/django.html#enable-whitenoise
-MIDDLEWARE.insert(1, "whitenoise.middleware.WhiteNoiseMiddleware")  # noqa F405
-
-{% endif %}
-{%- if cookiecutter.use_compressor == 'y' -%}
+{% if cookiecutter.use_compressor == 'y' -%}
 # django-compressor
 # ------------------------------------------------------------------------------
 # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_ENABLED

From 8a1ec53a74cb2cf11ad2405d8d21db14a224cc74 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 9 Nov 2019 11:00:30 +0000
Subject: [PATCH 0426/2840] Update gunicorn from 19.9.0 to 20.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 d65a0cbc2..8d32e81a6 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -2,7 +2,7 @@
 
 -r ./base.txt
 
-gunicorn==19.9.0  # https://github.com/benoitc/gunicorn
+gunicorn==20.0.0  # https://github.com/benoitc/gunicorn
 psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
 Collectfast==1.3.1  # https://github.com/antonagestam/collectfast

From eeda7dfe33c2bd390d5a784cd4f03251c1302001 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 9 Nov 2019 11:00:33 +0000
Subject: [PATCH 0427/2840] Update sentry-sdk from 0.13.1 to 0.13.2

---
 {{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 d65a0cbc2..c1fdd2a38 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==1.3.1  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.13.1  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.13.2  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From fd5e9be58bd6ff1feea5c5edeae603614f3e6d2e Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 9 Nov 2019 11:00:37 +0000
Subject: [PATCH 0428/2840] Update pytest-django from 3.6.0 to 3.7.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 baee31966..4a1c42098 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -33,4 +33,4 @@ factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 django-debug-toolbar==2.0  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==2.2.5  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.6.0  # https://github.com/nedbat/django_coverage_plugin
-pytest-django==3.6.0  # https://github.com/pytest-dev/pytest-django
+pytest-django==3.7.0  # https://github.com/pytest-dev/pytest-django

From a38c61369e0b9fc2864b137976c49f4697b199aa Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 12 Nov 2019 11:00:32 +0000
Subject: [PATCH 0429/2840] Update django-debug-toolbar from 2.0 to 2.1

---
 {{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 4a1c42098..2f7234bcb 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ pre-commit==1.20.0  # https://github.com/pre-commit/pre-commit
 # ------------------------------------------------------------------------------
 factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 
-django-debug-toolbar==2.0  # https://github.com/jazzband/django-debug-toolbar
+django-debug-toolbar==2.1  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==2.2.5  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.6.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.7.0  # https://github.com/pytest-dev/pytest-django

From 9a3391a6eb1a54fc150a9c5f9edea347b87865dc Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 12 Nov 2019 14:05:30 +0000
Subject: [PATCH 0430/2840] Update image in README

closes #2282
---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 4be3c4bc8..2fba0979a 100644
--- a/README.rst
+++ b/README.rst
@@ -108,7 +108,7 @@ Projects that provide financial support to the maintainers:
 Two Scoops of Django 1.11
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. image:: https://cdn.shopify.com/s/files/1/0304/6901/products/tsd-111-alpha_medium.jpg?v=1499531513
+.. image:: https://cdn.shopify.com/s/files/1/0304/6901/products/2017-06-29-tsd11-sticker-02.png
    :name: Two Scoops of Django 1.11 Cover
    :align: center
    :alt: Two Scoops of Django

From ff0122acd6de47b43be6ebf251180261483b1588 Mon Sep 17 00:00:00 2001
From: Dani Hodovic <dani.hodovic@gmail.com>
Date: Wed, 13 Nov 2019 23:28:38 +0100
Subject: [PATCH 0431/2840] Use pytest-django --reuse-db for faster tests

Pytest-django allows you to re-use database setups between tests for
quicker test runs. This is especially useful for large projects with many
migrations.

For example, here's a project of mine with 40+ migrations:

with --reuse-db
```
pytest --reuse-db  2.54s user 0.35s system 108% cpu 2.669 total
```

without --reuse-db
```
pytest 7.40s user 0.34s system 50% cpu 15.240 total
```

Caveat: if your model happens to change you need to manually --create-db
to ensure migrations are applied.

https://pytest-django.readthedocs.io/en/latest/database.html#reuse-db-reuse-the-testing-database-between-test-runs
---
 {{cookiecutter.project_slug}}/pytest.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/pytest.ini b/{{cookiecutter.project_slug}}/pytest.ini
index 52b48ab03..e3b2248d9 100644
--- a/{{cookiecutter.project_slug}}/pytest.ini
+++ b/{{cookiecutter.project_slug}}/pytest.ini
@@ -1,5 +1,5 @@
 [pytest]
-addopts = --ds=config.settings.test
+addopts = --ds=config.settings.test --reuse-db
 python_files = tests.py test_*.py
 {%- if cookiecutter.js_task_runner != 'None' %}
 norecursedirs = node_modules

From ecb2b259947db3bc5cd6ca67114473a63b16aad3 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 13 Nov 2019 15:22:52 -0800
Subject: [PATCH 0432/2840] Update tox from 3.14.0 to 3.14.1

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

diff --git a/requirements.txt b/requirements.txt
index 66786b19a..451d42815 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ flake8==3.7.8
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.14.0
+tox==3.14.1
 pytest==5.2.2
 pytest_cases==1.11.5
 pytest-cookies==0.4.0

From 7a9f133fc3cd8a6fafb069b3614d0763adcc1fb1 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 15 Nov 2019 11:00:32 +0000
Subject: [PATCH 0433/2840] Update pytest from 5.2.2 to 5.2.3

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

diff --git a/requirements.txt b/requirements.txt
index 451d42815..eccaa0002 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8==3.7.8
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.14.1
-pytest==5.2.2
+pytest==5.2.3
 pytest_cases==1.11.5
 pytest-cookies==0.4.0
 pytest-xdist==1.30.0

From 0bd04dd5b30dfe885dcc38f45a3f9a11b04928d5 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 15 Nov 2019 11:00:33 +0000
Subject: [PATCH 0434/2840] Update pytest from 5.2.2 to 5.2.3

---
 {{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 2f7234bcb..d338f9292 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -12,7 +12,7 @@ psycopg2-binary==2.8.4  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.740  # https://github.com/python/mypy
-pytest==5.2.2  # https://github.com/pytest-dev/pytest
+pytest==5.2.3  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From 44e404845b050afa8607e3ade1626c95bf7cf962 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 16 Nov 2019 11:00:31 +0000
Subject: [PATCH 0435/2840] Update pytest from 5.2.3 to 5.2.4

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

diff --git a/requirements.txt b/requirements.txt
index eccaa0002..966c944ab 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8==3.7.8
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.14.1
-pytest==5.2.3
+pytest==5.2.4
 pytest_cases==1.11.5
 pytest-cookies==0.4.0
 pytest-xdist==1.30.0

From 526f135e85596fe873f458ab799383d85f19b356 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 16 Nov 2019 11:00:32 +0000
Subject: [PATCH 0436/2840] Update pytest from 5.2.3 to 5.2.4

---
 {{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 d338f9292..bc8e66514 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -12,7 +12,7 @@ psycopg2-binary==2.8.4  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.740  # https://github.com/python/mypy
-pytest==5.2.3  # https://github.com/pytest-dev/pytest
+pytest==5.2.4  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From 7a6bbcb0835bef80d0f2fb52d5df27ef9a2d3c8e Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 18 Nov 2019 11:00:42 +0000
Subject: [PATCH 0437/2840] Update pytest_cases from 1.11.5 to 1.11.7

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

diff --git a/requirements.txt b/requirements.txt
index 966c944ab..9a3d98887 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8==3.7.8
 # ------------------------------------------------------------------------------
 tox==3.14.1
 pytest==5.2.4
-pytest_cases==1.11.5
+pytest_cases==1.11.7
 pytest-cookies==0.4.0
 pytest-xdist==1.30.0
 pyyaml==5.1.2

From 5a7e6671d6050fd620d24c73486aee50d0a1372e Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 20 Nov 2019 11:00:33 +0000
Subject: [PATCH 0438/2840] Update pytest from 5.2.4 to 5.3.0

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

diff --git a/requirements.txt b/requirements.txt
index 9a3d98887..73c787ddd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8==3.7.8
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.14.1
-pytest==5.2.4
+pytest==5.3.0
 pytest_cases==1.11.7
 pytest-cookies==0.4.0
 pytest-xdist==1.30.0

From cdd9205075eea1631f86522e210fd245daf88335 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 20 Nov 2019 11:00:35 +0000
Subject: [PATCH 0439/2840] Update pytest from 5.2.4 to 5.3.0

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

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index bc8e66514..61ab281f3 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -12,7 +12,7 @@ psycopg2-binary==2.8.4  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.740  # https://github.com/python/mypy
-pytest==5.2.4  # https://github.com/pytest-dev/pytest
+pytest==5.3.0  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From 4daf3b9769203f21d9a16e0a546f0eafecf2f454 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 21 Nov 2019 11:00:33 +0000
Subject: [PATCH 0440/2840] Update django-storages from 1.7.2 to 1.8

---
 {{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 d50125322..c89de8f0d 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -14,7 +14,7 @@ sentry-sdk==0.13.2  # https://github.com/getsentry/sentry-python
 # Django
 # ------------------------------------------------------------------------------
 {%- if cookiecutter.cloud_provider == 'AWS' %}
-django-storages[boto3]==1.7.2  # https://github.com/jschneier/django-storages
+django-storages[boto3]==1.8  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
 django-storages[google]==1.7.2  # https://github.com/jschneier/django-storages
 {%- endif %}

From 9481a5a39097d010daa44e57d28e71247b2bc357 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 21 Nov 2019 11:00:34 +0000
Subject: [PATCH 0441/2840] Update django-storages from 1.7.2 to 1.8

---
 {{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 c89de8f0d..e20dff519 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -16,6 +16,6 @@ sentry-sdk==0.13.2  # https://github.com/getsentry/sentry-python
 {%- if cookiecutter.cloud_provider == 'AWS' %}
 django-storages[boto3]==1.8  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
-django-storages[google]==1.7.2  # https://github.com/jschneier/django-storages
+django-storages[google]==1.8  # https://github.com/jschneier/django-storages
 {%- endif %}
 django-anymail[mailgun]==7.0.0  # https://github.com/anymail/django-anymail

From 528027f2b0f2f6e7374ca660466c25cf00bdef5e Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 23 Nov 2019 11:00:30 +0000
Subject: [PATCH 0442/2840] Update pytest_cases from 1.11.7 to 1.11.8

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

diff --git a/requirements.txt b/requirements.txt
index 73c787ddd..18f2e122e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8==3.7.8
 # ------------------------------------------------------------------------------
 tox==3.14.1
 pytest==5.3.0
-pytest_cases==1.11.7
+pytest_cases==1.11.8
 pytest-cookies==0.4.0
 pytest-xdist==1.30.0
 pyyaml==5.1.2

From b014121810e3332acbb15ba98e57e859086b0fb7 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 23 Nov 2019 11:00:33 +0000
Subject: [PATCH 0443/2840] Update gunicorn from 20.0.0 to 20.0.2

---
 {{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 e20dff519..93116cbd5 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -2,7 +2,7 @@
 
 -r ./base.txt
 
-gunicorn==20.0.0  # https://github.com/benoitc/gunicorn
+gunicorn==20.0.2  # https://github.com/benoitc/gunicorn
 psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
 Collectfast==1.3.1  # https://github.com/antonagestam/collectfast

From 09d95d8ab464498bc28ef5755637ed378bb1aca3 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 23 Nov 2019 11:00:37 +0000
Subject: [PATCH 0444/2840] Update django-crispy-forms from 1.8.0 to 1.8.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 dbdee1765..6ca90421e 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -23,7 +23,7 @@ django==2.2.7  # pyup: < 3.0  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==3.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.40.0  # https://github.com/pennersr/django-allauth
-django-crispy-forms==1.8.0  # https://github.com/django-crispy-forms/django-crispy-forms
+django-crispy-forms==1.8.1  # https://github.com/django-crispy-forms/django-crispy-forms
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==2.3  # https://github.com/django-compressor/django-compressor
 {%- endif %}

From dce02bae70f6681c88b0d3bad92ae30a6cc9e9f3 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sun, 24 Nov 2019 11:00:31 +0000
Subject: [PATCH 0445/2840] Update pylint-django from 2.0.12 to 2.0.13

---
 {{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 61ab281f3..5cfcce2b7 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -20,7 +20,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 flake8==3.7.8  # https://github.com/PyCQA/flake8
 coverage==4.5.4  # https://github.com/nedbat/coveragepy
 black==19.10b0  # https://github.com/ambv/black
-pylint-django==2.0.12  # https://github.com/PyCQA/pylint-django
+pylint-django==2.0.13  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}

From fbd0fcbb6104cfcf84a70dcb7f45ee2152a8df66 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 25 Nov 2019 11:00:33 +0000
Subject: [PATCH 0446/2840] Update sentry-sdk from 0.13.2 to 0.13.3

---
 {{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 e20dff519..4722ce9cd 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==1.3.1  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.13.2  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.13.3  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From 82c8b5127226398c537fba897437c62cfdf0c622 Mon Sep 17 00:00:00 2001
From: Harry Moreno <morenoh149@gmail.com>
Date: Mon, 25 Nov 2019 16:43:30 -0500
Subject: [PATCH 0447/2840] Make update form button look like a button

without `ban-primary` the button looks like some floating text.
---
 .../templates/users/user_form.html                              | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_form.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_form.html
index 6a86a2735..e9da0d48f 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_form.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_form.html
@@ -10,7 +10,7 @@
     {{ form|crispy }}
     <div class="control-group">
       <div class="controls">
-        <button type="submit" class="btn">Update</button>
+        <button type="submit" class="btn btn-primary">Update</button>
       </div>
     </div>
   </form>

From 832275a792b2ae0899b68bdacb75fa5ce6a34d2d Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 26 Nov 2019 11:00:32 +0000
Subject: [PATCH 0448/2840] Update gunicorn from 20.0.2 to 20.0.3

---
 {{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 846cb5788..c0a66efc5 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -2,7 +2,7 @@
 
 -r ./base.txt
 
-gunicorn==20.0.2  # https://github.com/benoitc/gunicorn
+gunicorn==20.0.3  # https://github.com/benoitc/gunicorn
 psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
 Collectfast==1.3.1  # https://github.com/antonagestam/collectfast

From 2a25e523e547d96dd0a6b40fc1acf554dffeffe4 Mon Sep 17 00:00:00 2001
From: Harry Moreno <morenoh149@gmail.com>
Date: Tue, 26 Nov 2019 14:51:48 -0500
Subject: [PATCH 0449/2840] Add self to contributors.rst

---
 CONTRIBUTORS.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 56416abfd..53edb28e8 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -116,6 +116,7 @@ Listed in alphabetical order.
   Gilbishkosma             `@Gilbishkosma`_
   Hamish Durkin            `@durkode`_
   Hana Quadara             `@hanaquadara`_
+  Harry Moreno             `@morenoh149`_                @morenoh149
   Harry Percival           `@hjwp`_
   Hendrik Schneider        `@hendrikschneider`_
   Henrique G. G. Pereira   `@ikkebr`_
@@ -307,6 +308,7 @@ Listed in alphabetical order.
 .. _@minho42: https://github.com/minho42
 .. _@mjsisley: https://github.com/mjsisley
 .. _@mknapper1: https://github.com/mknapper1
+.. _@morenoh149: https://github.com/morenoh149
 .. _@mostaszewski: https://github.com/mostaszewski
 .. _@mozillazg: https://github.com/mozillazg
 .. _@mrcoles: https://github.com/mrcoles

From a1669324e8c535be925557bc555b11e77e838b94 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 27 Nov 2019 02:41:09 -0800
Subject: [PATCH 0450/2840] Update pytest from 5.3.0 to 5.3.1

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

diff --git a/requirements.txt b/requirements.txt
index 18f2e122e..5f7c2e328 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8==3.7.8
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.14.1
-pytest==5.3.0
+pytest==5.3.1
 pytest_cases==1.11.8
 pytest-cookies==0.4.0
 pytest-xdist==1.30.0

From 6a302ec703b28ce2393480123432fe39560a9cb6 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 27 Nov 2019 11:00:34 +0000
Subject: [PATCH 0451/2840] Update gunicorn from 20.0.3 to 20.0.4

---
 {{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 c0a66efc5..7be7f97c1 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -2,7 +2,7 @@
 
 -r ./base.txt
 
-gunicorn==20.0.3  # https://github.com/benoitc/gunicorn
+gunicorn==20.0.4  # https://github.com/benoitc/gunicorn
 psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
 Collectfast==1.3.1  # https://github.com/antonagestam/collectfast

From 4283ca76a4b53b33c7fbf272f87abe888cc183ba Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 27 Nov 2019 11:00:38 +0000
Subject: [PATCH 0452/2840] Update sentry-sdk from 0.13.3 to 0.13.4

---
 {{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 c0a66efc5..850d1f029 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==1.3.1  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.13.3  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.13.4  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From 9ec808e7f415c9bda68caec167e3f722ce743ab1 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 28 Nov 2019 11:00:32 +0000
Subject: [PATCH 0453/2840] Update pytest from 5.3.0 to 5.3.1

---
 {{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 5cfcce2b7..3ebc23202 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -12,7 +12,7 @@ psycopg2-binary==2.8.4  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.740  # https://github.com/python/mypy
-pytest==5.3.0  # https://github.com/pytest-dev/pytest
+pytest==5.3.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From c76b3066d63efd45f62d4d9db43a19f4bd98c441 Mon Sep 17 00:00:00 2001
From: Denis Savran <dsavran@alytics-team.com>
Date: Thu, 28 Nov 2019 23:16:06 +0300
Subject: [PATCH 0454/2840] Upgrade to Traefik v2

---
 CONTRIBUTORS.rst                              |  2 +
 .../compose/production/traefik/Dockerfile     |  4 +-
 .../compose/production/traefik/traefik.toml   | 41 ------------
 .../compose/production/traefik/traefik.yml    | 67 +++++++++++++++++++
 4 files changed, 71 insertions(+), 43 deletions(-)
 delete mode 100644 {{cookiecutter.project_slug}}/compose/production/traefik/traefik.toml
 create mode 100644 {{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 53edb28e8..46afc393e 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -102,6 +102,7 @@ Listed in alphabetical order.
   Demetris Stavrou         `@demestav`_
   Denis Bobrov             `@delneg`_
   Denis Orehovsky          `@apirobot`_
+  Denis Savran             `@blaxpy`_
   Diane Chen               `@purplediane`_               @purplediane88
   Dónal Adams              `@epileptic-fish`_
   Dong Huynh               `@trungdong`_
@@ -226,6 +227,7 @@ Listed in alphabetical order.
 .. _@arruda: https://github.com/arruda
 .. _@bertdemiranda: https://github.com/bertdemiranda
 .. _@bittner: https://github.com/bittner
+.. _@blaxpy: https://github.com/blaxpy
 .. _@bloodpet: https://github.com/bloodpet
 .. _@blopker: https://github.com/blopker
 .. _@bogdal: https://github.com/bogdal
diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
index d7363a1af..746aa2b48 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
@@ -1,5 +1,5 @@
-FROM traefik:1.7-alpine
+FROM traefik:v2.0
 RUN mkdir -p /etc/traefik/acme
 RUN touch /etc/traefik/acme/acme.json
 RUN chmod 600 /etc/traefik/acme/acme.json
-COPY ./compose/production/traefik/traefik.toml /etc/traefik
+COPY ./compose/production/traefik/traefik.yml /etc/traefik
diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.toml b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.toml
deleted file mode 100644
index 0f2abe8a1..000000000
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.toml
+++ /dev/null
@@ -1,41 +0,0 @@
-logLevel = "INFO"
-defaultEntryPoints = ["http", "https"]
-
-# Entrypoints, http and https
-[entryPoints]
-  # http should be redirected to https
-  [entryPoints.http]
-  address = ":80"
-    [entryPoints.http.redirect]
-    entryPoint = "https"
-  # https is the default
-  [entryPoints.https]
-  address = ":443"
-    [entryPoints.https.tls]
-
-# Enable ACME (Let's Encrypt): automatic SSL
-[acme]
-# Email address used for registration
-email = "{{ cookiecutter.email }}"
-storage = "/etc/traefik/acme/acme.json"
-entryPoint = "https"
-onDemand = false
-OnHostRule = true
-  # Use a HTTP-01 acme challenge rather than TLS-SNI-01 challenge
-  [acme.httpChallenge]
-  entryPoint = "http"
-
-[file]
-[backends]
-  [backends.django]
-    [backends.django.servers.server1]
-      url = "http://django:5000"
-
-[frontends]
-  [frontends.django]
-    backend = "django"
-    passHostHeader = true
-    [frontends.django.headers]
-      HostsProxyHeaders = ['X-CSRFToken']
-    [frontends.django.routes.dr1]
-      rule = "Host:{{ cookiecutter.domain_name }}"
diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
new file mode 100644
index 000000000..324c62afa
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
@@ -0,0 +1,67 @@
+log:
+  level: INFO
+
+entryPoints:
+  web:
+    # http
+    address: ":80"
+
+  web-secure:
+    # https
+    address: ":443"
+
+certificatesResolvers:
+  letsencrypt:
+    # https://docs.traefik.io/master/https/acme/#lets-encrypt
+    acme:
+      email: "{{ cookiecutter.email }}"
+      storage: /etc/traefik/acme/acme.json
+      # https://docs.traefik.io/master/https/acme/#httpchallenge
+      httpChallenge:
+        entryPoint: web
+
+http:
+  routers:
+    web-router:
+      rule: "Host(`{{ cookiecutter.domain_name }}`)"
+      entryPoints:
+        - web
+      middlewares:
+        - redirect
+        - csrf
+      service: django
+
+    web-secure-router:
+      rule: "Host(`{{ cookiecutter.domain_name }}`)"
+      entryPoints:
+        - web-secure
+      middlewares:
+        - csrf
+      service: django
+      tls:
+        # https://docs.traefik.io/master/routing/routers/#certresolver
+        certResolver: letsencrypt
+
+  middlewares:
+    redirect:
+      # https://docs.traefik.io/master/middlewares/redirectscheme/
+      redirectScheme:
+        scheme: https
+        permanent: true
+    csrf:
+      # https://docs.traefik.io/master/middlewares/headers/#hostsproxyheaders
+      # https://docs.djangoproject.com/en/dev/ref/csrf/#ajax
+      headers:
+        hostsProxyHeaders: ['X-CSRFToken']
+
+  services:
+    django:
+      loadBalancer:
+        servers:
+          - url: http://django:5000
+
+providers:
+  # https://docs.traefik.io/master/providers/file/
+  file:
+    filename: /etc/traefik/traefik.yml
+    watch: true

From 1453b328916de4c78fbcdd85513eac83004823a1 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 30 Nov 2019 11:00:31 +0000
Subject: [PATCH 0455/2840] Update mypy from 0.740 to 0.750

---
 {{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 5cfcce2b7..df378239d 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -11,7 +11,7 @@ psycopg2-binary==2.8.4  # https://github.com/psycopg/psycopg2
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.740  # https://github.com/python/mypy
+mypy==0.750  # https://github.com/python/mypy
 pytest==5.3.0  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 

From b638ce0a1b523de0c38a576db4829c584d41d6f4 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 2 Dec 2019 11:00:31 +0000
Subject: [PATCH 0456/2840] Update django from 2.2.7 to 2.2.8

---
 {{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 6ca90421e..6ac355875 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -19,7 +19,7 @@ flower==0.9.3  # https://github.com/mher/flower
 
 # Django
 # ------------------------------------------------------------------------------
-django==2.2.7  # pyup: < 3.0  # https://www.djangoproject.com/
+django==2.2.8  # pyup: < 3.0  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==3.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.40.0  # https://github.com/pennersr/django-allauth

From 2214951bbe298d51343f8ee5f743c35e8a6736a9 Mon Sep 17 00:00:00 2001
From: Jelmert <jelmerdraaijer@gmail.com>
Date: Tue, 3 Dec 2019 11:19:01 +0100
Subject: [PATCH 0457/2840] updated werkzeug from 0.14.1 to 0.16.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 3ebc23202..d4453daab 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,6 +1,6 @@
 -r ./base.txt
 
-Werkzeug==0.14.1  # pyup: < 0.15 # https://github.com/pallets/werkzeug
+Werkzeug==0.16.0 # https://github.com/pallets/werkzeug
 ipdb==0.12.2  # https://github.com/gotcha/ipdb
 Sphinx==2.2.1  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}

From 4a185510e317eceb721ca322c947a865a36225c5 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 3 Dec 2019 11:00:33 +0000
Subject: [PATCH 0458/2840] Update tox from 3.14.1 to 3.14.2

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

diff --git a/requirements.txt b/requirements.txt
index 5f7c2e328..ffde91003 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ flake8==3.7.8
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.14.1
+tox==3.14.2
 pytest==5.3.1
 pytest_cases==1.11.8
 pytest-cookies==0.4.0

From a7ed8e9fee2a478f3769c3a309d6320c1e6c350c Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 3 Dec 2019 11:00:37 +0000
Subject: [PATCH 0459/2840] Update pyyaml from 5.1.2 to 5.2

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

diff --git a/requirements.txt b/requirements.txt
index 5f7c2e328..b032f217b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,4 +14,4 @@ pytest==5.3.1
 pytest_cases==1.11.8
 pytest-cookies==0.4.0
 pytest-xdist==1.30.0
-pyyaml==5.1.2
+pyyaml==5.2

From 3140fe74cabf27e28a8b0acd33e1efe9ef2559e3 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 3 Dec 2019 11:00:42 +0000
Subject: [PATCH 0460/2840] Update sphinx from 2.2.1 to 2.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 3ebc23202..4fd01d7cc 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -2,7 +2,7 @@
 
 Werkzeug==0.14.1  # pyup: < 0.15 # https://github.com/pallets/werkzeug
 ipdb==0.12.2  # https://github.com/gotcha/ipdb
-Sphinx==2.2.1  # https://github.com/sphinx-doc/sphinx
+Sphinx==2.2.2  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}

From 79da1482a533201267d69cb789cbde8a62748e63 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 3 Dec 2019 08:01:37 -0800
Subject: [PATCH 0461/2840] Update flake8 from 3.7.8 to 3.7.9

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

diff --git a/requirements.txt b/requirements.txt
index 4a75eef5b..ab1451d3f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==19.10b0
-flake8==3.7.8
+flake8==3.7.9
 
 # Testing
 # ------------------------------------------------------------------------------

From 112972d881159f5dbc468013cec331a0f715aecf Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 4 Dec 2019 11:00:32 +0000
Subject: [PATCH 0462/2840] Update ipdb from 0.12.2 to 0.12.3

---
 {{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 28bcb4a59..6f19183fe 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,7 +1,7 @@
 -r ./base.txt
 
 Werkzeug==0.16.0 # https://github.com/pallets/werkzeug
-ipdb==0.12.2  # https://github.com/gotcha/ipdb
+ipdb==0.12.3  # https://github.com/gotcha/ipdb
 Sphinx==2.2.2  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2

From e7923c6c5c0750b8823e260f63d16b82a137271e Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 4 Dec 2019 11:00:35 +0000
Subject: [PATCH 0463/2840] Update flake8 from 3.7.8 to 3.7.9

---
 {{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 28bcb4a59..aa740145d 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -17,7 +17,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality
 # ------------------------------------------------------------------------------
-flake8==3.7.8  # https://github.com/PyCQA/flake8
+flake8==3.7.9  # https://github.com/PyCQA/flake8
 coverage==4.5.4  # https://github.com/nedbat/coveragepy
 black==19.10b0  # https://github.com/ambv/black
 pylint-django==2.0.13  # https://github.com/PyCQA/pylint-django

From 113ce88d9cc9b7af133d114d551af93a509e7774 Mon Sep 17 00:00:00 2001
From: Ivan Khomutov <i.khomutov@protonmail.com>
Date: Fri, 6 Dec 2019 10:55:00 +0300
Subject: [PATCH 0464/2840] Add option to choose CI tool

---
 cookiecutter.json                            |  6 +++-
 docs/project-generation-options.rst          | 11 +++++--
 hooks/post_gen_project.py                    | 11 +++++--
 tests/test_cookiecutter_generation.py        | 20 +++++++++++-
 {{cookiecutter.project_slug}}/.gitlab-ci.yml | 33 ++++++++++++++++++++
 5 files changed, 75 insertions(+), 6 deletions(-)
 create mode 100644 {{cookiecutter.project_slug}}/.gitlab-ci.yml

diff --git a/cookiecutter.json b/cookiecutter.json
index d6d217ca4..6d030be0c 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -40,7 +40,11 @@
   "use_sentry": "n",
   "use_whitenoise": "n",
   "use_heroku": "n",
-  "use_travisci": "n",
+  "ci_tool": [
+    "None",
+    "Travis",
+    "Gitlab"
+  ],
   "keep_local_envs_in_vcs": "y",
 
   "debug": "n"
diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index afa9b8aff..ae47b0972 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -94,8 +94,12 @@ use_heroku:
     Indicates whether the project should be configured so as to be deployable
     to Heroku_.
 
-use_travisci:
-    Indicates whether the project should be configured to use `Travis CI`_.
+ci_tool:
+    Select a CI tool for running tests. The choices are:
+
+    1. None
+    2. Travis_
+    3. Gitlab_
 
 keep_local_envs_in_vcs:
     Indicates whether the project's ``.envs/.local/`` should be kept in VCS
@@ -138,3 +142,6 @@ debug:
 .. _Heroku: https://github.com/heroku/heroku-buildpack-python
 
 .. _Travis CI: https://travis-ci.org/
+
+.. _GitLab CI: https://docs.gitlab.com/ee/ci/
+
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index 0544f14bc..79c32f9b4 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -70,7 +70,7 @@ def remove_heroku_files():
     for file_name in file_names:
         if (
             file_name == "requirements.txt"
-            and "{{ cookiecutter.use_travisci }}".lower() == "y"
+            and "{{ cookiecutter.ci_tool }}".lower() == "travis"
         ):
             # don't remove the file if we are using travisci but not using heroku
             continue
@@ -105,6 +105,10 @@ def remove_dottravisyml_file():
     os.remove(".travis.yml")
 
 
+def remove_dotgitlabciyml_file():
+    os.remove(".gitlab-ci.yml")
+
+
 def append_to_project_gitignore(path):
     gitignore_file_path = ".gitignore"
     with open(gitignore_file_path, "a") as gitignore_file:
@@ -349,9 +353,12 @@ def main():
         if "{{ cookiecutter.use_docker }}".lower() == "y":
             remove_celery_compose_dirs()
 
-    if "{{ cookiecutter.use_travisci }}".lower() == "n":
+    if "{{ cookiecutter.ci_tool }}".lower() != "travis":
         remove_dottravisyml_file()
 
+    if "{{ cookiecutter.ci_tool }}".lower() != "gitlab":
+        remove_dotgitlabciyml_file()
+
     print(SUCCESS + "Project initialized, keep up the good work!" + TERMINATOR)
 
 
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index f931bce06..8c2f71fe8 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -140,7 +140,7 @@ def test_black_passes(cookies, context_combination):
 
 
 def test_travis_invokes_pytest(cookies, context):
-    context.update({"use_travisci": "y"})
+    context.update({"ci_tool": "Travis"})
     result = cookies.bake(extra_context=context)
 
     assert result.exit_code == 0
@@ -155,6 +155,24 @@ def test_travis_invokes_pytest(cookies, context):
             pytest.fail(e)
 
 
+def test_gitlab_invokes_flake8_and_pytest(cookies, context):
+    context.update({"ci_tool": "Gitlab"})
+    result = cookies.bake(extra_context=context)
+
+    assert result.exit_code == 0
+    assert result.exception is None
+    assert result.project.basename == context["project_slug"]
+    assert result.project.isdir()
+
+    with open(f"{result.project}/.gitlab-ci.yml", "r") as gitlab_yml:
+        try:
+            gitlab_config = yaml.load(gitlab_yml)
+            assert gitlab_config["flake8"]["script"] == ["flake8"]
+            assert gitlab_config["pytest"]["script"] == ["pytest"]
+        except yaml.YAMLError as e:
+            pytest.fail(e)
+
+
 @pytest.mark.parametrize("slug", ["project slug", "Project_Slug"])
 def test_invalid_slug(cookies, context, slug):
     """Invalid slug should failed pre-generation hook."""
diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
new file mode 100644
index 000000000..15ff73b10
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
@@ -0,0 +1,33 @@
+stages:
+  - lint
+  - test
+
+variables:
+  POSTGRES_USER: '{{ cookiecutter.project_slug }}'
+  POSTGRES_PASSWORD: ''
+  POSTGRES_DB: 'test_{{ cookiecutter.project_slug }}'
+
+flake8:
+  stage: lint
+  image: python:3.7-alpine
+  before_script:
+    - pip install -q flake8
+  script:
+    - flake8
+
+pytest:
+  stage: test
+  image: python:3.7
+  tags:
+    - docker
+  services:
+    - postgres:11
+  variables:
+    DATABASE_URL: pgsql://$POSTGRES_USER:$POSTGRES_PASSWORD@postgres/$POSTGRES_DB
+
+  before_script:
+    - pip install -r requirements/local.txt
+
+  script:
+    - pytest
+

From 97880e5046a4af5f2042a7c6144e012fe6e2e356 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 6 Dec 2019 11:00:30 +0000
Subject: [PATCH 0465/2840] Update sentry-sdk from 0.13.4 to 0.13.5

---
 {{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 69217ab3b..438ccca6d 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==1.3.1  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.13.4  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.13.5  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From a88b6b04b6c13b2d9f7f7f794680326786632a3b Mon Sep 17 00:00:00 2001
From: Yuchen Xie <4576282+mapx@users.noreply.github.com>
Date: Mon, 9 Dec 2019 09:55:37 +0800
Subject: [PATCH 0466/2840] Speed up django image build process, and reduce its
 size

---
 .../compose/production/django/Dockerfile                    | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index b0861d605..e63241f4e 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -57,13 +57,11 @@ RUN chmod +x /start-flower
 {%- endif %}
 
 {%- if cookiecutter.js_task_runner == 'Gulp' %}
-COPY --from=client-builder /app /app
+COPY --from=client-builder --chown=django:django /app /app
 {% else %}
-COPY . /app
+COPY --chown=django:django . /app
 {%- endif %}
 
-RUN chown -R django /app
-
 USER django
 
 WORKDIR /app

From 1dd8608142e7deadb943f4805dd13f9399a8330d Mon Sep 17 00:00:00 2001
From: Dani Hodovic <dani.hodovic@gmail.com>
Date: Tue, 10 Dec 2019 12:46:52 +0100
Subject: [PATCH 0467/2840] Add
 django.middleware.common.BrokenLinkEmailsMiddleware
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

https://docs.djangoproject.com/en/2.2/howto/error-reporting/#errors

> If those conditions are met, Django will email the users listed in the
> MANAGERS setting whenever your code raises a 404 and the request has a
> referer. It doesn’t bother to email for 404s that don’t have a referer –
> those are usually just people typing in broken URLs or broken Web bots.
> It also ignores 404s when the referer is equal to the requested URL,
> since this behavior is from broken Web bots too.
---
 {{cookiecutter.project_slug}}/config/settings/base.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 935a0d12a..ecfeed7ae 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -140,6 +140,7 @@ MIDDLEWARE = [
     "django.middleware.csrf.CsrfViewMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
+    "django.middleware.common.BrokenLinkEmailsMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
 

From 0f515974cb85e1c948bbdaae7874fd853ce35e56 Mon Sep 17 00:00:00 2001
From: Dani Hodovic <dani.hodovic@gmail.com>
Date: Wed, 11 Dec 2019 14:58:21 +0100
Subject: [PATCH 0468/2840] Remove mypy defaults and set django-stubs setting

https://mypy.readthedocs.io/en/latest/config_file.html

ignore_errors = False
strict_optional = True

Are both set to these values by default. No need to set them in the
config.

```toml
[mypy.plugins.django-stubs]
django_settings_module = config.settings.local
```
mypy.plugins.django-stubs requires django_settings_module to be set.
https://github.com/typeddjango/django-stubs#configuration
---
 {{cookiecutter.project_slug}}/setup.cfg | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/setup.cfg b/{{cookiecutter.project_slug}}/setup.cfg
index 42b638616..f7cd01cb6 100644
--- a/{{cookiecutter.project_slug}}/setup.cfg
+++ b/{{cookiecutter.project_slug}}/setup.cfg
@@ -9,13 +9,14 @@ exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules
 [mypy]
 python_version = 3.7
 check_untyped_defs = True
-ignore_errors = False
 ignore_missing_imports = True
-strict_optional = True
 warn_unused_ignores = True
 warn_redundant_casts = True
 warn_unused_configs = True
 
+[mypy.plugins.django-stubs]
+django_settings_module = config.settings.test
+
 [mypy-*.migrations.*]
 # Django migrations should not produce any errors:
 ignore_errors = True

From 37bc459796103b7ba0ea6b5009f516b507d1fc0f Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 12 Dec 2019 08:00:31 -0300
Subject: [PATCH 0469/2840] Update pytest_cases from 1.11.8 to 1.11.9

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

diff --git a/requirements.txt b/requirements.txt
index ab1451d3f..8cd8c53a1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8==3.7.9
 # ------------------------------------------------------------------------------
 tox==3.14.2
 pytest==5.3.1
-pytest_cases==1.11.8
+pytest_cases==1.11.9
 pytest-cookies==0.4.0
 pytest-xdist==1.30.0
 pyyaml==5.2

From c59062a496fb07033308dc8a845988fb98fe60ae Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 12 Dec 2019 08:00:35 -0300
Subject: [PATCH 0470/2840] Update django-model-utils from 3.2.0 to 4.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 6ac355875..c195e7962 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -21,7 +21,7 @@ flower==0.9.3  # https://github.com/mher/flower
 # ------------------------------------------------------------------------------
 django==2.2.8  # pyup: < 3.0  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
-django-model-utils==3.2.0  # https://github.com/jazzband/django-model-utils
+django-model-utils==4.0.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.40.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.8.1  # https://github.com/django-crispy-forms/django-crispy-forms
 {%- if cookiecutter.use_compressor == "y" %}

From d4189097146b04db04a2430f62cd43f7fbd04a6c Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 13 Dec 2019 08:00:31 -0300
Subject: [PATCH 0471/2840] Update whitenoise from 4.1.4 to 5.0.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 6ac355875..9d930428c 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -6,7 +6,7 @@ rcssmin==1.0.6{% if cookiecutter.windows == 'y' and cookiecutter.use_docker == '
 {%- endif %}
 argon2-cffi==19.2.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
-whitenoise==4.1.4  # https://github.com/evansd/whitenoise
+whitenoise==5.0.1  # https://github.com/evansd/whitenoise
 {%- endif %}
 redis==3.3.11  # https://github.com/antirez/redis
 {%- if cookiecutter.use_celery == "y" %}

From 6ce4b13d83257572a6f12abd9075e0d74475f7e6 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 13 Dec 2019 08:00:36 -0300
Subject: [PATCH 0472/2840] Update djangorestframework from 3.10.3 to 3.11.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 6ac355875..1eaca3d3c 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -30,5 +30,5 @@ django-compressor==2.3  # https://github.com/django-compressor/django-compressor
 django-redis==4.10.0  # https://github.com/niwinz/django-redis
 
 # Django REST Framework
-djangorestframework==3.10.3  # https://github.com/encode/django-rest-framework
+djangorestframework==3.11.0  # https://github.com/encode/django-rest-framework
 coreapi==2.3.3  # https://github.com/core-api/python-client

From d085a9c43236f2f821c32317d5da3da2c8b4bfa4 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 14 Dec 2019 08:00:29 -0300
Subject: [PATCH 0473/2840] Update django-redis from 4.10.0 to 4.11.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 69869e149..926a02c03 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -27,7 +27,7 @@ django-crispy-forms==1.8.1  # https://github.com/django-crispy-forms/django-cris
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==2.3  # https://github.com/django-compressor/django-compressor
 {%- endif %}
-django-redis==4.10.0  # https://github.com/niwinz/django-redis
+django-redis==4.11.0  # https://github.com/niwinz/django-redis
 
 # Django REST Framework
 djangorestframework==3.11.0  # https://github.com/encode/django-rest-framework

From 32e42cb0ec38839fec378757755c7f94f3be065d Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 15 Dec 2019 02:56:41 -0800
Subject: [PATCH 0474/2840] Update pytest from 5.3.1 to 5.3.2

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

diff --git a/requirements.txt b/requirements.txt
index 8cd8c53a1..0a2c06398 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8==3.7.9
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.14.2
-pytest==5.3.1
+pytest==5.3.2
 pytest_cases==1.11.9
 pytest-cookies==0.4.0
 pytest-xdist==1.30.0

From b6a524c346a0bd22d7c7b8a7f561ab7bba449343 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sun, 15 Dec 2019 08:00:29 -0300
Subject: [PATCH 0475/2840] Update coverage from 4.5.4 to 5.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 5b8f3279d..ae112a947 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -18,7 +18,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 # Code quality
 # ------------------------------------------------------------------------------
 flake8==3.7.9  # https://github.com/PyCQA/flake8
-coverage==4.5.4  # https://github.com/nedbat/coveragepy
+coverage==5.0  # https://github.com/nedbat/coveragepy
 black==19.10b0  # https://github.com/ambv/black
 pylint-django==2.0.13  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 8211a83f3a21381060c8767049e676f5cf609ef5 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 16 Dec 2019 08:00:30 -0300
Subject: [PATCH 0476/2840] Update celery from 4.3.0 to 4.4.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 926a02c03..de4e82523 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -10,7 +10,7 @@ whitenoise==5.0.1  # https://github.com/evansd/whitenoise
 {%- endif %}
 redis==3.3.11  # https://github.com/antirez/redis
 {%- if cookiecutter.use_celery == "y" %}
-celery==4.3.0  # pyup: < 5.0  # https://github.com/celery/celery
+celery==4.4.0  # pyup: < 5.0  # https://github.com/celery/celery
 django-celery-beat==1.5.0  # https://github.com/celery/django-celery-beat
 {%- if cookiecutter.use_docker == 'y' %}
 flower==0.9.3  # https://github.com/mher/flower

From acd63b14b8a1c4d0427c56ffd33bfb4c0b2280b2 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 16 Dec 2019 08:00:34 -0300
Subject: [PATCH 0477/2840] Update sphinx from 2.2.2 to 2.3.0

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

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index ae112a947..1b54f0018 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -2,7 +2,7 @@
 
 Werkzeug==0.16.0 # https://github.com/pallets/werkzeug
 ipdb==0.12.3  # https://github.com/gotcha/ipdb
-Sphinx==2.2.2  # https://github.com/sphinx-doc/sphinx
+Sphinx==2.3.0  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}

From 2229a09faccd789ca9dbe9d03f3c1031b522a446 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 18 Dec 2019 08:00:31 -0300
Subject: [PATCH 0478/2840] Update django from 2.2.8 to 2.2.9

---
 {{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 de4e82523..a307b4817 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -19,7 +19,7 @@ flower==0.9.3  # https://github.com/mher/flower
 
 # Django
 # ------------------------------------------------------------------------------
-django==2.2.8  # pyup: < 3.0  # https://www.djangoproject.com/
+django==2.2.9  # pyup: < 3.0  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==4.0.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.40.0  # https://github.com/pennersr/django-allauth

From 29d2ff0ccfb33b2bb9a8fc4df24bda409a582b48 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 18 Dec 2019 08:00:35 -0300
Subject: [PATCH 0479/2840] Update mypy from 0.750 to 0.760

---
 {{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 1b54f0018..2d333b5c6 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -11,7 +11,7 @@ psycopg2-binary==2.8.4  # https://github.com/psycopg/psycopg2
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.750  # https://github.com/python/mypy
+mypy==0.760  # https://github.com/python/mypy
 pytest==5.3.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 

From 2b0027de71df7d0bae08afc25c5037e6a1896619 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 19 Dec 2019 08:00:30 -0300
Subject: [PATCH 0480/2840] Update django-allauth from 0.40.0 to 0.41.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 a307b4817..c31481a35 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -22,7 +22,7 @@ flower==0.9.3  # https://github.com/mher/flower
 django==2.2.9  # pyup: < 3.0  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==4.0.0  # https://github.com/jazzband/django-model-utils
-django-allauth==0.40.0  # https://github.com/pennersr/django-allauth
+django-allauth==0.41.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.8.1  # https://github.com/django-crispy-forms/django-crispy-forms
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==2.3  # https://github.com/django-compressor/django-compressor

From 311b96b169252b1025383712c5413c03da3c91a4 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 20 Dec 2019 08:00:29 -0300
Subject: [PATCH 0481/2840] Update pytest_cases from 1.11.9 to 1.12.0

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

diff --git a/requirements.txt b/requirements.txt
index 0a2c06398..2ba89659c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8==3.7.9
 # ------------------------------------------------------------------------------
 tox==3.14.2
 pytest==5.3.2
-pytest_cases==1.11.9
+pytest_cases==1.12.0
 pytest-cookies==0.4.0
 pytest-xdist==1.30.0
 pyyaml==5.2

From 85efbda0033f6b4d98a0d58634c6047917eaa444 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 20 Dec 2019 08:00:32 -0300
Subject: [PATCH 0482/2840] Update pytest-xdist from 1.30.0 to 1.31.0

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

diff --git a/requirements.txt b/requirements.txt
index 0a2c06398..ba7dae86c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,5 +13,5 @@ tox==3.14.2
 pytest==5.3.2
 pytest_cases==1.11.9
 pytest-cookies==0.4.0
-pytest-xdist==1.30.0
+pytest-xdist==1.31.0
 pyyaml==5.2

From b75cb6e6da32bb3901a44b8b4561e0a916c95b9d Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 20 Dec 2019 08:00:35 -0300
Subject: [PATCH 0483/2840] Update mypy from 0.760 to 0.761

---
 {{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 2d333b5c6..070a0b2d2 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -11,7 +11,7 @@ psycopg2-binary==2.8.4  # https://github.com/psycopg/psycopg2
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.760  # https://github.com/python/mypy
+mypy==0.761  # https://github.com/python/mypy
 pytest==5.3.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 

From c7027526a3d295fce9e8b12f5b6e8b1017d789f4 Mon Sep 17 00:00:00 2001
From: David D <d.diazp@gmail.com>
Date: Sun, 22 Dec 2019 12:52:22 +0100
Subject: [PATCH 0484/2840] Add Debian 10 (buster) OS dependencies

---
 .../utility/requirements-buster.apt           | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 {{cookiecutter.project_slug}}/utility/requirements-buster.apt

diff --git a/{{cookiecutter.project_slug}}/utility/requirements-buster.apt b/{{cookiecutter.project_slug}}/utility/requirements-buster.apt
new file mode 100644
index 000000000..75957f40d
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/utility/requirements-buster.apt
@@ -0,0 +1,23 @@
+##basic build dependencies of various Django apps for Debian Jessie 10.x
+#build-essential metapackage install: make, gcc, g++,
+build-essential
+#required to translate
+gettext
+python3-dev
+
+##shared dependencies of:
+##Pillow, pylibmc
+zlib1g-dev
+
+##Postgresql and psycopg2 dependencies
+libpq-dev
+
+##Pillow dependencies
+libtiff5-dev
+libjpeg62-turbo-dev
+libfreetype6-dev
+liblcms2-dev
+libwebp-dev
+
+##django-extensions
+libgraphviz-dev

From afc7235d577f312de923bc8019d2906d7babb349 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 22 Dec 2019 19:37:15 -0800
Subject: [PATCH 0485/2840] Update cookiecutter from 1.6.0 to 1.7.0

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

diff --git a/requirements.txt b/requirements.txt
index eccb2d9da..8f8360068 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-cookiecutter==1.6.0
+cookiecutter==1.7.0
 sh==1.12.14
 binaryornot==0.4.4
 

From 66991d9e958791f6cbb0946b2e67694286d2b3ab Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 23 Dec 2019 08:00:31 -0300
Subject: [PATCH 0486/2840] Update sphinx from 2.3.0 to 2.3.1

---
 {{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 070a0b2d2..89d10373a 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -2,7 +2,7 @@
 
 Werkzeug==0.16.0 # https://github.com/pallets/werkzeug
 ipdb==0.12.3  # https://github.com/gotcha/ipdb
-Sphinx==2.3.0  # https://github.com/sphinx-doc/sphinx
+Sphinx==2.3.1  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}

From 16b219034af54784c530fc545079e1ab21c5906a Mon Sep 17 00:00:00 2001
From: howiezhao <howiezhaohr@hotmail.com>
Date: Sat, 28 Dec 2019 17:26:43 +0800
Subject: [PATCH 0487/2840] Update docs files

---
 docs/document.rst                             |  45 +++
 docs/index.rst                                |   1 +
 docs/testing.rst                              |   6 +-
 {{cookiecutter.project_slug}}/docs/Makefile   | 159 +----------
 {{cookiecutter.project_slug}}/docs/conf.py    | 258 ++----------------
 {{cookiecutter.project_slug}}/docs/index.rst  |  14 +-
 {{cookiecutter.project_slug}}/docs/make.bat   | 191 ++-----------
 .../docs/pycharm/configuration.rst            |   6 +
 8 files changed, 123 insertions(+), 557 deletions(-)
 create mode 100644 docs/document.rst

diff --git a/docs/document.rst b/docs/document.rst
new file mode 100644
index 000000000..abf115a17
--- /dev/null
+++ b/docs/document.rst
@@ -0,0 +1,45 @@
+.. _document:
+
+Document
+=========
+
+This project uses Sphinx_ documentation generator.
+After you have set up to `develop locally`_, run the following commands to generate the HTML documentation: ::
+
+    $ sphinx-build docs/ docs/_build/html/
+
+If you set up your project to `develop locally with docker`_, run the following command: ::
+
+    $ docker-compose -f local.yml run --rm django sphinx-build docs/ docs/_build/html/
+
+Generate API documentation
+----------------------------
+
+Sphinx can automatically generate documentation from docstrings, to enable this feature, follow these steps:
+
+1. Add Sphinx extension in ``docs/conf.py`` file, like below: ::
+
+    extensions = [
+        'sphinx.ext.autodoc',
+    ]
+
+2. Uncomment the following lines in the ``docs/conf.py`` file: ::
+
+    # import django
+    # sys.path.insert(0, os.path.abspath('..'))
+    # os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local")
+    # django.setup()
+
+3. Run the following command: ::
+
+    $ sphinx-apidoc -f -o ./docs/modules/ ./tpub/ migrations/*
+
+   If you set up your project to `develop locally with docker`_, run the following command: ::
+
+    $ docker-compose -f local.yml run --rm django sphinx-apidoc -f -o ./docs/modules ./tpub/ migrations/*
+
+4. Regenerate HTML documentation as written above.
+
+.. _Sphinx: https://www.sphinx-doc.org/en/master/index.html
+.. _develop locally: ../developing-locally.rst
+.. _develop locally with docker: ..../developing-locally-docker.rst
diff --git a/docs/index.rst b/docs/index.rst
index 5cb07b4b0..8e0d04aa3 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -18,6 +18,7 @@ Contents:
    settings
    linters
    testing
+   document
    deployment-on-pythonanywhere
    deployment-on-heroku
    deployment-with-docker
diff --git a/docs/testing.rst b/docs/testing.rst
index 63cb9e186..cd323e5cd 100644
--- a/docs/testing.rst
+++ b/docs/testing.rst
@@ -19,7 +19,7 @@ You will get a readout of the `users` app that has already been set up with test
 
 If you set up your project to `develop locally with docker`_, run the following command: ::
 
-   $ docker-compose -f local.yml run django pytest
+   $ docker-compose -f local.yml run --rm django pytest
 
 Targeting particular apps for testing in ``docker`` follows a similar pattern as previously shown above.
 
@@ -28,11 +28,11 @@ Coverage
 
 You should build your tests to provide the highest level of **code coverage**. You can run the ``pytest`` with code ``coverage`` by typing in the following command: ::
 
-   $ docker-compose -f local.yml run django coverage run -m pytest
+   $ docker-compose -f local.yml run --rm django coverage run -m pytest
 
 Once the tests are complete, in order to see the code coverage, run the following command: ::
 
-   $ docker-compose -f local.yml run django coverage report
+   $ docker-compose -f local.yml run --rm django coverage report
 
 .. note::
 
diff --git a/{{cookiecutter.project_slug}}/docs/Makefile b/{{cookiecutter.project_slug}}/docs/Makefile
index a5d4ea96e..d4bb2cbb9 100644
--- a/{{cookiecutter.project_slug}}/docs/Makefile
+++ b/{{cookiecutter.project_slug}}/docs/Makefile
@@ -1,153 +1,20 @@
-# Makefile for Sphinx documentation
+# Minimal makefile for Sphinx documentation
 #
 
-# You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-PAPER         =
+# You can set these variables from the command line, and also
+# from the environment for the first two.
+SPHINXOPTS    ?=
+SPHINXBUILD   ?= sphinx-build
+SOURCEDIR     = .
 BUILDDIR      = _build
 
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-# the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) .
-
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
-
+# Put it first so that "make" without argument is like "make help".
 help:
-	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  texinfo    to make Texinfo files"
-	@echo "  info       to make Texinfo files and run them through makeinfo"
-	@echo "  gettext    to make PO message catalogs"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
-clean:
-	-rm -rf $(BUILDDIR)/*
+.PHONY: help Makefile
 
-html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
-
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/{{ cookiecutter.project_slug }}.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/{{ cookiecutter.project_slug }}.qhc"
-
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/{{ cookiecutter.project_slug }}"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/{{ cookiecutter.project_slug }}"
-	@echo "# devhelp"
-
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-texinfo:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo
-	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
-	@echo "Run \`make' in that directory to run these through makeinfo" \
-	      "(use \`make info' here to do that automatically)."
-
-info:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo "Running Texinfo files through makeinfo..."
-	make -C $(BUILDDIR)/texinfo info
-	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
-
-gettext:
-	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
-	@echo
-	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
+# Catch-all target: route all unknown targets to Sphinx using the new
+# "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
+%: Makefile
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
diff --git a/{{cookiecutter.project_slug}}/docs/conf.py b/{{cookiecutter.project_slug}}/docs/conf.py
index 154c3a7aa..3c5d84ad8 100644
--- a/{{cookiecutter.project_slug}}/docs/conf.py
+++ b/{{cookiecutter.project_slug}}/docs/conf.py
@@ -1,255 +1,55 @@
-# {{ cookiecutter.project_name }} documentation build configuration file, created by
-# sphinx-quickstart.
+# Configuration file for the Sphinx documentation builder.
 #
-# This file is execfile()d with the current directory set to its containing dir.
-#
-# Note that not all possible configuration values are present in this
-# autogenerated file.
-#
-# All configuration values have a default; values that are commented out
-# serve to show the default.
+# This file only contains a selection of the most common options. For a full
+# list see the documentation:
+# https://www.sphinx-doc.org/en/master/usage/configuration.html
 
-import os
-import sys
+# -- Path setup --------------------------------------------------------------
 
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-# sys.path.insert(0, os.path.abspath('.'))
+#
+import os
+import sys
+# import django
+# sys.path.insert(0, os.path.abspath('..'))
+# os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local")
+# django.setup()
 
-# -- General configuration -----------------------------------------------------
 
-# If your documentation needs a minimal Sphinx version, state it here.
-# needs_sphinx = '1.0'
+# -- Project information -----------------------------------------------------
 
-# Add any Sphinx extension module names here, as strings. They can be extensions
-# coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = []
-
-# Add any paths that contain templates here, relative to this directory.
-templates_path = ["_templates"]
-
-# The suffix of source filenames.
-source_suffix = ".rst"
-
-# The encoding of source files.
-# source_encoding = 'utf-8-sig'
-
-# The master toctree document.
-master_doc = "index"
-
-# General information about the project.
 project = "{{ cookiecutter.project_name }}"
 copyright = """{% now 'utc', '%Y' %}, {{ cookiecutter.author_name }}"""
+author = "{{ cookiecutter.author_name }}"
 
-# The version info for the project you're documenting, acts as replacement for
-# |version| and |release|, also used in various other places throughout the
-# built documents.
-#
-# The short X.Y version.
-version = "0.1"
-# The full version, including alpha/beta/rc tags.
-release = "0.1"
 
-# The language for content autogenerated by Sphinx. Refer to documentation
-# for a list of supported languages.
-# language = None
+# -- General configuration ---------------------------------------------------
 
-# There are two options for replacing |today|: either, you set today to some
-# non-false value, then it is used:
-# today = ''
-# Else, today_fmt is used as the format for a strftime call.
-# today_fmt = '%B %d, %Y'
+# Add any Sphinx extension module names here, as strings. They can be
+# extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
+# ones.
+extensions = [
+]
+
+# Add any paths that contain templates here, relative to this directory.
+templates_path = ['_templates']
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
-exclude_patterns = ["_build"]
-
-# The reST default role (used for this markup: `text`) to use for all documents.
-# default_role = None
-
-# If true, '()' will be appended to :func: etc. cross-reference text.
-# add_function_parentheses = True
-
-# If true, the current module name will be prepended to all description
-# unit titles (such as .. function::).
-# add_module_names = True
-
-# If true, sectionauthor and moduleauthor directives will be shown in the
-# output. They are ignored by default.
-# show_authors = False
-
-# The name of the Pygments (syntax highlighting) style to use.
-pygments_style = "sphinx"
-
-# A list of ignored prefixes for module index sorting.
-# modindex_common_prefix = []
+# This pattern also affects html_static_path and html_extra_path.
+exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
 
 
-# -- Options for HTML output ---------------------------------------------------
+# -- Options for HTML output -------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = "default"
-
-# Theme options are theme-specific and customize the look and feel of a theme
-# further.  For a list of options available for each theme, see the
-# documentation.
-# html_theme_options = {}
-
-# Add any paths that contain custom themes here, relative to this directory.
-# html_theme_path = []
-
-# The name for this set of Sphinx documents.  If None, it defaults to
-# "<project> v<release> documentation".
-# html_title = None
-
-# A shorter title for the navigation bar.  Default is the same as html_title.
-# html_short_title = None
-
-# The name of an image file (relative to this directory) to place at the top
-# of the sidebar.
-# html_logo = None
-
-# The name of an image file (within the static path) to use as favicon of the
-# docs.  This file should be a Windows icon file (.ico) being 16x16 or 32x32
-# pixels large.
-# html_favicon = None
+#
+html_theme = 'alabaster'
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ["_static"]
-
-# If not '', a 'Last updated on:' timestamp is inserted at every page bottom,
-# using the given strftime format.
-# html_last_updated_fmt = '%b %d, %Y'
-
-# If true, SmartyPants will be used to convert quotes and dashes to
-# typographically correct entities.
-# html_use_smartypants = True
-
-# Custom sidebar templates, maps document names to template names.
-# html_sidebars = {}
-
-# Additional templates that should be rendered to pages, maps page names to
-# template names.
-# html_additional_pages = {}
-
-# If false, no module index is generated.
-# html_domain_indices = True
-
-# If false, no index is generated.
-# html_use_index = True
-
-# If true, the index is split into individual pages for each letter.
-# html_split_index = False
-
-# If true, links to the reST sources are added to the pages.
-# html_show_sourcelink = True
-
-# If true, "Created using Sphinx" is shown in the HTML footer. Default is True.
-# html_show_sphinx = True
-
-# If true, "(C) Copyright ..." is shown in the HTML footer. Default is True.
-# html_show_copyright = True
-
-# If true, an OpenSearch description file will be output, and all pages will
-# contain a <link> tag referring to it.  The value of this option must be the
-# base URL from which the finished HTML is served.
-# html_use_opensearch = ''
-
-# This is the file name suffix for HTML files (e.g. ".xhtml").
-# html_file_suffix = None
-
-# Output file base name for HTML help builder.
-htmlhelp_basename = "{{ cookiecutter.project_slug }}doc"
-
-
-# -- Options for LaTeX output --------------------------------------------------
-
-latex_elements = {
-    # The paper size ('letterpaper' or 'a4paper').
-    # 'papersize': 'letterpaper',
-    # The font size ('10pt', '11pt' or '12pt').
-    # 'pointsize': '10pt',
-    # Additional stuff for the LaTeX preamble.
-    # 'preamble': '',
-}
-
-# Grouping the document tree into LaTeX files. List of tuples
-# (source start file, target name, title, author, documentclass [howto/manual]).
-latex_documents = [
-    (
-        "index",
-        "{{ cookiecutter.project_slug }}.tex",
-        "{{ cookiecutter.project_name }} Documentation",
-        """{{ cookiecutter.author_name }}""",
-        "manual",
-    )
-]
-
-# The name of an image file (relative to this directory) to place at the top of
-# the title page.
-# latex_logo = None
-
-# For "manual" documents, if this is true, then toplevel headings are parts,
-# not chapters.
-# latex_use_parts = False
-
-# If true, show page references after internal links.
-# latex_show_pagerefs = False
-
-# If true, show URL addresses after external links.
-# latex_show_urls = False
-
-# Documents to append as an appendix to all manuals.
-# latex_appendices = []
-
-# If false, no module index is generated.
-# latex_domain_indices = True
-
-
-# -- Options for manual page output --------------------------------------------
-
-# One entry per manual page. List of tuples
-# (source start file, name, description, authors, manual section).
-man_pages = [
-    (
-        "index",
-        "{{ cookiecutter.project_slug }}",
-        "{{ cookiecutter.project_name }} Documentation",
-        ["""{{ cookiecutter.author_name }}"""],
-        1,
-    )
-]
-
-# If true, show URL addresses after external links.
-# man_show_urls = False
-
-
-# -- Options for Texinfo output ------------------------------------------------
-
-# Grouping the document tree into Texinfo files. List of tuples
-# (source start file, target name, title, author,
-#  dir menu entry, description, category)
-texinfo_documents = [
-    (
-        "index",
-        "{{ cookiecutter.project_slug }}",
-        "{{ cookiecutter.project_name }} Documentation",
-        """{{ cookiecutter.author_name }}""",
-        "{{ cookiecutter.project_name }}",
-        """{{ cookiecutter.description }}""",
-        "Miscellaneous",
-    )
-]
-
-# Documents to append as an appendix to all manuals.
-# texinfo_appendices = []
-
-# If false, no module index is generated.
-# texinfo_domain_indices = True
-
-# How to display URL addresses: 'footnote', 'no', or 'inline'.
-# texinfo_show_urls = 'footnote'
+html_static_path = ['_static']
diff --git a/{{cookiecutter.project_slug}}/docs/index.rst b/{{cookiecutter.project_slug}}/docs/index.rst
index 96752d807..b107a9e5c 100644
--- a/{{cookiecutter.project_slug}}/docs/index.rst
+++ b/{{cookiecutter.project_slug}}/docs/index.rst
@@ -3,17 +3,19 @@
    You can adapt this file completely to your liking, but it should at least
    contain the root `toctree` directive.
 
-{{ cookiecutter.project_name }} Project Documentation
-====================================================================
-
-Table of Contents:
+Welcome to {{ cookiecutter.project_name }}'s documentation!
+======================================================================
 
 .. toctree::
    :maxdepth: 2
+   :caption: Contents:
+
+   pycharm/configuration
 
 
-Indices & Tables
-================
+
+Indices and tables
+==================
 
 * :ref:`genindex`
 * :ref:`modindex`
diff --git a/{{cookiecutter.project_slug}}/docs/make.bat b/{{cookiecutter.project_slug}}/docs/make.bat
index ec43148b3..922152e96 100644
--- a/{{cookiecutter.project_slug}}/docs/make.bat
+++ b/{{cookiecutter.project_slug}}/docs/make.bat
@@ -1,190 +1,35 @@
 @ECHO OFF
 
+pushd %~dp0
+
 REM Command file for Sphinx documentation
 
 if "%SPHINXBUILD%" == "" (
 	set SPHINXBUILD=sphinx-build
 )
+set SOURCEDIR=.
 set BUILDDIR=_build
-set ALLSPHINXOPTS=-d %BUILDDIR%/doctrees %SPHINXOPTS% .
-set I18NSPHINXOPTS=%SPHINXOPTS% .
-if NOT "%PAPER%" == "" (
-	set ALLSPHINXOPTS=-D latex_paper_size=%PAPER% %ALLSPHINXOPTS%
-	set I18NSPHINXOPTS=-D latex_paper_size=%PAPER% %I18NSPHINXOPTS%
-)
 
 if "%1" == "" goto help
 
-if "%1" == "help" (
-	:help
-	echo.Please use `make ^<target^>` where ^<target^> is one of
-	echo.  html       to make standalone HTML files
-	echo.  dirhtml    to make HTML files named index.html in directories
-	echo.  singlehtml to make a single large HTML file
-	echo.  pickle     to make pickle files
-	echo.  json       to make JSON files
-	echo.  htmlhelp   to make HTML files and a HTML help project
-	echo.  qthelp     to make HTML files and a qthelp project
-	echo.  devhelp    to make HTML files and a Devhelp project
-	echo.  epub       to make an epub
-	echo.  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter
-	echo.  text       to make text files
-	echo.  man        to make manual pages
-	echo.  texinfo    to make Texinfo files
-	echo.  gettext    to make PO message catalogs
-	echo.  changes    to make an overview over all changed/added/deprecated items
-	echo.  linkcheck  to check all external links for integrity
-	echo.  doctest    to run all doctests embedded in the documentation if enabled
-	goto end
-)
-
-if "%1" == "clean" (
-	for /d %%i in (%BUILDDIR%\*) do rmdir /q /s %%i
-	del /q /s %BUILDDIR%\*
-	goto end
-)
-
-if "%1" == "html" (
-	%SPHINXBUILD% -b html %ALLSPHINXOPTS% %BUILDDIR%/html
-	if errorlevel 1 exit /b 1
+%SPHINXBUILD% >NUL 2>NUL
+if errorlevel 9009 (
 	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/html.
-	goto end
+	echo.The 'sphinx-build' command was not found. Make sure you have Sphinx
+	echo.installed, then set the SPHINXBUILD environment variable to point
+	echo.to the full path of the 'sphinx-build' executable. Alternatively you
+	echo.may add the Sphinx directory to PATH.
+	echo.
+	echo.If you don't have Sphinx installed, grab it from
+	echo.http://sphinx-doc.org/
+	exit /b 1
 )
 
-if "%1" == "dirhtml" (
-	%SPHINXBUILD% -b dirhtml %ALLSPHINXOPTS% %BUILDDIR%/dirhtml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/dirhtml.
-	goto end
-)
+%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+goto end
 
-if "%1" == "singlehtml" (
-	%SPHINXBUILD% -b singlehtml %ALLSPHINXOPTS% %BUILDDIR%/singlehtml
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The HTML pages are in %BUILDDIR%/singlehtml.
-	goto end
-)
-
-if "%1" == "pickle" (
-	%SPHINXBUILD% -b pickle %ALLSPHINXOPTS% %BUILDDIR%/pickle
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can process the pickle files.
-	goto end
-)
-
-if "%1" == "json" (
-	%SPHINXBUILD% -b json %ALLSPHINXOPTS% %BUILDDIR%/json
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can process the JSON files.
-	goto end
-)
-
-if "%1" == "htmlhelp" (
-	%SPHINXBUILD% -b htmlhelp %ALLSPHINXOPTS% %BUILDDIR%/htmlhelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can run HTML Help Workshop with the ^
-.hhp project file in %BUILDDIR%/htmlhelp.
-	goto end
-)
-
-if "%1" == "qthelp" (
-	%SPHINXBUILD% -b qthelp %ALLSPHINXOPTS% %BUILDDIR%/qthelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; now you can run "qcollectiongenerator" with the ^
-.qhcp project file in %BUILDDIR%/qthelp, like this:
-	echo.^> qcollectiongenerator %BUILDDIR%\qthelp\{{ cookiecutter.project_slug }}.qhcp
-	echo.To view the help file:
-	echo.^> assistant -collectionFile %BUILDDIR%\qthelp\{{ cookiecutter.project_slug }}.ghc
-	goto end
-)
-
-if "%1" == "devhelp" (
-	%SPHINXBUILD% -b devhelp %ALLSPHINXOPTS% %BUILDDIR%/devhelp
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished.
-	goto end
-)
-
-if "%1" == "epub" (
-	%SPHINXBUILD% -b epub %ALLSPHINXOPTS% %BUILDDIR%/epub
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The epub file is in %BUILDDIR%/epub.
-	goto end
-)
-
-if "%1" == "latex" (
-	%SPHINXBUILD% -b latex %ALLSPHINXOPTS% %BUILDDIR%/latex
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished; the LaTeX files are in %BUILDDIR%/latex.
-	goto end
-)
-
-if "%1" == "text" (
-	%SPHINXBUILD% -b text %ALLSPHINXOPTS% %BUILDDIR%/text
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The text files are in %BUILDDIR%/text.
-	goto end
-)
-
-if "%1" == "man" (
-	%SPHINXBUILD% -b man %ALLSPHINXOPTS% %BUILDDIR%/man
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The manual pages are in %BUILDDIR%/man.
-	goto end
-)
-
-if "%1" == "texinfo" (
-	%SPHINXBUILD% -b texinfo %ALLSPHINXOPTS% %BUILDDIR%/texinfo
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The Texinfo files are in %BUILDDIR%/texinfo.
-	goto end
-)
-
-if "%1" == "gettext" (
-	%SPHINXBUILD% -b gettext %I18NSPHINXOPTS% %BUILDDIR%/locale
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Build finished. The message catalogs are in %BUILDDIR%/locale.
-	goto end
-)
-
-if "%1" == "changes" (
-	%SPHINXBUILD% -b changes %ALLSPHINXOPTS% %BUILDDIR%/changes
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.The overview file is in %BUILDDIR%/changes.
-	goto end
-)
-
-if "%1" == "linkcheck" (
-	%SPHINXBUILD% -b linkcheck %ALLSPHINXOPTS% %BUILDDIR%/linkcheck
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Link check complete; look for any errors in the above output ^
-or in %BUILDDIR%/linkcheck/output.txt.
-	goto end
-)
-
-if "%1" == "doctest" (
-	%SPHINXBUILD% -b doctest %ALLSPHINXOPTS% %BUILDDIR%/doctest
-	if errorlevel 1 exit /b 1
-	echo.
-	echo.Testing of doctests in the sources finished, look at the ^
-results in %BUILDDIR%/doctest/output.txt.
-	goto end
-)
+:help
+%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
 
 :end
+popd
diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/configuration.rst b/{{cookiecutter.project_slug}}/docs/pycharm/configuration.rst
index c1d4f4b98..1c20d023f 100644
--- a/{{cookiecutter.project_slug}}/docs/pycharm/configuration.rst
+++ b/{{cookiecutter.project_slug}}/docs/pycharm/configuration.rst
@@ -36,12 +36,18 @@ After few seconds, all *Run/Debug Configurations* should be ready to use.
 **Things you can do with provided configuration**:
 
 * run and debug python code
+
 .. image:: images/f1.png
+
 * run and debug tests
+
 .. image:: images/f2.png
 .. image:: images/f3.png
+
 * run and debug migrations or different django management commands
+
 .. image:: images/f4.png
+
 * and many others..
 
 Known issues

From 028728351acebb1935be021d73ba528e7a5f5250 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 28 Dec 2019 08:00:31 -0300
Subject: [PATCH 0488/2840] Update tox from 3.14.2 to 3.14.3

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

diff --git a/requirements.txt b/requirements.txt
index eccb2d9da..2ab19a9e7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ flake8==3.7.9
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.14.2
+tox==3.14.3
 pytest==5.3.2
 pytest_cases==1.12.0
 pytest-cookies==0.4.0

From aa48a03c1ff86c06491a8997a2bbb62757cc0281 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 31 Dec 2019 08:00:30 -0300
Subject: [PATCH 0489/2840] Update django-compressor from 2.3 to 2.4

---
 {{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 c31481a35..7c8c7b2f0 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -25,7 +25,7 @@ django-model-utils==4.0.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.41.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.8.1  # https://github.com/django-crispy-forms/django-crispy-forms
 {%- if cookiecutter.use_compressor == "y" %}
-django-compressor==2.3  # https://github.com/django-compressor/django-compressor
+django-compressor==2.4  # https://github.com/django-compressor/django-compressor
 {%- endif %}
 django-redis==4.11.0  # https://github.com/niwinz/django-redis
 

From e33e90fb69a056d3f0f490659a9c826a0df42584 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 2 Jan 2020 08:00:30 -0300
Subject: [PATCH 0490/2840] Update pillow from 6.2.1 to 7.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 c31481a35..2d107178c 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,6 +1,6 @@
 pytz==2019.3  # https://github.com/stub42/pytz
 python-slugify==4.0.0  # https://github.com/un33k/python-slugify
-Pillow==6.2.1  # https://github.com/python-pillow/Pillow
+Pillow==7.0.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
 rcssmin==1.0.6{% if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} --install-option="--without-c-extensions"{% endif %}  # https://github.com/ndparker/rcssmin
 {%- endif %}

From 41d514e6cfe4563974b6d1d893fa5de5dbb9e6bf Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 3 Jan 2020 08:00:31 -0300
Subject: [PATCH 0491/2840] Update pre-commit from 1.20.0 to 1.21.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 070a0b2d2..8dd68ea4c 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -24,7 +24,7 @@ pylint-django==2.0.13  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}
-pre-commit==1.20.0  # https://github.com/pre-commit/pre-commit
+pre-commit==1.21.0  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From bfe094963582b7b1ccda377709067fb2ca7923c6 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 6 Jan 2020 11:00:33 +0000
Subject: [PATCH 0492/2840] Update coverage from 5.0 to 5.0.2

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

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 070a0b2d2..0acd5ec12 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -18,7 +18,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 # Code quality
 # ------------------------------------------------------------------------------
 flake8==3.7.9  # https://github.com/PyCQA/flake8
-coverage==5.0  # https://github.com/nedbat/coveragepy
+coverage==5.0.2  # https://github.com/nedbat/coveragepy
 black==19.10b0  # https://github.com/ambv/black
 pylint-django==2.0.13  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From a0359d9d6a48e1cae6de3a5898e7a9a2258de9b2 Mon Sep 17 00:00:00 2001
From: Hunterx7 <ialbetsram@gmail.com>
Date: Mon, 6 Jan 2020 13:57:19 +0100
Subject: [PATCH 0493/2840] Bumped runtime for heroku.

---
 {{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 42731f2fb..6919bf9ed 100644
--- a/{{cookiecutter.project_slug}}/runtime.txt
+++ b/{{cookiecutter.project_slug}}/runtime.txt
@@ -1 +1 @@
-python-3.7.4
+python-3.7.6

From f0e06a2a17746575825c33ee3535a7cfdbbad08b Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 7 Jan 2020 11:00:32 +0000
Subject: [PATCH 0494/2840] Update pyyaml from 5.2 to 5.3

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

diff --git a/requirements.txt b/requirements.txt
index eccb2d9da..8ecf7328d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,4 +14,4 @@ pytest==5.3.2
 pytest_cases==1.12.0
 pytest-cookies==0.4.0
 pytest-xdist==1.31.0
-pyyaml==5.2
+pyyaml==5.3

From b22045bcd4ebf563ccdcf226fb389a6bb71e2654 Mon Sep 17 00:00:00 2001
From: Trung Dong Huynh <trungdong@donggiang.com>
Date: Tue, 7 Jan 2020 11:06:31 +0000
Subject: [PATCH 0495/2840] Replaced base Docker image with debian:buster-slim
 (#2373)

Using system Python 3 distribution (3.7.3) in order to allow the use of Debian packages for numpy, scipy, etc. without the need of building them or installing build dependencies.

Changed `#!/bin/sh` in shell scripts to `#!/bin/bash` to make `set -o pipefail` work.
---
 .../compose/local/django/Dockerfile           | 24 +++++++++--------
 .../compose/local/django/celery/beat/start    |  2 +-
 .../compose/local/django/celery/flower/start  |  2 +-
 .../compose/local/django/celery/worker/start  |  2 +-
 .../compose/local/django/start                |  2 +-
 .../compose/production/django/Dockerfile      | 26 ++++++++++++-------
 .../production/django/celery/beat/start       |  2 +-
 .../production/django/celery/flower/start     |  2 +-
 .../production/django/celery/worker/start     |  2 +-
 .../compose/production/django/entrypoint      |  2 +-
 .../compose/production/django/start           |  2 +-
 11 files changed, 38 insertions(+), 30 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index a98547bdd..6747322a1 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -1,19 +1,21 @@
-FROM python:3.7-alpine
+FROM debian:buster-slim
 
 ENV PYTHONUNBUFFERED 1
 
-RUN apk update \
+RUN apt-get update \
+  # dependencies for building Python packages
+  && apt-get install -y build-essential python3-dev python3-pip \
+  # link the system python3 as just python for convenience
+  && ln -s `which python3` /usr/local/bin/python \
+  # update pip et al
+  && pip3 install -U pip setuptools wheel \ 
   # psycopg2 dependencies
-  && apk add --virtual build-deps gcc python3-dev musl-dev \
-  && apk add postgresql-dev \
-  # Pillow dependencies
-  && apk add jpeg-dev zlib-dev freetype-dev lcms2-dev openjpeg-dev tiff-dev tk-dev tcl-dev \
-  # CFFI dependencies
-  && apk add libffi-dev py-cffi \
+  && apt-get install -y libpq-dev \
   # Translations dependencies
-  && apk add gettext \
-  # https://docs.djangoproject.com/en/dev/ref/django-admin/#dbshell
-  && apk add postgresql-client
+  && apt-get install -y gettext \
+  # cleaning up unused files
+  && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+  && rm -rf /var/lib/apt/lists/*
 
 # Requirements are installed here to ensure they will be cached.
 COPY ./requirements /requirements
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
index 389e2baf1..c04a7365e 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -o errexit
 set -o nounset
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start
index be67050da..5bcaa8164 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -o errexit
 set -o nounset
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
index 072c6ae62..acd6f1574 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -o errexit
 set -o nounset
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start b/{{cookiecutter.project_slug}}/compose/local/django/start
index 921604dcb..f076ee51e 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/start
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -o errexit
 set -o pipefail
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index b0861d605..ddc46f7b3 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -9,21 +9,27 @@ RUN npm run build
 
 # Python build stage
 {%- endif %}
-FROM python:3.7-alpine
+FROM debian:buster-slim
 
 ENV PYTHONUNBUFFERED 1
 
-RUN apk update \
+RUN apt-get update \
+  # dependencies for building Python packages
+  && apt-get install -y build-essential python3-dev python3-pip \
+  # link the system python3 as just python for convenience
+  && ln -s `which python3` /usr/local/bin/python \
+  # update pip et al
+  && pip3 install -U pip setuptools wheel \ 
   # psycopg2 dependencies
-  && apk add --virtual build-deps gcc python3-dev musl-dev \
-  && apk add postgresql-dev \
-  # Pillow dependencies
-  && apk add jpeg-dev zlib-dev freetype-dev lcms2-dev openjpeg-dev tiff-dev tk-dev tcl-dev \
-  # CFFI dependencies
-  && apk add libffi-dev py-cffi
+  && apt-get install -y libpq-dev \
+  # Translations dependencies
+  && apt-get install -y gettext \
+  # cleaning up unused files
+  && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+  && rm -rf /var/lib/apt/lists/*
 
-RUN addgroup -S django \
-    && adduser -S -G django django
+RUN addgroup --system django \
+    && adduser --system --ingroup django django
 
 # Requirements are installed here to ensure they will be cached.
 COPY ./requirements /requirements
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start b/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
index 0e793e38e..20b93123a 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
+++ b/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -o errexit
 set -o pipefail
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start b/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start
index be67050da..5bcaa8164 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start
+++ b/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -o errexit
 set -o nounset
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/worker/start b/{{cookiecutter.project_slug}}/compose/production/django/celery/worker/start
index 4e519c3fc..38fb77f35 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/celery/worker/start
+++ b/{{cookiecutter.project_slug}}/compose/production/django/celery/worker/start
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -o errexit
 set -o pipefail
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint
index 0a76b3107..95ab8297a 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint
+++ b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -o errexit
 set -o pipefail
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/start b/{{cookiecutter.project_slug}}/compose/production/django/start
index 0ad39dfae..709c1dd04 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/start
+++ b/{{cookiecutter.project_slug}}/compose/production/django/start
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 set -o errexit
 set -o pipefail

From 4a71b0b9360b2ecea9518b4531a30f25c5735fff Mon Sep 17 00:00:00 2001
From: Trung Dong Huynh <trungdong@donggiang.com>
Date: Tue, 7 Jan 2020 13:54:15 +0000
Subject: [PATCH 0496/2840] Using the python:3.7-slim-buster image for later
 Python version - 3.7.6 (instead of debian:buster-slim, shipped with Python
 3.7.3)

---
 .../compose/local/django/Dockerfile                       | 8 ++------
 .../compose/production/django/Dockerfile                  | 8 ++------
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index 6747322a1..94c799520 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -1,14 +1,10 @@
-FROM debian:buster-slim
+FROM python:3.7-slim-buster
 
 ENV PYTHONUNBUFFERED 1
 
 RUN apt-get update \
   # dependencies for building Python packages
-  && apt-get install -y build-essential python3-dev python3-pip \
-  # link the system python3 as just python for convenience
-  && ln -s `which python3` /usr/local/bin/python \
-  # update pip et al
-  && pip3 install -U pip setuptools wheel \ 
+  && apt-get install -y build-essential \
   # psycopg2 dependencies
   && apt-get install -y libpq-dev \
   # Translations dependencies
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index ddc46f7b3..9d4dc5fc6 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -9,17 +9,13 @@ RUN npm run build
 
 # Python build stage
 {%- endif %}
-FROM debian:buster-slim
+FROM python:3.7-slim-buster
 
 ENV PYTHONUNBUFFERED 1
 
 RUN apt-get update \
   # dependencies for building Python packages
-  && apt-get install -y build-essential python3-dev python3-pip \
-  # link the system python3 as just python for convenience
-  && ln -s `which python3` /usr/local/bin/python \
-  # update pip et al
-  && pip3 install -U pip setuptools wheel \ 
+  && apt-get install -y build-essential \
   # psycopg2 dependencies
   && apt-get install -y libpq-dev \
   # Translations dependencies

From c94c6acfc453489c952e9bce85c27ef543e5bd6e Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 8 Jan 2020 11:00:33 +0000
Subject: [PATCH 0497/2840] Update sentry-sdk from 0.13.5 to 0.14.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 438ccca6d..db3d5e0a8 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==1.3.1  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.13.5  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.14.0  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From 3814fc7a3f8a513e0bc46ba6a20ad4ce3b1c31ea Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sat, 11 Jan 2020 13:45:37 +0000
Subject: [PATCH 0498/2840] Update contributors list

---
 CONTRIBUTORS.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 53edb28e8..71ba3d344 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -122,6 +122,7 @@ Listed in alphabetical order.
   Henrique G. G. Pereira   `@ikkebr`_
   Ian Lee                  `@IanLee1521`_
   Irfan Ahmad              `@erfaan`_                    @erfaan
+  Isaac12x                 `@Isaac12x`_
   Jan Van Bruggen          `@jvanbrug`_
   Jelmer Draaijer          `@foarsitter`_
   Jens Nilsson             `@phiberjenz`_
@@ -282,6 +283,7 @@ Listed in alphabetical order.
 .. _@hjwp: https://github.com/hjwp
 .. _@IanLee1521: https://github.com/IanLee1521
 .. _@ikkebr: https://github.com/ikkebr
+.. _@Isaac12x: https://github.com/Isaac12x
 .. _@iynaix: https://github.com/iynaix
 .. _@jangeador: https://github.com/jangeador
 .. _@jazztpt: https://github.com/jazztpt

From d9d6eb82c64ea0ba04f9017fd096be6442f11f19 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sat, 11 Jan 2020 13:52:47 +0000
Subject: [PATCH 0499/2840] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e7d9220d..f526bddb2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,12 @@
 All enhancements and patches to Cookiecutter Django will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2020-01-11]
+### Changed
+- Speed up & reduce size for production Django image
+- Bumped runtime version for Heroku
+- Added Debian 10 (Buster) OS dependencies
+
 ## [2019-10-06]
 ### Changed
 - Default Python version is now 3.7 (@nicolas471)

From 5e1bec2744eef38a909645b85fc1442b7172c59e Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sat, 11 Jan 2020 14:19:11 +0000
Subject: [PATCH 0500/2840] Update changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f526bddb2..58026739e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Speed up & reduce size for production Django image
 - Bumped runtime version for Heroku
 - Added Debian 10 (Buster) OS dependencies
+- Update Traefik to v2
 
 ## [2019-10-06]
 ### Changed

From 9bd9891541966a38311f7952a30e229c56e773b9 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sat, 11 Jan 2020 16:10:14 +0000
Subject: [PATCH 0501/2840] Align psycopg2 versions

---
 {{cookiecutter.project_slug}}/requirements/local.txt      | 2 +-
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index f4c228709..37305f4b4 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -4,7 +4,7 @@ Werkzeug==0.16.0 # https://github.com/pallets/werkzeug
 ipdb==0.12.3  # https://github.com/gotcha/ipdb
 Sphinx==2.3.1  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
-psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
+psycopg2==2.8.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}
 psycopg2-binary==2.8.4  # https://github.com/psycopg/psycopg2
 {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index db3d5e0a8..9e87b18c8 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -3,7 +3,7 @@
 -r ./base.txt
 
 gunicorn==20.0.4  # https://github.com/benoitc/gunicorn
-psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
+psycopg2==2.8.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
 Collectfast==1.3.1  # https://github.com/antonagestam/collectfast
 {%- endif %}

From 30f8000869b75ebe3e0a312b8a105c121541fca1 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sat, 11 Jan 2020 16:47:44 +0000
Subject: [PATCH 0502/2840] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 58026739e..10ee2d03d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Bumped runtime version for Heroku
 - Added Debian 10 (Buster) OS dependencies
 - Update Traefik to v2
+- Switched from Alpine based image to Debian based image
 
 ## [2019-10-06]
 ### Changed

From 88ff9c1846b84a8feb552ddad8c70fec3b8594c0 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sat, 11 Jan 2020 16:48:16 +0000
Subject: [PATCH 0503/2840] Update CHANGELOG.md

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10ee2d03d..7a2af7c03 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,7 +8,7 @@ This project adheres to [Semantic Versioning](http://semver.org/).
 - Bumped runtime version for Heroku
 - Added Debian 10 (Buster) OS dependencies
 - Update Traefik to v2
-- Switched from Alpine based image to Debian based image
+- Switched Docker images from Alpine based to Debian based
 
 ## [2019-10-06]
 ### Changed

From 08729822451f5149fae49b2fbaab47ebf4c02483 Mon Sep 17 00:00:00 2001
From: Daniel Hillier <daniel.hillier@gmail.com>
Date: Mon, 13 Jan 2020 00:28:37 +1100
Subject: [PATCH 0504/2840] Fix failing mypy tests in users app with
 django-stubs (#2395)

Adds django-stubs as a requirement for local virtualenv. This is
required now that the User Model type is being resolved properly.
---
 .../config/settings/production.py                  |  2 +-
 .../config/settings/test.py                        |  2 +-
 .../requirements/local.txt                         |  1 +
 {{cookiecutter.project_slug}}/setup.cfg            |  1 +
 .../{{cookiecutter.project_slug}}/conftest.py      |  4 ++--
 .../users/tests/test_models.py                     |  5 +++--
 .../users/tests/test_urls.py                       |  5 +++--
 .../users/tests/test_views.py                      | 14 ++++----------
 8 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 22a2acaef..39dbc7cd5 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -154,7 +154,7 @@ MEDIA_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/media/"
 # TEMPLATES
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#templates
-TEMPLATES[0]["OPTIONS"]["loaders"] = [  # noqa F405
+TEMPLATES[0]["OPTIONS"]["loaders"] = [  # type: ignore[index] # noqa F405
     (
         "django.template.loaders.cached.Loader",
         [
diff --git a/{{cookiecutter.project_slug}}/config/settings/test.py b/{{cookiecutter.project_slug}}/config/settings/test.py
index fad41afdd..d31b2864a 100644
--- a/{{cookiecutter.project_slug}}/config/settings/test.py
+++ b/{{cookiecutter.project_slug}}/config/settings/test.py
@@ -32,7 +32,7 @@ PASSWORD_HASHERS = ["django.contrib.auth.hashers.MD5PasswordHasher"]
 
 # TEMPLATES
 # ------------------------------------------------------------------------------
-TEMPLATES[0]["OPTIONS"]["loaders"] = [  # noqa F405
+TEMPLATES[0]["OPTIONS"]["loaders"] = [  # type: ignore[index] # noqa F405
     (
         "django.template.loaders.cached.Loader",
         [
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 37305f4b4..c46444efc 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -12,6 +12,7 @@ psycopg2-binary==2.8.4  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.761  # https://github.com/python/mypy
+django-stubs==1.3.1  # https://github.com/typeddjango/django-stubs
 pytest==5.3.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
diff --git a/{{cookiecutter.project_slug}}/setup.cfg b/{{cookiecutter.project_slug}}/setup.cfg
index f7cd01cb6..5f7d9b655 100644
--- a/{{cookiecutter.project_slug}}/setup.cfg
+++ b/{{cookiecutter.project_slug}}/setup.cfg
@@ -13,6 +13,7 @@ ignore_missing_imports = True
 warn_unused_ignores = True
 warn_redundant_casts = True
 warn_unused_configs = True
+plugins = mypy_django_plugin.main
 
 [mypy.plugins.django-stubs]
 django_settings_module = config.settings.test
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/conftest.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/conftest.py
index aae11d269..8cd51d7fe 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/conftest.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/conftest.py
@@ -1,7 +1,7 @@
 import pytest
-from django.conf import settings
 from django.test import RequestFactory
 
+from {{ cookiecutter.project_slug }}.users.models import User
 from {{ cookiecutter.project_slug }}.users.tests.factories import UserFactory
 
 
@@ -11,7 +11,7 @@ def media_storage(settings, tmpdir):
 
 
 @pytest.fixture
-def user() -> settings.AUTH_USER_MODEL:
+def user() -> User:
     return UserFactory()
 
 
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_models.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_models.py
index 548636323..3194be1fd 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_models.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_models.py
@@ -1,8 +1,9 @@
 import pytest
-from django.conf import settings
+
+from {{ cookiecutter.project_slug }}.users.models import User
 
 pytestmark = pytest.mark.django_db
 
 
-def test_user_get_absolute_url(user: settings.AUTH_USER_MODEL):
+def test_user_get_absolute_url(user: User):
     assert user.get_absolute_url() == f"/users/{user.username}/"
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
index c6361920d..933396ba0 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
@@ -1,11 +1,12 @@
 import pytest
-from django.conf import settings
 from django.urls import reverse, resolve
 
+from {{ cookiecutter.project_slug }}.users.models import User
+
 pytestmark = pytest.mark.django_db
 
 
-def test_detail(user: settings.AUTH_USER_MODEL):
+def test_detail(user: User):
     assert (
         reverse("users:detail", kwargs={"username": user.username})
         == f"/users/{user.username}/"
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
index 76cb80aa8..9e868899c 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
@@ -1,7 +1,7 @@
 import pytest
-from django.conf import settings
 from django.test import RequestFactory
 
+from {{ cookiecutter.project_slug }}.users.models import User
 from {{ cookiecutter.project_slug }}.users.views import UserRedirectView, UserUpdateView
 
 pytestmark = pytest.mark.django_db
@@ -16,9 +16,7 @@ class TestUserUpdateView:
         https://github.com/pytest-dev/pytest-django/pull/258
     """
 
-    def test_get_success_url(
-        self, user: settings.AUTH_USER_MODEL, request_factory: RequestFactory
-    ):
+    def test_get_success_url(self, user: User, request_factory: RequestFactory):
         view = UserUpdateView()
         request = request_factory.get("/fake-url/")
         request.user = user
@@ -27,9 +25,7 @@ class TestUserUpdateView:
 
         assert view.get_success_url() == f"/users/{user.username}/"
 
-    def test_get_object(
-        self, user: settings.AUTH_USER_MODEL, request_factory: RequestFactory
-    ):
+    def test_get_object(self, user: User, request_factory: RequestFactory):
         view = UserUpdateView()
         request = request_factory.get("/fake-url/")
         request.user = user
@@ -40,9 +36,7 @@ class TestUserUpdateView:
 
 
 class TestUserRedirectView:
-    def test_get_redirect_url(
-        self, user: settings.AUTH_USER_MODEL, request_factory: RequestFactory
-    ):
+    def test_get_redirect_url(self, user: User, request_factory: RequestFactory):
         view = UserRedirectView()
         request = request_factory.get("/fake-url")
         request.user = user

From 9d1d5e47ff18682a1190fa4ef2b916044daf34ab Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 13 Jan 2020 11:00:33 +0000
Subject: [PATCH 0505/2840] Update coverage from 5.0.2 to 5.0.3

---
 {{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 37305f4b4..01394c15d 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -18,7 +18,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 # Code quality
 # ------------------------------------------------------------------------------
 flake8==3.7.9  # https://github.com/PyCQA/flake8
-coverage==5.0.2  # https://github.com/nedbat/coveragepy
+coverage==5.0.3  # https://github.com/nedbat/coveragepy
 black==19.10b0  # https://github.com/ambv/black
 pylint-django==2.0.13  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 60bf49a10cc840d551d15c99ab9ec962f1d34ebf Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 13 Jan 2020 12:40:32 +0000
Subject: [PATCH 0506/2840] Update CONTRIBUTORS.rst

---
 CONTRIBUTORS.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 87c8b4bd5..3e1f1cfef 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -94,6 +94,7 @@ Listed in alphabetical order.
   Dan Shultz               `@shultz`_
   Dani Hodovic             `@danihodovic`_
   Daniel Hepper            `@dhepper`_                   @danielhepper
+  Daniel Hillier           `@danifus`_
   Daniele Tricoli          `@eriol`_
   David Díaz               `@ddiazpinto`_                @DavidDiazPinto
   Davit Tovmasyan          `@davitovmasyan`_
@@ -255,6 +256,7 @@ Listed in alphabetical order.
 .. _@curtisstpierre: https://github.com/curtisstpierre
 .. _@dadokkio: https://github.com/dadokkio
 .. _@danihodovic: https://github.com/danihodovic
+.. _@danifus: https://github.com/danifus
 .. _@davitovmasyan: https://github.com/davitovmasyan
 .. _@ddiazpinto: https://github.com/ddiazpinto
 .. _@delneg: https://github.com/delneg

From 463c1f83e6896284b6c77b868b42797425a99c38 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 13 Jan 2020 17:51:50 +0000
Subject: [PATCH 0507/2840] Update CONTRIBUTORS.rst

---
 CONTRIBUTORS.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 3e1f1cfef..14394dde9 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -125,6 +125,7 @@ Listed in alphabetical order.
   Ian Lee                  `@IanLee1521`_
   Irfan Ahmad              `@erfaan`_                    @erfaan
   Isaac12x                 `@Isaac12x`_
+  Ivan Khomutov            `@ikhomutov`_
   Jan Van Bruggen          `@jvanbrug`_
   Jelmer Draaijer          `@foarsitter`_
   Jens Nilsson             `@phiberjenz`_
@@ -286,6 +287,7 @@ Listed in alphabetical order.
 .. _@hendrikschneider: https://github.com/hendrikschneider
 .. _@hjwp: https://github.com/hjwp
 .. _@IanLee1521: https://github.com/IanLee1521
+.. _@ikhomutov: https://github.com/ikhomutov
 .. _@ikkebr: https://github.com/ikkebr
 .. _@Isaac12x: https://github.com/Isaac12x
 .. _@iynaix: https://github.com/iynaix

From d9d80751dd44d40c9b7da5a56b71e1e92d350c7d Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 13 Jan 2020 22:42:35 +0000
Subject: [PATCH 0508/2840] Update CHANGELOG.md

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a2af7c03..b12ce03ef 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,11 @@
 All enhancements and patches to Cookiecutter Django will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/).
 
+## [2020-01-12]
+### Changed
+- Fix mypy setup and added django-stubs
+- Add Gitlab CI as option
+
 ## [2020-01-11]
 ### Changed
 - Speed up & reduce size for production Django image

From 6d4128b487f83e1083b9249d5709558c24feec2b Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 14 Jan 2020 11:00:32 +0000
Subject: [PATCH 0509/2840] Update django-stubs from 1.3.1 to 1.4.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 600ef4f5e..ebaad16ef 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -12,7 +12,7 @@ psycopg2-binary==2.8.4  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.761  # https://github.com/python/mypy
-django-stubs==1.3.1  # https://github.com/typeddjango/django-stubs
+django-stubs==1.4.0  # https://github.com/typeddjango/django-stubs
 pytest==5.3.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 

From 82c483bad52871498bf9f2d5d65f956124df3589 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 14 Jan 2020 11:00:37 +0000
Subject: [PATCH 0510/2840] Update pytest-django from 3.7.0 to 3.8.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 600ef4f5e..95c57d7c0 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -34,4 +34,4 @@ factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 django-debug-toolbar==2.1  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==2.2.5  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.6.0  # https://github.com/nedbat/django_coverage_plugin
-pytest-django==3.7.0  # https://github.com/pytest-dev/pytest-django
+pytest-django==3.8.0  # https://github.com/pytest-dev/pytest-django

From 43601d805ab3a10ccb42496e26f0ea851e57794e Mon Sep 17 00:00:00 2001
From: Bo <BoPeng@users.noreply.github.com>
Date: Tue, 14 Jan 2020 08:49:33 -0600
Subject: [PATCH 0511/2840] Update CONTRIBUTORS.rst

---
 CONTRIBUTORS.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 14394dde9..e4ef31816 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -71,6 +71,7 @@ Listed in alphabetical order.
   Benjamin Abel
   Bert de Miranda          `@bertdemiranda`_
   Bo Lopker                `@blopker`_
+  Bo Peng                  `@BoPeng`_
   Bouke Haarsma
   Brent Payne              `@brentpayne`_               @brentpayne
   Bruce Olivier            `@bolivierjr`_
@@ -235,6 +236,7 @@ Listed in alphabetical order.
 .. _@blopker: https://github.com/blopker
 .. _@bogdal: https://github.com/bogdal
 .. _@bolivierjr: https://github.com/bolivierjr
+.. _@BoPeng: https://github.com/BoPeng
 .. _@brentpayne: https://github.com/brentpayne
 .. _@btknu: https://github.com/btknu
 .. _@burhan: https://github.com/burhan

From 15fc92ace134386adfced5b94504117eec8e954b Mon Sep 17 00:00:00 2001
From: Bo <BoPeng@users.noreply.github.com>
Date: Tue, 14 Jan 2020 08:50:38 -0600
Subject: [PATCH 0512/2840] Assuming DTL to be the last instead of first
 template engine

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

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 39dbc7cd5..36667b33a 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -154,7 +154,7 @@ MEDIA_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/media/"
 # TEMPLATES
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#templates
-TEMPLATES[0]["OPTIONS"]["loaders"] = [  # type: ignore[index] # noqa F405
+TEMPLATES[-1]["OPTIONS"]["loaders"] = [  # type: ignore[index] # noqa F405
     (
         "django.template.loaders.cached.Loader",
         [

From 1609d4410edc51a43a2487e55b6c013d1ce1c3ac Mon Sep 17 00:00:00 2001
From: Bo <BoPeng@users.noreply.github.com>
Date: Tue, 14 Jan 2020 21:19:44 -0600
Subject: [PATCH 0513/2840] Fix loaders option in test environment as well

---
 {{cookiecutter.project_slug}}/config/settings/test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/test.py b/{{cookiecutter.project_slug}}/config/settings/test.py
index d31b2864a..667bb20d8 100644
--- a/{{cookiecutter.project_slug}}/config/settings/test.py
+++ b/{{cookiecutter.project_slug}}/config/settings/test.py
@@ -32,7 +32,7 @@ PASSWORD_HASHERS = ["django.contrib.auth.hashers.MD5PasswordHasher"]
 
 # TEMPLATES
 # ------------------------------------------------------------------------------
-TEMPLATES[0]["OPTIONS"]["loaders"] = [  # type: ignore[index] # noqa F405
+TEMPLATES[-1]["OPTIONS"]["loaders"] = [  # type: ignore[index] # noqa F405
     (
         "django.template.loaders.cached.Loader",
         [

From 2f9d69398063025a59e7b2159f345af4bbaeb4ea Mon Sep 17 00:00:00 2001
From: howiezhao <howiezhaohr@hotmail.com>
Date: Thu, 16 Jan 2020 11:31:37 +0800
Subject: [PATCH 0514/2840] style: formatting code

---
 {{cookiecutter.project_slug}}/docs/conf.py | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/docs/conf.py b/{{cookiecutter.project_slug}}/docs/conf.py
index 3c5d84ad8..bfde1e3a6 100644
--- a/{{cookiecutter.project_slug}}/docs/conf.py
+++ b/{{cookiecutter.project_slug}}/docs/conf.py
@@ -12,6 +12,7 @@
 #
 import os
 import sys
+
 # import django
 # sys.path.insert(0, os.path.abspath('..'))
 # os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local")
@@ -30,16 +31,15 @@ author = "{{ cookiecutter.author_name }}"
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = [
-]
+extensions = []
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ['_templates']
+templates_path = ["_templates"]
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This pattern also affects html_static_path and html_extra_path.
-exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
+exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
 
 
 # -- Options for HTML output -------------------------------------------------
@@ -47,9 +47,9 @@ exclude_patterns = ['_build', 'Thumbs.db', '.DS_Store']
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 #
-html_theme = 'alabaster'
+html_theme = "alabaster"
 
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ['_static']
+html_static_path = ["_static"]

From d1a46b5d4ded1342459aba839963a92ceaccccd3 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 17 Jan 2020 10:53:54 +0000
Subject: [PATCH 0515/2840] Update badge from Gitter to Slack

---
 README.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index 2fba0979a..337a88458 100644
--- a/README.rst
+++ b/README.rst
@@ -9,8 +9,8 @@ Cookiecutter Django
     :target: https://pyup.io/repos/github/pydanny/cookiecutter-django/
     :alt: Updates
 
-.. image:: https://badges.gitter.im/Join Chat.svg
-    :target: https://gitter.im/pydanny/cookiecutter-django?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+.. image:: https://img.shields.io/badge/cookiecutter-Join%20on%20Slack-green?style=flat&logo=slack
+    :target: https://join.slack.com/t/cookie-cutter/shared_invite/enQtNzI0Mzg5NjE5Nzk5LTRlYWI2YTZhYmQ4YmU1Y2Q2NmE1ZjkwOGM0NDQyNTIwY2M4ZTgyNDVkNjMxMDdhZGI5ZGE5YmJjM2M3ODJlY2U?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
 
 .. image:: https://www.codetriage.com/pydanny/cookiecutter-django/badges/users.svg
     :target: https://www.codetriage.com/pydanny/cookiecutter-django

From cb95128b178b7948cc4a6c72784952d86c756b36 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 17 Jan 2020 10:56:11 +0000
Subject: [PATCH 0516/2840] Change link from Gitter to Slack

---
 README.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.rst b/README.rst
index 337a88458..6e534b0f2 100644
--- a/README.rst
+++ b/README.rst
@@ -10,7 +10,7 @@ Cookiecutter Django
     :alt: Updates
 
 .. image:: https://img.shields.io/badge/cookiecutter-Join%20on%20Slack-green?style=flat&logo=slack
-    :target: https://join.slack.com/t/cookie-cutter/shared_invite/enQtNzI0Mzg5NjE5Nzk5LTRlYWI2YTZhYmQ4YmU1Y2Q2NmE1ZjkwOGM0NDQyNTIwY2M4ZTgyNDVkNjMxMDdhZGI5ZGE5YmJjM2M3ODJlY2U?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+    :target: https://join.slack.com/t/cookie-cutter/shared_invite/enQtNzI0Mzg5NjE5Nzk5LTRlYWI2YTZhYmQ4YmU1Y2Q2NmE1ZjkwOGM0NDQyNTIwY2M4ZTgyNDVkNjMxMDdhZGI5ZGE5YmJjM2M3ODJlY2U
 
 .. image:: https://www.codetriage.com/pydanny/cookiecutter-django/badges/users.svg
     :target: https://www.codetriage.com/pydanny/cookiecutter-django
@@ -226,11 +226,11 @@ Community
 
 * Have questions? **Before you ask questions anywhere else**, please post your question on `Stack Overflow`_ under the *cookiecutter-django* tag. We check there periodically for questions.
 * If you think you found a bug or want to request a feature, please open an issue_.
-* For anything else, you can chat with us on `Gitter`_.
+* For anything else, you can chat with us on `Slack`_.
 
 .. _`Stack Overflow`: http://stackoverflow.com/questions/tagged/cookiecutter-django
 .. _`issue`: https://github.com/pydanny/cookiecutter-django/issues
-.. _`Gitter`: https://gitter.im/pydanny/cookiecutter-django?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge
+.. _`Slack`: https://join.slack.com/t/cookie-cutter/shared_invite/enQtNzI0Mzg5NjE5Nzk5LTRlYWI2YTZhYmQ4YmU1Y2Q2NmE1ZjkwOGM0NDQyNTIwY2M4ZTgyNDVkNjMxMDdhZGI5ZGE5YmJjM2M3ODJlY2U
 
 For Readers of Two Scoops of Django
 --------------------------------------------

From c02587300ea6f879b220637d6d5406a78fcd26b3 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 17 Jan 2020 11:00:36 +0000
Subject: [PATCH 0517/2840] Update django-extensions from 2.2.5 to 2.2.6

---
 {{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 d0f8ef22d..544930ad4 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -32,6 +32,6 @@ pre-commit==1.21.0  # https://github.com/pre-commit/pre-commit
 factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==2.1  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==2.2.5  # https://github.com/django-extensions/django-extensions
+django-extensions==2.2.6  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.6.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.8.0  # https://github.com/pytest-dev/pytest-django

From 70f43c77160bc786f5a965ee8e3ea67e28175022 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 17 Jan 2020 11:00:40 +0000
Subject: [PATCH 0518/2840] Update django-coverage-plugin from 1.6.0 to 1.7.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 d0f8ef22d..4abefa7e9 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -33,5 +33,5 @@ factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==2.1  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==2.2.5  # https://github.com/django-extensions/django-extensions
-django-coverage-plugin==1.6.0  # https://github.com/nedbat/django_coverage_plugin
+django-coverage-plugin==1.7.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.8.0  # https://github.com/pytest-dev/pytest-django

From 546168c64ba47219e8d3cddc4322bb97c6c9efc6 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 18 Jan 2020 11:00:33 +0000
Subject: [PATCH 0519/2840] Update pytest from 5.3.2 to 5.3.3

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

diff --git a/requirements.txt b/requirements.txt
index 2f7772b2f..b4be7b5d2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8==3.7.9
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.14.3
-pytest==5.3.2
+pytest==5.3.3
 pytest_cases==1.12.0
 pytest-cookies==0.4.0
 pytest-xdist==1.31.0

From a69bf2e778ff4d0bc12857c45e5187e1074a829d Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 18 Jan 2020 11:00:34 +0000
Subject: [PATCH 0520/2840] Update pytest from 5.3.1 to 5.3.3

---
 {{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 544930ad4..345193b59 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -13,7 +13,7 @@ psycopg2-binary==2.8.4  # https://github.com/psycopg/psycopg2
 # ------------------------------------------------------------------------------
 mypy==0.761  # https://github.com/python/mypy
 django-stubs==1.4.0  # https://github.com/typeddjango/django-stubs
-pytest==5.3.1  # https://github.com/pytest-dev/pytest
+pytest==5.3.3  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From 3f6562c7fe79b961952014285c887d958e102906 Mon Sep 17 00:00:00 2001
From: Bo Peng <47236991+bioworkflows@users.noreply.github.com>
Date: Sun, 19 Jan 2020 16:21:27 -0600
Subject: [PATCH 0521/2840] Honor passed password for UserFactory

---
 .../{{cookiecutter.project_slug}}/users/tests/factories.py      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
index b53713661..290f7b41e 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
@@ -12,7 +12,7 @@ class UserFactory(DjangoModelFactory):
 
     @post_generation
     def password(self, create: bool, extracted: Sequence[Any], **kwargs):
-        password = Faker(
+        password = extracted if extracted else Faker(
             "password",
             length=42,
             special_chars=True,

From a0fff1d0859699a430d69ad05c158477e6ea8710 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 21 Jan 2020 11:00:33 +0000
Subject: [PATCH 0522/2840] Update pytest from 5.3.3 to 5.3.4

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

diff --git a/requirements.txt b/requirements.txt
index b4be7b5d2..8d9b1685c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8==3.7.9
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.14.3
-pytest==5.3.3
+pytest==5.3.4
 pytest_cases==1.12.0
 pytest-cookies==0.4.0
 pytest-xdist==1.31.0

From 8ceaa3e1c72e13ea5b29c7581fa09b61bf45a12b Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 21 Jan 2020 11:00:34 +0000
Subject: [PATCH 0523/2840] Update pytest from 5.3.3 to 5.3.4

---
 {{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 6fd88bc76..4acb1d9d0 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -13,7 +13,7 @@ psycopg2-binary==2.8.4  # https://github.com/psycopg/psycopg2
 # ------------------------------------------------------------------------------
 mypy==0.761  # https://github.com/python/mypy
 django-stubs==1.4.0  # https://github.com/typeddjango/django-stubs
-pytest==5.3.3  # https://github.com/pytest-dev/pytest
+pytest==5.3.4  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From bc00a343ea6c93cc078e8f55f033fef1d9af1a88 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Wed, 22 Jan 2020 10:52:31 +0000
Subject: [PATCH 0524/2840] Fix broken links in doc fixes #2408

---
 docs/testing.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/testing.rst b/docs/testing.rst
index 63cb9e186..9aaa2455b 100644
--- a/docs/testing.rst
+++ b/docs/testing.rst
@@ -49,8 +49,8 @@ Once the tests are complete, in order to see the code coverage, run the followin
    Since this is a fresh install, and there are no tests built using the Python `unittest`_ library yet, you should get feedback that says there were no tests carried out.
 
 .. _Pytest: https://docs.pytest.org/en/latest/example/simple.html
-.. _develop locally: ../developing-locally.rst
-.. _develop locally with docker: ..../developing-locally-docker.rst
+.. _develop locally: ./developing-locally.html
+.. _develop locally with docker: ./developing-locally-docker.html
 .. _customize: https://docs.pytest.org/en/latest/customize.html
 .. _unittest: https://docs.python.org/3/library/unittest.html#module-unittest
-.. _configuring: https://coverage.readthedocs.io/en/v4.5.x/config.html
\ No newline at end of file
+.. _configuring: https://coverage.readthedocs.io/en/v4.5.x/config.html

From 9bf6ee16b215648c4014f4ef6fbe351fb0f0d5bc Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 22 Jan 2020 11:00:32 +0000
Subject: [PATCH 0525/2840] Update sentry-sdk from 0.14.0 to 0.14.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 9e87b18c8..38420a385 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==1.3.1  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.14.0  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.14.1  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From 2833600aec432f9af9f4437e38a7fb2674f17335 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Thu, 23 Jan 2020 14:43:17 +0000
Subject: [PATCH 0526/2840] Test generation with and without DRF

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

diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 8c2f71fe8..cd23b312a 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -33,6 +33,7 @@ def context():
 @pytest.mark.parametrize("use_mailhog", ["y", "n"], ids=lambda yn: f"mailhog:{yn}")
 @pytest.mark.parametrize("use_sentry", ["y", "n"], ids=lambda yn: f"sentry:{yn}")
 @pytest.mark.parametrize("use_compressor", ["y", "n"], ids=lambda yn: f"cmpr:{yn}")
+@pytest.mark.parametrize("use_drf", ["y", "n"], ids=lambda yn: f"drf:{yn}")
 @pytest.mark.parametrize(
     "use_whitenoise,cloud_provider",
     [
@@ -53,6 +54,7 @@ def context_combination(
     use_sentry,
     use_compressor,
     use_whitenoise,
+    use_drf,
     cloud_provider,
 ):
     """Fixture that parametrize the function where it's used."""
@@ -64,6 +66,7 @@ def context_combination(
         "use_mailhog": use_mailhog,
         "use_sentry": use_sentry,
         "use_whitenoise": use_whitenoise,
+        "use_drf": use_drf,
         "cloud_provider": cloud_provider,
     }
 

From fd43059e289e15296015b7a2eff9db9b8b1ff5e1 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Thu, 23 Jan 2020 17:52:17 +0000
Subject: [PATCH 0527/2840] Update formatting

---
 .../users/tests/factories.py                  | 20 +++++++++++--------
 1 file changed, 12 insertions(+), 8 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
index 290f7b41e..8917c5aec 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
@@ -12,14 +12,18 @@ class UserFactory(DjangoModelFactory):
 
     @post_generation
     def password(self, create: bool, extracted: Sequence[Any], **kwargs):
-        password = extracted if extracted else Faker(
-            "password",
-            length=42,
-            special_chars=True,
-            digits=True,
-            upper_case=True,
-            lower_case=True,
-        ).generate(extra_kwargs={})
+        password = (
+            extracted
+            if extracted
+            else Faker(
+                "password",
+                length=42,
+                special_chars=True,
+                digits=True,
+                upper_case=True,
+                lower_case=True,
+            ).generate(extra_kwargs={})
+        )
         self.set_password(password)
 
     class Meta:

From fa9a8cfe7ba3d40540d30f8f5b834541191b3f0d Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Thu, 23 Jan 2020 15:04:30 +0000
Subject: [PATCH 0528/2840] Fix code formatting

---
 {{cookiecutter.project_slug}}/config/api_router.py     |  4 ++--
 {{cookiecutter.project_slug}}/config/settings/base.py  | 10 ++++------
 {{cookiecutter.project_slug}}/config/urls.py           |  5 +++--
 .../users/api/serializers.py                           |  6 +++---
 .../{{cookiecutter.project_slug}}/users/api/views.py   |  8 ++++----
 5 files changed, 16 insertions(+), 17 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/api_router.py b/{{cookiecutter.project_slug}}/config/api_router.py
index fc8107b44..46a797a74 100644
--- a/{{cookiecutter.project_slug}}/config/api_router.py
+++ b/{{cookiecutter.project_slug}}/config/api_router.py
@@ -7,8 +7,8 @@ if settings.DEBUG:
 else:
     router = SimpleRouter()
 
-router.register('users', UserViewSet)
+router.register("users", UserViewSet)
 
 
-app_name = 'api'
+app_name = "api"
 urlpatterns = router.urls
diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 06a3fc890..ca43eb88f 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -308,13 +308,11 @@ STATICFILES_FINDERS += ["compressor.finders.CompressorFinder"]
 # -------------------------------------------------------------------------------
 # django-rest-framework - https://www.django-rest-framework.org/api-guide/settings/
 REST_FRAMEWORK = {
-    'DEFAULT_AUTHENTICATION_CLASSES': (
-        'rest_framework.authentication.SessionAuthentication',
-        'rest_framework.authentication.TokenAuthentication',
+    "DEFAULT_AUTHENTICATION_CLASSES": (
+        "rest_framework.authentication.SessionAuthentication",
+        "rest_framework.authentication.TokenAuthentication",
     ),
-    'DEFAULT_PERMISSION_CLASSES': (
-        'rest_framework.permissions.IsAuthenticated',
-    )
+    "DEFAULT_PERMISSION_CLASSES": ("rest_framework.permissions.IsAuthenticated",),
 }
 {%- endif %}
 # Your stuff...
diff --git a/{{cookiecutter.project_slug}}/config/urls.py b/{{cookiecutter.project_slug}}/config/urls.py
index 5382bdb7c..382bf8951 100644
--- a/{{cookiecutter.project_slug}}/config/urls.py
+++ b/{{cookiecutter.project_slug}}/config/urls.py
@@ -24,9 +24,10 @@ urlpatterns = [
 # API URLS
 urlpatterns += [
     # API base url
-    path("api/", include('config.api_router')),
+    path("api/", include("config.api_router")),
     # DRF auth token
-    path("auth-token/", obtain_auth_token)]
+    path("auth-token/", obtain_auth_token),
+]
 {%- endif %}
 
 if settings.DEBUG:
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py
index 8fc2262ec..bb52738b7 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py
@@ -1,12 +1,12 @@
 from rest_framework import serializers
 from {{ cookiecutter.project_slug }}.users.models import User
 
+
 class UserSerializer(serializers.ModelSerializer):
     class Meta:
         model = User
-        fields = ['username', 'email', 'name', 'url']
+        fields = ["username", "email", "name", "url"]
 
         extra_kwargs = {
-            'url': {'view_name': 'api:user-detail', 'lookup_field': 'username'}
+            "url": {"view_name": "api:user-detail", "lookup_field": "username"}
         }
-
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/views.py
index 440cc9b24..7b5af999b 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/views.py
@@ -5,20 +5,20 @@ from rest_framework.mixins import RetrieveModelMixin, ListModelMixin, UpdateMode
 from rest_framework.response import Response
 from rest_framework.viewsets import GenericViewSet
 
-
 from .serializers import UserSerializer
+
 User = get_user_model()
 
 
 class UserViewSet(RetrieveModelMixin, ListModelMixin, UpdateModelMixin, GenericViewSet):
     serializer_class = UserSerializer
     queryset = User.objects.all()
-    lookup_field = 'username'
+    lookup_field = "username"
 
     def get_queryset(self, *args, **kwargs):
         return self.queryset.filter(id=self.request.user.id)
 
-    @action(detail=False, methods=['GET'])
+    @action(detail=False, methods=["GET"])
     def me(self, request):
-        serializer = UserSerializer(request.user, context={'request': request})
+        serializer = UserSerializer(request.user, context={"request": request})
         return Response(status=status.HTTP_200_OK, data=serializer.data)

From 4bf0533bfabf5f34cdeff08f8bac75f090fa0def Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Thu, 23 Jan 2020 18:39:38 +0000
Subject: [PATCH 0529/2840] Fix broken links duplicated from testing.rst

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

diff --git a/docs/document.rst b/docs/document.rst
index abf115a17..7207e357c 100644
--- a/docs/document.rst
+++ b/docs/document.rst
@@ -41,5 +41,5 @@ Sphinx can automatically generate documentation from docstrings, to enable this
 4. Regenerate HTML documentation as written above.
 
 .. _Sphinx: https://www.sphinx-doc.org/en/master/index.html
-.. _develop locally: ../developing-locally.rst
-.. _develop locally with docker: ..../developing-locally-docker.rst
+.. _develop locally: ./developing-locally.html
+.. _develop locally with docker: ./developing-locally-docker.html

From e8fcf9ed6053bd467284fff40c9effeabd33a7a6 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Thu, 23 Jan 2020 18:53:03 +0000
Subject: [PATCH 0530/2840] Update list of contributors and changelog

---
 CHANGELOG.md     | 20 ++++++++++++--------
 CONTRIBUTORS.rst |  2 ++
 2 files changed, 14 insertions(+), 8 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b12ce03ef..ae8f7efe8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,19 +1,23 @@
 # Change Log
 All enhancements and patches to Cookiecutter Django will be documented in this file.
-This project adheres to [Semantic Versioning](http://semver.org/).
+
+## [2020-01-23]
+### Changed
+- Fix UserFactory to set the password if provided (@BoPeng)
+- Update documentation files with latest Sphinx (@howiezhao)
 
 ## [2020-01-12]
 ### Changed
-- Fix mypy setup and added django-stubs
-- Add Gitlab CI as option
+- Fix mypy setup and added django-stubs (@danifus)
+- Add Gitlab CI as option (@ikhomutov)
 
 ## [2020-01-11]
 ### Changed
-- Speed up & reduce size for production Django image
-- Bumped runtime version for Heroku
-- Added Debian 10 (Buster) OS dependencies
-- Update Traefik to v2
-- Switched Docker images from Alpine based to Debian based
+- Speed up & reduce size for production Django image (@maxp)
+- Bumped runtime version for Heroku (@Isaac12x)
+- Added Debian 10 (Buster) OS dependencies (@ddiazpinto)
+- Update Traefik to v2 (@blaxpy)
+- Switched Docker images from Alpine based to Debian based (@trungdong)
 
 ## [2019-10-06]
 ### Changed
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index e4ef31816..77ede253b 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -123,6 +123,7 @@ Listed in alphabetical order.
   Harry Percival           `@hjwp`_
   Hendrik Schneider        `@hendrikschneider`_
   Henrique G. G. Pereira   `@ikkebr`_
+  Howie Zhao               `@howiezhao`_
   Ian Lee                  `@IanLee1521`_
   Irfan Ahmad              `@erfaan`_                    @erfaan
   Isaac12x                 `@Isaac12x`_
@@ -288,6 +289,7 @@ Listed in alphabetical order.
 .. _@hanaquadara: https://github.com/hanaquadara
 .. _@hendrikschneider: https://github.com/hendrikschneider
 .. _@hjwp: https://github.com/hjwp
+.. _@howiezhao: https://github.com/howiezhao
 .. _@IanLee1521: https://github.com/IanLee1521
 .. _@ikhomutov: https://github.com/ikhomutov
 .. _@ikkebr: https://github.com/ikkebr

From 2b34e270139f970bd4cc16ae3b1cd8c5a64f65f4 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 24 Jan 2020 11:00:30 +0000
Subject: [PATCH 0531/2840] Update django-coverage-plugin from 1.7.0 to 1.8.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 4acb1d9d0..51ab40c48 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -33,5 +33,5 @@ factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==2.1  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==2.2.6  # https://github.com/django-extensions/django-extensions
-django-coverage-plugin==1.7.0  # https://github.com/nedbat/django_coverage_plugin
+django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.8.0  # https://github.com/pytest-dev/pytest-django

From 884e80fc5254398bf295ffce913066f81a756bfd Mon Sep 17 00:00:00 2001
From: Michael Samoylov <michael.samoylov@gmail.com>
Date: Fri, 24 Jan 2020 13:59:36 +0200
Subject: [PATCH 0532/2840] Fixed the redis-py project URL

Previously it was pointing to the Redis project repository.
---
 {{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 9ea6b9123..217536400 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -8,7 +8,7 @@ argon2-cffi==19.2.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==5.0.1  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==3.3.11  # https://github.com/antirez/redis
+redis==3.3.11  # https://github.com/andymccurdy/redis-py
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.4.0  # pyup: < 5.0  # https://github.com/celery/celery
 django-celery-beat==1.5.0  # https://github.com/celery/django-celery-beat

From f109e65816265c4812077a17fadfb19ecec0da2e Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Fri, 24 Jan 2020 15:28:03 +0000
Subject: [PATCH 0533/2840] Update list of contributors

---
 CONTRIBUTORS.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 77ede253b..44e32cddd 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -167,6 +167,7 @@ Listed in alphabetical order.
   Meghan Heintz            `@dot2dotseurat`_
   Mesut Yılmaz             `@myilmaz`_
   Michael Gecht            `@mimischi`_                  @_mischi
+  Michael Samoylov         `@msamoylov`_
   Min ho Kim               `@minho42`_
   mozillazg                `@mozillazg`_
   Nico Stefani             `@nicolas471`_                @moby_dick91
@@ -325,6 +326,7 @@ Listed in alphabetical order.
 .. _@mozillazg: https://github.com/mozillazg
 .. _@mrcoles: https://github.com/mrcoles
 .. _@msaizar: https://github.com/msaizar
+.. _@msamoylov: https://github.com/msamoylov
 .. _@myilmaz: https://github.com/myilmaz
 .. _@nicolas471: https://github.com/nicolas471
 .. _@noisy: https://github.com/noisy

From 9734582a88a9566910b60ffa66756a8fd50212ed Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 27 Jan 2020 11:00:31 +0000
Subject: [PATCH 0534/2840] Update werkzeug from 0.16.0 to 0.16.1

---
 {{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 51ab40c48..426fae385 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,6 +1,6 @@
 -r ./base.txt
 
-Werkzeug==0.16.0 # https://github.com/pallets/werkzeug
+Werkzeug==0.16.1 # https://github.com/pallets/werkzeug
 ipdb==0.12.3  # https://github.com/gotcha/ipdb
 Sphinx==2.3.1  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}

From 54a38bfb4312e2f03e487051daf19d54015b03a0 Mon Sep 17 00:00:00 2001
From: Dani Hodovic <danihodovic@users.noreply.github.com>
Date: Tue, 28 Jan 2020 10:55:09 +0100
Subject: [PATCH 0535/2840] Allow rendering custom widgets from root templates
 dir (#2356)

* Allow rendering custom widgets from root templates dir

Rendering custom widgets from the projects root template directory
doesn't work out of the box.

See: https://stackoverflow.com/questions/45844032/django-templatedoesnotexist-in-case-of-a-custom-widget/46208414#46-208414

This changes the setting to use the same template finding logic that the
TEMPLATES setting uses.

* update APP_DIRS=True

* fixup! update APP_DIRS=True
---
 {{cookiecutter.project_slug}}/config/settings/base.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index ecfeed7ae..42edac1f4 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -68,6 +68,7 @@ DJANGO_APPS = [
     "django.contrib.staticfiles",
     # "django.contrib.humanize", # Handy template tags
     "django.contrib.admin",
+    "django.forms",
 ]
 THIRD_PARTY_APPS = [
     "crispy_forms",
@@ -196,6 +197,10 @@ TEMPLATES = [
         },
     }
 ]
+
+# https://docs.djangoproject.com/en/dev/ref/settings/#form-renderer
+FORM_RENDERER = "django.forms.renderers.TemplatesSetting"
+
 # http://django-crispy-forms.readthedocs.io/en/latest/install.html#template-packs
 CRISPY_TEMPLATE_PACK = "bootstrap4"
 

From 2698867cf8b949b03ed215883f51538fe2f04b38 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 28 Jan 2020 10:33:24 +0000
Subject: [PATCH 0536/2840] Typo

---
 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 cd23b312a..40e6cf1be 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -42,7 +42,7 @@ def context():
         ("y", "None"),
         ("n", "AWS"),
         ("n", "GCP"),
-        # no whitenoise + co cloud provider is not supported
+        # no whitenoise + no cloud provider is not supported
     ],
     ids=lambda id: f"wnoise:{id[0]}-cloud:{id[1]}",
 )

From f9564485f5b9a2817a54c14be91174860a075236 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 29 Jan 2020 11:00:31 +0000
Subject: [PATCH 0537/2840] Update pytest_cases from 1.12.0 to 1.12.1

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

diff --git a/requirements.txt b/requirements.txt
index 8d9b1685c..ae3a3c052 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8==3.7.9
 # ------------------------------------------------------------------------------
 tox==3.14.3
 pytest==5.3.4
-pytest_cases==1.12.0
+pytest_cases==1.12.1
 pytest-cookies==0.4.0
 pytest-xdist==1.31.0
 pyyaml==5.3

From abdbe387a0d5c7e757840dde84cd095addfed6d0 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 29 Jan 2020 11:00:34 +0000
Subject: [PATCH 0538/2840] Update pre-commit from 1.21.0 to 2.0.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 426fae385..80500e5ed 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -25,7 +25,7 @@ pylint-django==2.0.13  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}
-pre-commit==1.21.0  # https://github.com/pre-commit/pre-commit
+pre-commit==2.0.0  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From a0e2e7aa0566e1dd867e11d095d7849ae8780dac Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 30 Jan 2020 11:00:30 +0000
Subject: [PATCH 0539/2840] Update pytest from 5.3.4 to 5.3.5

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

diff --git a/requirements.txt b/requirements.txt
index ae3a3c052..afc125ad5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8==3.7.9
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.14.3
-pytest==5.3.4
+pytest==5.3.5
 pytest_cases==1.12.1
 pytest-cookies==0.4.0
 pytest-xdist==1.31.0

From 1305ddaa6af7eb3fc312f048565ce18f36afc7bf Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 30 Jan 2020 11:00:31 +0000
Subject: [PATCH 0540/2840] Update pytest from 5.3.4 to 5.3.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 80500e5ed..f4844ed87 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -13,7 +13,7 @@ psycopg2-binary==2.8.4  # https://github.com/psycopg/psycopg2
 # ------------------------------------------------------------------------------
 mypy==0.761  # https://github.com/python/mypy
 django-stubs==1.4.0  # https://github.com/typeddjango/django-stubs
-pytest==5.3.4  # https://github.com/pytest-dev/pytest
+pytest==5.3.5  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From d292590ceba9127250b52cdc3b711b7912bff63b Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 30 Jan 2020 11:00:35 +0000
Subject: [PATCH 0541/2840] Update pre-commit from 2.0.0 to 2.0.1

---
 {{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 80500e5ed..df3e2780c 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -25,7 +25,7 @@ pylint-django==2.0.13  # 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.0.0  # https://github.com/pre-commit/pre-commit
+pre-commit==2.0.1  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From dec1abb3d0799f6a6dc88194ea910c3bd7b1be8e Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 31 Jan 2020 11:00:30 +0000
Subject: [PATCH 0542/2840] Update redis from 3.3.11 to 3.4.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 217536400..fb32701f7 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -8,7 +8,7 @@ argon2-cffi==19.2.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==5.0.1  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==3.3.11  # https://github.com/andymccurdy/redis-py
+redis==3.4.0  # https://github.com/andymccurdy/redis-py
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.4.0  # pyup: < 5.0  # https://github.com/celery/celery
 django-celery-beat==1.5.0  # https://github.com/celery/django-celery-beat

From 1f35086fe50df7e341985784b3493e382a1f7fda Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Fri, 31 Jan 2020 17:15:37 +0000
Subject: [PATCH 0543/2840] Downgrade Redis to 3.3.11 as Kombu is incompatible
 with 3.4.0

Fixes #2425
---
 {{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 fb32701f7..b4926de51 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -8,7 +8,7 @@ argon2-cffi==19.2.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==5.0.1  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==3.4.0  # https://github.com/andymccurdy/redis-py
+redis==3.3.11 # pyup: != 3.4.0 # https://github.com/andymccurdy/redis-py
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.4.0  # pyup: < 5.0  # https://github.com/celery/celery
 django-celery-beat==1.5.0  # https://github.com/celery/django-celery-beat

From af7dcd7ab275baaa8a5741b925fc8b729320e044 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 1 Feb 2020 11:00:29 +0000
Subject: [PATCH 0544/2840] Update django-celery-beat from 1.5.0 to 1.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 b4926de51..dabc10c98 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -11,7 +11,7 @@ whitenoise==5.0.1  # https://github.com/evansd/whitenoise
 redis==3.3.11 # pyup: != 3.4.0 # https://github.com/andymccurdy/redis-py
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.4.0  # pyup: < 5.0  # https://github.com/celery/celery
-django-celery-beat==1.5.0  # https://github.com/celery/django-celery-beat
+django-celery-beat==1.6.0  # https://github.com/celery/django-celery-beat
 {%- if cookiecutter.use_docker == 'y' %}
 flower==0.9.3  # https://github.com/mher/flower
 {%- endif %}

From 3c177776d8209721b7a9d98833f7256f7c288459 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 1 Feb 2020 11:00:33 +0000
Subject: [PATCH 0545/2840] Update django-debug-toolbar from 2.1 to 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 611ea1197..f7782f0d7 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -31,7 +31,7 @@ pre-commit==2.0.1  # https://github.com/pre-commit/pre-commit
 # ------------------------------------------------------------------------------
 factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 
-django-debug-toolbar==2.1  # https://github.com/jazzband/django-debug-toolbar
+django-debug-toolbar==2.2  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==2.2.6  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.8.0  # https://github.com/pytest-dev/pytest-django

From 2a6ee05782d73f0539dcdccdb3d30bcb47871da6 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sun, 2 Feb 2020 11:00:30 +0000
Subject: [PATCH 0546/2840] Update redis from 3.3.11 to 3.4.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 dabc10c98..92898a241 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -8,7 +8,7 @@ argon2-cffi==19.2.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==5.0.1  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==3.3.11 # pyup: != 3.4.0 # https://github.com/andymccurdy/redis-py
+redis==3.4.1 # pyup: != 3.4.0 # https://github.com/andymccurdy/redis-py
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.4.0  # pyup: < 5.0  # https://github.com/celery/celery
 django-celery-beat==1.6.0  # https://github.com/celery/django-celery-beat

From 06c7628a4c9162ac8f124a68fa3e3eca5c4abe8e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 3 Feb 2020 01:45:39 -0800
Subject: [PATCH 0547/2840] Update pytest-cookies from 0.4.0 to 0.5.0

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

diff --git a/requirements.txt b/requirements.txt
index afc125ad5..e05cff3f5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,6 +12,6 @@ flake8==3.7.9
 tox==3.14.3
 pytest==5.3.5
 pytest_cases==1.12.1
-pytest-cookies==0.4.0
+pytest-cookies==0.5.0
 pytest-xdist==1.31.0
 pyyaml==5.3

From b49e0f2e39bfa129744cab8d4ad807778039dd09 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 3 Feb 2020 11:00:31 +0000
Subject: [PATCH 0548/2840] Update django-storages from 1.8 to 1.9

---
 {{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 38420a385..0a1975c2c 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -14,7 +14,7 @@ sentry-sdk==0.14.1  # https://github.com/getsentry/sentry-python
 # Django
 # ------------------------------------------------------------------------------
 {%- if cookiecutter.cloud_provider == 'AWS' %}
-django-storages[boto3]==1.8  # https://github.com/jschneier/django-storages
+django-storages[boto3]==1.9  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
 django-storages[google]==1.8  # https://github.com/jschneier/django-storages
 {%- endif %}

From f6f78c9da849e3fa766842e5c311c5e7f99afebd Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 3 Feb 2020 11:00:32 +0000
Subject: [PATCH 0549/2840] Update django-storages from 1.8 to 1.9

---
 {{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 0a1975c2c..0f21e11aa 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -16,6 +16,6 @@ sentry-sdk==0.14.1  # https://github.com/getsentry/sentry-python
 {%- if cookiecutter.cloud_provider == 'AWS' %}
 django-storages[boto3]==1.9  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
-django-storages[google]==1.8  # https://github.com/jschneier/django-storages
+django-storages[google]==1.9  # https://github.com/jschneier/django-storages
 {%- endif %}
 django-anymail[mailgun]==7.0.0  # https://github.com/anymail/django-anymail

From e8a946dc7b61140b182354e968bd709b39f2efea Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 3 Feb 2020 11:00:35 +0000
Subject: [PATCH 0550/2840] Update django from 2.2.9 to 2.2.10

---
 {{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 dabc10c98..1347b6b26 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -19,7 +19,7 @@ flower==0.9.3  # https://github.com/mher/flower
 
 # Django
 # ------------------------------------------------------------------------------
-django==2.2.9  # pyup: < 3.0  # https://www.djangoproject.com/
+django==2.2.10  # pyup: < 3.0  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==4.0.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.41.0  # https://github.com/pennersr/django-allauth

From 2f6cb4e8f68fa67fb14553bb90a18d3c2b91c5a1 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 3 Feb 2020 12:29:37 +0000
Subject: [PATCH 0551/2840] Fix deprecation warning

---
 tests/test_cookiecutter_generation.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 40e6cf1be..39b05d7c6 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -3,7 +3,7 @@ import re
 
 import pytest
 from cookiecutter.exceptions import FailedHookException
-from pytest_cases import pytest_fixture_plus
+from pytest_cases import fixture_plus
 import sh
 import yaml
 from binaryornot.check import is_binary
@@ -26,7 +26,7 @@ def context():
     }
 
 
-@pytest_fixture_plus
+@fixture_plus
 @pytest.mark.parametrize("windows", ["y", "n"], ids=lambda yn: f"win:{yn}")
 @pytest.mark.parametrize("use_docker", ["y", "n"], ids=lambda yn: f"docker:{yn}")
 @pytest.mark.parametrize("use_celery", ["y", "n"], ids=lambda yn: f"celery:{yn}")

From 37ec5a45bbbab1e3b00e191264e5b3af6e6eb2af Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 3 Feb 2020 12:56:37 +0000
Subject: [PATCH 0552/2840] Remove pyup filter

---
 {{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 35727e1a4..5427f1d0e 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -8,7 +8,7 @@ argon2-cffi==19.2.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==5.0.1  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==3.4.1 # pyup: != 3.4.0 # https://github.com/andymccurdy/redis-py
+redis==3.4.1 # https://github.com/andymccurdy/redis-py
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.4.0  # pyup: < 5.0  # https://github.com/celery/celery
 django-celery-beat==1.6.0  # https://github.com/celery/django-celery-beat

From 8fd0d42de0e7c3c8fea92bb4d1d2df3e4af6aa31 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 3 Feb 2020 14:29:20 +0000
Subject: [PATCH 0553/2840] Don't include POSTGRES_... environment in the
 PyCharm start script when not using Docker

---
 {{cookiecutter.project_slug}}/.idea/workspace.xml | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/.idea/workspace.xml b/{{cookiecutter.project_slug}}/.idea/workspace.xml
index a5d73c185..deb28ba1b 100644
--- a/{{cookiecutter.project_slug}}/.idea/workspace.xml
+++ b/{{cookiecutter.project_slug}}/.idea/workspace.xml
@@ -1,6 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-    {%- if cookiecutter.use_celery == 'y' %}
+    {%- if cookiecutter.use_docker == 'n' %}
+        <component name="DjangoConsoleOptions"
+                   custom-start-script="import sys; print('Python %s on %s' % (sys.version, sys.platform))&#10;import django; print('Django %s' % django.get_version())&#10;import os&#10;sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS])&#10;if 'setup' in dir(django): django.setup()&#10;import django_manage_shell; django_manage_shell.run(PROJECT_ROOT)"
+                   module-name="{{ cookiecutter.project_slug }}" is-module-sdk="true">
+        </component>
+    {%- elif cookiecutter.use_celery == 'y' %}
         <component name="DjangoConsoleOptions"
                    custom-start-script="import sys; print('Python %s on %s' % (sys.version, sys.platform))&#10;import django; print('Django %s' % django.get_version())&#10;import os&#10;os.environ.setdefault(&quot;DATABASE_URL&quot;,&quot;postgres://{}:{}@{}:{}/{}&quot;.format(os.environ['POSTGRES_USER'], os.environ['POSTGRES_PASSWORD'], os.environ['POSTGRES_HOST'], os.environ['POSTGRES_PORT'], os.environ['POSTGRES_DB']))&#10;os.environ.setdefault(&quot;CELERY_BROKER_URL&quot;, os.environ['REDIS_URL'])&#10;sys.path.extend([WORKING_DIR_AND_PYTHON_PATHS])&#10;if 'setup' in dir(django): django.setup()&#10;import django_manage_shell; django_manage_shell.run(PROJECT_ROOT)"
                    module-name="{{ cookiecutter.project_slug }}" is-module-sdk="true">

From e9c6b3d9e9243a96814ce71c41809c302c86c4d7 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 4 Feb 2020 11:00:30 +0000
Subject: [PATCH 0554/2840] Update django-storages from 1.9 to 1.9.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 0f21e11aa..7b8e4b491 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -14,7 +14,7 @@ sentry-sdk==0.14.1  # https://github.com/getsentry/sentry-python
 # Django
 # ------------------------------------------------------------------------------
 {%- if cookiecutter.cloud_provider == 'AWS' %}
-django-storages[boto3]==1.9  # https://github.com/jschneier/django-storages
+django-storages[boto3]==1.9.1  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
 django-storages[google]==1.9  # https://github.com/jschneier/django-storages
 {%- endif %}

From c7a6dbdd1039dbb4f349a39a2082e8973f69b6f2 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 4 Feb 2020 11:00:31 +0000
Subject: [PATCH 0555/2840] Update django-storages from 1.9 to 1.9.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 7b8e4b491..9c1de8276 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -16,6 +16,6 @@ sentry-sdk==0.14.1  # https://github.com/getsentry/sentry-python
 {%- if cookiecutter.cloud_provider == 'AWS' %}
 django-storages[boto3]==1.9.1  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
-django-storages[google]==1.9  # https://github.com/jschneier/django-storages
+django-storages[google]==1.9.1  # https://github.com/jschneier/django-storages
 {%- endif %}
 django-anymail[mailgun]==7.0.0  # https://github.com/anymail/django-anymail

From 86c9b3cb282a4e0fc9a47b2ffa991fbc72486b20 Mon Sep 17 00:00:00 2001
From: Demetris Stavrou <1180929+demestav@users.noreply.github.com>
Date: Tue, 4 Feb 2020 15:04:47 +0200
Subject: [PATCH 0556/2840] Flower now served by Traefik

---
 .../compose/production/traefik/traefik.yml    | 19 ++++++++++++++++++-
 {{cookiecutter.project_slug}}/production.yml  |  2 --
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
index 324c62afa..bb3be1500 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
@@ -10,6 +10,9 @@ entryPoints:
     # https
     address: ":443"
 
+  flower:
+    address: ":5555"
+
 certificatesResolvers:
   letsencrypt:
     # https://docs.traefik.io/master/https/acme/#lets-encrypt
@@ -42,6 +45,15 @@ http:
         # https://docs.traefik.io/master/routing/routers/#certresolver
         certResolver: letsencrypt
 
+    flower-secure-router:
+      rule: "Host(`{{ cookiecutter.domain_name }}`)"
+      entryPoints:
+        - flower
+      service: flower
+      tls:
+        # https://docs.traefik.io/master/routing/routers/#certresolver
+        certResolver: letsencrypt
+
   middlewares:
     redirect:
       # https://docs.traefik.io/master/middlewares/redirectscheme/
@@ -52,7 +64,7 @@ http:
       # https://docs.traefik.io/master/middlewares/headers/#hostsproxyheaders
       # https://docs.djangoproject.com/en/dev/ref/csrf/#ajax
       headers:
-        hostsProxyHeaders: ['X-CSRFToken']
+        hostsProxyHeaders: ["X-CSRFToken"]
 
   services:
     django:
@@ -60,6 +72,11 @@ http:
         servers:
           - url: http://django:5000
 
+    flower:
+      loadBalancer:
+        servers:
+          - url: http://flower:5555
+
 providers:
   # https://docs.traefik.io/master/providers/file/
   file:
diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index 62ec9d829..125d4876c 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -60,8 +60,6 @@ services:
   flower:
     <<: *django
     image: {{ cookiecutter.project_slug }}_production_flower
-    ports:
-      - "5555:5555"
     command: /start-flower
 
   {%- endif %}

From 25a70c5b846f7e17ff416385decbc0bd16251797 Mon Sep 17 00:00:00 2001
From: Demetris Stavrou <1180929+demestav@users.noreply.github.com>
Date: Tue, 4 Feb 2020 22:47:56 +0200
Subject: [PATCH 0557/2840] Added Flower access documentation for production.

---
 docs/deployment-with-docker.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/docs/deployment-with-docker.rst b/docs/deployment-with-docker.rst
index 0df50ff45..8a206885a 100644
--- a/docs/deployment-with-docker.rst
+++ b/docs/deployment-with-docker.rst
@@ -25,7 +25,9 @@ Provided you have opted for Celery (via setting ``use_celery`` to ``y``) there a
 
 * ``celeryworker`` running a Celery worker process;
 * ``celerybeat`` running a Celery beat process;
-* ``flower`` running Flower_ (for more info, check out :ref:`CeleryFlower` instructions for local environment).
+* ``flower`` running Flower_.
+
+The ``flower`` service is served by Traefik over HTTPS, through the port ``5555``. For more information about Flower and its login credentials, check out :ref:`CeleryFlower` instructions for local environment.
 
 .. _`Flower`: https://github.com/mher/flower
 

From 45c353241b06391d9778b0abec411e55bbb505a7 Mon Sep 17 00:00:00 2001
From: Leonardo <leonardo@codetiger.co>
Date: Thu, 6 Feb 2020 05:37:31 -0400
Subject: [PATCH 0558/2840] Include `use_drf` option on documentation

---
 docs/project-generation-options.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index ae47b0972..2ed77facd 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -70,6 +70,9 @@ cloud_provider:
 
     Note that if you choose no cloud provider, media files won't work.
 
+use_drf:
+    Indicates whether the project should be configured to use `Django Rest Framework`_.
+
 custom_bootstrap_compilation:
     Indicates whether the project should support Bootstrap recompilation
     via the selected JavaScript task runner's task. This can be useful
@@ -129,6 +132,8 @@ debug:
 .. _AWS: https://aws.amazon.com/s3/
 .. _GCP: https://cloud.google.com/storage/
 
+.. _Django Rest Framework: https://github.com/encode/django-rest-framework/
+
 .. _Django Compressor: https://github.com/django-compressor/django-compressor
 
 .. _Celery: https://github.com/celery/celery

From 6709fc64c9f16d534a2f156b48425061ec01c7a8 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Thu, 6 Feb 2020 15:17:46 -0500
Subject: [PATCH 0559/2840] Added all supported Anymail Providers in
 cookiecutter.json * Utilizes {% if %} since it's financially more wise to use
 AWS SES only if AWS is the cloud provider. * FIXME: If AWS is not cloud
 provider, there are two None options. This may require a little hack inside
 of cookiecutter that I may not be aware of.

---
 cookiecutter.json | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/cookiecutter.json b/cookiecutter.json
index 4e77d1109..5efa745e9 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -33,6 +33,18 @@
     "GCP",
     "None"
   ],
+  "mail_service": [
+    "{% if cookiecutter.cloud_provider == 'AWS' %}Amazon SES{% else %}Mailgun{% endif %}",
+    "{% if cookiecutter.cloud_provider == 'AWS' %}Mailgun{% else %}Mailjet{% endif %}",
+    "{% if cookiecutter.cloud_provider == 'AWS' %}Mailjet{% else %}Mandrill{% endif %}",
+    "{% if cookiecutter.cloud_provider == 'AWS' %}Mandrill{% else %}Postmark{% endif %}",
+    "{% if cookiecutter.cloud_provider == 'AWS' %}Postmark{% else %}Sendgrid{% endif %}",
+    "{% if cookiecutter.cloud_provider == 'AWS' %}Sendgrid{% else %}SendinBlue{% endif %}",
+    "{% if cookiecutter.cloud_provider == 'AWS' %}SendinBlue{% else %}SparkPost{% endif %}",
+    "{% if cookiecutter.cloud_provider == 'AWS' %}SparkPost{% else %}Plain Django-Anymail{% endif %}",
+    "{% if cookiecutter.cloud_provider == 'AWS' %}Plain Django-Anymail{% else %}None{% endif %}",
+    "{% if cookiecutter.cloud_provider == 'AWS' %}None{% else %}None{% endif %}"
+  ],
   "use_drf": "n",
   "custom_bootstrap_compilation": "n",
   "use_compressor": "n",

From b7d3379f4405e38df62fe097b10a3df2a608e9a5 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Thu, 6 Feb 2020 15:36:51 -0500
Subject: [PATCH 0560/2840] Fixes the duplicate None in cookiecutter.json * The
 duplicate occurs if AWS is not the selected cloud provider

---
 cookiecutter.json | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/cookiecutter.json b/cookiecutter.json
index 5efa745e9..cbe3cbf70 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -34,16 +34,16 @@
     "None"
   ],
   "mail_service": [
-    "{% if cookiecutter.cloud_provider == 'AWS' %}Amazon SES{% else %}Mailgun{% endif %}",
-    "{% if cookiecutter.cloud_provider == 'AWS' %}Mailgun{% else %}Mailjet{% endif %}",
-    "{% if cookiecutter.cloud_provider == 'AWS' %}Mailjet{% else %}Mandrill{% endif %}",
-    "{% if cookiecutter.cloud_provider == 'AWS' %}Mandrill{% else %}Postmark{% endif %}",
-    "{% if cookiecutter.cloud_provider == 'AWS' %}Postmark{% else %}Sendgrid{% endif %}",
-    "{% if cookiecutter.cloud_provider == 'AWS' %}Sendgrid{% else %}SendinBlue{% endif %}",
-    "{% if cookiecutter.cloud_provider == 'AWS' %}SendinBlue{% else %}SparkPost{% endif %}",
-    "{% if cookiecutter.cloud_provider == 'AWS' %}SparkPost{% else %}Plain Django-Anymail{% endif %}",
-    "{% if cookiecutter.cloud_provider == 'AWS' %}Plain Django-Anymail{% else %}None{% endif %}",
-    "{% if cookiecutter.cloud_provider == 'AWS' %}None{% else %}None{% endif %}"
+    {% if cookiecutter.cloud_provider == 'AWS' %}"Amazon SES",{% endif %}
+    "Mailgun",
+    "Mailjet",
+    "Mandrill",
+    "Postmark",
+    "Sendgrid",
+    "SendinBlue",
+    "SparkPost",
+    "Plain/Vanilla Django-Anymail",
+    "None"
   ],
   "use_drf": "n",
   "custom_bootstrap_compilation": "n",

From 575dead7cb3e7c04ff7d7133575af32540c94bbf Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Thu, 6 Feb 2020 16:00:32 -0500
Subject: [PATCH 0561/2840] More concise cookiecutter.json; removed several if
 statements * Unfortunately, with
 https://github.com/pydanny/cookiecutter-django/pull/2321#issuecomment-558796906,
 I don't think I am going to add AWS SES specifically if AWS is not chosen as
 cloud provider. In that case, we'll just deal with 2 None's when AWS is not
 selected. * FIXME 2 Nones

---
 cookiecutter.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/cookiecutter.json b/cookiecutter.json
index cbe3cbf70..ae0576b58 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -34,7 +34,7 @@
     "None"
   ],
   "mail_service": [
-    {% if cookiecutter.cloud_provider == 'AWS' %}"Amazon SES",{% endif %}
+    "{% if cookiecutter.cloud_provider == 'AWS' %}Amazon SES{% else %}None{% endif %}",
     "Mailgun",
     "Mailjet",
     "Mandrill",

From c8eb5462eb921313d3fbb9a9957125022d444cd3 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Thu, 6 Feb 2020 16:58:15 -0500
Subject: [PATCH 0562/2840] Configurations and Packages added * Production
 settings updated for all * Added env vars from production settings * Added
 packages requirements.txt

---
 .../.envs/.production/.django                 | 19 ++++++-
 .../config/settings/production.py             | 52 ++++++++++++++++++-
 .../requirements/production.txt               | 18 +++++++
 3 files changed, 87 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/.envs/.production/.django b/{{cookiecutter.project_slug}}/.envs/.production/.django
index 2c2e94f2d..358b5e95d 100644
--- a/{{cookiecutter.project_slug}}/.envs/.production/.django
+++ b/{{cookiecutter.project_slug}}/.envs/.production/.django
@@ -13,9 +13,26 @@ DJANGO_SECURE_SSL_REDIRECT=False
 
 # Email
 # ------------------------------------------------------------------------------
-MAILGUN_API_KEY=
 DJANGO_SERVER_EMAIL=
+{% if cookiecutter.mail_service == 'Mailgun' %}
+MAILGUN_API_KEY=
 MAILGUN_DOMAIN=
+{% elif cookiecutter.mail_service == 'Mailjet' %}
+MAILJET_API_KEY=
+MAILJET_SECRET_KEY=
+{% elif cookiecutter.mail_service == 'Mandrill' %}
+MANDRILL_API_KEY=
+{% elif cookiecutter.mail_service == 'Postmark' %}
+POSTMARK_SERVER_TOKEN=
+{% elif cookiecutter.mail_service == 'Sendgrid' %}
+SENDGRID_API_KEY=
+SENDGRID_GENERATE_MESSAGE_ID=True
+SENDGRID_MERGE_FIELD_FORMAT=None
+{% elif cookiecutter.mail_service == 'SendinBlue' %}
+SENDINBLUE_API_KEY=
+{% elif cookiecutter.mail_service == 'SparkPost' %}
+SPARKPOST_API_KEY=
+{% endif %}
 {% if cookiecutter.cloud_provider == 'AWS' %}
 # AWS
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 36667b33a..e0af4c596 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -182,16 +182,66 @@ EMAIL_SUBJECT_PREFIX = env(
 # Django Admin URL regex.
 ADMIN_URL = env("DJANGO_ADMIN_URL")
 
-# Anymail (Mailgun)
+# Anymail
 # ------------------------------------------------------------------------------
 # https://anymail.readthedocs.io/en/stable/installation/#installing-anymail
 INSTALLED_APPS += ["anymail"]  # noqa F405
+{%- if cookiecutter.mail_service == 'Amazon SES' %}
+EMAIL_BACKEND = "anymail.backends.amazon_ses.EmailBackend"
+# https://anymail.readthedocs.io/en/stable/esps/amazon_ses/
+{%- elif cookiecutter.mail_service == 'Mailgun' %}
 EMAIL_BACKEND = "anymail.backends.mailgun.EmailBackend"
+# https://anymail.readthedocs.io/en/stable/esps/mailgun/
+{%- elif cookiecutter.mail_service == 'Mailjet' %}
+EMAIL_BACKEND = "anymail.backends.mailjet.EmailBackend"
+# https://anymail.readthedocs.io/en/stable/esps/mailjet/
+{%- elif cookiecutter.mail_service == 'Mandrill' %}
+EMAIL_BACKEND = "anymail.backends.mandrill.EmailBackend"
+# https://anymail.readthedocs.io/en/stable/esps/mandrill/
+{%- elif cookiecutter.mail_service == 'Postmark' %}
+EMAIL_BACKEND = "anymail.backends.postmark.EmailBackend"
+# https://anymail.readthedocs.io/en/stable/esps/postmark/
+{%- elif cookiecutter.mail_service == 'Sendgrid' %}
+EMAIL_BACKEND = "anymail.backends.sendgrid.EmailBackend"
+# https://anymail.readthedocs.io/en/stable/esps/sendgrid/
+{%- elif cookiecutter.mail_service == 'SendinBlue' %}
+EMAIL_BACKEND = "anymail.backends.sendinblue.EmailBackend"
+# https://anymail.readthedocs.io/en/stable/esps/sendinblue/
+{%- elif cookiecutter.mail_service == 'SparkPost' %}
+EMAIL_BACKEND = "anymail.backends.sparkpost.EmailBackend"
+# https://anymail.readthedocs.io/en/stable/esps/sparkpost/
+{%- elif cookiecutter.mail_service == 'Plain/Vanilla Django-Anymail' %}
+EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
+# https://docs.djangoproject.com/en/3.0/ref/settings/#email-backend
+{%- endif %}
 # https://anymail.readthedocs.io/en/stable/installation/#anymail-settings-reference
 ANYMAIL = {
+    {%- if cookiecutter.mail_service == 'Mailgun' %}
     "MAILGUN_API_KEY": env("MAILGUN_API_KEY"),
     "MAILGUN_SENDER_DOMAIN": env("MAILGUN_DOMAIN"),
     "MAILGUN_API_URL": env("MAILGUN_API_URL", default="https://api.mailgun.net/v3"),
+    {%- elif cookiecutter.mail_service == 'Mailjet' %}
+    "MAILJET_API_KEY": env("MAILJET_API_KEY"),
+    "MAILJET_SECRET_KEY": env("MAILJET_SECRET_KEY"),
+    "MAILJET_API_URL": env("MAILJET_API_URL", default="https://api.mailjet.com/v3"),
+    {%- elif cookiecutter.mail_service == 'Mandrill' %}
+    "MANDRILL_API_KEY": env("MANDRILL_API_KEY"),
+    "MANDRILL_API_URL": env("MANDRILL_API_URL", default="https://mandrillapp.com/api/1.0"),
+    {%- elif cookiecutter.mail_service == 'Postmark' %}
+    "POSTMARK_SERVER_TOKEN": env("POSTMARK_SERVER_TOKEN"),
+    "POSTMARK_API_URL": env("POSTMARK_API_URL", default="https://api.postmarkapp.com/"),
+    {%- elif cookiecutter.mail_service == 'Sendgrid' %}
+    "SENDGRID_API_KEY": env("SENDGRID_API_KEY"),
+    "SENDGRID_GENERATE_MESSAGE_ID": env("SENDGRID_GENERATE_MESSAGE_ID"),
+    "SENDGRID_MERGE_FIELD_FORMAT": env("SENDGRID_MERGE_FIELD_FORMAT"),
+    "SENDGRID_API_URL": env("SENDGRID_API_URL", default="https://api.sendgrid.com/v3/"),
+    {%- elif cookiecutter.mail_service == 'SendinBlue' %}
+    "SENDINBLUE_API_KEY": env("SENDINBLUE_API_KEY"),
+    "SENDINBLUE_API_URL": env("SENDINBLUE_API_URL", default="https://api.sendinblue.com/v3/"),
+    {%- elif cookiecutter.mail_service == 'SparkPost' %}
+    "SPARKPOST_API_KEY": env("SPARKPOST_API_KEY"),
+    "SPARKPOST_API_URL": env("SPARKPOST_API_URL", default="https://api.sparkpost.com/api/v1"),
+    {%- endif %}
 }
 
 {% if cookiecutter.use_compressor == 'y' -%}
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 9c1de8276..3e1d8515b 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -18,4 +18,22 @@ django-storages[boto3]==1.9.1  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
 django-storages[google]==1.9.1  # https://github.com/jschneier/django-storages
 {%- endif %}
+{%- if cookiecutter.mail_service == 'Amazon SES' %}
+django-anymail[amazon_ses]==7.0.0  # https://github.com/anymail/django-anymail
+{%- elif cookiecutter.mail_service == 'Mailgun' %}
 django-anymail[mailgun]==7.0.0  # https://github.com/anymail/django-anymail
+{%- elif cookiecutter.mail_service == 'Mailjet' %}
+django-anymail[mailjet]==7.0.0  # https://github.com/anymail/django-anymail
+{%- elif cookiecutter.mail_service == 'Mandrill' %}
+django-anymail[mandrill]==7.0.0  # https://github.com/anymail/django-anymail
+{%- elif cookiecutter.mail_service == 'Postmark' %}
+django-anymail[postmark]==7.0.0  # https://github.com/anymail/django-anymail
+{%- elif cookiecutter.mail_service == 'Sendgrid' %}
+django-anymail[sendgrid]==7.0.0  # https://github.com/anymail/django-anymail
+{%- elif cookiecutter.mail_service == 'SendinBlue' %}
+django-anymail[sendinblue]==7.0.0  # https://github.com/anymail/django-anymail
+{%- elif cookiecutter.mail_service == 'SparkPost' %}
+django-anymail[sparkpost]==7.0.0  # https://github.com/anymail/django-anymail
+{%- elif cookiecutter.mail_service == 'Plain/Vanilla Django-Anymail' %}
+django-anymail==7.0.0  # https://github.com/anymail/django-anymail
+{%- endif %}

From fecf9e0037885bac16228ac3bd8060f04f83375b Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Thu, 6 Feb 2020 16:59:42 -0500
Subject: [PATCH 0563/2840] Add @Andrew-Chen-Wang to CONTRIBUTORS

---
 CONTRIBUTORS.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 2554d2cfc..6dca6ddb4 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -56,6 +56,7 @@ Listed in alphabetical order.
   Andreas Meistad          `@ameistad`_
   Andres Gonzalez          `@andresgz`_
   Andrew Mikhnevich        `@zcho`_
+  Andrew Chen Wang         `@Andrew-Chen-Wang`_
   Andy Rose
   Anna Callahan            `@jazztpt`_
   Anna Sidwell             `@takkaria`_
@@ -228,6 +229,7 @@ Listed in alphabetical order.
 .. _@andor-pierdelacabeza: https://github.com/andor-pierdelacabeza
 .. _@andresgz: https://github.com/andresgz
 .. _@antoniablair: https://github.com/antoniablair
+.. _@Andrew-Chen-Wang: https://github.com/Andrew-Chen-Wang
 .. _@apirobot: https://github.com/apirobot
 .. _@archinal: https://github.com/archinal
 .. _@areski: https://github.com/areski

From 0621929cd2889892106d853a9a2cd3b0a491f73c Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Thu, 6 Feb 2020 18:41:30 -0500
Subject: [PATCH 0564/2840] Removed None option for mail service * This is
 necessary in order to be compatible with Django-allauth

---
 cookiecutter.json                             |  5 ++---
 .../config/settings/production.py             | 19 ++++++++++---------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/cookiecutter.json b/cookiecutter.json
index ae0576b58..5e85af486 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -34,7 +34,7 @@
     "None"
   ],
   "mail_service": [
-    "{% if cookiecutter.cloud_provider == 'AWS' %}Amazon SES{% else %}None{% endif %}",
+    "{% if cookiecutter.cloud_provider == 'AWS' %}Amazon SES{% else %}Plain/Vanilla Django-Anymail{% endif %}",
     "Mailgun",
     "Mailjet",
     "Mandrill",
@@ -42,8 +42,7 @@
     "Sendgrid",
     "SendinBlue",
     "SparkPost",
-    "Plain/Vanilla Django-Anymail",
-    "None"
+    "Plain/Vanilla Django-Anymail"
   ],
   "use_drf": "n",
   "custom_bootstrap_compilation": "n",
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index e0af4c596..6d4318001 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -188,59 +188,60 @@ ADMIN_URL = env("DJANGO_ADMIN_URL")
 INSTALLED_APPS += ["anymail"]  # noqa F405
 {%- if cookiecutter.mail_service == 'Amazon SES' %}
 EMAIL_BACKEND = "anymail.backends.amazon_ses.EmailBackend"
-# https://anymail.readthedocs.io/en/stable/esps/amazon_ses/
 {%- elif cookiecutter.mail_service == 'Mailgun' %}
 EMAIL_BACKEND = "anymail.backends.mailgun.EmailBackend"
-# https://anymail.readthedocs.io/en/stable/esps/mailgun/
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
 EMAIL_BACKEND = "anymail.backends.mailjet.EmailBackend"
-# https://anymail.readthedocs.io/en/stable/esps/mailjet/
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
 EMAIL_BACKEND = "anymail.backends.mandrill.EmailBackend"
-# https://anymail.readthedocs.io/en/stable/esps/mandrill/
 {%- elif cookiecutter.mail_service == 'Postmark' %}
 EMAIL_BACKEND = "anymail.backends.postmark.EmailBackend"
-# https://anymail.readthedocs.io/en/stable/esps/postmark/
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
 EMAIL_BACKEND = "anymail.backends.sendgrid.EmailBackend"
-# https://anymail.readthedocs.io/en/stable/esps/sendgrid/
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
 EMAIL_BACKEND = "anymail.backends.sendinblue.EmailBackend"
-# https://anymail.readthedocs.io/en/stable/esps/sendinblue/
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
 EMAIL_BACKEND = "anymail.backends.sparkpost.EmailBackend"
-# https://anymail.readthedocs.io/en/stable/esps/sparkpost/
 {%- elif cookiecutter.mail_service == 'Plain/Vanilla Django-Anymail' %}
 EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
 # https://docs.djangoproject.com/en/3.0/ref/settings/#email-backend
 {%- endif %}
 # https://anymail.readthedocs.io/en/stable/installation/#anymail-settings-reference
 ANYMAIL = {
-    {%- if cookiecutter.mail_service == 'Mailgun' %}
+    {%- if cookiecutter.mail_service == 'Amazon SES' %}
+    # https://anymail.readthedocs.io/en/stable/esps/amazon_ses/
+    {%- elif cookiecutter.mail_service == 'Mailgun' %}
     "MAILGUN_API_KEY": env("MAILGUN_API_KEY"),
     "MAILGUN_SENDER_DOMAIN": env("MAILGUN_DOMAIN"),
     "MAILGUN_API_URL": env("MAILGUN_API_URL", default="https://api.mailgun.net/v3"),
+    # https://anymail.readthedocs.io/en/stable/esps/mailgun/
     {%- elif cookiecutter.mail_service == 'Mailjet' %}
     "MAILJET_API_KEY": env("MAILJET_API_KEY"),
     "MAILJET_SECRET_KEY": env("MAILJET_SECRET_KEY"),
     "MAILJET_API_URL": env("MAILJET_API_URL", default="https://api.mailjet.com/v3"),
+    # https://anymail.readthedocs.io/en/stable/esps/mailjet/
     {%- elif cookiecutter.mail_service == 'Mandrill' %}
     "MANDRILL_API_KEY": env("MANDRILL_API_KEY"),
     "MANDRILL_API_URL": env("MANDRILL_API_URL", default="https://mandrillapp.com/api/1.0"),
+    # https://anymail.readthedocs.io/en/stable/esps/mandrill/
     {%- elif cookiecutter.mail_service == 'Postmark' %}
     "POSTMARK_SERVER_TOKEN": env("POSTMARK_SERVER_TOKEN"),
     "POSTMARK_API_URL": env("POSTMARK_API_URL", default="https://api.postmarkapp.com/"),
+    # https://anymail.readthedocs.io/en/stable/esps/postmark/
     {%- elif cookiecutter.mail_service == 'Sendgrid' %}
     "SENDGRID_API_KEY": env("SENDGRID_API_KEY"),
     "SENDGRID_GENERATE_MESSAGE_ID": env("SENDGRID_GENERATE_MESSAGE_ID"),
     "SENDGRID_MERGE_FIELD_FORMAT": env("SENDGRID_MERGE_FIELD_FORMAT"),
     "SENDGRID_API_URL": env("SENDGRID_API_URL", default="https://api.sendgrid.com/v3/"),
+    # https://anymail.readthedocs.io/en/stable/esps/sendgrid/
     {%- elif cookiecutter.mail_service == 'SendinBlue' %}
     "SENDINBLUE_API_KEY": env("SENDINBLUE_API_KEY"),
     "SENDINBLUE_API_URL": env("SENDINBLUE_API_URL", default="https://api.sendinblue.com/v3/"),
+    # https://anymail.readthedocs.io/en/stable/esps/sendinblue/
     {%- elif cookiecutter.mail_service == 'SparkPost' %}
     "SPARKPOST_API_KEY": env("SPARKPOST_API_KEY"),
     "SPARKPOST_API_URL": env("SPARKPOST_API_URL", default="https://api.sparkpost.com/api/v1"),
+    # https://anymail.readthedocs.io/en/stable/esps/sparkpost/
     {%- endif %}
 }
 

From ac884f3f75fa7f5b25f6a754a452193cd037b318 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Thu, 6 Feb 2020 20:18:49 -0500
Subject: [PATCH 0565/2840] Updated mail service docs * Trying to appease the
 Black-linter god...

---
 README.rst                                    |  4 +--
 docs/project-generation-options.rst           | 23 ++++++++++++
 docs/settings.rst                             | 15 ++++++++
 .../config/settings/production.py             | 36 +++++++++++++++----
 4 files changed, 69 insertions(+), 9 deletions(-)

diff --git a/README.rst b/README.rst
index 6e534b0f2..1d43b84e8 100644
--- a/README.rst
+++ b/README.rst
@@ -46,7 +46,7 @@ Features
 * Registration via django-allauth_
 * Comes with custom user model ready to go
 * Optional custom static build using Gulp and livereload
-* Send emails via Anymail_ (using Mailgun_ by default, but switchable)
+* Send emails via Anymail_ (using Mailgun_ by default or Amazon SES if AWS is selected cloud provider, but switchable)
 * Media storage using Amazon S3 or Google Cloud Storage
 * Docker support using docker-compose_ for development and production (using Traefik_ with LetsEncrypt_ support)
 * Procfile_ for deploying to Heroku
@@ -85,7 +85,7 @@ Optional Integrations
 .. _PythonAnywhere: https://www.pythonanywhere.com/
 .. _Traefik: https://traefik.io/
 .. _LetsEncrypt: https://letsencrypt.org/
-.. _pre-commit: https://github.com/pre-commit/pre-commit 
+.. _pre-commit: https://github.com/pre-commit/pre-commit
 
 Constraints
 -----------
diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index 2ed77facd..87ae90b1d 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -70,6 +70,19 @@ cloud_provider:
 
     Note that if you choose no cloud provider, media files won't work.
 
+mail_service:
+    Select an email service that Django-Anymail provides
+
+    1. Amazon SES_
+    2. Mailgun_
+    3. Mailjet_
+    4. Mandrill_
+    5. Postmark_
+    6. SendGrid_
+    7. SendinBlue_
+    8. SparkPost_
+    9. Plain/Vanilla Django-Anymail_
+
 use_drf:
     Indicates whether the project should be configured to use `Django Rest Framework`_.
 
@@ -132,6 +145,16 @@ debug:
 .. _AWS: https://aws.amazon.com/s3/
 .. _GCP: https://cloud.google.com/storage/
 
+.. _SES: https://aws.amazon.com/ses/
+.. _Mailgun: https://www.mailgun.com
+.. _Mailjet: https://www.mailjet.com
+.. _Mandrill: http://mandrill.com
+.. _Postmark: https://postmarkapp.com
+.. _SendGrid: https://sendgrid.com
+.. _SendinBlue: https://www.sendinblue.com
+.. _SparkPost: https://www.sparkpost.com
+.. _Django-Anymail: https://anymail.readthedocs.io/en/stable/
+
 .. _Django Rest Framework: https://github.com/encode/django-rest-framework/
 
 .. _Django Compressor: https://github.com/django-compressor/django-compressor
diff --git a/docs/settings.rst b/docs/settings.rst
index e586c9634..2ae8814e9 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -52,6 +52,21 @@ DJANGO_SENTRY_LOG_LEVEL                 SENTRY_LOG_LEVEL            n/a
 MAILGUN_API_KEY                         MAILGUN_API_KEY             n/a                                            raises error
 MAILGUN_DOMAIN                          MAILGUN_SENDER_DOMAIN       n/a                                            raises error
 MAILGUN_API_URL                         n/a                         n/a                                            "https://api.mailgun.net/v3"
+MAILJET_API_KEY                         MAILJET_API_KEY             n/a                                            raises error
+MAILJET_SECRET_KEY                      MAILJET_SECRET_KEY          n/a                                            raises error
+MAILJET_API_URL                         n/a                         n/a                                            "https://api.mailjet.com/v3"
+MANDRILL_API_KEY                        MANDRILL_API_KEY            n/a                                            raises error
+MANDRILL_API_URL                        n/a                         n/a                                            "https://mandrillapp.com/api/1.0"
+POSTMARK_SERVER_TOKEN                   POSTMARK_SERVER_TOKEN       n/a                                            raises error
+POSTMARK_API_URL                        n/a                         n/a                                            "https://api.postmarkapp.com/"
+SENDGRID_API_KEY                        SENDGRID_API_KEY            n/a                                            raises error
+SENDGRID_GENERATE_MESSAGE_ID            True                        n/a                                            raises error
+SENDGRID_MERGE_FIELD_FORMAT             None                        n/a                                            raises error
+SENDGRID_API_URL                        n/a                         n/a                                            "https://api.sendgrid.com/v3/"
+SENDINBLUE_API_KEY                      SENDINBLUE_API_KEY          n/a                                            raises error
+SENDINBLUE_API_URL                      n/a                         n/a                                            "https://api.sendinblue.com/v3/"
+SPARKPOST_API_KEY                       SPARKPOST_API_KEY           n/a                                            raises error
+SPARKPOST_API_URL                       n/a                         n/a                                            "https://api.sparkpost.com/api/v1"
 ======================================= =========================== ============================================== ======================================================================
 
 --------------------------
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 6d4318001..57b8eb397 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -208,39 +208,61 @@ EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
 {%- endif %}
 # https://anymail.readthedocs.io/en/stable/installation/#anymail-settings-reference
 ANYMAIL = {
+    # https://anymail.readthedocs.io/en/stable/esps/
     {%- if cookiecutter.mail_service == 'Amazon SES' %}
     # https://anymail.readthedocs.io/en/stable/esps/amazon_ses/
     {%- elif cookiecutter.mail_service == 'Mailgun' %}
     "MAILGUN_API_KEY": env("MAILGUN_API_KEY"),
     "MAILGUN_SENDER_DOMAIN": env("MAILGUN_DOMAIN"),
-    "MAILGUN_API_URL": env("MAILGUN_API_URL", default="https://api.mailgun.net/v3"),
+    "MAILGUN_API_URL": env(
+        "MAILGUN_API_URL",
+        default="https://api.mailgun.net/v3"
+    ),
     # https://anymail.readthedocs.io/en/stable/esps/mailgun/
     {%- elif cookiecutter.mail_service == 'Mailjet' %}
     "MAILJET_API_KEY": env("MAILJET_API_KEY"),
     "MAILJET_SECRET_KEY": env("MAILJET_SECRET_KEY"),
-    "MAILJET_API_URL": env("MAILJET_API_URL", default="https://api.mailjet.com/v3"),
+    "MAILJET_API_URL": env(
+        "MAILJET_API_URL",
+        default="https://api.mailjet.com/v3"
+    ),
     # https://anymail.readthedocs.io/en/stable/esps/mailjet/
     {%- elif cookiecutter.mail_service == 'Mandrill' %}
     "MANDRILL_API_KEY": env("MANDRILL_API_KEY"),
-    "MANDRILL_API_URL": env("MANDRILL_API_URL", default="https://mandrillapp.com/api/1.0"),
+    "MANDRILL_API_URL": env(
+        "MANDRILL_API_URL",
+        default="https://mandrillapp.com/api/1.0"
+    ),
     # https://anymail.readthedocs.io/en/stable/esps/mandrill/
     {%- elif cookiecutter.mail_service == 'Postmark' %}
     "POSTMARK_SERVER_TOKEN": env("POSTMARK_SERVER_TOKEN"),
-    "POSTMARK_API_URL": env("POSTMARK_API_URL", default="https://api.postmarkapp.com/"),
+    "POSTMARK_API_URL": env(
+        "POSTMARK_API_URL",
+        default="https://api.postmarkapp.com/"
+    ),
     # https://anymail.readthedocs.io/en/stable/esps/postmark/
     {%- elif cookiecutter.mail_service == 'Sendgrid' %}
     "SENDGRID_API_KEY": env("SENDGRID_API_KEY"),
     "SENDGRID_GENERATE_MESSAGE_ID": env("SENDGRID_GENERATE_MESSAGE_ID"),
     "SENDGRID_MERGE_FIELD_FORMAT": env("SENDGRID_MERGE_FIELD_FORMAT"),
-    "SENDGRID_API_URL": env("SENDGRID_API_URL", default="https://api.sendgrid.com/v3/"),
+    "SENDGRID_API_URL": env(
+        "SENDGRID_API_URL",
+        default="https://api.sendgrid.com/v3/"
+    ),
     # https://anymail.readthedocs.io/en/stable/esps/sendgrid/
     {%- elif cookiecutter.mail_service == 'SendinBlue' %}
     "SENDINBLUE_API_KEY": env("SENDINBLUE_API_KEY"),
-    "SENDINBLUE_API_URL": env("SENDINBLUE_API_URL", default="https://api.sendinblue.com/v3/"),
+    "SENDINBLUE_API_URL": env(
+        "SENDINBLUE_API_URL",
+        default="https://api.sendinblue.com/v3/"
+    ),
     # https://anymail.readthedocs.io/en/stable/esps/sendinblue/
     {%- elif cookiecutter.mail_service == 'SparkPost' %}
     "SPARKPOST_API_KEY": env("SPARKPOST_API_KEY"),
-    "SPARKPOST_API_URL": env("SPARKPOST_API_URL", default="https://api.sparkpost.com/api/v1"),
+    "SPARKPOST_API_URL": env(
+        "SPARKPOST_API_URL",
+        default="https://api.sparkpost.com/api/v1"
+    ),
     # https://anymail.readthedocs.io/en/stable/esps/sparkpost/
     {%- endif %}
 }

From 0df8cfdb901882f1bcbfba51da59450911fd4343 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Thu, 6 Feb 2020 21:03:49 -0500
Subject: [PATCH 0566/2840] Added mail service pytests in
 test_cookiecutter_generation.py

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

diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 39b05d7c6..5a5699614 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -46,6 +46,41 @@ def context():
     ],
     ids=lambda id: f"wnoise:{id[0]}-cloud:{id[1]}",
 )
+@pytest.mark.parametrize(
+    "cloud_provider,mail_service",
+    [
+        ("AWS", "Amazon SES"),
+        ("AWS", "Mailgun"),
+        ("AWS", "Mailjet"),
+        ("AWS", "Mandrill"),
+        ("AWS", "Postmark"),
+        ("AWS", "Sendgrid"),
+        ("AWS", "SendinBlue"),
+        ("AWS", "SparkPost"),
+        ("AWS", "Plain/Vanilla Django-Anymail"),
+
+        ("GCP", "Mailgun"),
+        ("GCP", "Mailjet"),
+        ("GCP", "Mandrill"),
+        ("GCP", "Postmark"),
+        ("GCP", "Sendgrid"),
+        ("GCP", "SendinBlue"),
+        ("GCP", "SparkPost"),
+        ("GCP", "Plain/Vanilla Django-Anymail"),
+
+        ("None", "Mailgun"),
+        ("None", "Mailjet"),
+        ("None", "Mandrill"),
+        ("None", "Postmark"),
+        ("None", "Sendgrid"),
+        ("None", "SendinBlue"),
+        ("None", "SparkPost"),
+        ("None", "Plain/Vanilla Django-Anymail"),
+
+        # GCP or None (i.e. no cloud provider) + Amazon SES is not supported
+    ],
+    ids=lambda id: f"cloud:{id[0]}-mail:{id[1]}",
+)
 def context_combination(
     windows,
     use_docker,
@@ -56,6 +91,7 @@ def context_combination(
     use_whitenoise,
     use_drf,
     cloud_provider,
+    mail_service,
 ):
     """Fixture that parametrize the function where it's used."""
     return {
@@ -68,6 +104,7 @@ def context_combination(
         "use_whitenoise": use_whitenoise,
         "use_drf": use_drf,
         "cloud_provider": cloud_provider,
+        "mail_service": mail_service,
     }
 
 
@@ -194,3 +231,21 @@ def test_no_whitenoise_and_no_cloud_provider(cookies, context):
 
     assert result.exit_code != 0
     assert isinstance(result.exception, FailedHookException)
+
+
+def test_gcp_with_aws_ses_mail_service(cookies, context):
+    """It should not generate project if SES is set with GCP cloud provider"""
+    context.update({"cloud_provider": "GCP", "mail_service": "Amazon SES"})
+    result = cookies.bake(extra_context=context)
+
+    assert result.exit_code != 0
+    assert isinstance(result.exception, FailedHookException)
+
+
+def test_no_cloud_provider_with_aws_ses_mail_service(cookies, context):
+    """It should not generate project if SES is set with no cloud provider"""
+    context.update({"cloud_provider": "None", "mail_service": "Amazon SES"})
+    result = cookies.bake(extra_context=context)
+
+    assert result.exit_code != 0
+    assert isinstance(result.exception, FailedHookException)

From c839862aefded2e2f09f51afd448c8a3d015c409 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Thu, 6 Feb 2020 22:12:30 -0500
Subject: [PATCH 0567/2840] Testing mail service does not raise KeyError *
 KeyError raised when cloud_provider was used twice in mark parametrization. *
 Tox isn't working properly for me (collecting 17,000 files; obviously
 neglecting tox.ini and/or pytest.ini)

---
 tests/test_cookiecutter_generation.py | 41 +++++++--------------------
 1 file changed, 11 insertions(+), 30 deletions(-)

diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 5a5699614..e8b341c96 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -47,39 +47,20 @@ def context():
     ids=lambda id: f"wnoise:{id[0]}-cloud:{id[1]}",
 )
 @pytest.mark.parametrize(
-    "cloud_provider,mail_service",
+    "mail_service",
     [
-        ("AWS", "Amazon SES"),
-        ("AWS", "Mailgun"),
-        ("AWS", "Mailjet"),
-        ("AWS", "Mandrill"),
-        ("AWS", "Postmark"),
-        ("AWS", "Sendgrid"),
-        ("AWS", "SendinBlue"),
-        ("AWS", "SparkPost"),
-        ("AWS", "Plain/Vanilla Django-Anymail"),
-
-        ("GCP", "Mailgun"),
-        ("GCP", "Mailjet"),
-        ("GCP", "Mandrill"),
-        ("GCP", "Postmark"),
-        ("GCP", "Sendgrid"),
-        ("GCP", "SendinBlue"),
-        ("GCP", "SparkPost"),
-        ("GCP", "Plain/Vanilla Django-Anymail"),
-
-        ("None", "Mailgun"),
-        ("None", "Mailjet"),
-        ("None", "Mandrill"),
-        ("None", "Postmark"),
-        ("None", "Sendgrid"),
-        ("None", "SendinBlue"),
-        ("None", "SparkPost"),
-        ("None", "Plain/Vanilla Django-Anymail"),
-
+        "Amazon SES",
+        "Mailgun",
+        "MailJet",
+        "Mandrill",
+        "Postmark",
+        "Sendgrid",
+        "SendinBlue",
+        "SparkPost",
+        "Plain/Vanilla Django-Anymail"
         # GCP or None (i.e. no cloud provider) + Amazon SES is not supported
     ],
-    ids=lambda id: f"cloud:{id[0]}-mail:{id[1]}",
+    ids=lambda id: f"mail:{id[0]}",
 )
 def context_combination(
     windows,

From 816fb1c44b5a5c4d82f3d154db1288cba3991524 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 7 Feb 2020 11:00:30 +0000
Subject: [PATCH 0568/2840] Update werkzeug from 0.16.1 to 1.0.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 f7782f0d7..151dc67ec 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,6 +1,6 @@
 -r ./base.txt
 
-Werkzeug==0.16.1 # https://github.com/pallets/werkzeug
+Werkzeug==1.0.0 # https://github.com/pallets/werkzeug
 ipdb==0.12.3  # https://github.com/gotcha/ipdb
 Sphinx==2.3.1  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}

From be019ea54a20ca2008260bcdfc49446b3ea5d5f2 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sun, 9 Feb 2020 11:00:30 +0000
Subject: [PATCH 0569/2840] Update sphinx from 2.3.1 to 2.4.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 f7782f0d7..f7d8b3681 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -2,7 +2,7 @@
 
 Werkzeug==0.16.1 # https://github.com/pallets/werkzeug
 ipdb==0.12.3  # https://github.com/gotcha/ipdb
-Sphinx==2.3.1  # https://github.com/sphinx-doc/sphinx
+Sphinx==2.4.0  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}

From 311e0dfc241199c9681c2b439a0b8b976ac67068 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 11 Feb 2020 11:00:30 +0000
Subject: [PATCH 0570/2840] Update django-extensions from 2.2.6 to 2.2.8

---
 {{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 f7782f0d7..f949d90d9 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -32,6 +32,6 @@ pre-commit==2.0.1  # https://github.com/pre-commit/pre-commit
 factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==2.2  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==2.2.6  # https://github.com/django-extensions/django-extensions
+django-extensions==2.2.8  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.8.0  # https://github.com/pytest-dev/pytest-django

From a8e668d659c2c06a7ac3cd7d6674ac2448c2d5a4 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 12 Feb 2020 11:00:32 +0000
Subject: [PATCH 0571/2840] Update sphinx from 2.4.0 to 2.4.1

---
 {{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 98cb19e60..81d793cb1 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -2,7 +2,7 @@
 
 Werkzeug==1.0.0 # https://github.com/pallets/werkzeug
 ipdb==0.12.3  # https://github.com/gotcha/ipdb
-Sphinx==2.4.0  # https://github.com/sphinx-doc/sphinx
+Sphinx==2.4.1  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}

From b64cb03b17e7872f99ff03f7d6b803d7465b3d9c Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 13 Feb 2020 16:59:38 -0800
Subject: [PATCH 0572/2840] Update tox from 3.14.3 to 3.14.4

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

diff --git a/requirements.txt b/requirements.txt
index e05cff3f5..0e72e65b6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ flake8==3.7.9
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.14.3
+tox==3.14.4
 pytest==5.3.5
 pytest_cases==1.12.1
 pytest-cookies==0.5.0

From 8c945af82a94ccc61de99038457510b375043826 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 14 Feb 2020 08:34:04 -0800
Subject: [PATCH 0573/2840] Update pytest-cookies from 0.5.0 to 0.5.1

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

diff --git a/requirements.txt b/requirements.txt
index 0e72e65b6..4b0a20872 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,6 +12,6 @@ flake8==3.7.9
 tox==3.14.4
 pytest==5.3.5
 pytest_cases==1.12.1
-pytest-cookies==0.5.0
+pytest-cookies==0.5.1
 pytest-xdist==1.31.0
 pyyaml==5.3

From a857038e13c35eb31615da50ffa4a8ca8d6099a7 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 17 Feb 2020 02:52:00 -0800
Subject: [PATCH 0574/2840] Update tox from 3.14.4 to 3.14.5

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

diff --git a/requirements.txt b/requirements.txt
index 4b0a20872..7d68e3f41 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,7 +9,7 @@ flake8==3.7.9
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.14.4
+tox==3.14.5
 pytest==5.3.5
 pytest_cases==1.12.1
 pytest-cookies==0.5.1

From 10be405c890743cad7a833d78a565260256a97a1 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 17 Feb 2020 11:00:34 +0000
Subject: [PATCH 0575/2840] Update collectfast from 1.3.1 to 1.3.2

---
 {{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 9c1de8276..974ae1e61 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -5,7 +5,7 @@
 gunicorn==20.0.4  # https://github.com/benoitc/gunicorn
 psycopg2==2.8.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
-Collectfast==1.3.1  # https://github.com/antonagestam/collectfast
+Collectfast==1.3.2  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
 sentry-sdk==0.14.1  # https://github.com/getsentry/sentry-python

From 1a7bcccd945bc7c79b5c395a2682b818a5725bce Mon Sep 17 00:00:00 2001
From: Demetris Stavrou <1180929+demestav@users.noreply.github.com>
Date: Tue, 18 Feb 2020 11:01:56 +0200
Subject: [PATCH 0576/2840] Added celery cookiecutter condition in Traefik
 configuration

---
 .../compose/production/traefik/traefik.yml                  | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
index bb3be1500..923774f4d 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
@@ -9,9 +9,11 @@ entryPoints:
   web-secure:
     # https
     address: ":443"
+  {%- if cookiecutter.use_celery == 'y' %}
 
   flower:
     address: ":5555"
+  {%- endif %}
 
 certificatesResolvers:
   letsencrypt:
@@ -44,6 +46,7 @@ http:
       tls:
         # https://docs.traefik.io/master/routing/routers/#certresolver
         certResolver: letsencrypt
+    {%- if cookiecutter.use_celery == 'y' %}
 
     flower-secure-router:
       rule: "Host(`{{ cookiecutter.domain_name }}`)"
@@ -53,6 +56,7 @@ http:
       tls:
         # https://docs.traefik.io/master/routing/routers/#certresolver
         certResolver: letsencrypt
+    {%- endif %}
 
   middlewares:
     redirect:
@@ -71,11 +75,13 @@ http:
       loadBalancer:
         servers:
           - url: http://django:5000
+    {%- if cookiecutter.use_celery == 'y' %}
 
     flower:
       loadBalancer:
         servers:
           - url: http://flower:5555
+    {%- endif %}
 
 providers:
   # https://docs.traefik.io/master/providers/file/

From b84017a8a856d6fdce5109f7d388a2f63c17f2a5 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 19 Feb 2020 11:00:32 +0000
Subject: [PATCH 0577/2840] Update pytest_cases from 1.12.1 to 1.12.2

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

diff --git a/requirements.txt b/requirements.txt
index 7d68e3f41..06f5a80ed 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8==3.7.9
 # ------------------------------------------------------------------------------
 tox==3.14.5
 pytest==5.3.5
-pytest_cases==1.12.1
+pytest_cases==1.12.2
 pytest-cookies==0.5.1
 pytest-xdist==1.31.0
 pyyaml==5.3

From 15e8e667e50750e37206e5a73b4b2c89a1d8d5b3 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 19 Feb 2020 11:00:36 +0000
Subject: [PATCH 0578/2840] Update sphinx from 2.4.1 to 2.4.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 81d793cb1..57a015595 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -2,7 +2,7 @@
 
 Werkzeug==1.0.0 # https://github.com/pallets/werkzeug
 ipdb==0.12.3  # https://github.com/gotcha/ipdb
-Sphinx==2.4.1  # https://github.com/sphinx-doc/sphinx
+Sphinx==2.4.2  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}

From d5edf1fa4dbccb838b815b742c7dcf6db5762fdd Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 19 Feb 2020 11:00:39 +0000
Subject: [PATCH 0579/2840] Update pre-commit from 2.0.1 to 2.1.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 81d793cb1..d3cfa24a3 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -25,7 +25,7 @@ pylint-django==2.0.13  # 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.0.1  # https://github.com/pre-commit/pre-commit
+pre-commit==2.1.0  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From 2fb739fed2d5794204a2a9189c66d67169dd4105 Mon Sep 17 00:00:00 2001
From: "Vicente G. Reyes" <icenreyes@icloud.com>
Date: Thu, 20 Feb 2020 02:02:48 +0800
Subject: [PATCH 0580/2840] Update README.rst

Update command $ pip install "cookiecutter>=1.7.0" on docs
---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 6e534b0f2..0ae86d053 100644
--- a/README.rst
+++ b/README.rst
@@ -135,7 +135,7 @@ and then editing the results to include your name, email, and various configurat
 
 First, get Cookiecutter. Trust me, it's awesome::
 
-    $ pip install "cookiecutter>=1.4.0"
+    $ pip install "cookiecutter>=1.7.0"
 
 Now run it against this repo::
 

From d1c417b63d8729e3fdb431a73032e798b116e9da Mon Sep 17 00:00:00 2001
From: "Vicente G. Reyes" <icenreyes@icloud.com>
Date: Thu, 20 Feb 2020 02:06:20 +0800
Subject: [PATCH 0581/2840] Update CONTRIBUTORS.rst

added myself
---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 2554d2cfc..130d7e6ee 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -205,6 +205,7 @@ Listed in alphabetical order.
   Tubo Shi                 `@Tubo`_
   Umair Ashraf             `@umrashrf`_                 @fabumair
   Vadim Iskuchekov         `@Egregors`_                 @egregors
+  Vicente G. Reyes         `@reyesvicente`_             @highcenburg
   Vitaly Babiy
   Vivian Guillen           `@viviangb`_
   Vlad Doster              `@vladdoster`_

From 161d8bcf9e749b235757cbf8c542c16b68accdee Mon Sep 17 00:00:00 2001
From: "Vicente G. Reyes" <icenreyes@icloud.com>
Date: Thu, 20 Feb 2020 02:39:21 +0800
Subject: [PATCH 0582/2840] Update CONTRIBUTORS.rst

fixed conflict
---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 130d7e6ee..a07ea8e9b 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -341,6 +341,7 @@ Listed in alphabetical order.
 .. _@purplediane: https://github.com/purplediane
 .. _@raonyguimaraes: https://github.com/raonyguimaraes
 .. _@reggieriser: https://github.com/reggieriser
+.. _@reyesvicente: https://github.com/reyesvicente
 .. _@rm--: https://github.com/rm--
 .. _@rolep: https://github.com/rolep
 .. _@romanosipenko: https://github.com/romanosipenko

From e8b36af72fb371a528ee20acceea6e7ed4ef4d52 Mon Sep 17 00:00:00 2001
From: Cole Maclean <hi@colemaclean.dev>
Date: Wed, 19 Feb 2020 13:13:10 -0800
Subject: [PATCH 0583/2840] Remove coreapi requirement

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

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 5427f1d0e..31a6a32b6 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -31,4 +31,3 @@ django-redis==4.11.0  # https://github.com/niwinz/django-redis
 
 # Django REST Framework
 djangorestframework==3.11.0  # https://github.com/encode/django-rest-framework
-coreapi==2.3.3  # https://github.com/core-api/python-client

From 54dd167501b2049e70acfd786ba856e3e2ed0845 Mon Sep 17 00:00:00 2001
From: Cole Maclean <hi@colemaclean.dev>
Date: Wed, 19 Feb 2020 13:17:02 -0800
Subject: [PATCH 0584/2840] Add myself to contributors

---
 CONTRIBUTORS.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 2554d2cfc..5859bc3a1 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -87,6 +87,7 @@ Listed in alphabetical order.
   Chris Pappalardo         `@ChrisPappalardo`_
   Christopher Clarke       `@chrisdev`_
   Cole Mackenzie           `@cmackenzie1`_
+  Cole Maclean             `@cole`_                      @cole
   Collederas               `@Collederas`_
   Craig Margieson          `@cmargieson`_
   Cristian Vargas          `@cdvv7788`_
@@ -258,6 +259,7 @@ Listed in alphabetical order.
 .. _@chuckus: https://github.com/chuckus
 .. _@cmackenzie1: https://github.com/cmackenzie1
 .. _@cmargieson: https://github.com/cmargieson
+.. _@cole: https://github.com/cole
 .. _@Collederas: https://github.com/Collederas
 .. _@curtisstpierre: https://github.com/curtisstpierre
 .. _@dadokkio: https://github.com/dadokkio

From f6a63a5f0c69bc074655304098478b3fa9aae2c7 Mon Sep 17 00:00:00 2001
From: Demetris Stavrou <1180929+demestav@users.noreply.github.com>
Date: Fri, 21 Feb 2020 10:08:10 +0200
Subject: [PATCH 0585/2840] Added 5555 port mapping to traefik service

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

diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index 125d4876c..45e1c447c 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -42,6 +42,7 @@ services:
     ports:
       - "0.0.0.0:80:80"
       - "0.0.0.0:443:443"
+      - "0.0.0.0:5555:5555"
 
   redis:
     image: redis:5.0

From e3d7ea0e108a76827e96002e05eb8726768eaa7a Mon Sep 17 00:00:00 2001
From: Demetris Stavrou <1180929+demestav@users.noreply.github.com>
Date: Sat, 22 Feb 2020 21:29:40 +0200
Subject: [PATCH 0586/2840] Added condition for Flower port mapping

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

diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index 45e1c447c..2cd2af132 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -42,7 +42,9 @@ services:
     ports:
       - "0.0.0.0:80:80"
       - "0.0.0.0:443:443"
+      {%- if cookiecutter.use_celery == 'y' %}
       - "0.0.0.0:5555:5555"
+      {%- endif %}
 
   redis:
     image: redis:5.0

From 405d33d99e5f45d18a9db3b39b352027ed54187c Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sun, 23 Feb 2020 11:00:30 +0000
Subject: [PATCH 0587/2840] Update sphinx from 2.4.2 to 2.4.3

---
 {{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 e2f2b5815..2c7fc85be 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -2,7 +2,7 @@
 
 Werkzeug==1.0.0 # https://github.com/pallets/werkzeug
 ipdb==0.12.3  # https://github.com/gotcha/ipdb
-Sphinx==2.4.2  # https://github.com/sphinx-doc/sphinx
+Sphinx==2.4.3  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}

From 7df671611a280a3171c9280a9e13a4e603ae15a5 Mon Sep 17 00:00:00 2001
From: Pawan Chaurasia <logan@MacBook-Pro.local>
Date: Mon, 24 Feb 2020 18:46:01 +0530
Subject: [PATCH 0588/2840] fixed pre-commit  not loading the flake8 config.
 added path of setup.cfg in .pre-commit-config.yaml

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

diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index b9d69a9a1..4b72ee80a 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -16,4 +16,5 @@ repos:
         entry: flake8
         language: python
         types: [python]
+        args: ['--config=setup.cfg']
 

From c5ef5bf757555135e9703c2fd830bf30ef8d135f Mon Sep 17 00:00:00 2001
From: Pawan Chaurasia <logan@MacBook-Pro.local>
Date: Mon, 24 Feb 2020 18:49:13 +0530
Subject: [PATCH 0589/2840] added name in contributors.rst

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 691b43ca3..1069a951b 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -176,6 +176,7 @@ Listed in alphabetical order.
   Oleg Russkin             `@rolep`_
   Pablo                    `@oubiga`_
   Parbhat Puri             `@parbhat`_
+  Pawan Chaurasia          `@rjsnh1522`_
   Peter Bittner            `@bittner`_
   Peter Coles              `@mrcoles`_
   Philipp Matthies         `@canonnervio`_

From 786b2beb44efcc0a3e52e9eb365e2aafed02d278 Mon Sep 17 00:00:00 2001
From: Pawan Chaurasia <logan@MacBook-Pro.local>
Date: Tue, 25 Feb 2020 10:06:49 +0530
Subject: [PATCH 0590/2840] fixed broken link in contributors.rst

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 1069a951b..86804b69d 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -339,6 +339,7 @@ Listed in alphabetical order.
 .. _@originell: https://github.com/originell
 .. _@oubiga: https://github.com/oubiga
 .. _@parbhat: https://github.com/parbhat
+.. _@rjsnh1522: https://github.com/rjsnh1522
 .. _@pchiquet: https://github.com/pchiquet
 .. _@phiberjenz: https://github.com/phiberjenz
 .. _@purplediane: https://github.com/purplediane

From 487ed35bc5e7c13ade498c68752f9a2f25d7dec9 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 25 Feb 2020 11:00:32 +0000
Subject: [PATCH 0591/2840] Update collectfast from 1.3.2 to 2.0.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 974ae1e61..821550083 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -5,7 +5,7 @@
 gunicorn==20.0.4  # https://github.com/benoitc/gunicorn
 psycopg2==2.8.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
-Collectfast==1.3.2  # https://github.com/antonagestam/collectfast
+Collectfast==2.0.1  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
 sentry-sdk==0.14.1  # https://github.com/getsentry/sentry-python

From a36f6a7495ccc141f1b8d565e4acbc925b66d807 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 25 Feb 2020 11:00:36 +0000
Subject: [PATCH 0592/2840] Update pylint-django from 2.0.13 to 2.0.14

---
 {{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 2c7fc85be..5011f3c34 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -21,7 +21,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 flake8==3.7.9  # https://github.com/PyCQA/flake8
 coverage==5.0.3  # https://github.com/nedbat/coveragepy
 black==19.10b0  # https://github.com/ambv/black
-pylint-django==2.0.13  # https://github.com/PyCQA/pylint-django
+pylint-django==2.0.14  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}

From f9b0c4846b1d09c7c0c470ab8ced814b5df6513b Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 25 Feb 2020 12:58:45 +0000
Subject: [PATCH 0593/2840] Update pre-commit from 2.1.0 to 2.1.1 (#2463)

---
 {{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 5011f3c34..194e25d58 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -25,7 +25,7 @@ pylint-django==2.0.14  # 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.1.0  # https://github.com/pre-commit/pre-commit
+pre-commit==2.1.1  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From fe7a70be6606b5516a02b71ae0ed5a95e9174b0b Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 27 Feb 2020 11:00:32 +0000
Subject: [PATCH 0594/2840] Update sentry-sdk from 0.14.1 to 0.14.2

---
 {{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 821550083..62fe3e40c 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==2.0.1  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.14.1  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.14.2  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From c54345e5f8a572045aa08634af5fdcd1cc45edaa Mon Sep 17 00:00:00 2001
From: Daniel Roy Greenfeld <pydanny@users.noreply.github.com>
Date: Thu, 27 Feb 2020 21:07:31 -0800
Subject: [PATCH 0595/2840] Switch sponsorship to Django Crash Course

---
 README.rst | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/README.rst b/README.rst
index 0ae86d053..3add09cf3 100644
--- a/README.rst
+++ b/README.rst
@@ -105,16 +105,16 @@ This project is run by volunteers. Please support them in their efforts to maint
 
 Projects that provide financial support to the maintainers:
 
-Two Scoops of Django 1.11
+Django Crash Course
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. image:: https://cdn.shopify.com/s/files/1/0304/6901/products/2017-06-29-tsd11-sticker-02.png
-   :name: Two Scoops of Django 1.11 Cover
+.. image:: https://cdn.shopify.com/s/files/1/0304/6901/files/Django-Crash-Course-300x436.jpg
+   :name: Django Crash Course: Covers Django 3.0 and Python 3.8
    :align: center
-   :alt: Two Scoops of Django
-   :target: http://twoscoopspress.com/products/two-scoops-of-django-1-11
+   :alt: Django Crash Course
+   :target: https://www.roygreenfeld.com/products/django-crash-course
 
-Two Scoops of Django is the best dessert-themed Django reference in the universe
+Django Crash Course for Django 3.0 and Python 3.8 is the best cheese-themed Django reference in the universe!
 
 pyup
 ~~~~~~~~~~~~~~~~~~

From 89f85f1255598578126776372f41ceb8eaa0e5af Mon Sep 17 00:00:00 2001
From: James Williams <zcapjwi@ucl.ac.uk>
Date: Tue, 11 Feb 2020 20:17:50 +0000
Subject: [PATCH 0596/2840] - configure compressor when not using s3

- update django start script to compress if using whitenoise and compress enabled

- add to contributors.rst
---
 CONTRIBUTORS.rst                               |  1 +
 .../compose/production/django/start            |  6 ++++++
 .../config/settings/production.py              | 18 ++++++++++++++++++
 3 files changed, 25 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 86804b69d..043312b03 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -129,6 +129,7 @@ Listed in alphabetical order.
   Irfan Ahmad              `@erfaan`_                    @erfaan
   Isaac12x                 `@Isaac12x`_
   Ivan Khomutov            `@ikhomutov`_
+  James Williams           `@jameswilliams1`_
   Jan Van Bruggen          `@jvanbrug`_
   Jelmer Draaijer          `@foarsitter`_
   Jerome Caisip            `@jeromecaisip`_
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/start b/{{cookiecutter.project_slug}}/compose/production/django/start
index 709c1dd04..a3aa1161c 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/start
+++ b/{{cookiecutter.project_slug}}/compose/production/django/start
@@ -6,4 +6,10 @@ set -o nounset
 
 
 python /app/manage.py collectstatic --noinput
+{%- if cookiecutter.use_whitenoise == 'y' and cookiecutter.use_compressor == 'y' %}
+if [ "${COMPRESS_ENABLED:-}" = "True" ];
+then
+  python /app/manage.py compress
+fi
+{%- endif %}
 /usr/local/bin/gunicorn config.wsgi --bind 0.0.0.0:5000 --chdir=/app
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 36667b33a..a3e4b9c27 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -200,9 +200,27 @@ ANYMAIL = {
 # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_ENABLED
 COMPRESS_ENABLED = env.bool("COMPRESS_ENABLED", default=True)
 # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_STORAGE
+{%- if cookiecutter.cloud_provider == 'AWS' %}
 COMPRESS_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
+{%- elif cookiecutter.cloud_provider == 'GCP' %}
+COMPRESS_STORAGE = "storages.backends.gcloud.GoogleCloudStorage"
+{%- elif cookiecutter.cloud_provider == 'None' %}
+COMPRESS_STORAGE = "compressor.storage.GzipCompressorFileStorage"
+{%- endif %}
 # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_URL
 COMPRESS_URL = STATIC_URL{% if cookiecutter.use_whitenoise == 'y' or cookiecutter.cloud_provider == 'None' %}  # noqa F405{% endif %}
+{%- if cookiecutter.use_whitenoise == 'y' %}
+# https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_OFFLINE
+COMPRESS_OFFLINE = True  # Offline compression is required when using Whitenoise
+{%- endif %}
+# https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_FILTERS
+COMPRESS_FILTERS = {
+    "css": [
+        "compressor.filters.css_default.CssAbsoluteFilter",
+        "compressor.filters.cssmin.rCSSMinFilter",
+    ],
+    "js": ["compressor.filters.jsmin.JSMinFilter"],
+}
 {% endif %}
 {%- if cookiecutter.use_whitenoise == 'n' -%}
 # Collectfast

From e1cb30b699460dc8dbdef9587d20c8423d022b1a Mon Sep 17 00:00:00 2001
From: James Williams <jamesleighwilliams@gmail.com>
Date: Fri, 28 Feb 2020 16:08:20 +0000
Subject: [PATCH 0597/2840] fix broken contributors link

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 043312b03..beba320bf 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -299,6 +299,7 @@ Listed in alphabetical order.
 .. _@howiezhao: https://github.com/howiezhao
 .. _@IanLee1521: https://github.com/IanLee1521
 .. _@ikhomutov: https://github.com/ikhomutov
+.. _@jameswilliams1: https://github.com/jameswilliams1
 .. _@ikkebr: https://github.com/ikkebr
 .. _@Isaac12x: https://github.com/Isaac12x
 .. _@iynaix: https://github.com/iynaix

From d3db7a867fbf58b80ceea4dc05829a2fcbbdbe60 Mon Sep 17 00:00:00 2001
From: James Williams <jamesleighwilliams@gmail.com>
Date: Fri, 28 Feb 2020 17:04:15 +0000
Subject: [PATCH 0598/2840] fix compresss offline never runs using environ

---
 .../compose/production/django/start           | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/django/start b/{{cookiecutter.project_slug}}/compose/production/django/start
index a3aa1161c..4985aeedd 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/start
+++ b/{{cookiecutter.project_slug}}/compose/production/django/start
@@ -6,9 +6,24 @@ set -o nounset
 
 
 python /app/manage.py collectstatic --noinput
-{%- if cookiecutter.use_whitenoise == 'y' and cookiecutter.use_compressor == 'y' %}
-if [ "${COMPRESS_ENABLED:-}" = "True" ];
-then
+{% if cookiecutter.use_whitenoise == 'y' and cookiecutter.use_compressor == 'y' %}
+compress_enabled() {
+python << END
+import sys
+
+from environ import Env
+
+env = Env(COMPRESS_ENABLED=(bool, True))
+if env('COMPRESS_ENABLED'):
+    sys.exit(0)
+else:
+    sys.exit(1)
+
+END
+}
+
+if compress_enabled; then
+  # NOTE this command will fail if django-compressor is disabled
   python /app/manage.py compress
 fi
 {%- endif %}

From 7e0f86b4ba0666dc03cbb3dc6644b53291e74d26 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 29 Feb 2020 11:00:30 +0000
Subject: [PATCH 0599/2840] Update django-celery-beat from 1.6.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 31a6a32b6..0d6d14070 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -11,7 +11,7 @@ whitenoise==5.0.1  # https://github.com/evansd/whitenoise
 redis==3.4.1 # https://github.com/andymccurdy/redis-py
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.4.0  # pyup: < 5.0  # https://github.com/celery/celery
-django-celery-beat==1.6.0  # https://github.com/celery/django-celery-beat
+django-celery-beat==2.0.0  # https://github.com/celery/django-celery-beat
 {%- if cookiecutter.use_docker == 'y' %}
 flower==0.9.3  # https://github.com/mher/flower
 {%- endif %}

From ccfe97972a189b877fc499f965bbe1bf6f954d55 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 29 Feb 2020 11:00:33 +0000
Subject: [PATCH 0600/2840] Update django-crispy-forms from 1.8.1 to 1.9.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 31a6a32b6..182dd224e 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -23,7 +23,7 @@ django==2.2.10  # pyup: < 3.0  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==4.0.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.41.0  # https://github.com/pennersr/django-allauth
-django-crispy-forms==1.8.1  # https://github.com/django-crispy-forms/django-crispy-forms
+django-crispy-forms==1.9.0  # https://github.com/django-crispy-forms/django-crispy-forms
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==2.4  # https://github.com/django-compressor/django-compressor
 {%- endif %}

From 37652710159de08a322771d549b19d2097afeac9 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 29 Feb 2020 11:00:36 +0000
Subject: [PATCH 0601/2840] Update ipdb from 0.12.3 to 0.13.1

---
 {{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 194e25d58..e70cb63fd 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,7 +1,7 @@
 -r ./base.txt
 
 Werkzeug==1.0.0 # https://github.com/pallets/werkzeug
-ipdb==0.12.3  # https://github.com/gotcha/ipdb
+ipdb==0.13.1  # https://github.com/gotcha/ipdb
 Sphinx==2.4.3  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2

From 33f210abc432c79ad2b6e619629a8b9633237d2f Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sat, 29 Feb 2020 17:15:35 +0000
Subject: [PATCH 0602/2840] Simplify setup for the automated tests

---
 .travis.yml                           |   4 -
 pytest.ini                            |   3 -
 requirements.txt                      |   1 -
 tests/test_cookiecutter_generation.py | 146 +++++++++++++-------------
 tox.ini                               |  12 +--
 5 files changed, 75 insertions(+), 91 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 925d82e7b..52786a17f 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -15,10 +15,6 @@ matrix:
   include:
     - name: Test results
       script: tox -e py37
-    - name: Run flake8 on result
-      script: tox -e flake8
-    - name: Run black on result
-      script: tox -e black
     - name: Black template
       script: tox -e black-template
     - name: Basic Docker
diff --git a/pytest.ini b/pytest.ini
index 89aeb302c..5d5a9c932 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -2,6 +2,3 @@
 addopts = -x --tb=short
 python_paths = .
 norecursedirs = .tox .git */migrations/* */static/* docs venv */{{cookiecutter.project_slug}}/*
-markers =
-    flake8: Run flake8 on all possible template combinations
-    black: Run black on all possible template combinations
diff --git a/requirements.txt b/requirements.txt
index 06f5a80ed..853ae4eb2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,6 @@ flake8==3.7.9
 # ------------------------------------------------------------------------------
 tox==3.14.5
 pytest==5.3.5
-pytest_cases==1.12.2
 pytest-cookies==0.5.1
 pytest-xdist==1.31.0
 pyyaml==5.3
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 39b05d7c6..964c91d7a 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -3,7 +3,6 @@ import re
 
 import pytest
 from cookiecutter.exceptions import FailedHookException
-from pytest_cases import fixture_plus
 import sh
 import yaml
 from binaryornot.check import is_binary
@@ -26,49 +25,62 @@ def context():
     }
 
 
-@fixture_plus
-@pytest.mark.parametrize("windows", ["y", "n"], ids=lambda yn: f"win:{yn}")
-@pytest.mark.parametrize("use_docker", ["y", "n"], ids=lambda yn: f"docker:{yn}")
-@pytest.mark.parametrize("use_celery", ["y", "n"], ids=lambda yn: f"celery:{yn}")
-@pytest.mark.parametrize("use_mailhog", ["y", "n"], ids=lambda yn: f"mailhog:{yn}")
-@pytest.mark.parametrize("use_sentry", ["y", "n"], ids=lambda yn: f"sentry:{yn}")
-@pytest.mark.parametrize("use_compressor", ["y", "n"], ids=lambda yn: f"cmpr:{yn}")
-@pytest.mark.parametrize("use_drf", ["y", "n"], ids=lambda yn: f"drf:{yn}")
-@pytest.mark.parametrize(
-    "use_whitenoise,cloud_provider",
-    [
-        ("y", "AWS"),
-        ("y", "GCP"),
-        ("y", "None"),
-        ("n", "AWS"),
-        ("n", "GCP"),
-        # no whitenoise + no cloud provider is not supported
-    ],
-    ids=lambda id: f"wnoise:{id[0]}-cloud:{id[1]}",
-)
-def context_combination(
-    windows,
-    use_docker,
-    use_celery,
-    use_mailhog,
-    use_sentry,
-    use_compressor,
-    use_whitenoise,
-    use_drf,
-    cloud_provider,
-):
-    """Fixture that parametrize the function where it's used."""
-    return {
-        "windows": windows,
-        "use_docker": use_docker,
-        "use_compressor": use_compressor,
-        "use_celery": use_celery,
-        "use_mailhog": use_mailhog,
-        "use_sentry": use_sentry,
-        "use_whitenoise": use_whitenoise,
-        "use_drf": use_drf,
-        "cloud_provider": cloud_provider,
-    }
+SUPPORTED_COMBINATIONS = [
+    {"open_source_license": "MIT"},
+    {"open_source_license": "BSD"},
+    {"open_source_license": "GPLv3"},
+    {"open_source_license": "Apache Software License 2.0"},
+    {"open_source_license": "Not open source"},
+    {"windows": "y"},
+    {"windows": "n"},
+    {"use_pycharm": "y"},
+    {"use_pycharm": "n"},
+    {"use_docker": "y"},
+    {"use_docker": "n"},
+    {"postgresql_version": "11.3"},
+    {"postgresql_version": "10.8"},
+    {"postgresql_version": "9.6"},
+    {"postgresql_version": "9.5"},
+    {"postgresql_version": "9.4"},
+    {"cloud_provider": "AWS", "use_whitenoise": "y"},
+    {"cloud_provider": "AWS", "use_whitenoise": "n"},
+    {"cloud_provider": "GCP", "use_whitenoise": "y"},
+    {"cloud_provider": "GCP", "use_whitenoise": "n"},
+    {"cloud_provider": "None", "use_whitenoise": "y"},
+    # Note: cloud_provider=None AND use_whitenoise=n is not supported
+    {"use_drf": "y"},
+    {"use_drf": "n"},
+    {"js_task_runner": "None"},
+    {"js_task_runner": "Gulp"},
+    {"custom_bootstrap_compilation": "y"},
+    {"custom_bootstrap_compilation": "n"},
+    {"use_compressor": "y"},
+    {"use_compressor": "n"},
+    {"use_celery": "y"},
+    {"use_celery": "n"},
+    {"use_mailhog": "y"},
+    {"use_mailhog": "n"},
+    {"use_sentry": "y"},
+    {"use_sentry": "n"},
+    {"use_whitenoise": "y"},
+    {"use_whitenoise": "n"},
+    {"use_heroku": "y"},
+    {"use_heroku": "n"},
+    {"ci_tool": "None"},
+    {"ci_tool": "Travis"},
+    {"ci_tool": "Gitlab"},
+    {"keep_local_envs_in_vcs": "y"},
+    {"keep_local_envs_in_vcs": "n"},
+    {"debug": "y"},
+    {"debug": "n"},
+]
+
+UNSUPPORTED_COMBINATIONS = [{"cloud_provider": "None", "use_whitenoise": "n"}]
+
+
+def _fixture_id(ctx):
+    """Helper to get a user friendly test name from the parametrized context."""
+    return "-".join(f"{key}:{value}" for key, value in ctx.items())
 
 
 def build_files_list(root_dir):
@@ -81,9 +93,7 @@ def build_files_list(root_dir):
 
 
 def check_paths(paths):
-    """Method to check all paths have correct substitutions,
-    used by other tests cases
-    """
+    """Method to check all paths have correct substitutions."""
     # Assert that no match is found in any of the files
     for path in paths:
         if is_binary(path):
@@ -95,13 +105,10 @@ def check_paths(paths):
             assert match is None, msg.format(path)
 
 
-def test_project_generation(cookies, context, context_combination):
-    """
-    Test that project is generated and fully rendered.
-
-    This is parametrized for each combination from ``context_combination`` fixture
-    """
-    result = cookies.bake(extra_context={**context, **context_combination})
+@pytest.mark.parametrize("context_override", SUPPORTED_COMBINATIONS, ids=_fixture_id)
+def test_project_generation(cookies, context, context_override):
+    """Test that project is generated and fully rendered."""
+    result = cookies.bake(extra_context={**context, **context_override})
     assert result.exit_code == 0
     assert result.exception is None
     assert result.project.basename == context["project_slug"]
@@ -112,14 +119,10 @@ def test_project_generation(cookies, context, context_combination):
     check_paths(paths)
 
 
-@pytest.mark.flake8
-def test_flake8_passes(cookies, context_combination):
-    """
-    Generated project should pass flake8.
-
-    This is parametrized for each combination from ``context_combination`` fixture
-    """
-    result = cookies.bake(extra_context=context_combination)
+@pytest.mark.parametrize("context_override", SUPPORTED_COMBINATIONS, ids=_fixture_id)
+def test_flake8_passes(cookies, context_override):
+    """Generated project should pass flake8."""
+    result = cookies.bake(extra_context=context_override)
 
     try:
         sh.flake8(str(result.project))
@@ -127,14 +130,10 @@ def test_flake8_passes(cookies, context_combination):
         pytest.fail(e)
 
 
-@pytest.mark.black
-def test_black_passes(cookies, context_combination):
-    """
-    Generated project should pass black.
-
-    This is parametrized for each combination from ``context_combination`` fixture
-    """
-    result = cookies.bake(extra_context=context_combination)
+@pytest.mark.parametrize("context_override", SUPPORTED_COMBINATIONS, ids=_fixture_id)
+def test_black_passes(cookies, context_override):
+    """Generated project should pass black."""
+    result = cookies.bake(extra_context=context_override)
 
     try:
         sh.black("--check", "--diff", "--exclude", "migrations", f"{result.project}/")
@@ -187,9 +186,10 @@ def test_invalid_slug(cookies, context, slug):
     assert isinstance(result.exception, FailedHookException)
 
 
-def test_no_whitenoise_and_no_cloud_provider(cookies, context):
-    """It should not generate project if neither whitenoise or cloud provider are set"""
-    context.update({"use_whitenoise": "n", "cloud_provider": "None"})
+@pytest.mark.parametrize("invalid_context", UNSUPPORTED_COMBINATIONS)
+def test_error_if_incompatible(cookies, context, invalid_context):
+    """It should not generate project an incompatible combination is selected."""
+    context.update(invalid_context)
     result = cookies.bake(extra_context=context)
 
     assert result.exit_code != 0
diff --git a/tox.ini b/tox.ini
index 1c83465cc..737b26e73 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,18 +1,10 @@
 [tox]
 skipsdist = true
-envlist = py37,flake8,black,black-template
+envlist = py37,black-template
 
 [testenv]
 deps = -rrequirements.txt
-commands = pytest -m "not flake8" -m "not black" {posargs:./tests}
-
-[testenv:flake8]
-deps = -rrequirements.txt
-commands = pytest -m flake8 {posargs:./tests}
-
-[testenv:black]
-deps = -rrequirements.txt
-commands = pytest -m black {posargs:./tests}
+commands = pytest {posargs:./tests}
 
 [testenv:black-template]
 deps = black

From fa6ca7b1c853f46a2124ef2f69bb29967409cb13 Mon Sep 17 00:00:00 2001
From: jeromecaisip <jerome.caisip@gmail.com>
Date: Mon, 2 Mar 2020 19:16:33 +0100
Subject: [PATCH 0603/2840] Add rest_framework.authtoken on installed apps.

Add rest_framework.authtoken on installed apps when the option to use DRF is selected,  because the endpoint
'/auth-token/" depends on the said app.
---
 {{cookiecutter.project_slug}}/config/settings/base.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 6ad8e820b..a771ed46e 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -79,6 +79,10 @@ THIRD_PARTY_APPS = [
 {%- if cookiecutter.use_celery == 'y' %}
     "django_celery_beat",
 {%- endif %}
+{% if cookiecutter.use_drf == "y" -%}
+    "rest_framework.authtoken",
+{%- endif %}
+
 ]
 
 LOCAL_APPS = [

From bfe463fa7c5731d0219f113f5f192f9a421aa472 Mon Sep 17 00:00:00 2001
From: jeromecaisip <jerome.caisip@gmail.com>
Date: Mon, 2 Mar 2020 19:27:07 +0100
Subject: [PATCH 0604/2840] Update base.py

---
 {{cookiecutter.project_slug}}/config/settings/base.py | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index a771ed46e..22b1fed81 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -79,10 +79,9 @@ THIRD_PARTY_APPS = [
 {%- if cookiecutter.use_celery == 'y' %}
     "django_celery_beat",
 {%- endif %}
-{% if cookiecutter.use_drf == "y" -%}
+{%- if cookiecutter.use_drf == "y" %}
     "rest_framework.authtoken",
 {%- endif %}
-
 ]
 
 LOCAL_APPS = [

From 4fd15474b1806ea06554451efec59708f3a349a1 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 3 Mar 2020 11:00:31 +0000
Subject: [PATCH 0605/2840] Update collectfast from 2.0.1 to 2.1.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 62fe3e40c..f0c4fed12 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -5,7 +5,7 @@
 gunicorn==20.0.4  # https://github.com/benoitc/gunicorn
 psycopg2==2.8.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
-Collectfast==2.0.1  # https://github.com/antonagestam/collectfast
+Collectfast==2.1.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
 sentry-sdk==0.14.2  # https://github.com/getsentry/sentry-python

From ff43635bb784e005593489368a72a101c79b865b Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 3 Mar 2020 11:00:36 +0000
Subject: [PATCH 0606/2840] Update celery from 4.4.0 to 4.4.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 99c9d4cd9..44c2600f2 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -10,7 +10,7 @@ whitenoise==5.0.1  # https://github.com/evansd/whitenoise
 {%- endif %}
 redis==3.4.1 # https://github.com/andymccurdy/redis-py
 {%- if cookiecutter.use_celery == "y" %}
-celery==4.4.0  # pyup: < 5.0  # https://github.com/celery/celery
+celery==4.4.1  # pyup: < 5.0  # https://github.com/celery/celery
 django-celery-beat==2.0.0  # https://github.com/celery/django-celery-beat
 {%- if cookiecutter.use_docker == 'y' %}
 flower==0.9.3  # https://github.com/mher/flower

From 4825b932c7e81075db901abae019fcd358467a5c Mon Sep 17 00:00:00 2001
From: jeromecaisip <jerome.caisip@gmail.com>
Date: Tue, 3 Mar 2020 14:45:20 +0100
Subject: [PATCH 0607/2840] Optionally remove/add restframework according to
 choice

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

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 99c9d4cd9..601ee96ff 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,5 +29,7 @@ django-compressor==2.4  # https://github.com/django-compressor/django-compressor
 {%- endif %}
 django-redis==4.11.0  # https://github.com/niwinz/django-redis
 
+{%- if cookiecutter.use_drf == "y" %}
 # Django REST Framework
 djangorestframework==3.11.0  # https://github.com/encode/django-rest-framework
+{%- endif %}

From a24a6f337b6bf6c15b92df84937c0731d82f4401 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 3 Mar 2020 18:56:18 +0000
Subject: [PATCH 0608/2840] Add Heroku dyno for celery beat

---
 {{cookiecutter.project_slug}}/Procfile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/{{cookiecutter.project_slug}}/Procfile b/{{cookiecutter.project_slug}}/Procfile
index 5b8e9eaf8..3838eafd7 100644
--- a/{{cookiecutter.project_slug}}/Procfile
+++ b/{{cookiecutter.project_slug}}/Procfile
@@ -2,4 +2,5 @@ release: python manage.py migrate
 web: gunicorn config.wsgi:application
 {% if cookiecutter.use_celery == "y" -%}
 worker: celery worker --app=config.celery_app --loglevel=info
+beat: celery beat --app=config.celery_app --loglevel=info
 {%- endif %}

From 52dc302c9326dab67fe5f6673f032bfd15634f87 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 3 Mar 2020 19:37:27 +0000
Subject: [PATCH 0609/2840] Better error reporting in case of flake8 or black
 error

---
 tests/test_cookiecutter_generation.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 964c91d7a..e51e4b9fa 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -127,7 +127,7 @@ def test_flake8_passes(cookies, context_override):
     try:
         sh.flake8(str(result.project))
     except sh.ErrorReturnCode as e:
-        pytest.fail(e)
+        pytest.fail(e.stdout.decode())
 
 
 @pytest.mark.parametrize("context_override", SUPPORTED_COMBINATIONS, ids=_fixture_id)
@@ -138,7 +138,7 @@ def test_black_passes(cookies, context_override):
     try:
         sh.black("--check", "--diff", "--exclude", "migrations", f"{result.project}/")
     except sh.ErrorReturnCode as e:
-        pytest.fail(e)
+        pytest.fail(e.stdout.decode())
 
 
 def test_travis_invokes_pytest(cookies, context):

From fab6b8724aea351dc9ef46e17245875bfaf719d2 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 3 Mar 2020 19:53:15 +0000
Subject: [PATCH 0610/2840] Test isort flake8-isort & fix issues

fixes #2123
---
 pytest.ini                                                  | 2 +-
 requirements.txt                                            | 1 +
 {{cookiecutter.project_slug}}/.editorconfig                 | 4 ++--
 {{cookiecutter.project_slug}}/config/api_router.py          | 3 ++-
 {{cookiecutter.project_slug}}/config/celery_app.py          | 1 +
 {{cookiecutter.project_slug}}/config/settings/production.py | 1 +
 {{cookiecutter.project_slug}}/config/urls.py                | 6 +++---
 {{cookiecutter.project_slug}}/requirements/local.txt        | 1 +
 .../{{cookiecutter.project_slug}}/users/api/serializers.py  | 1 +
 .../{{cookiecutter.project_slug}}/users/api/views.py        | 2 +-
 .../{{cookiecutter.project_slug}}/users/forms.py            | 2 +-
 .../{{cookiecutter.project_slug}}/users/tests/test_tasks.py | 1 -
 .../{{cookiecutter.project_slug}}/users/tests/test_urls.py  | 2 +-
 .../{{cookiecutter.project_slug}}/users/urls.py             | 2 +-
 .../{{cookiecutter.project_slug}}/users/views.py            | 4 ++--
 15 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/pytest.ini b/pytest.ini
index 5d5a9c932..edf3a7c34 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,4 +1,4 @@
 [pytest]
-addopts = -x --tb=short
+addopts = --tb=short
 python_paths = .
 norecursedirs = .tox .git */migrations/* */static/* docs venv */{{cookiecutter.project_slug}}/*
diff --git a/requirements.txt b/requirements.txt
index 853ae4eb2..56f72f9b5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,6 +6,7 @@ binaryornot==0.4.4
 # ------------------------------------------------------------------------------
 black==19.10b0
 flake8==3.7.9
+flake8-isort==2.8.0
 
 # Testing
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/.editorconfig b/{{cookiecutter.project_slug}}/.editorconfig
index 792dd3b06..39c15f079 100644
--- a/{{cookiecutter.project_slug}}/.editorconfig
+++ b/{{cookiecutter.project_slug}}/.editorconfig
@@ -13,8 +13,8 @@ indent_style = space
 indent_size = 4
 
 [*.py]
-line_length = 120
-known_first_party = {{ cookiecutter.project_slug }}
+line_length = 88
+known_first_party = {{cookiecutter.project_slug}},config
 multi_line_output = 3
 default_section = THIRDPARTY
 recursive = true
diff --git a/{{cookiecutter.project_slug}}/config/api_router.py b/{{cookiecutter.project_slug}}/config/api_router.py
index 46a797a74..743069b2c 100644
--- a/{{cookiecutter.project_slug}}/config/api_router.py
+++ b/{{cookiecutter.project_slug}}/config/api_router.py
@@ -1,5 +1,6 @@
-from rest_framework.routers import DefaultRouter, SimpleRouter
 from django.conf import settings
+from rest_framework.routers import DefaultRouter, SimpleRouter
+
 from {{ cookiecutter.project_slug }}.users.api.views import UserViewSet
 
 if settings.DEBUG:
diff --git a/{{cookiecutter.project_slug}}/config/celery_app.py b/{{cookiecutter.project_slug}}/config/celery_app.py
index e275f054f..0728a649e 100644
--- a/{{cookiecutter.project_slug}}/config/celery_app.py
+++ b/{{cookiecutter.project_slug}}/config/celery_app.py
@@ -1,4 +1,5 @@
 import os
+
 from celery import Celery
 
 # set the default Django settings module for the 'celery' program.
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 36667b33a..73ce4d648 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -1,3 +1,4 @@
+"""isort:skip_file"""
 {% if cookiecutter.use_sentry == 'y' -%}
 import logging
 
diff --git a/{{cookiecutter.project_slug}}/config/urls.py b/{{cookiecutter.project_slug}}/config/urls.py
index 382bf8951..818609061 100644
--- a/{{cookiecutter.project_slug}}/config/urls.py
+++ b/{{cookiecutter.project_slug}}/config/urls.py
@@ -1,10 +1,10 @@
 from django.conf import settings
-from django.urls import include, path
 from django.conf.urls.static import static
 from django.contrib import admin
-from django.views.generic import TemplateView
+from django.urls import include, path
 from django.views import defaults as default_views
-{% if cookiecutter.use_drf == 'y' -%}
+from django.views.generic import TemplateView
+{%- if cookiecutter.use_drf == 'y' %}
 from rest_framework.authtoken.views import obtain_auth_token
 {%- endif %}
 
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index e70cb63fd..33c0dc36d 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -19,6 +19,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 # Code quality
 # ------------------------------------------------------------------------------
 flake8==3.7.9  # https://github.com/PyCQA/flake8
+flake8-isort==2.8.0  # https://github.com/gforcada/flake8-isort
 coverage==5.0.3  # https://github.com/nedbat/coveragepy
 black==19.10b0  # https://github.com/ambv/black
 pylint-django==2.0.14  # https://github.com/PyCQA/pylint-django
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py
index bb52738b7..04bf4c85e 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py
@@ -1,4 +1,5 @@
 from rest_framework import serializers
+
 from {{ cookiecutter.project_slug }}.users.models import User
 
 
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/views.py
index 7b5af999b..288ea7ab2 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/views.py
@@ -1,7 +1,7 @@
 from django.contrib.auth import get_user_model
 from rest_framework import status
 from rest_framework.decorators import action
-from rest_framework.mixins import RetrieveModelMixin, ListModelMixin, UpdateModelMixin
+from rest_framework.mixins import ListModelMixin, RetrieveModelMixin, UpdateModelMixin
 from rest_framework.response import Response
 from rest_framework.viewsets import GenericViewSet
 
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
index 250cc9040..25065419a 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
@@ -1,4 +1,4 @@
-from django.contrib.auth import get_user_model, forms
+from django.contrib.auth import forms, get_user_model
 from django.core.exceptions import ValidationError
 from django.utils.translation import ugettext_lazy as _
 
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_tasks.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_tasks.py
index addb091db..61586b5ca 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_tasks.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_tasks.py
@@ -1,7 +1,6 @@
 import pytest
 from celery.result import EagerResult
 
-
 from {{ cookiecutter.project_slug }}.users.tasks import get_users_count
 from {{ cookiecutter.project_slug }}.users.tests.factories import UserFactory
 
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
index 933396ba0..aab6d0a87 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
@@ -1,5 +1,5 @@
 import pytest
-from django.urls import reverse, resolve
+from django.urls import resolve, reverse
 
 from {{ cookiecutter.project_slug }}.users.models import User
 
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py
index eff24dd04..8c8c7e2ea 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py
@@ -1,9 +1,9 @@
 from django.urls import path
 
 from {{ cookiecutter.project_slug }}.users.views import (
+    user_detail_view,
     user_redirect_view,
     user_update_view,
-    user_detail_view,
 )
 
 app_name = "users"
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
index 5c0d5b5c2..f0e81dffc 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
@@ -1,9 +1,9 @@
+from django.contrib import messages
 from django.contrib.auth import get_user_model
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.urls import reverse
-from django.views.generic import DetailView, RedirectView, UpdateView
-from django.contrib import messages
 from django.utils.translation import ugettext_lazy as _
+from django.views.generic import DetailView, RedirectView, UpdateView
 
 User = get_user_model()
 

From e1141d699945d5dfbf1d163cea989e04dd06eb42 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 3 Mar 2020 20:33:44 +0000
Subject: [PATCH 0611/2840] Remove pytest-xdist to try get a better output

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

diff --git a/requirements.txt b/requirements.txt
index 56f72f9b5..bc8767466 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,5 +13,4 @@ flake8-isort==2.8.0
 tox==3.14.5
 pytest==5.3.5
 pytest-cookies==0.5.1
-pytest-xdist==1.31.0
 pyyaml==5.3

From c8fc7cf119583018665b4dd71fa5c40f11a304b5 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 3 Mar 2020 20:46:13 +0000
Subject: [PATCH 0612/2840] Add pytest-instafail plugin to get failures earlier

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

diff --git a/requirements.txt b/requirements.txt
index bc8767466..140dc2cdd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,4 +13,5 @@ flake8-isort==2.8.0
 tox==3.14.5
 pytest==5.3.5
 pytest-cookies==0.5.1
+pytest-instafail==0.4.1.post0
 pyyaml==5.3

From 7f957564a19871022e7ee34b12de72f7eb4047ef Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 3 Mar 2020 20:46:35 +0000
Subject: [PATCH 0613/2840] Bump pytest verbosity

---
 pytest.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pytest.ini b/pytest.ini
index edf3a7c34..03ca13891 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,4 +1,4 @@
 [pytest]
-addopts = --tb=short
+addopts = -v --tb=short
 python_paths = .
 norecursedirs = .tox .git */migrations/* */static/* docs venv */{{cookiecutter.project_slug}}/*

From effb548b5de992349d86a27e1a50acc94eb92bae Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 4 Mar 2020 11:00:32 +0000
Subject: [PATCH 0614/2840] Update django from 2.2.10 to 2.2.11

---
 {{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 44c2600f2..e4bb31baf 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -19,7 +19,7 @@ flower==0.9.3  # https://github.com/mher/flower
 
 # Django
 # ------------------------------------------------------------------------------
-django==2.2.10  # pyup: < 3.0  # https://www.djangoproject.com/
+django==2.2.11  # pyup: < 3.0  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==4.0.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.41.0  # https://github.com/pennersr/django-allauth

From 2fd0cf0e35aad2cf5743967c1620c1c5da7513d5 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 4 Mar 2020 11:00:36 +0000
Subject: [PATCH 0615/2840] Update ipdb from 0.13.1 to 0.13.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 33c0dc36d..80558f5c7 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,7 +1,7 @@
 -r ./base.txt
 
 Werkzeug==1.0.0 # https://github.com/pallets/werkzeug
-ipdb==0.13.1  # https://github.com/gotcha/ipdb
+ipdb==0.13.2  # https://github.com/gotcha/ipdb
 Sphinx==2.4.3  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2

From 09fd30b6a87f004d0f319af28968c13ad317b01e Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 6 Mar 2020 11:00:31 +0000
Subject: [PATCH 0616/2840] Update sphinx from 2.4.3 to 2.4.4

---
 {{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 80558f5c7..dcffd53ec 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -2,7 +2,7 @@
 
 Werkzeug==1.0.0 # https://github.com/pallets/werkzeug
 ipdb==0.13.2  # https://github.com/gotcha/ipdb
-Sphinx==2.4.3  # https://github.com/sphinx-doc/sphinx
+Sphinx==2.4.4  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}

From 3a3550cd3f4abe2990298d2d9c5368e88bdf6817 Mon Sep 17 00:00:00 2001
From: jeromecaisip <jerome.caisip@gmail.com>
Date: Sun, 8 Mar 2020 17:55:19 +0100
Subject: [PATCH 0617/2840] Update base.txt

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

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 601ee96ff..3b72da7f6 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -28,7 +28,6 @@ django-crispy-forms==1.9.0  # https://github.com/django-crispy-forms/django-cris
 django-compressor==2.4  # https://github.com/django-compressor/django-compressor
 {%- endif %}
 django-redis==4.11.0  # https://github.com/niwinz/django-redis
-
 {%- if cookiecutter.use_drf == "y" %}
 # Django REST Framework
 djangorestframework==3.11.0  # https://github.com/encode/django-rest-framework

From 9ec538962ec692a3a65241038b5b57906c01e559 Mon Sep 17 00:00:00 2001
From: Daniel Roy Greenfeld <pydanny@users.noreply.github.com>
Date: Mon, 9 Mar 2020 13:51:23 -0700
Subject: [PATCH 0618/2840] Update FUNDING.yml

---
 .github/FUNDING.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 9f4c97f31..6ea27a8f0 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,7 +1,7 @@
 # These are supported funding model platforms
 
 github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
-patreon: danielroygreenfeld
+patreon: roygreenfeld
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel

From 427c69562e94063a650215f72a2524c6fe37c031 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 11 Mar 2020 11:00:31 +0000
Subject: [PATCH 0619/2840] Update mypy from 0.761 to 0.770

---
 {{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 dcffd53ec..ddc5d2a51 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -11,7 +11,7 @@ psycopg2-binary==2.8.4  # https://github.com/psycopg/psycopg2
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.761  # https://github.com/python/mypy
+mypy==0.770  # https://github.com/python/mypy
 django-stubs==1.4.0  # https://github.com/typeddjango/django-stubs
 pytest==5.3.5  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar

From 7e345d5fb3fa17bb1b547198dc1d223c2ef391c2 Mon Sep 17 00:00:00 2001
From: Agustin Scaramuzza <agustinscaramuzza@gmail.com>
Date: Wed, 11 Mar 2020 14:37:12 -0300
Subject: [PATCH 0620/2840] Add PYTHONDONTWRITEBYTECODE flag to local
 development Dockerfile

---
 CONTRIBUTORS.rst                                              | 1 +
 {{cookiecutter.project_slug}}/compose/local/django/Dockerfile | 1 +
 2 files changed, 2 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 86804b69d..edb2ccdd3 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -49,6 +49,7 @@ Listed in alphabetical order.
   Adam Dobrawy             `@ad-m`_
   Adam Steele              `@adammsteele`_
   Agam Dua
+  Agustín Scaramuzza       `@scaramagus`_               @scaramagus
   Alberto Sanchez          `@alb3rto`_
   Alex Tsai                `@caffodian`_
   Alvaro [Andor]           `@andor-pierdelacabeza`_
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index 94c799520..6a356ac60 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -1,6 +1,7 @@
 FROM python:3.7-slim-buster
 
 ENV PYTHONUNBUFFERED 1
+ENV PYTHONDONTWRITEBYTECODE 1
 
 RUN apt-get update \
   # dependencies for building Python packages

From 324e3074029cccb4d0e4b1ca155087798f7f88cc Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 13 Mar 2020 11:00:34 +0000
Subject: [PATCH 0621/2840] Update pre-commit from 2.1.1 to 2.2.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 ddc5d2a51..fd8c104ab 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -26,7 +26,7 @@ pylint-django==2.0.14  # 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.1.1  # https://github.com/pre-commit/pre-commit
+pre-commit==2.2.0  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From 81d9274e09fdbbd72ad959ac5daf1b8e93b0db57 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 13 Mar 2020 07:21:10 -0700
Subject: [PATCH 0622/2840] Update pytest from 5.3.5 to 5.4.1

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

diff --git a/requirements.txt b/requirements.txt
index 140dc2cdd..bc8292a8c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8-isort==2.8.0
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.14.5
-pytest==5.3.5
+pytest==5.4.1
 pytest-cookies==0.5.1
 pytest-instafail==0.4.1.post0
 pyyaml==5.3

From 6d0a187addb1fb616568859f268ab503870d2d00 Mon Sep 17 00:00:00 2001
From: Daniel Roy Greenfeld <pydanny@users.noreply.github.com>
Date: Fri, 13 Mar 2020 14:32:25 -0700
Subject: [PATCH 0623/2840] Update FUNDING.yml

---
 .github/FUNDING.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 6ea27a8f0..5a5aefc78 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2]
+github: pydanny
 patreon: roygreenfeld
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username

From 397889050205bda8ee819200bb20920d3006b1d7 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Sat, 14 Mar 2020 13:43:37 -0400
Subject: [PATCH 0624/2840] Adjusted readability * Changed Vanilla/Plain
 Django-Anymail to Other SMTP * Made Mailgun default again *
 config/production.py adjusted if conditions according to @browniebroke

---
 cookiecutter.json                             |  4 +-
 .../config/settings/production.py             | 81 ++++++++++---------
 .../requirements/production.txt               |  8 +-
 3 files changed, 49 insertions(+), 44 deletions(-)

diff --git a/cookiecutter.json b/cookiecutter.json
index 5e85af486..cfa1b346a 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -34,15 +34,15 @@
     "None"
   ],
   "mail_service": [
-    "{% if cookiecutter.cloud_provider == 'AWS' %}Amazon SES{% else %}Plain/Vanilla Django-Anymail{% endif %}",
     "Mailgun",
+    "Amazon SES",
     "Mailjet",
     "Mandrill",
     "Postmark",
     "Sendgrid",
     "SendinBlue",
     "SparkPost",
-    "Plain/Vanilla Django-Anymail"
+    "Other SMTP"
   ],
   "use_drf": "n",
   "custom_bootstrap_compilation": "n",
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index e227186e9..6b07141dc 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -187,62 +187,58 @@ ADMIN_URL = env("DJANGO_ADMIN_URL")
 # ------------------------------------------------------------------------------
 # https://anymail.readthedocs.io/en/stable/installation/#installing-anymail
 INSTALLED_APPS += ["anymail"]  # noqa F405
-{%- if cookiecutter.mail_service == 'Amazon SES' %}
-EMAIL_BACKEND = "anymail.backends.amazon_ses.EmailBackend"
-{%- elif cookiecutter.mail_service == 'Mailgun' %}
-EMAIL_BACKEND = "anymail.backends.mailgun.EmailBackend"
-{%- elif cookiecutter.mail_service == 'Mailjet' %}
-EMAIL_BACKEND = "anymail.backends.mailjet.EmailBackend"
-{%- elif cookiecutter.mail_service == 'Mandrill' %}
-EMAIL_BACKEND = "anymail.backends.mandrill.EmailBackend"
-{%- elif cookiecutter.mail_service == 'Postmark' %}
-EMAIL_BACKEND = "anymail.backends.postmark.EmailBackend"
-{%- elif cookiecutter.mail_service == 'Sendgrid' %}
-EMAIL_BACKEND = "anymail.backends.sendgrid.EmailBackend"
-{%- elif cookiecutter.mail_service == 'SendinBlue' %}
-EMAIL_BACKEND = "anymail.backends.sendinblue.EmailBackend"
-{%- elif cookiecutter.mail_service == 'SparkPost' %}
-EMAIL_BACKEND = "anymail.backends.sparkpost.EmailBackend"
-{%- elif cookiecutter.mail_service == 'Plain/Vanilla Django-Anymail' %}
-EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
-# https://docs.djangoproject.com/en/3.0/ref/settings/#email-backend
-{%- endif %}
+# https://docs.djangoproject.com/en/dev/ref/settings/#email-backend
 # https://anymail.readthedocs.io/en/stable/installation/#anymail-settings-reference
+{%- if cookiecutter.mail_service == 'Mailgun' %}
+# https://anymail.readthedocs.io/en/stable/esps/mailgun/
+EMAIL_BACKEND = "anymail.backends.mailgun.EmailBackend"
 ANYMAIL = {
-    # https://anymail.readthedocs.io/en/stable/esps/
-    {%- if cookiecutter.mail_service == 'Amazon SES' %}
-    # https://anymail.readthedocs.io/en/stable/esps/amazon_ses/
-    {%- elif cookiecutter.mail_service == 'Mailgun' %}
     "MAILGUN_API_KEY": env("MAILGUN_API_KEY"),
     "MAILGUN_SENDER_DOMAIN": env("MAILGUN_DOMAIN"),
     "MAILGUN_API_URL": env(
         "MAILGUN_API_URL",
         default="https://api.mailgun.net/v3"
     ),
-    # https://anymail.readthedocs.io/en/stable/esps/mailgun/
-    {%- elif cookiecutter.mail_service == 'Mailjet' %}
+}
+{%- elif cookiecutter.mail_service == 'Amazon SES' %}
+# https://anymail.readthedocs.io/en/stable/esps/amazon_ses/
+EMAIL_BACKEND = "anymail.backends.amazon_ses.EmailBackend"
+ANYMAIL = {}
+{%- elif cookiecutter.mail_service == 'Mailjet' %}
+# https://anymail.readthedocs.io/en/stable/esps/mailjet/
+EMAIL_BACKEND = "anymail.backends.mailjet.EmailBackend"
+ANYMAIL = {
     "MAILJET_API_KEY": env("MAILJET_API_KEY"),
     "MAILJET_SECRET_KEY": env("MAILJET_SECRET_KEY"),
     "MAILJET_API_URL": env(
         "MAILJET_API_URL",
         default="https://api.mailjet.com/v3"
     ),
-    # https://anymail.readthedocs.io/en/stable/esps/mailjet/
-    {%- elif cookiecutter.mail_service == 'Mandrill' %}
+}
+{%- elif cookiecutter.mail_service == 'Mandrill' %}
+# https://anymail.readthedocs.io/en/stable/esps/mandrill/
+EMAIL_BACKEND = "anymail.backends.mandrill.EmailBackend"
+ANYMAIL = {
     "MANDRILL_API_KEY": env("MANDRILL_API_KEY"),
     "MANDRILL_API_URL": env(
         "MANDRILL_API_URL",
         default="https://mandrillapp.com/api/1.0"
     ),
-    # https://anymail.readthedocs.io/en/stable/esps/mandrill/
-    {%- elif cookiecutter.mail_service == 'Postmark' %}
+}
+{%- elif cookiecutter.mail_service == 'Postmark' %}
+# https://anymail.readthedocs.io/en/stable/esps/postmark/
+EMAIL_BACKEND = "anymail.backends.postmark.EmailBackend"
+ANYMAIL = {
     "POSTMARK_SERVER_TOKEN": env("POSTMARK_SERVER_TOKEN"),
     "POSTMARK_API_URL": env(
         "POSTMARK_API_URL",
         default="https://api.postmarkapp.com/"
     ),
-    # https://anymail.readthedocs.io/en/stable/esps/postmark/
-    {%- elif cookiecutter.mail_service == 'Sendgrid' %}
+}
+{%- elif cookiecutter.mail_service == 'Sendgrid' %}
+# https://anymail.readthedocs.io/en/stable/esps/sendgrid/
+EMAIL_BACKEND = "anymail.backends.sendgrid.EmailBackend"
+ANYMAIL = {
     "SENDGRID_API_KEY": env("SENDGRID_API_KEY"),
     "SENDGRID_GENERATE_MESSAGE_ID": env("SENDGRID_GENERATE_MESSAGE_ID"),
     "SENDGRID_MERGE_FIELD_FORMAT": env("SENDGRID_MERGE_FIELD_FORMAT"),
@@ -250,23 +246,32 @@ ANYMAIL = {
         "SENDGRID_API_URL",
         default="https://api.sendgrid.com/v3/"
     ),
-    # https://anymail.readthedocs.io/en/stable/esps/sendgrid/
-    {%- elif cookiecutter.mail_service == 'SendinBlue' %}
+}
+{%- elif cookiecutter.mail_service == 'SendinBlue' %}
+# https://anymail.readthedocs.io/en/stable/esps/sendinblue/
+EMAIL_BACKEND = "anymail.backends.sendinblue.EmailBackend"
+ANYMAIL = {
     "SENDINBLUE_API_KEY": env("SENDINBLUE_API_KEY"),
     "SENDINBLUE_API_URL": env(
         "SENDINBLUE_API_URL",
         default="https://api.sendinblue.com/v3/"
     ),
-    # https://anymail.readthedocs.io/en/stable/esps/sendinblue/
-    {%- elif cookiecutter.mail_service == 'SparkPost' %}
+}
+{%- elif cookiecutter.mail_service == 'SparkPost' %}
+# https://anymail.readthedocs.io/en/stable/esps/sparkpost/
+EMAIL_BACKEND = "anymail.backends.sparkpost.EmailBackend"
+ANYMAIL = {
     "SPARKPOST_API_KEY": env("SPARKPOST_API_KEY"),
     "SPARKPOST_API_URL": env(
         "SPARKPOST_API_URL",
         default="https://api.sparkpost.com/api/v1"
     ),
-    # https://anymail.readthedocs.io/en/stable/esps/sparkpost/
-    {%- endif %}
 }
+{%- elif cookiecutter.mail_service == 'Other SMTP' %}
+# https://anymail.readthedocs.io/en/stable/esps
+EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
+ANYMAIL = {}
+{%- endif %}
 
 {% if cookiecutter.use_compressor == 'y' -%}
 # django-compressor
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 06e2a4d2e..da9cbc97a 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -18,10 +18,10 @@ django-storages[boto3]==1.9.1  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
 django-storages[google]==1.9.1  # https://github.com/jschneier/django-storages
 {%- endif %}
-{%- if cookiecutter.mail_service == 'Amazon SES' %}
-django-anymail[amazon_ses]==7.0.0  # https://github.com/anymail/django-anymail
-{%- elif cookiecutter.mail_service == 'Mailgun' %}
+{%- if cookiecutter.mail_service == 'Mailgun' %}
 django-anymail[mailgun]==7.0.0  # https://github.com/anymail/django-anymail
+{%- elif cookiecutter.mail_service == 'Amazon SES' %}
+django-anymail[amazon_ses]==7.0.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
 django-anymail[mailjet]==7.0.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
@@ -34,6 +34,6 @@ django-anymail[sendgrid]==7.0.0  # https://github.com/anymail/django-anymail
 django-anymail[sendinblue]==7.0.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
 django-anymail[sparkpost]==7.0.0  # https://github.com/anymail/django-anymail
-{%- elif cookiecutter.mail_service == 'Plain/Vanilla Django-Anymail' %}
+{%- elif cookiecutter.mail_service == 'Other SMTP' %}
 django-anymail==7.0.0  # https://github.com/anymail/django-anymail
 {%- endif %}

From 5e1d1dd1c39b92bae280ae071b3e20cad1c88ae2 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Sat, 14 Mar 2020 15:09:05 -0400
Subject: [PATCH 0625/2840] Fixed tests for mail providers

---
 tests/test_cookiecutter_generation.py         | 20 ++++++-------
 .../config/settings/production.py             | 29 +++++--------------
 2 files changed, 16 insertions(+), 33 deletions(-)

diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index d4db10856..91f44ae5a 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -48,6 +48,15 @@ SUPPORTED_COMBINATIONS = [
     {"cloud_provider": "GCP", "use_whitenoise": "n"},
     {"cloud_provider": "None", "use_whitenoise": "y"},
     # Note: cloud_provider=None AND use_whitenoise=n is not supported
+    {"mail_service": "Mailgun"},
+    {"mail_service": "Amazon SES"},
+    {"mail_service": "Mailjet"},
+    {"mail_service": "Mandrill"},
+    {"mail_service": "Postmark"},
+    {"mail_service": "Sendgrid"},
+    {"mail_service": "SendinBlue"},
+    {"mail_service": "SparkPost"},
+    {"mail_service": "Other SMTP"},
     {"use_drf": "y"},
     {"use_drf": "n"},
     {"js_task_runner": "None"},
@@ -73,21 +82,10 @@ SUPPORTED_COMBINATIONS = [
     {"keep_local_envs_in_vcs": "n"},
     {"debug": "y"},
     {"debug": "n"},
-    {"mail_service", "AWS SES"},
-    {"mail_service", "Mailgun"},
-    {"mail_service", "Mailjet"},
-    {"mail_service", "Mandrill"},
-    {"mail_service", "Postmark"},
-    {"mail_service", "Sendgrid"},
-    {"mail_service", "SendinBlue"},
-    {"mail_service", "SparkPost"},
-    {"mail_service", "Other SMTP"},
 ]
 
 UNSUPPORTED_COMBINATIONS = [
     {"cloud_provider": "None", "use_whitenoise": "n"},
-    {"cloud_provider": "GCP", "mail_service": "Amazon SES"},
-    {"cloud_provider": "None", "mail_service": "Amazon SES"}
 ]
 
 
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 6b07141dc..13e8c6971 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -195,10 +195,7 @@ EMAIL_BACKEND = "anymail.backends.mailgun.EmailBackend"
 ANYMAIL = {
     "MAILGUN_API_KEY": env("MAILGUN_API_KEY"),
     "MAILGUN_SENDER_DOMAIN": env("MAILGUN_DOMAIN"),
-    "MAILGUN_API_URL": env(
-        "MAILGUN_API_URL",
-        default="https://api.mailgun.net/v3"
-    ),
+    "MAILGUN_API_URL": env("MAILGUN_API_URL", default="https://api.mailgun.net/v3"),
 }
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
 # https://anymail.readthedocs.io/en/stable/esps/amazon_ses/
@@ -210,10 +207,7 @@ EMAIL_BACKEND = "anymail.backends.mailjet.EmailBackend"
 ANYMAIL = {
     "MAILJET_API_KEY": env("MAILJET_API_KEY"),
     "MAILJET_SECRET_KEY": env("MAILJET_SECRET_KEY"),
-    "MAILJET_API_URL": env(
-        "MAILJET_API_URL",
-        default="https://api.mailjet.com/v3"
-    ),
+    "MAILJET_API_URL": env("MAILJET_API_URL", default="https://api.mailjet.com/v3"),
 }
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
 # https://anymail.readthedocs.io/en/stable/esps/mandrill/
@@ -221,8 +215,7 @@ EMAIL_BACKEND = "anymail.backends.mandrill.EmailBackend"
 ANYMAIL = {
     "MANDRILL_API_KEY": env("MANDRILL_API_KEY"),
     "MANDRILL_API_URL": env(
-        "MANDRILL_API_URL",
-        default="https://mandrillapp.com/api/1.0"
+        "MANDRILL_API_URL", default="https://mandrillapp.com/api/1.0"
     ),
 }
 {%- elif cookiecutter.mail_service == 'Postmark' %}
@@ -230,10 +223,7 @@ ANYMAIL = {
 EMAIL_BACKEND = "anymail.backends.postmark.EmailBackend"
 ANYMAIL = {
     "POSTMARK_SERVER_TOKEN": env("POSTMARK_SERVER_TOKEN"),
-    "POSTMARK_API_URL": env(
-        "POSTMARK_API_URL",
-        default="https://api.postmarkapp.com/"
-    ),
+    "POSTMARK_API_URL": env("POSTMARK_API_URL", default="https://api.postmarkapp.com/"),
 }
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
 # https://anymail.readthedocs.io/en/stable/esps/sendgrid/
@@ -242,10 +232,7 @@ ANYMAIL = {
     "SENDGRID_API_KEY": env("SENDGRID_API_KEY"),
     "SENDGRID_GENERATE_MESSAGE_ID": env("SENDGRID_GENERATE_MESSAGE_ID"),
     "SENDGRID_MERGE_FIELD_FORMAT": env("SENDGRID_MERGE_FIELD_FORMAT"),
-    "SENDGRID_API_URL": env(
-        "SENDGRID_API_URL",
-        default="https://api.sendgrid.com/v3/"
-    ),
+    "SENDGRID_API_URL": env("SENDGRID_API_URL", default="https://api.sendgrid.com/v3/"),
 }
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
 # https://anymail.readthedocs.io/en/stable/esps/sendinblue/
@@ -253,8 +240,7 @@ EMAIL_BACKEND = "anymail.backends.sendinblue.EmailBackend"
 ANYMAIL = {
     "SENDINBLUE_API_KEY": env("SENDINBLUE_API_KEY"),
     "SENDINBLUE_API_URL": env(
-        "SENDINBLUE_API_URL",
-        default="https://api.sendinblue.com/v3/"
+        "SENDINBLUE_API_URL", default="https://api.sendinblue.com/v3/"
     ),
 }
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
@@ -263,8 +249,7 @@ EMAIL_BACKEND = "anymail.backends.sparkpost.EmailBackend"
 ANYMAIL = {
     "SPARKPOST_API_KEY": env("SPARKPOST_API_KEY"),
     "SPARKPOST_API_URL": env(
-        "SPARKPOST_API_URL",
-        default="https://api.sparkpost.com/api/v1"
+        "SPARKPOST_API_URL", default="https://api.sparkpost.com/api/v1"
     ),
 }
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}

From 95057c47695c4a7f0535dd7aba7b13c6f004eb1c Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sun, 15 Mar 2020 11:00:30 +0000
Subject: [PATCH 0626/2840] Update django-stubs from 1.4.0 to 1.5.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 fd8c104ab..ee2e1d41e 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -12,7 +12,7 @@ psycopg2-binary==2.8.4  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.770  # https://github.com/python/mypy
-django-stubs==1.4.0  # https://github.com/typeddjango/django-stubs
+django-stubs==1.5.0  # https://github.com/typeddjango/django-stubs
 pytest==5.3.5  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 

From fa8311405d98bef284301424006c93cf4e7fc06e Mon Sep 17 00:00:00 2001
From: Guilherme Guy <guilhermeguy349@gmail.com>
Date: Sun, 15 Mar 2020 09:23:21 -0300
Subject: [PATCH 0627/2840] Fixes gitlabCI failing due to postgres config

---
 {{cookiecutter.project_slug}}/.gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
index 15ff73b10..91ad7238c 100644
--- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml
+++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
@@ -6,6 +6,7 @@ variables:
   POSTGRES_USER: '{{ cookiecutter.project_slug }}'
   POSTGRES_PASSWORD: ''
   POSTGRES_DB: 'test_{{ cookiecutter.project_slug }}'
+  POSTGRES_HOST_AUTH_METHOD: trust
 
 flake8:
   stage: lint

From 0822add31145a6a8ba27ce8455087b841f29a3c8 Mon Sep 17 00:00:00 2001
From: Guilherme Guy <guilhermeguy349@gmail.com>
Date: Sun, 15 Mar 2020 09:29:07 -0300
Subject: [PATCH 0628/2840] Adds @guilherme1guy to CONTRIBUTORS

---
 CONTRIBUTORS.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 86804b69d..fb65dc274 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -118,6 +118,7 @@ Listed in alphabetical order.
   Garry Cairns             `@garry-cairns`_
   Garry Polley             `@garrypolley`_
   Gilbishkosma             `@Gilbishkosma`_
+  Guilherme Guy            `@guilherme1guy`_
   Hamish Durkin            `@durkode`_
   Hana Quadara             `@hanaquadara`_
   Harry Moreno             `@morenoh149`_                @morenoh149
@@ -275,6 +276,7 @@ Listed in alphabetical order.
 .. _@dhepper: https://github.com/dhepper
 .. _@dot2dotseurat: https://github.com/dot2dotseurat
 .. _@dsclementsen: https://github.com/dsclementsen
+.. _@guilherme1guy: https://github.com/guilherme1guy
 .. _@durkode: https://github.com/durkode
 .. _@Egregors: https://github.com/Egregors
 .. _@epileptic-fish: https://gihub.com/epileptic-fish

From 783e61bee7677bc31c8d614d775120430c22df6d Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sun, 15 Mar 2020 19:11:43 +0000
Subject: [PATCH 0629/2840] Fix broken link in list of contributors

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 326165721..d2418f8a9 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -353,6 +353,7 @@ Listed in alphabetical order.
 .. _@rolep: https://github.com/rolep
 .. _@romanosipenko: https://github.com/romanosipenko
 .. _@saschalalala: https://github.com/saschalalala
+.. _@scaramagus: https://github.com/scaramagus
 .. _@shireenrao: https://github.com/shireenrao
 .. _@show0k: https://github.com/show0k
 .. _@shultz: https://github.com/shultz

From 530868d072248b4472fb09a42e511c6024f361dd Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sun, 15 Mar 2020 19:20:44 +0000
Subject: [PATCH 0630/2840] Move "rest_framework" in THIRD_PARTY_APPS

---
 {{cookiecutter.project_slug}}/config/settings/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 22b1fed81..c3941fd9e 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -75,11 +75,11 @@ THIRD_PARTY_APPS = [
     "allauth",
     "allauth.account",
     "allauth.socialaccount",
-    "rest_framework",
 {%- if cookiecutter.use_celery == 'y' %}
     "django_celery_beat",
 {%- endif %}
 {%- if cookiecutter.use_drf == "y" %}
+    "rest_framework",
     "rest_framework.authtoken",
 {%- endif %}
 ]

From 090b93c01ebc5333c477cc9f955c6a9924c90bbc Mon Sep 17 00:00:00 2001
From: James Williams <33026008+jameswilliams1@users.noreply.github.com>
Date: Sun, 15 Mar 2020 22:16:40 +0000
Subject: [PATCH 0631/2840] remove setting compress_enabled to null in .django

---
 {{cookiecutter.project_slug}}/.envs/.production/.django | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/.envs/.production/.django b/{{cookiecutter.project_slug}}/.envs/.production/.django
index 2c2e94f2d..ae13ee01d 100644
--- a/{{cookiecutter.project_slug}}/.envs/.production/.django
+++ b/{{cookiecutter.project_slug}}/.envs/.production/.django
@@ -31,11 +31,7 @@ DJANGO_GCP_STORAGE_BUCKET_NAME=
 # django-allauth
 # ------------------------------------------------------------------------------
 DJANGO_ACCOUNT_ALLOW_REGISTRATION=True
-{% if cookiecutter.use_compressor == 'y' %}
-# django-compressor
-# ------------------------------------------------------------------------------
-COMPRESS_ENABLED=
-{% endif %}
+
 # Gunicorn
 # ------------------------------------------------------------------------------
 WEB_CONCURRENCY=4

From a553fa9aafe89a1daec41e7d1a6e509f0b867754 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 16 Mar 2020 12:53:12 -0700
Subject: [PATCH 0632/2840] Update flake8-isort from 2.8.0 to 2.9.0

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

diff --git a/requirements.txt b/requirements.txt
index bc8292a8c..6894fa8f6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ binaryornot==0.4.4
 # ------------------------------------------------------------------------------
 black==19.10b0
 flake8==3.7.9
-flake8-isort==2.8.0
+flake8-isort==2.9.0
 
 # Testing
 # ------------------------------------------------------------------------------

From e3486dc782ad87cf994fb5f465a98dee6b23e019 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 17 Mar 2020 11:00:31 +0000
Subject: [PATCH 0633/2840] Update celery from 4.4.1 to 4.4.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 d645dc05d..7ef43601c 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -10,7 +10,7 @@ whitenoise==5.0.1  # https://github.com/evansd/whitenoise
 {%- endif %}
 redis==3.4.1 # https://github.com/andymccurdy/redis-py
 {%- if cookiecutter.use_celery == "y" %}
-celery==4.4.1  # pyup: < 5.0  # https://github.com/celery/celery
+celery==4.4.2  # pyup: < 5.0  # https://github.com/celery/celery
 django-celery-beat==2.0.0  # https://github.com/celery/django-celery-beat
 {%- if cookiecutter.use_docker == 'y' %}
 flower==0.9.3  # https://github.com/mher/flower

From 61476eaca1fdd60fbb038367378e903fb5f66bb2 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 17 Mar 2020 11:00:35 +0000
Subject: [PATCH 0634/2840] Update flake8-isort from 2.8.0 to 2.9.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 ee2e1d41e..00f8bcd16 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -19,7 +19,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 # Code quality
 # ------------------------------------------------------------------------------
 flake8==3.7.9  # https://github.com/PyCQA/flake8
-flake8-isort==2.8.0  # https://github.com/gforcada/flake8-isort
+flake8-isort==2.9.0  # https://github.com/gforcada/flake8-isort
 coverage==5.0.3  # https://github.com/nedbat/coveragepy
 black==19.10b0  # https://github.com/ambv/black
 pylint-django==2.0.14  # https://github.com/PyCQA/pylint-django

From 06a880164a434df3b27618d60c12a89701329fc0 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 17 Mar 2020 11:00:39 +0000
Subject: [PATCH 0635/2840] Update coverage from 5.0.3 to 5.0.4

---
 {{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 ee2e1d41e..cba162d51 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -20,7 +20,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 # ------------------------------------------------------------------------------
 flake8==3.7.9  # https://github.com/PyCQA/flake8
 flake8-isort==2.8.0  # https://github.com/gforcada/flake8-isort
-coverage==5.0.3  # https://github.com/nedbat/coveragepy
+coverage==5.0.4  # https://github.com/nedbat/coveragepy
 black==19.10b0  # https://github.com/ambv/black
 pylint-django==2.0.14  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 5498716c74542a604fe599956968c7bdc67f576b Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 17 Mar 2020 15:35:42 +0000
Subject: [PATCH 0636/2840] Fix isort

---
 {{cookiecutter.project_slug}}/config/settings/base.py          | 3 +--
 {{cookiecutter.project_slug}}/config/wsgi.py                   | 2 +-
 .../merge_production_dotenvs_in_dotenv.py                      | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index fe2131c51..a0bf8f0a9 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -1,11 +1,10 @@
 """
 Base settings to build other settings files upon.
 """
+from pathlib import Path
 
 import environ
 
-from pathlib import Path
-
 ROOT_DIR = Path(__file__).parents[2]
 # {{ cookiecutter.project_slug }}/)
 APPS_DIR = ROOT_DIR / "{{ cookiecutter.project_slug }}"
diff --git a/{{cookiecutter.project_slug}}/config/wsgi.py b/{{cookiecutter.project_slug}}/config/wsgi.py
index b5755c5ce..fccfea354 100644
--- a/{{cookiecutter.project_slug}}/config/wsgi.py
+++ b/{{cookiecutter.project_slug}}/config/wsgi.py
@@ -15,9 +15,9 @@ framework.
 """
 import os
 import sys
+from pathlib import Path
 
 from django.core.wsgi import get_wsgi_application
-from pathlib import Path
 
 # This allows easy placement of apps within the interior
 # {{ cookiecutter.project_slug }} directory.
diff --git a/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py b/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py
index b204494eb..936e24060 100644
--- a/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py
+++ b/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py
@@ -1,6 +1,6 @@
 import os
-from typing import Sequence
 from pathlib import Path
+from typing import Sequence
 
 import pytest
 

From 984b5bcfbecf61f154b88bcb036fbba1fd717c65 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 17 Mar 2020 15:46:55 +0000
Subject: [PATCH 0637/2840] Nicer syntax to join paths

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

diff --git a/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py b/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py
index 936e24060..d1170eff6 100644
--- a/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py
+++ b/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py
@@ -5,7 +5,7 @@ from typing import Sequence
 import pytest
 
 ROOT_DIR_PATH = Path(__file__).parent.resolve()
-PRODUCTION_DOTENVS_DIR_PATH = ROOT_DIR_PATH.joinpath(".envs", ".production")
+PRODUCTION_DOTENVS_DIR_PATH = ROOT_DIR_PATH / ".envs" / ".production"
 PRODUCTION_DOTENV_FILE_PATHS = [
     PRODUCTION_DOTENVS_DIR_PATH / ".django",
     PRODUCTION_DOTENVS_DIR_PATH / ".postgres",

From ab99cc768ff9d5253ae44b50d3e2762fbdc96ec0 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 17 Mar 2020 18:26:38 +0000
Subject: [PATCH 0638/2840] Adding @highpost to the list of contributors

Helped in writing code to rule out an issue with the template
---
 CONTRIBUTORS.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index af13839b0..075b3f329 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -99,6 +99,7 @@ Listed in alphabetical order.
   Dani Hodovic             `@danihodovic`_
   Daniel Hepper            `@dhepper`_                   @danielhepper
   Daniel Hillier           `@danifus`_
+  Daniel Sears             `@highpost`_                  @highpost
   Daniele Tricoli          `@eriol`_
   David Díaz               `@ddiazpinto`_                @DavidDiazPinto
   Davit Tovmasyan          `@davitovmasyan`_
@@ -301,6 +302,7 @@ Listed in alphabetical order.
 .. _@hairychris: https://github.com/hairychris
 .. _@hanaquadara: https://github.com/hanaquadara
 .. _@hendrikschneider: https://github.com/hendrikschneider
+.. _@highpost: https://github.com/highpost
 .. _@hjwp: https://github.com/hjwp
 .. _@howiezhao: https://github.com/howiezhao
 .. _@IanLee1521: https://github.com/IanLee1521

From 92bbddc2901c5720042fcadbbceaa68642e7cf3d Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 17 Mar 2020 18:41:27 +0000
Subject: [PATCH 0639/2840] Change style for pytest marker

Update pytest.mark.django_db to be more consistent with rest of the project
---
 .../{{cookiecutter.project_slug}}/users/tests/test_tasks.py    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_tasks.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_tasks.py
index 61586b5ca..41d5af292 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_tasks.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_tasks.py
@@ -4,8 +4,9 @@ from celery.result import EagerResult
 from {{ cookiecutter.project_slug }}.users.tasks import get_users_count
 from {{ cookiecutter.project_slug }}.users.tests.factories import UserFactory
 
+pytestmark = pytest.mark.django_db
+
 
-@pytest.mark.django_db
 def test_user_count(settings):
     """A basic test to execute the get_users_count Celery task."""
     UserFactory.create_batch(3)

From 5b9161e16e7789a423aeb788c8c0296c8a2a6906 Mon Sep 17 00:00:00 2001
From: Demetris Stavrou <1180929+demestav@users.noreply.github.com>
Date: Tue, 17 Mar 2020 22:11:16 +0200
Subject: [PATCH 0640/2840] Fixed pre-commit files selector regex

---
 {{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 4b72ee80a..c50fefe94 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -7,7 +7,7 @@ repos:
     rev: master
     hooks:
       - id: trailing-whitespace
-        files: (^|/)a/.+\.(py|html|sh|css|js)$
+        files: (^|/).+\.(py|html|sh|css|js)$
 
 -   repo: local
     hooks:

From 67aeb8c5c6889d7e36732a455cd8b93402e34afa Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 18 Mar 2020 23:05:19 -0700
Subject: [PATCH 0641/2840] Update pyyaml from 5.3 to 5.3.1

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

diff --git a/requirements.txt b/requirements.txt
index 6894fa8f6..81fbf524a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,4 +14,4 @@ tox==3.14.5
 pytest==5.4.1
 pytest-cookies==0.5.1
 pytest-instafail==0.4.1.post0
-pyyaml==5.3
+pyyaml==5.3.1

From 12a4bd27e8a3e5754c8ec78271f34ce7024a0f07 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 21 Mar 2020 11:00:31 +0000
Subject: [PATCH 0642/2840] Update sentry-sdk from 0.14.2 to 0.14.3

---
 {{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 da9cbc97a..a8bc31dce 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==2.1.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.14.2  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.14.3  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django

From 484fa4ae77b2115db6fe50f494329a3c34a8f481 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Sun, 22 Mar 2020 13:31:52 -0400
Subject: [PATCH 0643/2840] Added unsupported mail_service combinations * Added
 default yaml Loader for pre_gen_projects.py

---
 docs/project-generation-options.rst   | 14 ++++-----
 hooks/pre_gen_project.py              | 12 ++++++++
 tests/test_cookiecutter_generation.py | 42 +++++++++++++++++++--------
 3 files changed, 49 insertions(+), 19 deletions(-)

diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index 87ae90b1d..8abeda9b9 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -73,15 +73,15 @@ cloud_provider:
 mail_service:
     Select an email service that Django-Anymail provides
 
-    1. Amazon SES_
-    2. Mailgun_
+    1. Mailgun_
+    2. `Amazon SES`_
     3. Mailjet_
     4. Mandrill_
     5. Postmark_
     6. SendGrid_
     7. SendinBlue_
     8. SparkPost_
-    9. Plain/Vanilla Django-Anymail_
+    9. `Other SMTP`_
 
 use_drf:
     Indicates whether the project should be configured to use `Django Rest Framework`_.
@@ -114,8 +114,8 @@ ci_tool:
     Select a CI tool for running tests. The choices are:
 
     1. None
-    2. Travis_
-    3. Gitlab_
+    2. `Travis CI`_
+    3. `Gitlab CI`_
 
 keep_local_envs_in_vcs:
     Indicates whether the project's ``.envs/.local/`` should be kept in VCS
@@ -145,7 +145,7 @@ debug:
 .. _AWS: https://aws.amazon.com/s3/
 .. _GCP: https://cloud.google.com/storage/
 
-.. _SES: https://aws.amazon.com/ses/
+.. _Amazon SES: https://aws.amazon.com/ses/
 .. _Mailgun: https://www.mailgun.com
 .. _Mailjet: https://www.mailjet.com
 .. _Mandrill: http://mandrill.com
@@ -153,7 +153,7 @@ debug:
 .. _SendGrid: https://sendgrid.com
 .. _SendinBlue: https://www.sendinblue.com
 .. _SparkPost: https://www.sparkpost.com
-.. _Django-Anymail: https://anymail.readthedocs.io/en/stable/
+.. _Other SMTP: https://anymail.readthedocs.io/en/stable/
 
 .. _Django Rest Framework: https://github.com/encode/django-rest-framework/
 
diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py
index 668a6e278..54334dedd 100644
--- a/hooks/pre_gen_project.py
+++ b/hooks/pre_gen_project.py
@@ -68,3 +68,15 @@ if (
         "You should either use Whitenoise or select a Cloud Provider to serve static files"
     )
     sys.exit(1)
+
+if (
+    "{{ cookiecutter.cloud_provider }}" == "GCP"
+    and "{{ cookiecutter.mail_service }}" == "Amazon SES"
+) or (
+    "{{ cookiecutter.cloud_provider }}" == "None"
+    and "{{ cookiecutter.mail_service }}" == "Amazon SES"
+):
+    print(
+        "You should either use AWS or select a different Mail Service for sending emails."
+    )
+    sys.exit(1)
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 91f44ae5a..2c7e6dc43 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -46,17 +46,33 @@ SUPPORTED_COMBINATIONS = [
     {"cloud_provider": "AWS", "use_whitenoise": "n"},
     {"cloud_provider": "GCP", "use_whitenoise": "y"},
     {"cloud_provider": "GCP", "use_whitenoise": "n"},
-    {"cloud_provider": "None", "use_whitenoise": "y"},
+    {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "Mailgun"},
+    {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "Mailjet"},
+    {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "Mandrill"},
+    {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "Postmark"},
+    {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "Sendgrid"},
+    {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "SendinBlue"},
+    {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "SparkPost"},
+    {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "Other SMTP"},
     # Note: cloud_provider=None AND use_whitenoise=n is not supported
-    {"mail_service": "Mailgun"},
-    {"mail_service": "Amazon SES"},
-    {"mail_service": "Mailjet"},
-    {"mail_service": "Mandrill"},
-    {"mail_service": "Postmark"},
-    {"mail_service": "Sendgrid"},
-    {"mail_service": "SendinBlue"},
-    {"mail_service": "SparkPost"},
-    {"mail_service": "Other SMTP"},
+    {"cloud_provider": "AWS", "mail_service": "Mailgun"},
+    {"cloud_provider": "AWS", "mail_service": "Amazon SES"},
+    {"cloud_provider": "AWS", "mail_service": "Mailjet"},
+    {"cloud_provider": "AWS", "mail_service": "Mandrill"},
+    {"cloud_provider": "AWS", "mail_service": "Postmark"},
+    {"cloud_provider": "AWS", "mail_service": "Sendgrid"},
+    {"cloud_provider": "AWS", "mail_service": "SendinBlue"},
+    {"cloud_provider": "AWS", "mail_service": "SparkPost"},
+    {"cloud_provider": "AWS", "mail_service": "Other SMTP"},
+    {"cloud_provider": "GCP", "mail_service": "Mailgun"},
+    {"cloud_provider": "GCP", "mail_service": "Mailjet"},
+    {"cloud_provider": "GCP", "mail_service": "Mandrill"},
+    {"cloud_provider": "GCP", "mail_service": "Postmark"},
+    {"cloud_provider": "GCP", "mail_service": "Sendgrid"},
+    {"cloud_provider": "GCP", "mail_service": "SendinBlue"},
+    {"cloud_provider": "GCP", "mail_service": "SparkPost"},
+    {"cloud_provider": "GCP", "mail_service": "Other SMTP"},
+    # Note: cloud_providers GCP and None with mail_service Amazon SES is not supported
     {"use_drf": "y"},
     {"use_drf": "n"},
     {"js_task_runner": "None"},
@@ -86,6 +102,8 @@ SUPPORTED_COMBINATIONS = [
 
 UNSUPPORTED_COMBINATIONS = [
     {"cloud_provider": "None", "use_whitenoise": "n"},
+    {"cloud_provider": "GCP", "mail_service": "Amazon SES"},
+    {"cloud_provider": "None", "mail_service": "Amazon SES"},
 ]
 
 
@@ -163,7 +181,7 @@ def test_travis_invokes_pytest(cookies, context):
 
     with open(f"{result.project}/.travis.yml", "r") as travis_yml:
         try:
-            assert yaml.load(travis_yml)["script"] == ["pytest"]
+            assert yaml.load(travis_yml, Loader=yaml.FullLoader)["script"] == ["pytest"]
         except yaml.YAMLError as e:
             pytest.fail(e)
 
@@ -179,7 +197,7 @@ def test_gitlab_invokes_flake8_and_pytest(cookies, context):
 
     with open(f"{result.project}/.gitlab-ci.yml", "r") as gitlab_yml:
         try:
-            gitlab_config = yaml.load(gitlab_yml)
+            gitlab_config = yaml.load(gitlab_yml, Loader=yaml.FullLoader)
             assert gitlab_config["flake8"]["script"] == ["flake8"]
             assert gitlab_config["pytest"]["script"] == ["pytest"]
         except yaml.YAMLError as e:

From ea5db6c4f4d0d013be1acc8fa141922a5f84bcb4 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 23 Mar 2020 21:41:51 +0000
Subject: [PATCH 0644/2840] Django 3.0 support (#2469)

* Bump Django version to 3.0.x to see what breaks

* Update places where Django 2.2 is mentioned to 3.0

* Update to latest Django 3.0 version

* Bump version in setup.py
---
 README.rst                                            | 2 +-
 setup.py                                              | 4 ++--
 {{cookiecutter.project_slug}}/config/settings/base.py | 2 +-
 {{cookiecutter.project_slug}}/requirements/base.txt   | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/README.rst b/README.rst
index 56db4c785..649199236 100644
--- a/README.rst
+++ b/README.rst
@@ -36,7 +36,7 @@ production-ready Django projects quickly.
 Features
 ---------
 
-* For Django 2.2
+* For Django 3.0
 * Works with Python 3.7
 * Renders Django projects with 100% starting test coverage
 * Twitter Bootstrap_ v4 (`maintained Foundation fork`_ also available)
diff --git a/setup.py b/setup.py
index 330320096..e311e82ad 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 = "2.2.1"
+version = "3.0.4"
 
 if sys.argv[-1] == "tag":
     os.system(f'git tag -a {version} -m "version {version}"')
@@ -34,7 +34,7 @@ setup(
     classifiers=[
         "Development Status :: 4 - Beta",
         "Environment :: Console",
-        "Framework :: Django :: 2.2",
+        "Framework :: Django :: 3.0",
         "Intended Audience :: Developers",
         "Natural Language :: English",
         "License :: OSI Approved :: BSD License",
diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index a0bf8f0a9..6a2a9c3f2 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -228,7 +228,7 @@ X_FRAME_OPTIONS = "DENY"
 EMAIL_BACKEND = env(
     "DJANGO_EMAIL_BACKEND", default="django.core.mail.backends.smtp.EmailBackend"
 )
-# https://docs.djangoproject.com/en/2.2/ref/settings/#email-timeout
+# https://docs.djangoproject.com/en/dev/ref/settings/#email-timeout
 EMAIL_TIMEOUT = 5
 
 # ADMIN
diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 7ef43601c..b41be3b06 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -19,7 +19,7 @@ flower==0.9.3  # https://github.com/mher/flower
 
 # Django
 # ------------------------------------------------------------------------------
-django==2.2.11  # pyup: < 3.0  # https://www.djangoproject.com/
+django==3.0.4  # pyup: < 3.1  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==4.0.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.41.0  # https://github.com/pennersr/django-allauth

From 2e1a922577ec888589c7e6ee368dd3f1aedf1a89 Mon Sep 17 00:00:00 2001
From: Gabriel Mejia <elgartoinf@gmail.com>
Date: Mon, 23 Mar 2020 16:43:59 -0500
Subject: [PATCH 0645/2840] Add CELERY_BROKER_URL for gitlab #2504 (#2505)

* Solved issue #2504

* Added new contributor

Co-authored-by: Gabriel Mejia <gmejia@veritran.com>
---
 CONTRIBUTORS.rst                             | 1 +
 {{cookiecutter.project_slug}}/.gitlab-ci.yml | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 075b3f329..c244f64b8 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -222,6 +222,7 @@ Listed in alphabetical order.
   Xaver Y.R. Chen          `@yrchen`_                   @yrchen
   Yaroslav Halchenko
   Yuchen Xie               `@mapx`_
+  Gabriel Mejia            `@elgartoinf`                @elgartoinf
 ========================== ============================ ==============
 
 .. _@a7p: https://github.com/a7p
diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
index 91ad7238c..611ff202f 100644
--- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml
+++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
@@ -7,6 +7,9 @@ variables:
   POSTGRES_PASSWORD: ''
   POSTGRES_DB: 'test_{{ cookiecutter.project_slug }}'
   POSTGRES_HOST_AUTH_METHOD: trust
+  {% if cookiecutter.use_celery == 'y' -%}
+  CELERY_BROKER_URL: 'redis://redis:6379/0'
+  {%- endif %}
 
 flake8:
   stage: lint

From 0c36c57f2d45be9bdf5c4bdd0c8754765a75a0ea Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 23 Mar 2020 21:45:38 +0000
Subject: [PATCH 0646/2840] Fix broken link in list of contributors

---
 CONTRIBUTORS.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index c244f64b8..2e7b11e62 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -118,6 +118,7 @@ Listed in alphabetical order.
   Eyad Al Sibai            `@eyadsibai`_
   Felipe Arruda            `@arruda`_
   Florian Idelberger       `@step21`_                    @windrush
+  Gabriel Mejia            `@elgartoinf`_                @elgartoinf
   Garry Cairns             `@garry-cairns`_
   Garry Polley             `@garrypolley`_
   Gilbishkosma             `@Gilbishkosma`_
@@ -222,7 +223,6 @@ Listed in alphabetical order.
   Xaver Y.R. Chen          `@yrchen`_                   @yrchen
   Yaroslav Halchenko
   Yuchen Xie               `@mapx`_
-  Gabriel Mejia            `@elgartoinf`                @elgartoinf
 ========================== ============================ ==============
 
 .. _@a7p: https://github.com/a7p
@@ -286,6 +286,7 @@ Listed in alphabetical order.
 .. _@guilherme1guy: https://github.com/guilherme1guy
 .. _@durkode: https://github.com/durkode
 .. _@Egregors: https://github.com/Egregors
+.. _@elgartoinf: https://gihub.com/elgartoinf
 .. _@epileptic-fish: https://gihub.com/epileptic-fish
 .. _@eraldo: https://github.com/eraldo
 .. _@erfaan: https://github.com/erfaan

From c4b1666707551cd2ce3f82ffd8a676d34e33130a Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 3 Mar 2020 20:28:02 +0000
Subject: [PATCH 0647/2840] Move storages classes into their own module

---
 hooks/post_gen_project.py                     |  5 +++
 .../config/settings/production.py             | 37 ++-----------------
 .../utils/storages.py                         | 25 +++++++++++++
 3 files changed, 34 insertions(+), 33 deletions(-)
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/storages.py

diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index 5cc8c32f7..9bde5377b 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -292,6 +292,10 @@ def remove_drf_starter_files():
     shutil.rmtree(os.path.join("{{cookiecutter.project_slug}}", "users", "api"))
 
 
+def remove_storages_module():
+    os.remove(os.path.join("{{cookiecutter.project_slug}}", "utils", "storages.py"))
+
+
 def main():
     debug = "{{ cookiecutter.debug }}".lower() == "y"
 
@@ -352,6 +356,7 @@ def main():
             WARNING + "You chose not to use a cloud provider, "
             "media files won't be served in production." + TERMINATOR
         )
+        remove_storages_module()
 
     if "{{ cookiecutter.use_celery }}".lower() == "n":
         remove_celery_files()
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 22832d341..2043e89e2 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -104,11 +104,11 @@ GS_DEFAULT_ACL = "publicRead"
 {% if cookiecutter.use_whitenoise == 'y' -%}
 STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
 {% elif cookiecutter.cloud_provider == 'AWS' -%}
-STATICFILES_STORAGE = "config.settings.production.StaticRootS3Boto3Storage"
+STATICFILES_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.StaticRootS3Boto3Storage"
 COLLECTFAST_STRATEGY = "collectfast.strategies.boto3.Boto3Strategy"
 STATIC_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/static/"
 {% elif cookiecutter.cloud_provider == 'GCP' -%}
-STATICFILES_STORAGE = "config.settings.production.StaticRootGoogleCloudStorage"
+STATICFILES_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.StaticRootGoogleCloudStorage"
 COLLECTFAST_STRATEGY = "collectfast.strategies.gcloud.GoogleCloudStrategy"
 STATIC_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/static/"
 {% endif -%}
@@ -116,39 +116,10 @@ STATIC_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/static/"
 # MEDIA
 # ------------------------------------------------------------------------------
 {%- if cookiecutter.cloud_provider == 'AWS' %}
-# region http://stackoverflow.com/questions/10390244/
-# Full-fledge class: https://stackoverflow.com/a/18046120/104731
-from storages.backends.s3boto3 import S3Boto3Storage  # noqa E402
-
-
-class StaticRootS3Boto3Storage(S3Boto3Storage):
-    location = "static"
-    default_acl = "public-read"
-
-
-class MediaRootS3Boto3Storage(S3Boto3Storage):
-    location = "media"
-    file_overwrite = False
-
-
-# endregion
-DEFAULT_FILE_STORAGE = "config.settings.production.MediaRootS3Boto3Storage"
+DEFAULT_FILE_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.MediaRootS3Boto3Storage"
 MEDIA_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/media/"
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
-from storages.backends.gcloud import GoogleCloudStorage  # noqa E402
-
-
-class StaticRootGoogleCloudStorage(GoogleCloudStorage):
-    location = "static"
-    default_acl = "publicRead"
-
-
-class MediaRootGoogleCloudStorage(GoogleCloudStorage):
-    location = "media"
-    file_overwrite = False
-
-
-DEFAULT_FILE_STORAGE = "config.settings.production.MediaRootGoogleCloudStorage"
+DEFAULT_FILE_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.MediaRootGoogleCloudStorage"
 MEDIA_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/media/"
 {%- endif %}
 
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/storages.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/storages.py
new file mode 100644
index 000000000..72b8ea3ba
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/storages.py
@@ -0,0 +1,25 @@
+{% if cookiecutter.cloud_provider == 'AWS' -%}
+from storages.backends.s3boto3 import S3Boto3Storage  # noqa E402
+
+
+class StaticRootS3Boto3Storage(S3Boto3Storage):
+    location = "static"
+    default_acl = "public-read"
+
+
+class MediaRootS3Boto3Storage(S3Boto3Storage):
+    location = "media"
+    file_overwrite = False
+{%- elif cookiecutter.cloud_provider == 'GCP' -%}
+from storages.backends.gcloud import GoogleCloudStorage  # noqa E402
+
+
+class StaticRootGoogleCloudStorage(GoogleCloudStorage):
+    location = "static"
+    default_acl = "publicRead"
+
+
+class MediaRootGoogleCloudStorage(GoogleCloudStorage):
+    location = "media"
+    file_overwrite = False
+{%- endif %}

From 56d5e271aabffbbf9b8dbb00922507f1cc1e3f13 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 3 Mar 2020 20:32:03 +0000
Subject: [PATCH 0648/2840] Remove isort exception in production config & fix
 issue

---
 {{cookiecutter.project_slug}}/config/settings/production.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 2043e89e2..cea29b8e5 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -1,9 +1,7 @@
-"""isort:skip_file"""
 {% if cookiecutter.use_sentry == 'y' -%}
 import logging
 
 import sentry_sdk
-
 from sentry_sdk.integrations.django import DjangoIntegration
 from sentry_sdk.integrations.logging import LoggingIntegration
 {%- if cookiecutter.use_celery == 'y' %}

From 7e1cb599af980075459d47cbcabbde0fe1db1e81 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 3 Mar 2020 21:10:50 +0000
Subject: [PATCH 0649/2840] Remove flake noqa exception

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

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/storages.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/storages.py
index 72b8ea3ba..b712d3239 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/storages.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/storages.py
@@ -1,5 +1,5 @@
 {% if cookiecutter.cloud_provider == 'AWS' -%}
-from storages.backends.s3boto3 import S3Boto3Storage  # noqa E402
+from storages.backends.s3boto3 import S3Boto3Storage
 
 
 class StaticRootS3Boto3Storage(S3Boto3Storage):
@@ -11,7 +11,7 @@ class MediaRootS3Boto3Storage(S3Boto3Storage):
     location = "media"
     file_overwrite = False
 {%- elif cookiecutter.cloud_provider == 'GCP' -%}
-from storages.backends.gcloud import GoogleCloudStorage  # noqa E402
+from storages.backends.gcloud import GoogleCloudStorage
 
 
 class StaticRootGoogleCloudStorage(GoogleCloudStorage):

From aee2de347bbefbf57edd1790acef2a0c8cef4501 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Tue, 24 Mar 2020 15:40:14 -0400
Subject: [PATCH 0650/2840] Add uvicorn and web sockets for Django 3 * Add
 use_async option to cookiecutter.json * Add websocket configuration

---
 cookiecutter.json                             |  1 +
 docs/project-generation-options.rst           |  3 ++
 hooks/post_gen_project.py                     | 12 ++++++
 tests/test_cookiecutter_generation.py         |  2 +
 .../compose/local/django/start                |  4 ++
 .../compose/production/django/start           |  4 ++
 {{cookiecutter.project_slug}}/config/asgi.py  | 41 +++++++++++++++++++
 .../config/websocket.py                       | 18 ++++++++
 .../requirements/base.txt                     |  3 ++
 9 files changed, 88 insertions(+)
 create mode 100644 {{cookiecutter.project_slug}}/config/asgi.py
 create mode 100644 {{cookiecutter.project_slug}}/config/websocket.py

diff --git a/cookiecutter.json b/cookiecutter.json
index cfa1b346a..62155ad0e 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -44,6 +44,7 @@
     "SparkPost",
     "Other SMTP"
   ],
+  "use_async": "n",
   "use_drf": "n",
   "custom_bootstrap_compilation": "n",
   "use_compressor": "n",
diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index 8abeda9b9..1c2fc3149 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -83,6 +83,9 @@ mail_service:
     8. SparkPost_
     9. `Other SMTP`_
 
+use_async:
+    Indicates whether the project should use web sockets with Uvicorn + Gunicorn.
+
 use_drf:
     Indicates whether the project should be configured to use `Django Rest Framework`_.
 
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index 5cc8c32f7..2e2c19e1f 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -101,6 +101,15 @@ def remove_celery_files():
         os.remove(file_name)
 
 
+def remove_async_files():
+    file_names = [
+        os.path.join("config", "asgi.py"),
+        os.path.join("config", "websocket.py"),
+    ]
+    for file_name in file_names:
+        os.remove(file_name)
+
+
 def remove_dottravisyml_file():
     os.remove(".travis.yml")
 
@@ -367,6 +376,9 @@ def main():
     if "{{ cookiecutter.use_drf }}".lower() == "n":
         remove_drf_starter_files()
 
+    if "{{ cookiecutter.use_async }}".lower() == "n":
+        remove_async_files()
+
     print(SUCCESS + "Project initialized, keep up the good work!" + TERMINATOR)
 
 
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 2c7e6dc43..eee56115f 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -73,6 +73,8 @@ SUPPORTED_COMBINATIONS = [
     {"cloud_provider": "GCP", "mail_service": "SparkPost"},
     {"cloud_provider": "GCP", "mail_service": "Other SMTP"},
     # Note: cloud_providers GCP and None with mail_service Amazon SES is not supported
+    {"use_async", "y"},
+    {"use_async", "n"},
     {"use_drf": "y"},
     {"use_drf": "n"},
     {"js_task_runner": "None"},
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start b/{{cookiecutter.project_slug}}/compose/local/django/start
index f076ee51e..bc1293dee 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/start
@@ -6,4 +6,8 @@ set -o nounset
 
 
 python manage.py migrate
+{%- if cookiecutter.use_async %}
+/usr/local/bin/uvicorn config.asgi --bind 0.0.0.0:5000 --chdir=/app
+{%- else %}
 python manage.py runserver_plus 0.0.0.0:8000
+{% endif %}
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/start b/{{cookiecutter.project_slug}}/compose/production/django/start
index 4985aeedd..dd06949a6 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/start
+++ b/{{cookiecutter.project_slug}}/compose/production/django/start
@@ -27,4 +27,8 @@ if compress_enabled; then
   python /app/manage.py compress
 fi
 {%- endif %}
+{% if cookiecutter.use_async %}
+/usr/local/bin/uvicorn config.asgi --bind 0.0.0.0:5000 --chdir=/app
+{% else %}
 /usr/local/bin/gunicorn config.wsgi --bind 0.0.0.0:5000 --chdir=/app
+{%- endif %}
diff --git a/{{cookiecutter.project_slug}}/config/asgi.py b/{{cookiecutter.project_slug}}/config/asgi.py
new file mode 100644
index 000000000..81f1c76aa
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/config/asgi.py
@@ -0,0 +1,41 @@
+"""
+ASGI config for {{ cookiecutter.project_name }} project.
+
+It exposes the ASGI callable as a module-level variable named ``application``.
+
+For more information on this file, see
+https://docs.djangoproject.com/en/dev/howto/deployment/asgi/
+"""
+import os
+import sys
+from pathlib import Path
+
+from django.core.asgi import get_asgi_application
+from .websocket import websocket_application
+
+# This allows easy placement of apps within the interior
+# {{ cookiecutter.project_slug }} directory.
+app_path = Path(__file__).parents[1].resolve()
+sys.path.append(str(app_path / "{{ cookiecutter.project_slug }}"))
+# We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks
+# if running multiple sites in the same mod_wsgi process. To fix this, use
+# mod_wsgi daemon mode with each site in its own daemon process, or use
+# os.environ["DJANGO_SETTINGS_MODULE"] = "config.settings.production"
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.production")
+
+# This application object is used by any ASGI server configured to use this
+# file. This includes Django's development server, if the ASGI_APPLICATION
+# setting points here.
+django_application = get_asgi_application()
+# Apply ASGI middleware here.
+# from helloworld.asgi import HelloWorldApplication
+# application = HelloWorldApplication(application)
+
+
+async def application(scope, receive, send):
+    if scope['type'] == 'http':
+        await django_application(scope, receive, send)
+    elif scope['type'] == 'websocket':
+        await websocket_application(scope, receive, send)
+    else:
+        raise NotImplementedError(f"Unknown scope type {scope['type']}")
diff --git a/{{cookiecutter.project_slug}}/config/websocket.py b/{{cookiecutter.project_slug}}/config/websocket.py
new file mode 100644
index 000000000..9c84a5282
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/config/websocket.py
@@ -0,0 +1,18 @@
+async def websocket_application(scope, receive, send):
+    while True:
+        event = await receive()
+
+        if event['type'] == 'websocket.connect':
+            await send({
+                'type': 'websocket.accept'
+            })
+
+        if event['type'] == 'websocket.disconnect':
+            break
+
+        if event['type'] == 'websocket.receive':
+            if event['text'] == 'ping':
+                await send({
+                    'type': 'websocket.send',
+                    'text': 'pong!'
+                })
diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index b41be3b06..ec861f352 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -16,6 +16,9 @@ django-celery-beat==2.0.0  # https://github.com/celery/django-celery-beat
 flower==0.9.3  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
+{%- if cookiecutter.use_async %}
+uvicorn==0.11.3  # https://github.com/encode/uvicorn
+{%- endif %}
 
 # Django
 # ------------------------------------------------------------------------------

From c4eaf68982eefa368390ff7bbc1296633d86fc63 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Tue, 24 Mar 2020 15:53:45 -0400
Subject: [PATCH 0651/2840] Fixed test_cookiecutter_generation.py for use_async
 from set to dict

---
 tests/test_cookiecutter_generation.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index eee56115f..853f4ebde 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -73,8 +73,8 @@ SUPPORTED_COMBINATIONS = [
     {"cloud_provider": "GCP", "mail_service": "SparkPost"},
     {"cloud_provider": "GCP", "mail_service": "Other SMTP"},
     # Note: cloud_providers GCP and None with mail_service Amazon SES is not supported
-    {"use_async", "y"},
-    {"use_async", "n"},
+    {"use_async": "y"},
+    {"use_async": "n"},
     {"use_drf": "y"},
     {"use_drf": "n"},
     {"js_task_runner": "None"},

From 910ed86d1132b084f3fc4b56aa5657ce1444d98f Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Tue, 24 Mar 2020 16:12:47 -0400
Subject: [PATCH 0652/2840] Fixed linter check for #2506

---
 {{cookiecutter.project_slug}}/config/asgi.py    |  5 +++--
 .../config/websocket.py                         | 17 ++++++-----------
 2 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/asgi.py b/{{cookiecutter.project_slug}}/config/asgi.py
index 81f1c76aa..4cc878cac 100644
--- a/{{cookiecutter.project_slug}}/config/asgi.py
+++ b/{{cookiecutter.project_slug}}/config/asgi.py
@@ -11,6 +11,7 @@ import sys
 from pathlib import Path
 
 from django.core.asgi import get_asgi_application
+
 from .websocket import websocket_application
 
 # This allows easy placement of apps within the interior
@@ -33,9 +34,9 @@ django_application = get_asgi_application()
 
 
 async def application(scope, receive, send):
-    if scope['type'] == 'http':
+    if scope["type"] == "http":
         await django_application(scope, receive, send)
-    elif scope['type'] == 'websocket':
+    elif scope["type"] == "websocket":
         await websocket_application(scope, receive, send)
     else:
         raise NotImplementedError(f"Unknown scope type {scope['type']}")
diff --git a/{{cookiecutter.project_slug}}/config/websocket.py b/{{cookiecutter.project_slug}}/config/websocket.py
index 9c84a5282..81adfbc66 100644
--- a/{{cookiecutter.project_slug}}/config/websocket.py
+++ b/{{cookiecutter.project_slug}}/config/websocket.py
@@ -2,17 +2,12 @@ async def websocket_application(scope, receive, send):
     while True:
         event = await receive()
 
-        if event['type'] == 'websocket.connect':
-            await send({
-                'type': 'websocket.accept'
-            })
+        if event["type"] == "websocket.connect":
+            await send({"type": "websocket.accept"})
 
-        if event['type'] == 'websocket.disconnect':
+        if event["type"] == "websocket.disconnect":
             break
 
-        if event['type'] == 'websocket.receive':
-            if event['text'] == 'ping':
-                await send({
-                    'type': 'websocket.send',
-                    'text': 'pong!'
-                })
+        if event["type"] == "websocket.receive":
+            if event["text"] == "ping":
+                await send({"type": "websocket.send", "text": "pong!"})

From 125ffec2431337fcd95bf74ea391e2097cd5a1e1 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Tue, 24 Mar 2020 20:51:43 -0400
Subject: [PATCH 0653/2840] Changed starting commands for running server *
 Performance is very low

---
 {{cookiecutter.project_slug}}/compose/local/django/start      | 2 +-
 {{cookiecutter.project_slug}}/compose/production/django/start | 2 +-
 {{cookiecutter.project_slug}}/config/asgi.py                  | 1 -
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start b/{{cookiecutter.project_slug}}/compose/local/django/start
index bc1293dee..259e7cd15 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/start
@@ -7,7 +7,7 @@ set -o nounset
 
 python manage.py migrate
 {%- if cookiecutter.use_async %}
-/usr/local/bin/uvicorn config.asgi --bind 0.0.0.0:5000 --chdir=/app
+/usr/local/bin/gunicorn config.asgi --bind 0.0.0.0:8000 --chdir=/app -k uvicorn.workers.UvicornWorker -e DJANGO_SETTINGS_MODULE=config.settings.local --reload
 {%- else %}
 python manage.py runserver_plus 0.0.0.0:8000
 {% endif %}
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/start b/{{cookiecutter.project_slug}}/compose/production/django/start
index dd06949a6..96c8987c4 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/start
+++ b/{{cookiecutter.project_slug}}/compose/production/django/start
@@ -28,7 +28,7 @@ if compress_enabled; then
 fi
 {%- endif %}
 {% if cookiecutter.use_async %}
-/usr/local/bin/uvicorn config.asgi --bind 0.0.0.0:5000 --chdir=/app
+/usr/local/bin/gunicorn config.asgi --workers 4 --bind 0.0.0.0:5000 --chdir=/app -k uvicorn.workers.UvicornWorker
 {% else %}
 /usr/local/bin/gunicorn config.wsgi --bind 0.0.0.0:5000 --chdir=/app
 {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/config/asgi.py b/{{cookiecutter.project_slug}}/config/asgi.py
index 4cc878cac..3dd31f70e 100644
--- a/{{cookiecutter.project_slug}}/config/asgi.py
+++ b/{{cookiecutter.project_slug}}/config/asgi.py
@@ -11,7 +11,6 @@ import sys
 from pathlib import Path
 
 from django.core.asgi import get_asgi_application
-
 from .websocket import websocket_application
 
 # This allows easy placement of apps within the interior

From e6b800d9854bb0956afd1df175501466faa5be2b Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Tue, 24 Mar 2020 20:59:28 -0400
Subject: [PATCH 0654/2840] Added static files URL for runserver-level/best
 performance * The reason there was a degraded performance was because we're
 using Gunicorn itself as a local tester. So we needed to add the staticfiles
 urls

---
 {{cookiecutter.project_slug}}/config/urls.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/config/urls.py b/{{cookiecutter.project_slug}}/config/urls.py
index 818609061..2cf7be95e 100644
--- a/{{cookiecutter.project_slug}}/config/urls.py
+++ b/{{cookiecutter.project_slug}}/config/urls.py
@@ -7,6 +7,9 @@ from django.views.generic import TemplateView
 {%- if cookiecutter.use_drf == 'y' %}
 from rest_framework.authtoken.views import obtain_auth_token
 {%- endif %}
+{%- if cookiecutter.use_async %}
+from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+{%- endif %}
 
 urlpatterns = [
     path("", TemplateView.as_view(template_name="pages/home.html"), name="home"),
@@ -20,6 +23,11 @@ urlpatterns = [
     path("accounts/", include("allauth.urls")),
     # Your stuff: custom urls includes go here
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
+{% if cookiecutter.use_async %}
+# Static file serving when using Gunicorn + Uvicorn for local development
+if settings.DEBUG:
+    urlpatterns += staticfiles_urlpatterns()
+{% endif %}
 {% if cookiecutter.use_drf == 'y' -%}
 # API URLS
 urlpatterns += [

From 7cd390854b72abd2c93f46c7a2476890f29cabd8 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Tue, 24 Mar 2020 21:42:28 -0400
Subject: [PATCH 0655/2840] Fixed linter checks

---
 {{cookiecutter.project_slug}}/config/asgi.py |  1 +
 {{cookiecutter.project_slug}}/config/urls.py | 14 +++++++-------
 2 files changed, 8 insertions(+), 7 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/asgi.py b/{{cookiecutter.project_slug}}/config/asgi.py
index 3dd31f70e..4cc878cac 100644
--- a/{{cookiecutter.project_slug}}/config/asgi.py
+++ b/{{cookiecutter.project_slug}}/config/asgi.py
@@ -11,6 +11,7 @@ import sys
 from pathlib import Path
 
 from django.core.asgi import get_asgi_application
+
 from .websocket import websocket_application
 
 # This allows easy placement of apps within the interior
diff --git a/{{cookiecutter.project_slug}}/config/urls.py b/{{cookiecutter.project_slug}}/config/urls.py
index 2cf7be95e..168d77a8b 100644
--- a/{{cookiecutter.project_slug}}/config/urls.py
+++ b/{{cookiecutter.project_slug}}/config/urls.py
@@ -1,15 +1,15 @@
 from django.conf import settings
 from django.conf.urls.static import static
 from django.contrib import admin
+{%- if cookiecutter.use_async == 'y' %}
+from django.contrib.staticfiles.urls import staticfiles_urlpatterns
+{%- endif %}
 from django.urls import include, path
 from django.views import defaults as default_views
 from django.views.generic import TemplateView
 {%- if cookiecutter.use_drf == 'y' %}
 from rest_framework.authtoken.views import obtain_auth_token
 {%- endif %}
-{%- if cookiecutter.use_async %}
-from django.contrib.staticfiles.urls import staticfiles_urlpatterns
-{%- endif %}
 
 urlpatterns = [
     path("", TemplateView.as_view(template_name="pages/home.html"), name="home"),
@@ -23,12 +23,12 @@ urlpatterns = [
     path("accounts/", include("allauth.urls")),
     # Your stuff: custom urls includes go here
 ] + static(settings.MEDIA_URL, document_root=settings.MEDIA_ROOT)
-{% if cookiecutter.use_async %}
-# Static file serving when using Gunicorn + Uvicorn for local development
+{%- if cookiecutter.use_async == 'y' %}
 if settings.DEBUG:
+    # Static file serving when using Gunicorn + Uvicorn for local web socket development
     urlpatterns += staticfiles_urlpatterns()
-{% endif %}
-{% if cookiecutter.use_drf == 'y' -%}
+{%- endif %}
+{% if cookiecutter.use_drf == 'y' %}
 # API URLS
 urlpatterns += [
     # API base url

From 367225e4e84998e664bed8fabc4c7f159a1c49e1 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Tue, 24 Mar 2020 21:46:40 -0400
Subject: [PATCH 0656/2840] Removed the 4 workers from the production start of
 uvicorn

---
 {{cookiecutter.project_slug}}/compose/local/django/start      | 2 +-
 {{cookiecutter.project_slug}}/compose/production/django/start | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start b/{{cookiecutter.project_slug}}/compose/local/django/start
index 259e7cd15..129266c8d 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/start
@@ -6,7 +6,7 @@ set -o nounset
 
 
 python manage.py migrate
-{%- if cookiecutter.use_async %}
+{%- if cookiecutter.use_async == 'y' %}
 /usr/local/bin/gunicorn config.asgi --bind 0.0.0.0:8000 --chdir=/app -k uvicorn.workers.UvicornWorker -e DJANGO_SETTINGS_MODULE=config.settings.local --reload
 {%- else %}
 python manage.py runserver_plus 0.0.0.0:8000
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/start b/{{cookiecutter.project_slug}}/compose/production/django/start
index 96c8987c4..1a41ed48d 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/start
+++ b/{{cookiecutter.project_slug}}/compose/production/django/start
@@ -27,8 +27,8 @@ if compress_enabled; then
   python /app/manage.py compress
 fi
 {%- endif %}
-{% if cookiecutter.use_async %}
-/usr/local/bin/gunicorn config.asgi --workers 4 --bind 0.0.0.0:5000 --chdir=/app -k uvicorn.workers.UvicornWorker
+{% if cookiecutter.use_async == 'y' %}
+/usr/local/bin/gunicorn config.asgi --bind 0.0.0.0:5000 --chdir=/app -k uvicorn.workers.UvicornWorker
 {% else %}
 /usr/local/bin/gunicorn config.wsgi --bind 0.0.0.0:5000 --chdir=/app
 {%- endif %}

From c9744497c90db88ea85246607215e21008b42ca1 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Tue, 24 Mar 2020 21:53:53 -0400
Subject: [PATCH 0657/2840] Added gunicorn to base.txt requirements for async
 work

---
 {{cookiecutter.project_slug}}/requirements/base.txt       | 3 ++-
 {{cookiecutter.project_slug}}/requirements/production.txt | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index ec861f352..2d47c6e1a 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -16,8 +16,9 @@ django-celery-beat==2.0.0  # https://github.com/celery/django-celery-beat
 flower==0.9.3  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
-{%- if cookiecutter.use_async %}
+{%- if cookiecutter.use_async == 'y' %}
 uvicorn==0.11.3  # https://github.com/encode/uvicorn
+gunicorn==20.0.4  # https://github.com/benoitc/gunicorn
 {%- endif %}
 
 # Django
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index a8bc31dce..75ae8c300 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -2,8 +2,10 @@
 
 -r ./base.txt
 
-gunicorn==20.0.4  # https://github.com/benoitc/gunicorn
 psycopg2==2.8.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
+{%- if cookiecutter.use_async == 'n' %}
+gunicorn==20.0.4  # https://github.com/benoitc/gunicorn
+{%- endif %}
 {%- if cookiecutter.use_whitenoise == 'n' %}
 Collectfast==2.1.0  # https://github.com/antonagestam/collectfast
 {%- endif %}

From 6c9ba12ddf2531c6b9d7737b20a02b2b8700ff19 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 25 Mar 2020 12:13:30 +0000
Subject: [PATCH 0658/2840] Update tox from 3.14.5 to 3.14.6 (#2507)

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

diff --git a/requirements.txt b/requirements.txt
index 81fbf524a..7967d95c4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8-isort==2.9.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.14.5
+tox==3.14.6
 pytest==5.4.1
 pytest-cookies==0.5.1
 pytest-instafail==0.4.1.post0

From 83f28a592c2a1270dc5413a243719a8485e31c9b Mon Sep 17 00:00:00 2001
From: "Fabio C. Barrioneuvo da Luz" <bnafta@gmail.com>
Date: Wed, 25 Mar 2020 11:57:33 -0300
Subject: [PATCH 0659/2840] Migrate book domain to Feldroy and other small
 fixes

---
 LICENSE        | 2 +-
 README.rst     | 2 +-
 docs/faq.rst   | 2 +-
 docs/index.rst | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/LICENSE b/LICENSE
index 28466d40f..a67e4da21 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,4 +1,4 @@
-Copyright (c) 2013-2018, Daniel Roy Greenfeld
+Copyright (c) 2013-2020, Daniel Roy Greenfeld
 All rights reserved.
 
 Redistribution and use in source and binary forms, with or without modification,
diff --git a/README.rst b/README.rst
index 649199236..1855f59f6 100644
--- a/README.rst
+++ b/README.rst
@@ -272,7 +272,7 @@ If you do rename your fork, I encourage you to submit it to the following places
 * cookiecutter_ so it gets listed in the README as a template.
 * The cookiecutter grid_ on Django Packages.
 
-.. _cookiecutter: https://github.com/audreyr/cookiecutter
+.. _cookiecutter: https://github.com/cookiecutter/cookiecutter
 .. _grid: https://www.djangopackages.com/grids/g/cookiecutters/
 
 Submit a Pull Request
diff --git a/docs/faq.rst b/docs/faq.rst
index 1481a8bac..59e82465f 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -24,4 +24,4 @@ Why doesn't this follow the layout from Two Scoops of Django?
 
 You may notice that some elements of this project do not exactly match what we describe in chapter 3 of `Two Scoops of Django 1.11`_. The reason for that is this project, amongst other things, serves as a test bed for trying out new ideas and concepts. Sometimes they work, sometimes they don't, but the end result is that it won't necessarily match precisely what is described in the book I co-authored.
 
-.. _Two Scoops of Django 1.11: https://www.twoscoopspress.com/collections/django/products/two-scoops-of-django-1-11
+.. _Two Scoops of Django 1.11: https://www.feldroy.com/collections/django/products/two-scoops-of-django-1-11
diff --git a/docs/index.rst b/docs/index.rst
index 8e0d04aa3..b29e728e9 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -5,7 +5,7 @@ Welcome to Cookiecutter Django's documentation!
 
 A Cookiecutter_ template for Django.
 
-.. _cookiecutter: https://github.com/audreyr/cookiecutter
+.. _cookiecutter: https://github.com/cookiecutter/cookiecutter
 
 Contents:
 

From 1e612c4cfb30b3b030a9f8582dbad7fca3906974 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 17 Mar 2020 19:00:55 +0000
Subject: [PATCH 0660/2840] Remove request_factory fixture, use the rf one from
 pytest-django

---
 .../{{cookiecutter.project_slug}}/conftest.py        |  6 ------
 .../users/tests/test_views.py                        | 12 ++++++------
 2 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/conftest.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/conftest.py
index 8cd51d7fe..335648e07 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/conftest.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/conftest.py
@@ -1,5 +1,4 @@
 import pytest
-from django.test import RequestFactory
 
 from {{ cookiecutter.project_slug }}.users.models import User
 from {{ cookiecutter.project_slug }}.users.tests.factories import UserFactory
@@ -13,8 +12,3 @@ def media_storage(settings, tmpdir):
 @pytest.fixture
 def user() -> User:
     return UserFactory()
-
-
-@pytest.fixture
-def request_factory() -> RequestFactory:
-    return RequestFactory()
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
index 9e868899c..ca0060595 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
@@ -16,18 +16,18 @@ class TestUserUpdateView:
         https://github.com/pytest-dev/pytest-django/pull/258
     """
 
-    def test_get_success_url(self, user: User, request_factory: RequestFactory):
+    def test_get_success_url(self, user: User, rf: RequestFactory):
         view = UserUpdateView()
-        request = request_factory.get("/fake-url/")
+        request = rf.get("/fake-url/")
         request.user = user
 
         view.request = request
 
         assert view.get_success_url() == f"/users/{user.username}/"
 
-    def test_get_object(self, user: User, request_factory: RequestFactory):
+    def test_get_object(self, user: User, rf: RequestFactory):
         view = UserUpdateView()
-        request = request_factory.get("/fake-url/")
+        request = rf.get("/fake-url/")
         request.user = user
 
         view.request = request
@@ -36,9 +36,9 @@ class TestUserUpdateView:
 
 
 class TestUserRedirectView:
-    def test_get_redirect_url(self, user: User, request_factory: RequestFactory):
+    def test_get_redirect_url(self, user: User, rf: RequestFactory):
         view = UserRedirectView()
-        request = request_factory.get("/fake-url")
+        request = rf.get("/fake-url")
         request.user = user
 
         view.request = request

From 820f574bf534b7c6126f9d7e8c6484116bf094ac Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 27 Mar 2020 11:00:30 +0000
Subject: [PATCH 0661/2840] Update django-extensions from 2.2.8 to 2.2.9

---
 {{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 81ef97c71..2c7ee6026 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -33,6 +33,6 @@ pre-commit==2.2.0  # https://github.com/pre-commit/pre-commit
 factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==2.2  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==2.2.8  # https://github.com/django-extensions/django-extensions
+django-extensions==2.2.9  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.8.0  # https://github.com/pytest-dev/pytest-django

From 62236dd908dcd35fbd2baabec1e9fadde40406d5 Mon Sep 17 00:00:00 2001
From: Tim Gates <tim.gates@iress.com>
Date: Fri, 27 Mar 2020 22:15:56 +1100
Subject: [PATCH 0662/2840] docs: Fix simple typo, interpteter -> interpreter

There is a small typo in {{cookiecutter.project_slug}}/docs/pycharm/configuration.rst.

Should read `interpreter` rather than `interpteter`.
---
 {{cookiecutter.project_slug}}/docs/pycharm/configuration.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/configuration.rst b/{{cookiecutter.project_slug}}/docs/pycharm/configuration.rst
index 1c20d023f..d8e769167 100644
--- a/{{cookiecutter.project_slug}}/docs/pycharm/configuration.rst
+++ b/{{cookiecutter.project_slug}}/docs/pycharm/configuration.rst
@@ -14,7 +14,7 @@ This repository comes with already prepared "Run/Debug Configurations" for docke
 
 .. image:: images/2.png
 
-But as you can see, at the beginning there is something wrong with them. They have red X on django icon, and they cannot be used, without configuring remote python interpteter. To do that, you have to go to *Settings > Build, Execution, Deployment* first.
+But as you can see, at the beginning there is something wrong with them. They have red X on django icon, and they cannot be used, without configuring remote python interpreter. To do that, you have to go to *Settings > Build, Execution, Deployment* first.
 
 
 Next, you have to add new remote python interpreter, based on already tested deployment settings. Go to *Settings > Project > Project Interpreter*. Click on the cog icon, and click *Add Remote*.

From efbb04da9155d1e45885d5c925c2b26ad3a9cf7f Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Fri, 27 Mar 2020 21:32:17 -0400
Subject: [PATCH 0663/2840] Update so apps load first when using asgi.py

---
 {{cookiecutter.project_slug}}/config/asgi.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/asgi.py b/{{cookiecutter.project_slug}}/config/asgi.py
index 4cc878cac..a325839b4 100644
--- a/{{cookiecutter.project_slug}}/config/asgi.py
+++ b/{{cookiecutter.project_slug}}/config/asgi.py
@@ -12,8 +12,6 @@ from pathlib import Path
 
 from django.core.asgi import get_asgi_application
 
-from .websocket import websocket_application
-
 # This allows easy placement of apps within the interior
 # {{ cookiecutter.project_slug }} directory.
 app_path = Path(__file__).parents[1].resolve()
@@ -32,6 +30,9 @@ django_application = get_asgi_application()
 # from helloworld.asgi import HelloWorldApplication
 # application = HelloWorldApplication(application)
 
+# Importing websocket application so that apps are loaded first
+from .websocket import websocket_application  # noqa
+
 
 async def application(scope, receive, send):
     if scope["type"] == "http":

From 558380ebe98017fe220b99eda58bc533efd4347f Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 29 Mar 2020 05:11:07 +0200
Subject: [PATCH 0664/2840] Update flake8-isort to 2.9.1 (#2511)

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

diff --git a/requirements.txt b/requirements.txt
index 7967d95c4..f4d5a931e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ binaryornot==0.4.4
 # ------------------------------------------------------------------------------
 black==19.10b0
 flake8==3.7.9
-flake8-isort==2.9.0
+flake8-isort==2.9.1
 
 # Testing
 # ------------------------------------------------------------------------------

From e49afda665a445899916f448bf6afa0a77a69f13 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sun, 29 Mar 2020 12:00:30 +0100
Subject: [PATCH 0665/2840] Update flower from 0.9.3 to 0.9.4

---
 {{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 b41be3b06..0b18afc51 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -13,7 +13,7 @@ redis==3.4.1 # https://github.com/andymccurdy/redis-py
 celery==4.4.2  # pyup: < 5.0  # https://github.com/celery/celery
 django-celery-beat==2.0.0  # https://github.com/celery/django-celery-beat
 {%- if cookiecutter.use_docker == 'y' %}
-flower==0.9.3  # https://github.com/mher/flower
+flower==0.9.4  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 

From 53b240af9a9be8439ea9e36ab9f7acd33786687f Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sun, 29 Mar 2020 12:00:34 +0100
Subject: [PATCH 0666/2840] Update flake8-isort from 2.9.0 to 2.9.1

---
 {{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 2c7ee6026..70c498f28 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -19,7 +19,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 # Code quality
 # ------------------------------------------------------------------------------
 flake8==3.7.9  # https://github.com/PyCQA/flake8
-flake8-isort==2.9.0  # https://github.com/gforcada/flake8-isort
+flake8-isort==2.9.1  # https://github.com/gforcada/flake8-isort
 coverage==5.0.4  # https://github.com/nedbat/coveragepy
 black==19.10b0  # https://github.com/ambv/black
 pylint-django==2.0.14  # https://github.com/PyCQA/pylint-django

From ec374425348c1241a918905a4a8409930e73599e Mon Sep 17 00:00:00 2001
From: Ernesto Cedeno <codnee@pm.me>
Date: Sun, 29 Mar 2020 19:54:30 +0200
Subject: [PATCH 0667/2840] Add Ernesto Cedeno to Contributors

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 2e7b11e62..e1416cf76 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -115,6 +115,7 @@ Listed in alphabetical order.
   Emanuel Calso            `@bloodpet`_                  @bloodpet
   Eraldo Energy            `@eraldo`_
   Eric Groom               `@ericgroom`_
+  Ernesto Cedeno           `@codnee`
   Eyad Al Sibai            `@eyadsibai`_
   Felipe Arruda            `@arruda`_
   Florian Idelberger       `@step21`_                    @windrush

From 0cdf60ceac4398aa74bbf8a45a4a92756c0e3d3b Mon Sep 17 00:00:00 2001
From: Ernesto Cedeno <codnee@pm.me>
Date: Sun, 29 Mar 2020 19:55:27 +0200
Subject: [PATCH 0668/2840] Change Python version to 3.8

---
 .travis.yml                                                   | 4 ++--
 CONTRIBUTING.rst                                              | 4 ++--
 README.rst                                                    | 2 +-
 docs/deployment-on-pythonanywhere.rst                         | 2 +-
 docs/developing-locally.rst                                   | 4 ++--
 hooks/pre_gen_project.py                                      | 2 +-
 setup.py                                                      | 2 +-
 tox.ini                                                       | 2 +-
 {{cookiecutter.project_slug}}/.travis.yml                     | 2 +-
 {{cookiecutter.project_slug}}/compose/local/django/Dockerfile | 2 +-
 .../compose/production/django/Dockerfile                      | 2 +-
 {{cookiecutter.project_slug}}/runtime.txt                     | 2 +-
 {{cookiecutter.project_slug}}/setup.cfg                       | 2 +-
 13 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 52786a17f..b250148e0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,7 +5,7 @@ services:
 
 language: python
 
-python: 3.7
+python: 3.8
 
 before_install:
   - docker-compose -v
@@ -14,7 +14,7 @@ before_install:
 matrix:
   include:
     - name: Test results
-      script: tox -e py37
+      script: tox -e py38
     - name: Black template
       script: tox -e black-template
     - name: Basic Docker
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index cb59ae5f3..0a64e628b 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -39,9 +39,9 @@ To run all tests using various versions of python in virtualenvs defined in tox.
 It is possible to test with a specific version of python. To do this, the command
 is::
 
-    $ tox -e py37
+    $ tox -e py38
 
-This will run py.test with the python3.7 interpreter, for example.
+This will run py.test with the python3.8 interpreter, for example.
 
 To run a particular test with tox for against your current Python version::
 
diff --git a/README.rst b/README.rst
index 1855f59f6..475d41cf7 100644
--- a/README.rst
+++ b/README.rst
@@ -37,7 +37,7 @@ Features
 ---------
 
 * For Django 3.0
-* Works with Python 3.7
+* Works with Python 3.8
 * Renders Django projects with 100% starting test coverage
 * Twitter Bootstrap_ v4 (`maintained Foundation fork`_ also available)
 * 12-Factor_ based settings via django-environ_
diff --git a/docs/deployment-on-pythonanywhere.rst b/docs/deployment-on-pythonanywhere.rst
index 4738d5a55..75109675d 100644
--- a/docs/deployment-on-pythonanywhere.rst
+++ b/docs/deployment-on-pythonanywhere.rst
@@ -35,7 +35,7 @@ Make sure your project is fully committed and pushed up to Bitbucket or Github o
 
     git clone <my-repo-url>  # you can also use hg
     cd my-project-name
-    mkvirtualenv --python=/usr/bin/python3.7 my-project-name
+    mkvirtualenv --python=/usr/bin/python3.8 my-project-name
     pip install -r requirements/production.txt  # may take a few minutes
 
 
diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index 7a58d0999..f02e5c56d 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -9,7 +9,7 @@ Setting Up Development Environment
 
 Make sure to have the following on your host:
 
-* Python 3.7
+* Python 3.8
 * PostgreSQL_.
 * Redis_, if using Celery
 
@@ -17,7 +17,7 @@ First things first.
 
 #. Create a virtualenv: ::
 
-    $ python3.7 -m venv <virtual env path>
+    $ python3.8 -m venv <virtual env path>
 
 #. Activate the virtualenv you have just created: ::
 
diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py
index 54334dedd..8eaf4983d 100644
--- a/hooks/pre_gen_project.py
+++ b/hooks/pre_gen_project.py
@@ -35,7 +35,7 @@ if "{{ cookiecutter.use_docker }}".lower() == "n":
     if python_major_version == 2:
         print(
             WARNING + "You're running cookiecutter under Python 2, but the generated "
-            "project requires Python 3.7+. Do you want to proceed (y/n)? " + TERMINATOR
+            "project requires Python 3.8+. Do you want to proceed (y/n)? " + TERMINATOR
         )
         yes_options, no_options = frozenset(["y"]), frozenset(["n"])
         while True:
diff --git a/setup.py b/setup.py
index e311e82ad..ee325e8ab 100644
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,7 @@ setup(
         "License :: OSI Approved :: BSD License",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.7",
+        "Programming Language :: Python :: 3.8",
         "Programming Language :: Python :: Implementation :: CPython",
         "Topic :: Software Development",
     ],
diff --git a/tox.ini b/tox.ini
index 737b26e73..242183c39 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 skipsdist = true
-envlist = py37,black-template
+envlist = py38,black-template
 
 [testenv]
 deps = -rrequirements.txt
diff --git a/{{cookiecutter.project_slug}}/.travis.yml b/{{cookiecutter.project_slug}}/.travis.yml
index 31695e419..6f7596970 100644
--- a/{{cookiecutter.project_slug}}/.travis.yml
+++ b/{{cookiecutter.project_slug}}/.travis.yml
@@ -10,7 +10,7 @@ before_install:
   - sudo apt-get install -qq libsqlite3-dev libxml2 libxml2-dev libssl-dev libbz2-dev wget curl llvm
 language: python
 python:
-  - "3.7"
+  - "3.8"
 install:
   - pip install -r requirements/local.txt
 script:
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index 6a356ac60..5473f114e 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.7-slim-buster
+FROM python:3.8-slim-buster
 
 ENV PYTHONUNBUFFERED 1
 ENV PYTHONDONTWRITEBYTECODE 1
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index 42ecbeafc..72f71d6ec 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -9,7 +9,7 @@ RUN npm run build
 
 # Python build stage
 {%- endif %}
-FROM python:3.7-slim-buster
+FROM python:3.8-slim-buster
 
 ENV PYTHONUNBUFFERED 1
 
diff --git a/{{cookiecutter.project_slug}}/runtime.txt b/{{cookiecutter.project_slug}}/runtime.txt
index 6919bf9ed..724c203e1 100644
--- a/{{cookiecutter.project_slug}}/runtime.txt
+++ b/{{cookiecutter.project_slug}}/runtime.txt
@@ -1 +1 @@
-python-3.7.6
+python-3.8.2
diff --git a/{{cookiecutter.project_slug}}/setup.cfg b/{{cookiecutter.project_slug}}/setup.cfg
index 5f7d9b655..f1f66519e 100644
--- a/{{cookiecutter.project_slug}}/setup.cfg
+++ b/{{cookiecutter.project_slug}}/setup.cfg
@@ -7,7 +7,7 @@ max-line-length = 120
 exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules
 
 [mypy]
-python_version = 3.7
+python_version = 3.8
 check_untyped_defs = True
 ignore_missing_imports = True
 warn_unused_ignores = True

From a2966da438aafcc2cdeb9c987e20f5866fd146d9 Mon Sep 17 00:00:00 2001
From: codnee <codnee@users.noreply.github.com>
Date: Sun, 29 Mar 2020 23:30:42 +0200
Subject: [PATCH 0669/2840] Update CONTRIBUTORS.rst

Fix link to @codnee

Co-Authored-By: Bruno Alla <browniebroke@users.noreply.github.com>
---
 CONTRIBUTORS.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index e1416cf76..3d2a84637 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -115,7 +115,7 @@ Listed in alphabetical order.
   Emanuel Calso            `@bloodpet`_                  @bloodpet
   Eraldo Energy            `@eraldo`_
   Eric Groom               `@ericgroom`_
-  Ernesto Cedeno           `@codnee`
+  Ernesto Cedeno           `@codnee`_
   Eyad Al Sibai            `@eyadsibai`_
   Felipe Arruda            `@arruda`_
   Florian Idelberger       `@step21`_                    @windrush

From 94a1fef0af2450b89e6b4861b5155a02c2ee5e05 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 31 Mar 2020 12:00:31 +0100
Subject: [PATCH 0670/2840] Update pytest-django from 3.8.0 to 3.9.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 70c498f28..e2e3fdd68 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -35,4 +35,4 @@ factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 django-debug-toolbar==2.2  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==2.2.9  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
-pytest-django==3.8.0  # https://github.com/pytest-dev/pytest-django
+pytest-django==3.9.0  # https://github.com/pytest-dev/pytest-django

From bbd940363f29ba41f6e0527d6b2e8b908738bf96 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 1 Apr 2020 12:00:31 +0100
Subject: [PATCH 0671/2840] Update django from 3.0.4 to 3.0.5

---
 {{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 0b18afc51..8f473c50c 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -19,7 +19,7 @@ flower==0.9.4  # https://github.com/mher/flower
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.0.4  # pyup: < 3.1  # https://www.djangoproject.com/
+django==3.0.5  # pyup: < 3.1  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==4.0.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.41.0  # https://github.com/pennersr/django-allauth

From 80fdb5c7cc3c65dcc78552585d76d5e36102b37b Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 1 Apr 2020 12:00:35 +0100
Subject: [PATCH 0672/2840] Update werkzeug from 1.0.0 to 1.0.1

---
 {{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 e2e3fdd68..8f7cbd73b 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,6 +1,6 @@
 -r ./base.txt
 
-Werkzeug==1.0.0 # https://github.com/pallets/werkzeug
+Werkzeug==1.0.1 # https://github.com/pallets/werkzeug
 ipdb==0.13.2  # https://github.com/gotcha/ipdb
 Sphinx==2.4.4  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}

From a9977e78e058b83907854938cebea15586dec22f Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Wed, 1 Apr 2020 16:02:21 +0100
Subject: [PATCH 0673/2840] Bump version

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

diff --git a/setup.py b/setup.py
index e311e82ad..d1051d8bc 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.0.4"
+version = "3.0.5"
 
 if sys.argv[-1] == "tag":
     os.system(f'git tag -a {version} -m "version {version}"')

From 8eb14e6c84f1b964c24645de93eeb1c6c96fa7bc Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 2 Apr 2020 12:00:31 +0100
Subject: [PATCH 0674/2840] Update pillow from 7.0.0 to 7.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 8f473c50c..8752ec372 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,6 +1,6 @@
 pytz==2019.3  # https://github.com/stub42/pytz
 python-slugify==4.0.0  # https://github.com/un33k/python-slugify
-Pillow==7.0.0  # https://github.com/python-pillow/Pillow
+Pillow==7.1.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
 rcssmin==1.0.6{% if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} --install-option="--without-c-extensions"{% endif %}  # https://github.com/ndparker/rcssmin
 {%- endif %}

From d16760bf8b3dff00fc63d35993395be0e017fbb4 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Fri, 3 Apr 2020 12:00:30 +0100
Subject: [PATCH 0675/2840] Update pillow from 7.1.0 to 7.1.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 8752ec372..b7a370d46 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,6 +1,6 @@
 pytz==2019.3  # https://github.com/stub42/pytz
 python-slugify==4.0.0  # https://github.com/un33k/python-slugify
-Pillow==7.1.0  # https://github.com/python-pillow/Pillow
+Pillow==7.1.1  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
 rcssmin==1.0.6{% if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} --install-option="--without-c-extensions"{% endif %}  # https://github.com/ndparker/rcssmin
 {%- endif %}

From 68d751f2d4dde5297771a6e665c395585e95a7e1 Mon Sep 17 00:00:00 2001
From: gwiskur <glenn.wiskur@gmail.com>
Date: Sat, 4 Apr 2020 08:59:00 -0500
Subject: [PATCH 0676/2840] Add compress command when using Django Compressor

If the django-compressor option is selected, then the ``compress`` command is required where COMPRESS_OFFLINE = True is default in the production settings.  See here: https://django-compressor.readthedocs.io/en/latest/usage/#offline-compression
---
 CONTRIBUTORS.rst                      | 2 ++
 docs/deployment-on-pythonanywhere.rst | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 2e7b11e62..3ab939c27 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -122,6 +122,7 @@ Listed in alphabetical order.
   Garry Cairns             `@garry-cairns`_
   Garry Polley             `@garrypolley`_
   Gilbishkosma             `@Gilbishkosma`_
+  Glenn Wiskur             `@gwiskur`_
   Guilherme Guy            `@guilherme1guy`_
   Hamish Durkin            `@durkode`_
   Hana Quadara             `@hanaquadara`_
@@ -298,6 +299,7 @@ Listed in alphabetical order.
 .. _@garry-cairns: https://github.com/garry-cairns
 .. _@garrypolley: https://github.com/garrypolley
 .. _@Gilbishkosma: https://github.com/Gilbishkosma
+.. _@gwiskur: https://github.com/gwiskur
 .. _@glasslion: https://github.com/glasslion
 .. _@goldhand: https://github.com/goldhand
 .. _@hackebrot: https://github.com/hackebrot
diff --git a/docs/deployment-on-pythonanywhere.rst b/docs/deployment-on-pythonanywhere.rst
index 4738d5a55..a924d69ac 100644
--- a/docs/deployment-on-pythonanywhere.rst
+++ b/docs/deployment-on-pythonanywhere.rst
@@ -15,7 +15,7 @@ Full instructions follow, but here's a high-level view.
 
 2. Set your config variables in the *postactivate* script
 
-3. Run the *manage.py* ``migrate`` and ``collectstatic`` commands
+3. Run the *manage.py* ``migrate`` and ``collectstatic`` {%- if cookiecutter.use_compressor == "y" %}and ``compress`` {%- endif %}commands
 
 4. Add an entry to the PythonAnywhere *Web tab*
 
@@ -109,6 +109,7 @@ Now run the migration, and collectstatic:
     source $VIRTUAL_ENV/bin/postactivate
     python manage.py migrate
     python manage.py collectstatic
+    {%- if cookiecutter.use_compressor == "y" %}python manage.py compress {%- endif %}
     # and, optionally
     python manage.py createsuperuser
 
@@ -175,6 +176,7 @@ For subsequent deployments, the procedure is much simpler.  In a Bash console:
     git pull
     python manage.py migrate
     python manage.py collectstatic
+    {%- if cookiecutter.use_compressor == "y" %}python manage.py compress {%- endif %}
 
 And then go to the Web tab and hit **Reload**
 

From 0df3087d3d93a26daeceac8ed31518ce7be40541 Mon Sep 17 00:00:00 2001
From: Tevak <teva.krief@hotmail.fr>
Date: Sat, 4 Apr 2020 17:26:24 +0200
Subject: [PATCH 0677/2840] Traefik - Also redirect wwww. to service.

---
 CONTRIBUTORS.rst                                              | 2 ++
 .../compose/production/traefik/traefik.yml                    | 4 ++--
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 3ab939c27..b39845c22 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -200,6 +200,7 @@ Listed in alphabetical order.
   Sascha                   `@saschalalala`_             @saschalalala
   Shupeyko Nikita          `@webyneter`_
   Sławek Ehlert            `@slafs`_
+  Sorasful                 `@sorasful`_
   Srinivas Nyayapati       `@shireenrao`_
   stepmr                   `@stepmr`_
   Steve Steiner            `@ssteinerX`_
@@ -372,6 +373,7 @@ Listed in alphabetical order.
 .. _@siauPatrick: https://github.com/siauPatrick
 .. _@sladinji: https://github.com/sladinji
 .. _@slafs: https://github.com/slafs
+.. _@sorasful:: https://github.com/sorasful
 .. _@ssteinerX: https://github.com/ssteinerx
 .. _@step21: https://github.com/step21
 .. _@stepmr: https://github.com/stepmr
diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
index 923774f4d..960d1ac2e 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
@@ -28,7 +28,7 @@ certificatesResolvers:
 http:
   routers:
     web-router:
-      rule: "Host(`{{ cookiecutter.domain_name }}`)"
+      rule: "Host(`{{ cookiecutter.domain_name }}`) || Host(`www.{{ cookiecutter.domain_name }}`)"
       entryPoints:
         - web
       middlewares:
@@ -37,7 +37,7 @@ http:
       service: django
 
     web-secure-router:
-      rule: "Host(`{{ cookiecutter.domain_name }}`)"
+      rule: "Host(`{{ cookiecutter.domain_name }}`) || Host(`www.{{ cookiecutter.domain_name }}`)"
       entryPoints:
         - web-secure
       middlewares:

From bd104afb3dfdc0c4a6e0bc817c0deb5ff73df66a Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 6 Apr 2020 12:00:30 +0100
Subject: [PATCH 0678/2840] Update sphinx from 2.4.4 to 3.0.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 8f7cbd73b..370ea21ec 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -2,7 +2,7 @@
 
 Werkzeug==1.0.1 # https://github.com/pallets/werkzeug
 ipdb==0.13.2  # https://github.com/gotcha/ipdb
-Sphinx==2.4.4  # https://github.com/sphinx-doc/sphinx
+Sphinx==3.0.0  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}

From 75f4d304f4898114b699e9e1cc4ef9e3a64a60ae Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 6 Apr 2020 12:00:33 +0100
Subject: [PATCH 0679/2840] Update psycopg2-binary from 2.8.4 to 2.8.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 370ea21ec..49ed908dc 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -6,7 +6,7 @@ Sphinx==3.0.0  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}
-psycopg2-binary==2.8.4  # https://github.com/psycopg/psycopg2
+psycopg2-binary==2.8.5  # https://github.com/psycopg/psycopg2
 {%- endif %}
 
 # Testing

From 94d7bd11ad27511d9f5beab72282a7d978a2f06f Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 6 Apr 2020 13:36:25 +0100
Subject: [PATCH 0680/2840] Update psycopg2 from 2.8.4 to 2.8.5

---
 {{cookiecutter.project_slug}}/requirements/local.txt      | 2 +-
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 49ed908dc..6dbf448e2 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -4,7 +4,7 @@ Werkzeug==1.0.1 # https://github.com/pallets/werkzeug
 ipdb==0.13.2  # https://github.com/gotcha/ipdb
 Sphinx==3.0.0  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
-psycopg2==2.8.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
+psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}
 psycopg2-binary==2.8.5  # https://github.com/psycopg/psycopg2
 {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index a8bc31dce..b13c4533c 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -3,7 +3,7 @@
 -r ./base.txt
 
 gunicorn==20.0.4  # https://github.com/benoitc/gunicorn
-psycopg2==2.8.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
+psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
 Collectfast==2.1.0  # https://github.com/antonagestam/collectfast
 {%- endif %}

From 041751a359fd774857f723c4344e5b8dd9680c66 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Tue, 7 Apr 2020 00:23:31 -0400
Subject: [PATCH 0681/2840] Fixed linter for asgi.py

---
 {{cookiecutter.project_slug}}/config/asgi.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/asgi.py b/{{cookiecutter.project_slug}}/config/asgi.py
index a325839b4..ef3ff58e3 100644
--- a/{{cookiecutter.project_slug}}/config/asgi.py
+++ b/{{cookiecutter.project_slug}}/config/asgi.py
@@ -5,6 +5,7 @@ It exposes the ASGI callable as a module-level variable named ``application``.
 
 For more information on this file, see
 https://docs.djangoproject.com/en/dev/howto/deployment/asgi/
+
 """
 import os
 import sys
@@ -30,8 +31,8 @@ django_application = get_asgi_application()
 # from helloworld.asgi import HelloWorldApplication
 # application = HelloWorldApplication(application)
 
-# Importing websocket application so that apps are loaded first
-from .websocket import websocket_application  # noqa
+# Import websocket application here, so apps from django_application are loaded first
+from .websocket import websocket_application  # noqa isort:skip
 
 
 async def application(scope, receive, send):

From 1d2d881aba9b72653bbd206af4afd6ba297d0649 Mon Sep 17 00:00:00 2001
From: Duda Nogueira <dudanogueira@gmail.com>
Date: Tue, 7 Apr 2020 18:53:09 -0300
Subject: [PATCH 0682/2840] Fix INTERNAL_IPS for DOCKER when ip higher than 9

previously, for IP ex: 172.19.0.13 becomes: 172.19.0.11
now, it becomes 172.19.0.1
---
 {{cookiecutter.project_slug}}/config/settings/local.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py
index 015d8aff8..9bbfa60d2 100644
--- a/{{cookiecutter.project_slug}}/config/settings/local.py
+++ b/{{cookiecutter.project_slug}}/config/settings/local.py
@@ -68,7 +68,7 @@ if env("USE_DOCKER") == "yes":
     import socket
 
     hostname, _, ips = socket.gethostbyname_ex(socket.gethostname())
-    INTERNAL_IPS += [ip[:-1] + "1" for ip in ips]
+    INTERNAL_IPS += [".".join(ip.split(".")[:-1]+["1"]) for ip in ips]
 {%- endif %}
 
 # django-extensions

From 8d9796d9f8db16df6e222daa4c09bf12f1d3db9d Mon Sep 17 00:00:00 2001
From: Duda Nogueira <dudanogueira@gmail.com>
Date: Tue, 7 Apr 2020 19:03:34 -0300
Subject: [PATCH 0683/2840] Update CONTRIBUTORS.rst

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 3ab939c27..01248eccc 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -112,6 +112,7 @@ Listed in alphabetical order.
   Diane Chen               `@purplediane`_               @purplediane88
   Dónal Adams              `@epileptic-fish`_
   Dong Huynh               `@trungdong`_
+  Duda Nogueira            `@dudanogueira`_                  @dudanogueira
   Emanuel Calso            `@bloodpet`_                  @bloodpet
   Eraldo Energy            `@eraldo`_
   Eric Groom               `@ericgroom`_

From 5602d4f73b04a1a0b9dc3a124303f74932dd4f17 Mon Sep 17 00:00:00 2001
From: Duda Nogueira <dudanogueira@gmail.com>
Date: Tue, 7 Apr 2020 19:11:43 -0300
Subject: [PATCH 0684/2840] Link to my github

---
 CONTRIBUTORS.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 01248eccc..64a901d12 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -112,7 +112,7 @@ Listed in alphabetical order.
   Diane Chen               `@purplediane`_               @purplediane88
   Dónal Adams              `@epileptic-fish`_
   Dong Huynh               `@trungdong`_
-  Duda Nogueira            `@dudanogueira`_                  @dudanogueira
+  Duda Nogueira            `@dudanogueira`_              @dudanogueira
   Emanuel Calso            `@bloodpet`_                  @bloodpet
   Eraldo Energy            `@eraldo`_
   Eric Groom               `@ericgroom`_
@@ -284,6 +284,7 @@ Listed in alphabetical order.
 .. _@dezoito: https://github.com/dezoito
 .. _@dhepper: https://github.com/dhepper
 .. _@dot2dotseurat: https://github.com/dot2dotseurat
+.. _@dudanogueira: https://github.com/dudanogueira
 .. _@dsclementsen: https://github.com/dsclementsen
 .. _@guilherme1guy: https://github.com/guilherme1guy
 .. _@durkode: https://github.com/durkode

From 819e9ff27351001055dc10382b70a919e3634573 Mon Sep 17 00:00:00 2001
From: Duda Nogueira <dudanogueira@gmail.com>
Date: Tue, 7 Apr 2020 19:29:46 -0300
Subject: [PATCH 0685/2840] Adding some spaces to pass build :P

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

diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py
index 9bbfa60d2..21e6a8dfc 100644
--- a/{{cookiecutter.project_slug}}/config/settings/local.py
+++ b/{{cookiecutter.project_slug}}/config/settings/local.py
@@ -68,7 +68,7 @@ if env("USE_DOCKER") == "yes":
     import socket
 
     hostname, _, ips = socket.gethostbyname_ex(socket.gethostname())
-    INTERNAL_IPS += [".".join(ip.split(".")[:-1]+["1"]) for ip in ips]
+    INTERNAL_IPS += [".".join(ip.split(".")[:-1] + ["1"]) for ip in ips]
 {%- endif %}
 
 # django-extensions

From e474ed3f1aa70cf8790089200c99ae71037c1e1b Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 11 Apr 2020 12:00:29 +0100
Subject: [PATCH 0686/2840] Update sphinx from 3.0.0 to 3.0.1

---
 {{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 6dbf448e2..ddecd5414 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -2,7 +2,7 @@
 
 Werkzeug==1.0.1 # https://github.com/pallets/werkzeug
 ipdb==0.13.2  # https://github.com/gotcha/ipdb
-Sphinx==3.0.0  # https://github.com/sphinx-doc/sphinx
+Sphinx==3.0.1  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}

From 0f388a6d96655e732b5f066844bcfddba7529196 Mon Sep 17 00:00:00 2001
From: Tano Abeleyra <tano@abeleyra.com>
Date: Sat, 11 Apr 2020 14:49:04 -0300
Subject: [PATCH 0687/2840] Fix minor typo

---
 {{cookiecutter.project_slug}}/config/settings/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 6a2a9c3f2..390f2252c 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -311,7 +311,7 @@ INSTALLED_APPS += ["compressor"]
 STATICFILES_FINDERS += ["compressor.finders.CompressorFinder"]
 {%- endif %}
 {% if cookiecutter.use_drf == "y" -%}
-# django-reset-framework
+# django-rest-framework
 # -------------------------------------------------------------------------------
 # django-rest-framework - https://www.django-rest-framework.org/api-guide/settings/
 REST_FRAMEWORK = {

From 83934f3d86e77ee98f62e3b36a6e2c6f653b27a1 Mon Sep 17 00:00:00 2001
From: Dani Hodovic <dani.hodovic@gmail.com>
Date: Sun, 12 Apr 2020 21:40:02 +0300
Subject: [PATCH 0688/2840] Store coverage config in setup.cfg

Less is more. Unify tooling configuration in one file.
---
 {{cookiecutter.project_slug}}/.coveragerc | 5 -----
 {{cookiecutter.project_slug}}/setup.cfg   | 6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)
 delete mode 100644 {{cookiecutter.project_slug}}/.coveragerc

diff --git a/{{cookiecutter.project_slug}}/.coveragerc b/{{cookiecutter.project_slug}}/.coveragerc
deleted file mode 100644
index 283a4b89c..000000000
--- a/{{cookiecutter.project_slug}}/.coveragerc
+++ /dev/null
@@ -1,5 +0,0 @@
-[run]
-include = {{cookiecutter.project_slug}}/*
-omit = *migrations*, *tests*
-plugins =
-    django_coverage_plugin
diff --git a/{{cookiecutter.project_slug}}/setup.cfg b/{{cookiecutter.project_slug}}/setup.cfg
index 5f7d9b655..5bcbc8c4d 100644
--- a/{{cookiecutter.project_slug}}/setup.cfg
+++ b/{{cookiecutter.project_slug}}/setup.cfg
@@ -21,3 +21,9 @@ django_settings_module = config.settings.test
 [mypy-*.migrations.*]
 # Django migrations should not produce any errors:
 ignore_errors = True
+
+[coverage:run]
+include = {{cookiecutter.project_slug}}/*
+omit = *migrations*, *tests*
+plugins =
+    django_coverage_plugin

From 6510ab1555dfea7281847ca832bb7e55e3b4b555 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 13 Apr 2020 12:00:29 +0100
Subject: [PATCH 0689/2840] Update coverage from 5.0.4 to 5.1

---
 {{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 ddecd5414..975ed2526 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -20,7 +20,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 # ------------------------------------------------------------------------------
 flake8==3.7.9  # https://github.com/PyCQA/flake8
 flake8-isort==2.9.1  # https://github.com/gforcada/flake8-isort
-coverage==5.0.4  # https://github.com/nedbat/coveragepy
+coverage==5.1  # https://github.com/nedbat/coveragepy
 black==19.10b0  # https://github.com/ambv/black
 pylint-django==2.0.14  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 7bf1a81dcc7365cc44d7b8fcf4cc34b2f8224ec1 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 13 Apr 2020 15:16:08 +0100
Subject: [PATCH 0690/2840] Fix broken link in contributors list

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 209d22a3b..40119fd39 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -272,6 +272,7 @@ Listed in alphabetical order.
 .. _@chuckus: https://github.com/chuckus
 .. _@cmackenzie1: https://github.com/cmackenzie1
 .. _@cmargieson: https://github.com/cmargieson
+.. _@codnee: https://github.com/codnee
 .. _@cole: https://github.com/cole
 .. _@Collederas: https://github.com/Collederas
 .. _@curtisstpierre: https://github.com/curtisstpierre

From 02aaba1ee5c38586408c3ff31fe64af64a1815c5 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 13 Apr 2020 15:24:45 +0100
Subject: [PATCH 0691/2840] Added a few things to the changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ae8f7efe8..27a8578a2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,36 @@
 # Change Log
 All enhancements and patches to Cookiecutter Django will be documented in this file.
 
+## [2020-04-13]
+### Changed
+- Updated to Python 3.8 (@codnee)
+- Moved converage config in setup.cfg (@danihodovic)
+
+## [2020-04-08]
+### Fixed
+- Internal IPs for debug toolbar (@dudanogueira)
+
+## [2020-04-04]
+### Fixed
+- Added compress command command with Django compressor (@gwiskur)
+
+## [2020-03-23]
+### Changed
+- Updated project to Django 3.0
+
+## [2020-03-17]
+### Changed
+- Handle paths using Pathlib (@jules-ch)
+
+### Fixed
+- Pre-commit hook regex (@demestav)
+
+## [2020-03-16]
+### Added
+- Support for all Anymail providers (@Andrew-Chen-Wang)
+### Fixed
+- Django compressor setup (@jameswilliams1)
+
 ## [2020-01-23]
 ### Changed
 - Fix UserFactory to set the password if provided (@BoPeng)

From f0813a24b2e5648b8f6d2f2d5ce7da36dd4fead5 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Mon, 13 Apr 2020 10:57:42 -0400
Subject: [PATCH 0692/2840] Added Heroku and Gulp support * Deleted some
 unnecessary info inside asgi.py

---
 {{cookiecutter.project_slug}}/Procfile       |  4 ++++
 {{cookiecutter.project_slug}}/config/asgi.py | 12 ++----------
 {{cookiecutter.project_slug}}/gulpfile.js    | 17 +++++++++++++++++
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/Procfile b/{{cookiecutter.project_slug}}/Procfile
index 3838eafd7..0becb2cbe 100644
--- a/{{cookiecutter.project_slug}}/Procfile
+++ b/{{cookiecutter.project_slug}}/Procfile
@@ -1,5 +1,9 @@
 release: python manage.py migrate
+{% if cookiecutter.use_async == "y" -%}
+web: gunicorn config.asgi:application -k uvicorn.workers.UvicornWorker
+{%- else  %}
 web: gunicorn config.wsgi:application
+{%- endif %}
 {% if cookiecutter.use_celery == "y" -%}
 worker: celery worker --app=config.celery_app --loglevel=info
 beat: celery beat --app=config.celery_app --loglevel=info
diff --git a/{{cookiecutter.project_slug}}/config/asgi.py b/{{cookiecutter.project_slug}}/config/asgi.py
index ef3ff58e3..485c8ecad 100644
--- a/{{cookiecutter.project_slug}}/config/asgi.py
+++ b/{{cookiecutter.project_slug}}/config/asgi.py
@@ -7,7 +7,6 @@ For more information on this file, see
 https://docs.djangoproject.com/en/dev/howto/deployment/asgi/
 
 """
-import os
 import sys
 from pathlib import Path
 
@@ -17,22 +16,15 @@ from django.core.asgi import get_asgi_application
 # {{ cookiecutter.project_slug }} directory.
 app_path = Path(__file__).parents[1].resolve()
 sys.path.append(str(app_path / "{{ cookiecutter.project_slug }}"))
-# We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks
-# if running multiple sites in the same mod_wsgi process. To fix this, use
-# mod_wsgi daemon mode with each site in its own daemon process, or use
-# os.environ["DJANGO_SETTINGS_MODULE"] = "config.settings.production"
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.production")
 
-# This application object is used by any ASGI server configured to use this
-# file. This includes Django's development server, if the ASGI_APPLICATION
-# setting points here.
+# This application object is used by any ASGI server configured to use this file.
 django_application = get_asgi_application()
 # Apply ASGI middleware here.
 # from helloworld.asgi import HelloWorldApplication
 # application = HelloWorldApplication(application)
 
 # Import websocket application here, so apps from django_application are loaded first
-from .websocket import websocket_application  # noqa isort:skip
+from config.websocket import websocket_application  # noqa isort:skip
 
 
 async def application(scope, receive, send):
diff --git a/{{cookiecutter.project_slug}}/gulpfile.js b/{{cookiecutter.project_slug}}/gulpfile.js
index 3c28a7359..89894d38b 100644
--- a/{{cookiecutter.project_slug}}/gulpfile.js
+++ b/{{cookiecutter.project_slug}}/gulpfile.js
@@ -110,6 +110,18 @@ function imgCompression() {
     .pipe(dest(paths.images))
 }
 
+{% if cookiecutter.use_async == 'y' -%}
+// Run django server
+function asyncRunServer(cb) {
+  var cmd = spawn('gunicorn', [
+      'config.asgi', '-k', 'uvicorn.workers.UvicornWorker', '--reload'
+      ], {stdio: 'inherit'}
+  )
+  cmd.on('close', function(code) {
+    console.log('gunicorn exited with code ' + code)
+  })
+}
+{%- else %}
 // Run django server
 function runServer(cb) {
   var cmd = spawn('python', ['manage.py', 'runserver'], {stdio: 'inherit'})
@@ -118,6 +130,7 @@ function runServer(cb) {
     cb(code)
   })
 }
+{%- endif %}
 
 // Browser sync server for live reload
 function initBrowserSync() {
@@ -166,8 +179,12 @@ const generateAssets = parallel(
 // Set up dev environment
 const dev = parallel(
   {%- if cookiecutter.use_docker == 'n' %}
+  {%- if cookiecutter.use_async == 'y' %}
+  asyncRunServer,
+  {%- else %}
   runServer,
   {%- endif %}
+  {%- endif %}
   initBrowserSync,
   watchPaths
 )

From cc099ae941a6136da9dfd5dd24ce41766fd720cb Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Mon, 13 Apr 2020 11:26:09 -0400
Subject: [PATCH 0693/2840] Edited docs for local running async

---
 docs/developing-locally.rst                              | 6 +++++-
 {{cookiecutter.project_slug}}/compose/local/django/start | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index 7a58d0999..dae14f6ac 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -68,10 +68,14 @@ First things first.
 
     $ python manage.py migrate
 
-#. See the application being served through Django development server: ::
+#. If you're running synchronously, see the application being served through Django development server: ::
 
     $ python manage.py runserver 0.0.0.0:8000
 
+or if you're running asynchronously: ::
+
+    $ gunicorn config.asgi --bind 0.0.0.0:8000 -k uvicorn.workers.UvicornWorker --reload
+
 .. _PostgreSQL: https://www.postgresql.org/download/
 .. _Redis: https://redis.io/download
 .. _createdb: https://www.postgresql.org/docs/current/static/app-createdb.html
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start b/{{cookiecutter.project_slug}}/compose/local/django/start
index 129266c8d..9c0b43d1f 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/start
@@ -7,7 +7,7 @@ set -o nounset
 
 python manage.py migrate
 {%- if cookiecutter.use_async == 'y' %}
-/usr/local/bin/gunicorn config.asgi --bind 0.0.0.0:8000 --chdir=/app -k uvicorn.workers.UvicornWorker -e DJANGO_SETTINGS_MODULE=config.settings.local --reload
+/usr/local/bin/gunicorn config.asgi --bind 0.0.0.0:8000 --chdir=/app -k uvicorn.workers.UvicornWorker --reload
 {%- else %}
 python manage.py runserver_plus 0.0.0.0:8000
 {% endif %}

From efd53908af9579c4a7b5b230bebec1bf18d3628e Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 14 Apr 2020 12:00:30 +0100
Subject: [PATCH 0694/2840] Update django-anymail from 7.0.0 to 7.1.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 b13c4533c..e0f4b3323 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -19,7 +19,7 @@ django-storages[boto3]==1.9.1  # https://github.com/jschneier/django-storages
 django-storages[google]==1.9.1  # https://github.com/jschneier/django-storages
 {%- endif %}
 {%- if cookiecutter.mail_service == 'Mailgun' %}
-django-anymail[mailgun]==7.0.0  # https://github.com/anymail/django-anymail
+django-anymail[mailgun]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
 django-anymail[amazon_ses]==7.0.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}

From cbaf953ed29c37d11c7d251ca2c7c33e683860f7 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 14 Apr 2020 12:00:31 +0100
Subject: [PATCH 0695/2840] Update django-anymail from 7.0.0 to 7.1.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 e0f4b3323..f53110b79 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -21,7 +21,7 @@ django-storages[google]==1.9.1  # https://github.com/jschneier/django-storages
 {%- if cookiecutter.mail_service == 'Mailgun' %}
 django-anymail[mailgun]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
-django-anymail[amazon_ses]==7.0.0  # https://github.com/anymail/django-anymail
+django-anymail[amazon_ses]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
 django-anymail[mailjet]==7.0.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}

From 7cc6fc0b3052102758b2fb6c28c8edc093de6cfe Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 14 Apr 2020 12:00:32 +0100
Subject: [PATCH 0696/2840] Update django-anymail from 7.0.0 to 7.1.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 f53110b79..617c49786 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -23,7 +23,7 @@ django-anymail[mailgun]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
 django-anymail[amazon_ses]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
-django-anymail[mailjet]==7.0.0  # https://github.com/anymail/django-anymail
+django-anymail[mailjet]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
 django-anymail[mandrill]==7.0.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}

From d816a62e43d39d45cb5cd2d8b5855d8bec081c7a Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 14 Apr 2020 12:00:33 +0100
Subject: [PATCH 0697/2840] Update django-anymail from 7.0.0 to 7.1.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 617c49786..9b9926aac 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -25,7 +25,7 @@ django-anymail[amazon_ses]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
 django-anymail[mailjet]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
-django-anymail[mandrill]==7.0.0  # https://github.com/anymail/django-anymail
+django-anymail[mandrill]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
 django-anymail[postmark]==7.0.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}

From 81363cc0f8faeea9e85ef0df3e15583b25c21eb7 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 14 Apr 2020 12:00:35 +0100
Subject: [PATCH 0698/2840] Update django-anymail from 7.0.0 to 7.1.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 9b9926aac..48da0fa20 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -27,7 +27,7 @@ django-anymail[mailjet]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
 django-anymail[mandrill]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
-django-anymail[postmark]==7.0.0  # https://github.com/anymail/django-anymail
+django-anymail[postmark]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
 django-anymail[sendgrid]==7.0.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}

From 8bbcc6aa01637349719852ac37dc2b49885ab40c Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 14 Apr 2020 12:00:36 +0100
Subject: [PATCH 0699/2840] Update django-anymail from 7.0.0 to 7.1.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 48da0fa20..59f8dc962 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -29,7 +29,7 @@ django-anymail[mandrill]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
 django-anymail[postmark]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
-django-anymail[sendgrid]==7.0.0  # https://github.com/anymail/django-anymail
+django-anymail[sendgrid]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
 django-anymail[sendinblue]==7.0.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}

From 5040eb9ba49fdb711f97df2c64ebaa2dd8604d60 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 14 Apr 2020 12:00:37 +0100
Subject: [PATCH 0700/2840] Update django-anymail from 7.0.0 to 7.1.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 59f8dc962..74a5c00c4 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -31,7 +31,7 @@ django-anymail[postmark]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
 django-anymail[sendgrid]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
-django-anymail[sendinblue]==7.0.0  # https://github.com/anymail/django-anymail
+django-anymail[sendinblue]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
 django-anymail[sparkpost]==7.0.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}

From 508ca6f4e853a9e8f56a12787113b5dbc4271b92 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 14 Apr 2020 12:00:37 +0100
Subject: [PATCH 0701/2840] Update django-anymail from 7.0.0 to 7.1.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 74a5c00c4..bf34ee702 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -33,7 +33,7 @@ django-anymail[sendgrid]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
 django-anymail[sendinblue]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
-django-anymail[sparkpost]==7.0.0  # https://github.com/anymail/django-anymail
+django-anymail[sparkpost]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
 django-anymail==7.0.0  # https://github.com/anymail/django-anymail
 {%- endif %}

From 82cde2eacc598c119e717a4d32918ed2869953f3 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 14 Apr 2020 12:00:39 +0100
Subject: [PATCH 0702/2840] Update django-anymail from 7.0.0 to 7.1.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 bf34ee702..83ed366f4 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -35,5 +35,5 @@ django-anymail[sendinblue]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
 django-anymail[sparkpost]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
-django-anymail==7.0.0  # https://github.com/anymail/django-anymail
+django-anymail==7.1.0  # https://github.com/anymail/django-anymail
 {%- endif %}

From 0c32fac51eac0b121a57aede6fb5bc78dea65b38 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 14 Apr 2020 12:00:42 +0100
Subject: [PATCH 0703/2840] Update pylint-django from 2.0.14 to 2.0.15

---
 {{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 975ed2526..0d052969c 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -22,7 +22,7 @@ flake8==3.7.9  # https://github.com/PyCQA/flake8
 flake8-isort==2.9.1  # https://github.com/gforcada/flake8-isort
 coverage==5.1  # https://github.com/nedbat/coveragepy
 black==19.10b0  # https://github.com/ambv/black
-pylint-django==2.0.14  # https://github.com/PyCQA/pylint-django
+pylint-django==2.0.15  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}

From 264466904e6621eac99036e40bbe34eccf5d2d1b Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Tue, 14 Apr 2020 11:36:11 -0400
Subject: [PATCH 0704/2840] Add Apache Software License 2.0 to LICENSE

---
 {{cookiecutter.project_slug}}/LICENSE | 203 ++++++++++++++++++++++++++
 1 file changed, 203 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/LICENSE b/{{cookiecutter.project_slug}}/LICENSE
index 3a6c7e13a..0bf0b7c7a 100644
--- a/{{cookiecutter.project_slug}}/LICENSE
+++ b/{{cookiecutter.project_slug}}/LICENSE
@@ -50,4 +50,207 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
+{% elif cookiecutter.open_source_license == 'Apache Software License 2.0' %}
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {% now 'utc', '%Y' %} {{ cookiecutter.author_name }}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
 {% endif %}

From e2b5dba3f7acda9c898241ebb7a19efe192a4a35 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Tue, 14 Apr 2020 11:50:44 -0400
Subject: [PATCH 0705/2840] Remove Apache LICENSE Appendix

---
 {{cookiecutter.project_slug}}/LICENSE | 11 -----------
 1 file changed, 11 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/LICENSE b/{{cookiecutter.project_slug}}/LICENSE
index 0bf0b7c7a..c831e0309 100644
--- a/{{cookiecutter.project_slug}}/LICENSE
+++ b/{{cookiecutter.project_slug}}/LICENSE
@@ -229,17 +229,6 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 
    END OF TERMS AND CONDITIONS
 
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
    Copyright {% now 'utc', '%Y' %} {{ cookiecutter.author_name }}
 
    Licensed under the Apache License, Version 2.0 (the "License");

From 3c63b3e46ef2c4c99c1cab341eb5e09c5f4e8884 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Tue, 14 Apr 2020 11:52:14 -0400
Subject: [PATCH 0706/2840] Add Docker support to Travis and GitLab CI *
 Celerybeat start files wait for table migration so that errors don't occur if
 a migration does not happen post-build

---
 tests/test_cookiecutter_generation.py         | 10 +++-
 {{cookiecutter.project_slug}}/.gitlab-ci.yml  | 12 +++++
 {{cookiecutter.project_slug}}/.travis.yml     | 52 ++++++++++++++-----
 .../compose/local/django/celery/beat/start    | 37 +++++++++++++
 .../production/django/celery/beat/start       | 35 +++++++++++++
 5 files changed, 132 insertions(+), 14 deletions(-)

diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 2c7e6dc43..8785d7ce1 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -181,7 +181,15 @@ def test_travis_invokes_pytest(cookies, context):
 
     with open(f"{result.project}/.travis.yml", "r") as travis_yml:
         try:
-            assert yaml.load(travis_yml, Loader=yaml.FullLoader)["script"] == ["pytest"]
+            yml = yaml.load(travis_yml, Loader=yaml.FullLoader)["jobs"]["include"]
+            assert yml[0]["script"] == ["flake8"]
+
+            if context.get("use_docker") == "y":
+                assert yml[1]["script"] == [
+                    "docker-compose -f local.yml run django pytest"
+                ]
+            else:
+                assert yml[1]["script"] == ["pytest"]
         except yaml.YAMLError as e:
             pytest.fail(e)
 
diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
index 91ad7238c..8c032bf73 100644
--- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml
+++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
@@ -19,8 +19,19 @@ flake8:
 pytest:
   stage: test
   image: python:3.7
+  {% if cookiecutter.use_docker == 'y' -%}
   tags:
     - docker
+  services:
+    - docker
+  before_script:
+    - docker-compose -f local.yml build
+    - docker-compose -f local.yml up -d
+  script:
+    - docker-compose -f local.yml run django pytest
+  {%- else %}
+  tags:
+    - python
   services:
     - postgres:11
   variables:
@@ -31,4 +42,5 @@ pytest:
 
   script:
     - pytest
+  {%- endif %}
 
diff --git a/{{cookiecutter.project_slug}}/.travis.yml b/{{cookiecutter.project_slug}}/.travis.yml
index 31695e419..7b618e37a 100644
--- a/{{cookiecutter.project_slug}}/.travis.yml
+++ b/{{cookiecutter.project_slug}}/.travis.yml
@@ -1,17 +1,43 @@
 dist: xenial
-services:
-  - postgresql
-before_install:
-  - sudo apt-get update -qq
-  - sudo apt-get install -qq build-essential gettext python-dev zlib1g-dev libpq-dev xvfb
-  - sudo apt-get install -qq libjpeg8-dev libfreetype6-dev libwebp-dev
-  - sudo apt-get install -qq graphviz-dev python-setuptools python3-dev python-virtualenv python-pip
-  - sudo apt-get install -qq firefox automake libtool libreadline6 libreadline6-dev libreadline-dev
-  - sudo apt-get install -qq libsqlite3-dev libxml2 libxml2-dev libssl-dev libbz2-dev wget curl llvm
+
 language: python
 python:
   - "3.7"
-install:
-  - pip install -r requirements/local.txt
-script:
-  - "pytest"
+
+services:
+  - {% if cookiecutter.use_docker == 'y' %}docker{% else %}postgresql{% endif %}
+jobs:
+  include:
+    - name: "Linter"
+      before_script:
+        - pip install -q flake8
+      script:
+        - "flake8"
+
+    - name: "Django Test"
+    {% if cookiecutter.use_docker == 'y' -%}
+      before_script:
+        - docker-compose -v
+        - docker -v
+        - docker-compose -f local.yml build
+        - docker-compose -f local.yml up -d
+      script:
+        - "docker-compose -f local.yml run django pytest"
+      after_failure:
+        - docker-compose -f local.yml logs
+    {%- else %}
+      before_install:
+        - sudo apt-get update -qq
+        - sudo apt-get install -qq build-essential gettext python-dev zlib1g-dev libpq-dev xvfb
+        - sudo apt-get install -qq libjpeg8-dev libfreetype6-dev libwebp-dev
+        - sudo apt-get install -qq graphviz-dev python-setuptools python3-dev python-virtualenv python-pip
+        - sudo apt-get install -qq firefox automake libtool libreadline6 libreadline6-dev libreadline-dev
+        - sudo apt-get install -qq libsqlite3-dev libxml2 libxml2-dev libssl-dev libbz2-dev wget curl llvm
+      language: python
+      python:
+        - "3.8"
+      install:
+        - pip install -r requirements/local.txt
+      script:
+        - "pytest"
+    {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
index c04a7365e..779750caf 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
@@ -5,4 +5,41 @@ set -o nounset
 
 
 rm -f './celerybeat.pid'
+
+postgres_ready() {
+python << END
+import sys
+from time import sleep
+import psycopg2
+try:
+    conn = psycopg2.connect(
+        dbname="${POSTGRES_DB}",
+        user="${POSTGRES_USER}",
+        password="${POSTGRES_PASSWORD}",
+        host="${POSTGRES_HOST}",
+        port="${POSTGRES_PORT}",
+    )
+    # Check if table exists yet.
+    # If not, wait for docker-compose up to migrate all tables.
+    cur = conn.cursor()
+    cur.execute(
+        "select exists(select * from ${POSTGRES_DB}.tables where table_name=%s)",
+        ('django_celery_beat_periodictask',)
+    )
+    conn.close()
+except psycopg2.OperationalError:
+    sys.exit(-1)
+except psycopg2.errors.UndefinedTable:
+    conn.close()
+    sys.exit(-1)
+
+sys.exit(0)
+END
+}
+until postgres_ready; do
+  >&2 echo 'Waiting for celerybeat models to be migrated...'
+  sleep 1
+done
+>&2 echo 'PostgreSQL is ready'
+
 celery -A config.celery_app beat -l INFO
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start b/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
index 20b93123a..0bc76667b 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
+++ b/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
@@ -4,5 +4,40 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
+postgres_ready() {
+python << END
+import sys
+from time import sleep
+import psycopg2
+try:
+    conn = psycopg2.connect(
+        dbname="${POSTGRES_DB}",
+        user="${POSTGRES_USER}",
+        password="${POSTGRES_PASSWORD}",
+        host="${POSTGRES_HOST}",
+        port="${POSTGRES_PORT}",
+    )
+    # Check if table exists yet.
+    # If not, wait for docker-compose up to migrate all tables.
+    cur = conn.cursor()
+    cur.execute(
+        "select exists(select * from ${POSTGRES_DB}.tables where table_name=%s)",
+        ('django_celery_beat_periodictask',)
+    )
+    conn.close()
+except psycopg2.OperationalError:
+    sys.exit(-1)
+except psycopg2.errors.UndefinedTable:
+    conn.close()
+    sys.exit(-1)
+
+sys.exit(0)
+END
+}
+until postgres_ready; do
+  >&2 echo 'Waiting for celerybeat models to be migrated...'
+  sleep 1
+done
+>&2 echo 'PostgreSQL is ready'
 
 celery -A config.celery_app beat -l INFO

From dd0e7c0c801a55f13c6235dc5937ef81664752e8 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Tue, 14 Apr 2020 12:04:41 -0400
Subject: [PATCH 0707/2840] Remove unnecssary import in celerybeat start files

---
 .../compose/local/django/celery/beat/start                       | 1 -
 .../compose/production/django/celery/beat/start                  | 1 -
 2 files changed, 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
index 779750caf..2499f8666 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
@@ -9,7 +9,6 @@ rm -f './celerybeat.pid'
 postgres_ready() {
 python << END
 import sys
-from time import sleep
 import psycopg2
 try:
     conn = psycopg2.connect(
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start b/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
index 0bc76667b..3882e1948 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
+++ b/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
@@ -7,7 +7,6 @@ set -o nounset
 postgres_ready() {
 python << END
 import sys
-from time import sleep
 import psycopg2
 try:
     conn = psycopg2.connect(

From 25cd8ea72b8dd3e017ddac738373ab64ce934524 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Tue, 14 Apr 2020 15:05:53 -0400
Subject: [PATCH 0708/2840] Update beat start files with better? SQL statement

---
 .../compose/local/django/celery/beat/start          | 13 +++++++------
 .../compose/production/django/celery/beat/start     | 12 +++++++-----
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
index 2499f8666..477dfca30 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
@@ -22,17 +22,18 @@ try:
     # If not, wait for docker-compose up to migrate all tables.
     cur = conn.cursor()
     cur.execute(
-        "select exists(select * from ${POSTGRES_DB}.tables where table_name=%s)",
+        "select exists(select * from information_schema.tables where table_name=%s)",
         ('django_celery_beat_periodictask',)
     )
-    conn.close()
+    if cur.fetchone()[0] == 1:
+        cur.close()
+        sys.exit(0)
+    else:
+        cur.close()
+        sys.exit(-1)
 except psycopg2.OperationalError:
     sys.exit(-1)
-except psycopg2.errors.UndefinedTable:
-    conn.close()
-    sys.exit(-1)
 
-sys.exit(0)
 END
 }
 until postgres_ready; do
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start b/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
index 3882e1948..0cc8ae8a4 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
+++ b/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
@@ -20,15 +20,17 @@ try:
     # If not, wait for docker-compose up to migrate all tables.
     cur = conn.cursor()
     cur.execute(
-        "select exists(select * from ${POSTGRES_DB}.tables where table_name=%s)",
+        "select exists(select * from information_schema.tables where table_name=%s)",
         ('django_celery_beat_periodictask',)
     )
-    conn.close()
+    if cur.fetchone()[0] == 1:
+        cur.close()
+        sys.exit(0)
+    else:
+        cur.close()
+        sys.exit(-1)
 except psycopg2.OperationalError:
     sys.exit(-1)
-except psycopg2.errors.UndefinedTable:
-    conn.close()
-    sys.exit(-1)
 
 sys.exit(0)
 END

From 7e3f61a2f8a6dbe57f98f684b6dcebf010007980 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 15 Apr 2020 10:37:57 +0100
Subject: [PATCH 0709/2840] Update .pyup.yml

---
 .pyup.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.pyup.yml b/.pyup.yml
index 4978524e8..c503dabf3 100644
--- a/.pyup.yml
+++ b/.pyup.yml
@@ -8,6 +8,11 @@ update: all
 # allowed: True, False
 pin: True
 
+# add a label to pull requests, default is not set
+# requires private repo permissions, even on public repos
+# default: empty
+label_prs: update
+
 # Specify requirement files by hand, pyup seems to struggle to 
 # find the ones in the project_slug folder
 requirements:

From f2f881179c3e35fddb5c937e8aebff92240a3f05 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 15 Apr 2020 09:43:34 -0700
Subject: [PATCH 0710/2840] Update flake8-isort from 2.9.1 to 3.0.0

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

diff --git a/requirements.txt b/requirements.txt
index f4d5a931e..3beb162b3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ binaryornot==0.4.4
 # ------------------------------------------------------------------------------
 black==19.10b0
 flake8==3.7.9
-flake8-isort==2.9.1
+flake8-isort==3.0.0
 
 # Testing
 # ------------------------------------------------------------------------------

From c639541d506c20405e43a903058b75f5fee63192 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Thu, 16 Apr 2020 09:11:15 +0100
Subject: [PATCH 0711/2840] Default DJANGO_SETTINGS_MODULE to local settings in
 asgi.py

This is to be consistent with `manage.py` behaviour and required to run locally.
---
 {{cookiecutter.project_slug}}/config/asgi.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/config/asgi.py b/{{cookiecutter.project_slug}}/config/asgi.py
index 485c8ecad..562ecf402 100644
--- a/{{cookiecutter.project_slug}}/config/asgi.py
+++ b/{{cookiecutter.project_slug}}/config/asgi.py
@@ -7,6 +7,7 @@ For more information on this file, see
 https://docs.djangoproject.com/en/dev/howto/deployment/asgi/
 
 """
+import os
 import sys
 from pathlib import Path
 
@@ -17,6 +18,9 @@ from django.core.asgi import get_asgi_application
 app_path = Path(__file__).parents[1].resolve()
 sys.path.append(str(app_path / "{{ cookiecutter.project_slug }}"))
 
+# If DJANGO_SETTINGS_MODULE is unset, default to the local settings
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local")
+
 # This application object is used by any ASGI server configured to use this file.
 django_application = get_asgi_application()
 # Apply ASGI middleware here.

From 835cd8c9b5c5811fdcd7e04b6f09739c82b9eddc Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Thu, 16 Apr 2020 09:18:58 +0100
Subject: [PATCH 0712/2840] Remove unused parameter in Gulp task

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

diff --git a/{{cookiecutter.project_slug}}/gulpfile.js b/{{cookiecutter.project_slug}}/gulpfile.js
index 89894d38b..1f9884ec8 100644
--- a/{{cookiecutter.project_slug}}/gulpfile.js
+++ b/{{cookiecutter.project_slug}}/gulpfile.js
@@ -112,7 +112,7 @@ function imgCompression() {
 
 {% if cookiecutter.use_async == 'y' -%}
 // Run django server
-function asyncRunServer(cb) {
+function asyncRunServer() {
   var cmd = spawn('gunicorn', [
       'config.asgi', '-k', 'uvicorn.workers.UvicornWorker', '--reload'
       ], {stdio: 'inherit'}

From 3d6dce66aad8ded5a4ba490336f4fee7f5374eb1 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Thu, 16 Apr 2020 09:35:50 +0100
Subject: [PATCH 0713/2840] Mention ASGI in the README

---
 README.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.rst b/README.rst
index 1855f59f6..604cff91f 100644
--- a/README.rst
+++ b/README.rst
@@ -45,6 +45,7 @@ Features
 * Optimized development and production settings
 * Registration via django-allauth_
 * Comes with custom user model ready to go
+* Optional basic ASGI setup for Websockets
 * Optional custom static build using Gulp and livereload
 * Send emails via Anymail_ (using Mailgun_ by default or Amazon SES if AWS is selected cloud provider, but switchable)
 * Media storage using Amazon S3 or Google Cloud Storage

From 3d9f7b91d0b813fab5b8c5bbed5fb87b3ab9afde Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 16 Apr 2020 12:00:30 +0100
Subject: [PATCH 0714/2840] Update flake8-isort from 2.9.1 to 3.0.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 0d052969c..4b113507b 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -19,7 +19,7 @@ pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 # Code quality
 # ------------------------------------------------------------------------------
 flake8==3.7.9  # https://github.com/PyCQA/flake8
-flake8-isort==2.9.1  # https://github.com/gforcada/flake8-isort
+flake8-isort==3.0.0  # https://github.com/gforcada/flake8-isort
 coverage==5.1  # https://github.com/nedbat/coveragepy
 black==19.10b0  # https://github.com/ambv/black
 pylint-django==2.0.15  # https://github.com/PyCQA/pylint-django

From d2285d9e2d1798e863d355e0efee76fe7e73fdd1 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Thu, 16 Apr 2020 13:34:12 -0400
Subject: [PATCH 0715/2840] pytest.parametrized test for generating CI *
 Removed celerybeat start's postgres_ready() for new PR for closer inspection
 and further review. Travis and GitLab CI reflect changes

---
 tests/test_cookiecutter_generation.py         | 30 ++++++++-------
 {{cookiecutter.project_slug}}/.gitlab-ci.yml  |  2 +
 {{cookiecutter.project_slug}}/.travis.yml     |  2 +
 .../compose/local/django/celery/beat/start    | 37 -------------------
 .../production/django/celery/beat/start       | 36 ------------------
 5 files changed, 21 insertions(+), 86 deletions(-)

diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 8785d7ce1..ecd08ea0c 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -170,8 +170,12 @@ def test_black_passes(cookies, context_override):
         pytest.fail(e.stdout.decode())
 
 
-def test_travis_invokes_pytest(cookies, context):
-    context.update({"ci_tool": "Travis"})
+@pytest.mark.parametrize(
+    ["use_docker", "expected_test_script"],
+    [("n", "pytest"), ("y", "docker-compose -f local.yml run django pytest"),],
+)
+def test_travis_invokes_pytest(cookies, context, use_docker, expected_test_script):
+    context.update({"ci_tool": "Travis", "use_docker": use_docker})
     result = cookies.bake(extra_context=context)
 
     assert result.exit_code == 0
@@ -183,19 +187,19 @@ def test_travis_invokes_pytest(cookies, context):
         try:
             yml = yaml.load(travis_yml, Loader=yaml.FullLoader)["jobs"]["include"]
             assert yml[0]["script"] == ["flake8"]
-
-            if context.get("use_docker") == "y":
-                assert yml[1]["script"] == [
-                    "docker-compose -f local.yml run django pytest"
-                ]
-            else:
-                assert yml[1]["script"] == ["pytest"]
+            assert yml[1]["script"] == [expected_test_script]
         except yaml.YAMLError as e:
-            pytest.fail(e)
+            pytest.fail(str(e))
 
 
-def test_gitlab_invokes_flake8_and_pytest(cookies, context):
-    context.update({"ci_tool": "Gitlab"})
+@pytest.mark.parametrize(
+    ["use_docker", "expected_test_script"],
+    [("n", "pytest"), ("y", "docker-compose -f local.yml run django pytest"),],
+)
+def test_gitlab_invokes_flake8_and_pytest(
+    cookies, context, use_docker, expected_test_script
+):
+    context.update({"ci_tool": "Gitlab", "use_docker": use_docker})
     result = cookies.bake(extra_context=context)
 
     assert result.exit_code == 0
@@ -207,7 +211,7 @@ def test_gitlab_invokes_flake8_and_pytest(cookies, context):
         try:
             gitlab_config = yaml.load(gitlab_yml, Loader=yaml.FullLoader)
             assert gitlab_config["flake8"]["script"] == ["flake8"]
-            assert gitlab_config["pytest"]["script"] == ["pytest"]
+            assert gitlab_config["pytest"]["script"] == [expected_test_script]
         except yaml.YAMLError as e:
             pytest.fail(e)
 
diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
index 4d67f8a1e..a74d5de87 100644
--- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml
+++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
@@ -29,6 +29,8 @@ pytest:
     - docker
   before_script:
     - docker-compose -f local.yml build
+    # Ensure celerybeat does not crash due to non-existent tables
+    - docker-compose -f local.yml run --rm django python manage.py migrate
     - docker-compose -f local.yml up -d
   script:
     - docker-compose -f local.yml run django pytest
diff --git a/{{cookiecutter.project_slug}}/.travis.yml b/{{cookiecutter.project_slug}}/.travis.yml
index 7f90b5f5e..fac60650a 100644
--- a/{{cookiecutter.project_slug}}/.travis.yml
+++ b/{{cookiecutter.project_slug}}/.travis.yml
@@ -20,6 +20,8 @@ jobs:
         - docker-compose -v
         - docker -v
         - docker-compose -f local.yml build
+        # Ensure celerybeat does not crash due to non-existent tables
+        - docker-compose -f local.yml run --rm django python manage.py migrate
         - docker-compose -f local.yml up -d
       script:
         - "docker-compose -f local.yml run django pytest"
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
index 477dfca30..c04a7365e 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
@@ -5,41 +5,4 @@ set -o nounset
 
 
 rm -f './celerybeat.pid'
-
-postgres_ready() {
-python << END
-import sys
-import psycopg2
-try:
-    conn = psycopg2.connect(
-        dbname="${POSTGRES_DB}",
-        user="${POSTGRES_USER}",
-        password="${POSTGRES_PASSWORD}",
-        host="${POSTGRES_HOST}",
-        port="${POSTGRES_PORT}",
-    )
-    # Check if table exists yet.
-    # If not, wait for docker-compose up to migrate all tables.
-    cur = conn.cursor()
-    cur.execute(
-        "select exists(select * from information_schema.tables where table_name=%s)",
-        ('django_celery_beat_periodictask',)
-    )
-    if cur.fetchone()[0] == 1:
-        cur.close()
-        sys.exit(0)
-    else:
-        cur.close()
-        sys.exit(-1)
-except psycopg2.OperationalError:
-    sys.exit(-1)
-
-END
-}
-until postgres_ready; do
-  >&2 echo 'Waiting for celerybeat models to be migrated...'
-  sleep 1
-done
->&2 echo 'PostgreSQL is ready'
-
 celery -A config.celery_app beat -l INFO
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start b/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
index 0cc8ae8a4..20b93123a 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
+++ b/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
@@ -4,41 +4,5 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
-postgres_ready() {
-python << END
-import sys
-import psycopg2
-try:
-    conn = psycopg2.connect(
-        dbname="${POSTGRES_DB}",
-        user="${POSTGRES_USER}",
-        password="${POSTGRES_PASSWORD}",
-        host="${POSTGRES_HOST}",
-        port="${POSTGRES_PORT}",
-    )
-    # Check if table exists yet.
-    # If not, wait for docker-compose up to migrate all tables.
-    cur = conn.cursor()
-    cur.execute(
-        "select exists(select * from information_schema.tables where table_name=%s)",
-        ('django_celery_beat_periodictask',)
-    )
-    if cur.fetchone()[0] == 1:
-        cur.close()
-        sys.exit(0)
-    else:
-        cur.close()
-        sys.exit(-1)
-except psycopg2.OperationalError:
-    sys.exit(-1)
-
-sys.exit(0)
-END
-}
-until postgres_ready; do
-  >&2 echo 'Waiting for celerybeat models to be migrated...'
-  sleep 1
-done
->&2 echo 'PostgreSQL is ready'
 
 celery -A config.celery_app beat -l INFO

From d249158444d1cb0f32cbc9cdd6dc868dcc2210d7 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Thu, 16 Apr 2020 14:15:35 -0400
Subject: [PATCH 0716/2840] Fix .travis.yml indent alignment

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

diff --git a/{{cookiecutter.project_slug}}/.travis.yml b/{{cookiecutter.project_slug}}/.travis.yml
index fac60650a..24f9f24ac 100644
--- a/{{cookiecutter.project_slug}}/.travis.yml
+++ b/{{cookiecutter.project_slug}}/.travis.yml
@@ -15,7 +15,7 @@ jobs:
         - "flake8"
 
     - name: "Django Test"
-    {% if cookiecutter.use_docker == 'y' -%}
+    {%- if cookiecutter.use_docker == 'y' %}
       before_script:
         - docker-compose -v
         - docker -v

From d02b88f681b5d467219b56e14b1e2ecc78e49177 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Fri, 17 Apr 2020 19:08:38 +0100
Subject: [PATCH 0717/2840] Bump to version 3.0.5-01

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

diff --git a/setup.py b/setup.py
index 98e98fb77..6dfd9e50b 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.0.5"
+version = "3.0.5-01"
 
 if sys.argv[-1] == "tag":
     os.system(f'git tag -a {version} -m "version {version}"')

From 7a435b3d4a14296f239bd9c4df4ffbedbcc7edc3 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Fri, 17 Apr 2020 19:18:56 +0100
Subject: [PATCH 0718/2840] Add GitHub action to label pull requests

---
 .github/labeler.yml         | 11 +++++++++++
 .github/workflows/label.yml | 20 ++++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 .github/labeler.yml
 create mode 100644 .github/workflows/label.yml

diff --git a/.github/labeler.yml b/.github/labeler.yml
new file mode 100644
index 000000000..bad7cac06
--- /dev/null
+++ b/.github/labeler.yml
@@ -0,0 +1,11 @@
+# Add 'docs' to any changes within 'docs' folder or any subfolders
+docs:
+  - README.rst
+  - docs/**/*
+  - {{cookiecutter.project_slug}}/docs/**/*
+
+# Flag PR related to docker
+docker:
+  - {{cookiecutter.project_slug}}/compose/**/*
+  - {{cookiecutter.project_slug}}/local.yml
+  - {{cookiecutter.project_slug}}/production.yml
diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
new file mode 100644
index 000000000..3df0ec0c0
--- /dev/null
+++ b/.github/workflows/label.yml
@@ -0,0 +1,20 @@
+# This workflow will triage pull requests and apply a label based on the
+# paths that are modified in the pull request.
+#
+# To use this workflow, you will need to set up a .github/labeler.yml
+# file with configuration.  For more information, see:
+# https://github.com/actions/labeler/blob/master/README.md
+
+
+name: Labeler
+on: [pull_request]
+
+jobs:
+  label:
+
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/labeler@v2
+      with:
+        repo-token: "${{ secrets.GITHUB_TOKEN }}"

From 4ab97dd5a4da02305a795841a4c4d3f90ae44a2f Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sat, 18 Apr 2020 12:33:13 +0100
Subject: [PATCH 0719/2840] Add GitHub action to draft releases notes

---
 .github/release-drafter.yml         | 30 +++++++++++++++++++++++++++++
 .github/workflows/draft-release.yml | 14 ++++++++++++++
 2 files changed, 44 insertions(+)
 create mode 100644 .github/release-drafter.yml
 create mode 100644 .github/workflows/draft-release.yml

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
new file mode 100644
index 000000000..7d3a1b4f5
--- /dev/null
+++ b/.github/release-drafter.yml
@@ -0,0 +1,30 @@
+categories:
+  - title: 'Breaking Changes'
+    labels:
+      - 'breaking'
+  - title: 'Major Changes'
+    labels:
+      - 'major'
+  - title: 'Minor Changes'
+    labels:
+      - 'enhancement'
+  - title: 'Bugfixes'
+    labels:
+      - 'bug'
+  - title: 'Removals'
+    labels:
+      - 'removed'
+  - title: 'Documentation updates'
+    labels:
+      - 'docs'
+  - title: 'Dependencies updates'
+    labels:
+      - 'update'
+
+exclude-labels:
+  - 'skip-changelog'
+
+template: |
+  ## Changes
+
+  $CHANGES
diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml
new file mode 100644
index 000000000..6c2d6620d
--- /dev/null
+++ b/.github/workflows/draft-release.yml
@@ -0,0 +1,14 @@
+name: Release Drafter
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  release_notes:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: release-drafter/release-drafter@v5
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

From d0481624e77e5ff498415a3e1e73cef51e1596cb Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 18 Apr 2020 14:46:37 +0100
Subject: [PATCH 0720/2840] Remove updates from release drafter

---
 .github/release-drafter.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index 7d3a1b4f5..af10ea701 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -17,9 +17,6 @@ categories:
   - title: 'Documentation updates'
     labels:
       - 'docs'
-  - title: 'Dependencies updates'
-    labels:
-      - 'update'
 
 exclude-labels:
   - 'skip-changelog'

From 935c83fa309b5d08fa0b3a2f381be72fac4efd88 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 18 Apr 2020 14:49:20 +0100
Subject: [PATCH 0721/2840] Don't mention updates in release drafter at all

---
 .github/release-drafter.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index af10ea701..340308617 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -20,6 +20,7 @@ categories:
 
 exclude-labels:
   - 'skip-changelog'
+  - 'update'
 
 template: |
   ## Changes

From d3439b859298776749d152c6e5a76c4447866a07 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 18 Apr 2020 14:53:57 +0100
Subject: [PATCH 0722/2840] Exclude changes for project infrastructure

---
 .github/release-drafter.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
index 340308617..734a541af 100644
--- a/.github/release-drafter.yml
+++ b/.github/release-drafter.yml
@@ -21,6 +21,7 @@ categories:
 exclude-labels:
   - 'skip-changelog'
   - 'update'
+  - 'project infrastructure'
 
 template: |
   ## Changes

From 8eeef9a86c1612d2a934053beb1c10d9ef902119 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 20 Apr 2020 12:00:32 +0100
Subject: [PATCH 0723/2840] Update sphinx from 3.0.1 to 3.0.2

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

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 4b113507b..03f8467a9 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -2,7 +2,7 @@
 
 Werkzeug==1.0.1 # https://github.com/pallets/werkzeug
 ipdb==0.13.2  # https://github.com/gotcha/ipdb
-Sphinx==3.0.1  # https://github.com/sphinx-doc/sphinx
+Sphinx==3.0.2  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}

From bda0541a2b536e305ec1ec2de10a4b1fde9711a2 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 20 Apr 2020 21:32:43 -0700
Subject: [PATCH 0724/2840] Update cookiecutter from 1.7.0 to 1.7.2

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

diff --git a/requirements.txt b/requirements.txt
index 3beb162b3..c5601892c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-cookiecutter==1.7.0
+cookiecutter==1.7.2
 sh==1.12.14
 binaryornot==0.4.4
 

From 42101feef1eb1b4992e34d6635fabee582265df0 Mon Sep 17 00:00:00 2001
From: Yotam Tal <me@yotamtal.co>
Date: Tue, 21 Apr 2020 13:45:30 +0300
Subject: [PATCH 0725/2840] Add hot-reload support to celery worker

---
 .../compose/local/django/celery/worker/start                  | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt          | 4 ++++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
index acd6f1574..ef32dd69f 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
@@ -4,4 +4,4 @@ set -o errexit
 set -o nounset
 
 
-celery -A config.celery_app worker -l INFO
+watchmedo auto-restart --directory=./ --pattern="*tasks.py;*celery_app.py" --recursive -- celery -A config.celery_app worker -l INFO
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 4b113507b..0dc58b68f 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -5,6 +5,10 @@ ipdb==0.13.2  # https://github.com/gotcha/ipdb
 Sphinx==3.0.1  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
+{%- if cookiecutter.use_celery == 'y' %}
+argh==0.26.2  # http://github.com/neithere/argh/
+watchdog==0.10.2  # http://github.com/gorakhargosh/watchdog
+{%- endif %}
 {%- else %}
 psycopg2-binary==2.8.5  # https://github.com/psycopg/psycopg2
 {%- endif %}

From 2bd95984d4fe813c74a4a7fd10f213258e4e7d72 Mon Sep 17 00:00:00 2001
From: Yotam Tal <me@yotamtal.co>
Date: Tue, 21 Apr 2020 13:49:13 +0300
Subject: [PATCH 0726/2840] add myself to contributors

---
 CONTRIBUTORS.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 280a9f4f1..07e16cd21 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -226,6 +226,7 @@ Listed in alphabetical order.
   William Archinal         `@archinal`_
   Xaver Y.R. Chen          `@yrchen`_                   @yrchen
   Yaroslav Halchenko
+  Yotam Tal                `@yotamtal`_
   Yuchen Xie               `@mapx`_
 ========================== ============================ ==============
 
@@ -395,6 +396,7 @@ Listed in alphabetical order.
 .. _@vladdoster: https://github.com/vladdoster
 .. _@xpostudio4: https://github.com/xpostudio4
 .. _@yrchen: https://github.com/yrchen
+.. _@yotamtal: https://github.com/yotamtal
 .. _@yunti: https://github.com/yunti
 .. _@zcho: https://github.com/zcho
 

From 109784b79d063d2fb529a93c849ab85bc5e478f1 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 21 Apr 2020 17:21:43 +0100
Subject: [PATCH 0727/2840] Fix labeler config

---
 .github/labeler.yml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/labeler.yml b/.github/labeler.yml
index bad7cac06..a29e237db 100644
--- a/.github/labeler.yml
+++ b/.github/labeler.yml
@@ -1,11 +1,11 @@
 # Add 'docs' to any changes within 'docs' folder or any subfolders
 docs:
-  - README.rst
-  - docs/**/*
-  - {{cookiecutter.project_slug}}/docs/**/*
+  - 'README.rst'
+  - 'docs/**/*'
+  - '{{cookiecutter.project_slug}}/docs/**/*'
 
 # Flag PR related to docker
 docker:
-  - {{cookiecutter.project_slug}}/compose/**/*
-  - {{cookiecutter.project_slug}}/local.yml
-  - {{cookiecutter.project_slug}}/production.yml
+  - '{{cookiecutter.project_slug}}/compose/**/*'
+  - '{{cookiecutter.project_slug}}/local.yml'
+  - '{{cookiecutter.project_slug}}/production.yml'

From 433aa667f552c2c2b2375606da2f022d5a1c5b4c Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 23 Apr 2020 12:00:33 +0100
Subject: [PATCH 0728/2840] Update pre-commit from 2.2.0 to 2.3.0

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

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 03f8467a9..f6be44b51 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -26,7 +26,7 @@ pylint-django==2.0.15  # 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.2.0  # https://github.com/pre-commit/pre-commit
+pre-commit==2.3.0  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From cafc0ac1f31d3a4ef4f30dcde6b314fb675ad065 Mon Sep 17 00:00:00 2001
From: Sudarshan Wadkar <wadkar@users.noreply.github.com>
Date: Fri, 17 Apr 2020 23:50:57 +0530
Subject: [PATCH 0729/2840] Conditionally add www host to traefik router

If the domain_name entered contains subdomains, e.g. `api.example.com`
then do *not* add an additional `www.api.example.com` route to traefik

If the user enters only the domain `example.com` then add the optional
`www.example.com` Host to the traefik routers.
---
 .../compose/production/traefik/traefik.yml                | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
index 960d1ac2e..3f6d80721 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
@@ -28,7 +28,11 @@ certificatesResolvers:
 http:
   routers:
     web-router:
+      {%- if len(cookiecutter.domain_name.split('.')) == 2 %}
       rule: "Host(`{{ cookiecutter.domain_name }}`) || Host(`www.{{ cookiecutter.domain_name }}`)"
+      {% else %}
+      rule: "Host(`{{ cookiecutter.domain_name }}`)"
+      {%- endif %}
       entryPoints:
         - web
       middlewares:
@@ -37,7 +41,11 @@ http:
       service: django
 
     web-secure-router:
+      {%- if len(cookiecutter.domain_name.split('.')) == 2 %}
       rule: "Host(`{{ cookiecutter.domain_name }}`) || Host(`www.{{ cookiecutter.domain_name }}`)"
+      {% else %}
+      rule: "Host(`{{ cookiecutter.domain_name }}`)"
+      {%- endif %}
       entryPoints:
         - web-secure
       middlewares:

From ab93e28c888588bc4ac41062386c0238745e796e Mon Sep 17 00:00:00 2001
From: Sudarshan Wadkar <wadkar@users.noreply.github.com>
Date: Fri, 17 Apr 2020 23:57:15 +0530
Subject: [PATCH 0730/2840] Update contributors

---
 CONTRIBUTORS.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 280a9f4f1..86b529eb7 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -206,6 +206,7 @@ Listed in alphabetical order.
   Srinivas Nyayapati       `@shireenrao`_
   stepmr                   `@stepmr`_
   Steve Steiner            `@ssteinerX`_
+  Sudarshan Wadkar         `@wadkar`_
   Sule Marshall            `@suledev`_
   Tano Abeleyra            `@tanoabeleyra`_
   Taylor Baldwin
@@ -393,6 +394,7 @@ Listed in alphabetical order.
 .. _@umrashrf: https://github.com/umrashrf
 .. _@viviangb: https://github.com/viviangb
 .. _@vladdoster: https://github.com/vladdoster
+.. _@wadkar: https://github.com/wadkar
 .. _@xpostudio4: https://github.com/xpostudio4
 .. _@yrchen: https://github.com/yrchen
 .. _@yunti: https://github.com/yunti

From 9cf47898f41b135b390f5e27c9c52b4a85fe6a8d Mon Sep 17 00:00:00 2001
From: Sudarshan Wadkar <wadkar@users.noreply.github.com>
Date: Fri, 24 Apr 2020 14:00:27 +0530
Subject: [PATCH 0731/2840] Only consider TLDs while adding `www` route

Instead of checking for `.co.XX` on best effort basis, we only check for
the single dot in the domain_name indicating no subdomain usage.
---
 .../compose/production/traefik/traefik.yml                   | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
index 5ff2e3636..cfd566a8d 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
@@ -26,10 +26,9 @@ certificatesResolvers:
         entryPoint: web
 
 http:
-  {%- set domain_dots = cookiecutter.domain_name.count('.') %}
   routers:
     web-router:
-      {%- if domain_dots == 1 or (domain_dots == 2 and '.co.' in cookiecutter.domain_name) %}
+      {%- if cookiecutter.domain_name.count('.') == 1 %}
       rule: "Host(`{{ cookiecutter.domain_name }}`) || Host(`www.{{ cookiecutter.domain_name }}`)"
       {% else %}
       rule: "Host(`{{ cookiecutter.domain_name }}`)"
@@ -42,7 +41,7 @@ http:
       service: django
 
     web-secure-router:
-      {%- if domain_dots == 1 or (domain_dots == 2 and '.co.' in cookiecutter.domain_name) %}
+      {%- if cookiecutter.domain_name.count('.') == 1 %}
       rule: "Host(`{{ cookiecutter.domain_name }}`) || Host(`www.{{ cookiecutter.domain_name }}`)"
       {% else %}
       rule: "Host(`{{ cookiecutter.domain_name }}`)"

From 4021286be0ba0d857d03f93212a3dd6e946ece01 Mon Sep 17 00:00:00 2001
From: Sudarshan Wadkar <wadkar@users.noreply.github.com>
Date: Sat, 18 Apr 2020 00:13:12 +0530
Subject: [PATCH 0732/2840] Add condition to include .co.XX TLDs

This is best effort checking of domain names and creating the traefik
rules. These two checks should cover most of the use cases.
---
 .../compose/production/traefik/traefik.yml                   | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
index 3f6d80721..5ff2e3636 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
@@ -26,9 +26,10 @@ certificatesResolvers:
         entryPoint: web
 
 http:
+  {%- set domain_dots = cookiecutter.domain_name.count('.') %}
   routers:
     web-router:
-      {%- if len(cookiecutter.domain_name.split('.')) == 2 %}
+      {%- if domain_dots == 1 or (domain_dots == 2 and '.co.' in cookiecutter.domain_name) %}
       rule: "Host(`{{ cookiecutter.domain_name }}`) || Host(`www.{{ cookiecutter.domain_name }}`)"
       {% else %}
       rule: "Host(`{{ cookiecutter.domain_name }}`)"
@@ -41,7 +42,7 @@ http:
       service: django
 
     web-secure-router:
-      {%- if len(cookiecutter.domain_name.split('.')) == 2 %}
+      {%- if domain_dots == 1 or (domain_dots == 2 and '.co.' in cookiecutter.domain_name) %}
       rule: "Host(`{{ cookiecutter.domain_name }}`) || Host(`www.{{ cookiecutter.domain_name }}`)"
       {% else %}
       rule: "Host(`{{ cookiecutter.domain_name }}`)"

From 1838ba37e0c74dd2c75225c1b02c157f02d378b0 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Fri, 24 Apr 2020 15:38:20 +0100
Subject: [PATCH 0733/2840] Remove the labeler workflow, it's broken with forks

---
 .github/labeler.yml         | 11 -----------
 .github/workflows/label.yml | 20 --------------------
 2 files changed, 31 deletions(-)
 delete mode 100644 .github/labeler.yml
 delete mode 100644 .github/workflows/label.yml

diff --git a/.github/labeler.yml b/.github/labeler.yml
deleted file mode 100644
index a29e237db..000000000
--- a/.github/labeler.yml
+++ /dev/null
@@ -1,11 +0,0 @@
-# Add 'docs' to any changes within 'docs' folder or any subfolders
-docs:
-  - 'README.rst'
-  - 'docs/**/*'
-  - '{{cookiecutter.project_slug}}/docs/**/*'
-
-# Flag PR related to docker
-docker:
-  - '{{cookiecutter.project_slug}}/compose/**/*'
-  - '{{cookiecutter.project_slug}}/local.yml'
-  - '{{cookiecutter.project_slug}}/production.yml'
diff --git a/.github/workflows/label.yml b/.github/workflows/label.yml
deleted file mode 100644
index 3df0ec0c0..000000000
--- a/.github/workflows/label.yml
+++ /dev/null
@@ -1,20 +0,0 @@
-# This workflow will triage pull requests and apply a label based on the
-# paths that are modified in the pull request.
-#
-# To use this workflow, you will need to set up a .github/labeler.yml
-# file with configuration.  For more information, see:
-# https://github.com/actions/labeler/blob/master/README.md
-
-
-name: Labeler
-on: [pull_request]
-
-jobs:
-  label:
-
-    runs-on: ubuntu-latest
-
-    steps:
-    - uses: actions/labeler@v2
-      with:
-        repo-token: "${{ secrets.GITHUB_TOKEN }}"

From f9c20af456750977f52927d30bbfa496a26d28da Mon Sep 17 00:00:00 2001
From: Hannah Lazarus <hanhanhan.lazarus@gmail.com>
Date: Thu, 16 Apr 2020 09:45:24 -0400
Subject: [PATCH 0734/2840] Add container_names for docker commands

container_names make it possible to run docker commands
without looking up container hash
use in dev.yml
---
 CONTRIBUTORS.rst                        | 1 +
 docs/developing-locally-docker.rst      | 9 +++++++++
 {{cookiecutter.project_slug}}/local.yml | 8 ++++++++
 3 files changed, 18 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 86b529eb7..660ffc68f 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -128,6 +128,7 @@ Listed in alphabetical order.
   Guilherme Guy            `@guilherme1guy`_
   Hamish Durkin            `@durkode`_
   Hana Quadara             `@hanaquadara`_
+  Hannah Lazarus           `@hanhanhan`_
   Harry Moreno             `@morenoh149`_                @morenoh149
   Harry Percival           `@hjwp`_
   Hendrik Schneider        `@hendrikschneider`_
diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index 09e684986..d6b4146d5 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -154,6 +154,15 @@ django-debug-toolbar
 In order for ``django-debug-toolbar`` to work designate your Docker Machine IP with ``INTERNAL_IPS`` in ``local.py``.
 
 
+docker
+""""""
+
+The ``container_name`` from the yml file can be used to check on containers with docker commands, for example: ::
+
+    $ docker logs worker
+    $ docker top worker
+
+
 Mailhog
 ~~~~~~~
 
diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index 60f8f9228..b603f1778 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -10,6 +10,7 @@ services:
       context: .
       dockerfile: ./compose/local/django/Dockerfile
     image: {{ cookiecutter.project_slug }}_local_django
+    container_name: django
     depends_on:
       - postgres
       {%- if cookiecutter.use_mailhog == 'y' %}
@@ -29,6 +30,7 @@ services:
       context: .
       dockerfile: ./compose/production/postgres/Dockerfile
     image: {{ cookiecutter.project_slug }}_production_postgres
+    container_name: postgres
     volumes:
       - local_postgres_data:/var/lib/postgresql/data
       - local_postgres_data_backups:/backups
@@ -38,6 +40,7 @@ services:
 
   mailhog:
     image: mailhog/mailhog:v1.0.0
+    container_name: mailhog
     ports:
       - "8025:8025"
 
@@ -46,10 +49,12 @@ services:
 
   redis:
     image: redis:5.0
+    container_name: redis
 
   celeryworker:
     <<: *django
     image: {{ cookiecutter.project_slug }}_local_celeryworker
+    container_name: celeryworker
     depends_on:
       - redis
       - postgres
@@ -62,6 +67,7 @@ services:
   celerybeat:
     <<: *django
     image: {{ cookiecutter.project_slug }}_local_celerybeat
+    container_name: celerybeat
     depends_on:
       - redis
       - postgres
@@ -74,6 +80,7 @@ services:
   flower:
     <<: *django
     image: {{ cookiecutter.project_slug }}_local_flower
+    container_name: flower
     ports:
       - "5555:5555"
     command: /start-flower
@@ -86,6 +93,7 @@ services:
       context: .
       dockerfile: ./compose/local/node/Dockerfile
     image: {{ cookiecutter.project_slug }}_local_node
+    container_name: node
     depends_on:
       - django
     volumes:

From 95ca7ca29171fc98307219d3d95257e736528635 Mon Sep 17 00:00:00 2001
From: Tano Abeleyra <tano@abeleyra.com>
Date: Fri, 24 Apr 2020 21:29:59 -0300
Subject: [PATCH 0735/2840] Update django-redis links

---
 {{cookiecutter.project_slug}}/config/settings/production.py | 2 +-
 {{cookiecutter.project_slug}}/requirements/base.txt         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index cea29b8e5..c13f1aebe 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -34,7 +34,7 @@ CACHES = {
         "OPTIONS": {
             "CLIENT_CLASS": "django_redis.client.DefaultClient",
             # Mimicing memcache behavior.
-            # http://niwinz.github.io/django-redis/latest/#_memcached_exceptions_behavior
+            # http://jazzband.github.io/django-redis/latest/#_memcached_exceptions_behavior
             "IGNORE_EXCEPTIONS": True,
         },
     }
diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 896110c2d..62db8c794 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -31,7 +31,7 @@ django-crispy-forms==1.9.0  # https://github.com/django-crispy-forms/django-cris
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==2.4  # https://github.com/django-compressor/django-compressor
 {%- endif %}
-django-redis==4.11.0  # https://github.com/niwinz/django-redis
+django-redis==4.11.0  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == "y" %}
 # Django REST Framework
 djangorestframework==3.11.0  # https://github.com/encode/django-rest-framework

From b8a1805a9fd4dd81f798d34bb67143d63d867bc4 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sun, 26 Apr 2020 12:00:30 +0100
Subject: [PATCH 0736/2840] Update pillow from 7.1.1 to 7.1.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 62db8c794..0a81a003e 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,6 +1,6 @@
 pytz==2019.3  # https://github.com/stub42/pytz
 python-slugify==4.0.0  # https://github.com/un33k/python-slugify
-Pillow==7.1.1  # https://github.com/python-pillow/Pillow
+Pillow==7.1.2  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
 rcssmin==1.0.6{% if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} --install-option="--without-c-extensions"{% endif %}  # https://github.com/ndparker/rcssmin
 {%- endif %}

From 393526bc4795be176d2a86944e77904c0085a497 Mon Sep 17 00:00:00 2001
From: Jonathan Thompson <nojanath@users.noreply.github.com>
Date: Mon, 27 Apr 2020 02:31:46 +0000
Subject: [PATCH 0737/2840] Clarify the installation steps for local setup

Added a link to Cookiecutter as a prerequisite.
Added an installation command for cookiecutter-django.
Added a command for git init.  The precommit install fails unless you have a git repo.

This should make it easier for a newcomer to get things configured.
---
 docs/developing-locally.rst | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index 4f70414cb..dc146c232 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -12,6 +12,7 @@ Make sure to have the following on your host:
 * Python 3.8
 * PostgreSQL_.
 * Redis_, if using Celery
+* Cookiecutter_
 
 First things first.
 
@@ -23,9 +24,14 @@ First things first.
 
     $ source <virtual env path>/bin/activate
 
+#. Install cookiecutter-django
+
+    $ cookiecutter gh:pydanny/cookiecutter-django ::
+
 #. Install development requirements: ::
 
     $ pip install -r requirements/local.txt
+    $ git init # A git repo is required for pre-commit to install
     $ pre-commit install
 
      .. note::
@@ -78,6 +84,7 @@ or if you're running asynchronously: ::
 
 .. _PostgreSQL: https://www.postgresql.org/download/
 .. _Redis: https://redis.io/download
+.. _CookieCutter: https://github.com/cookiecutter/cookiecutter
 .. _createdb: https://www.postgresql.org/docs/current/static/app-createdb.html
 .. _initial PostgreSQL set up: http://suite.opengeo.org/docs/latest/dataadmin/pgGettingStarted/firstconnect.html
 .. _postgres documentation: https://www.postgresql.org/docs/current/static/auth-pg-hba-conf.html

From a34e3a53c66f7953dbc03d010e4685b41272bfa3 Mon Sep 17 00:00:00 2001
From: Jonathan Thompson <nojanath@users.noreply.github.com>
Date: Mon, 27 Apr 2020 02:38:51 +0000
Subject: [PATCH 0738/2840] Update CONTRIBUTORS.rst

---
 CONTRIBUTORS.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 86b529eb7..39e05c3fb 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -145,6 +145,7 @@ Listed in alphabetical order.
   Jerome Leclanche         `@jleclanche`_                @Adys
   Jimmy Gitonga            `@afrowave`_                  @afrowave
   John Cass                `@jcass77`_                   @cass_john
+  Jonathan Thompson        `@nojanath`_
   Jules Cheron             `@jules-ch`_
   Julien Almarcha          `@sladinji`_
   Julio Castillo           `@juliocc`_
@@ -357,6 +358,7 @@ Listed in alphabetical order.
 .. _@myilmaz: https://github.com/myilmaz
 .. _@nicolas471: https://github.com/nicolas471
 .. _@noisy: https://github.com/noisy
+.. _@nojanath: https://github.com/nojanath
 .. _@originell: https://github.com/originell
 .. _@oubiga: https://github.com/oubiga
 .. _@parbhat: https://github.com/parbhat

From 04d8b06035bb052f05147c160f303e33fd119729 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 27 Apr 2020 12:00:31 +0100
Subject: [PATCH 0739/2840] Update sphinx from 3.0.2 to 3.0.3

---
 {{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 f6be44b51..bf78bce03 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -2,7 +2,7 @@
 
 Werkzeug==1.0.1 # https://github.com/pallets/werkzeug
 ipdb==0.13.2  # https://github.com/gotcha/ipdb
-Sphinx==3.0.2  # https://github.com/sphinx-doc/sphinx
+Sphinx==3.0.3  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}

From 3d8c4627f4cc7a49cb6a63b1bec2990f1397aaa5 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Mon, 27 Apr 2020 12:00:36 +0100
Subject: [PATCH 0740/2840] Update pytest-sugar from 0.9.2 to 0.9.3

---
 {{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 f6be44b51..9cc7111db 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -14,7 +14,7 @@ psycopg2-binary==2.8.5  # https://github.com/psycopg/psycopg2
 mypy==0.770  # https://github.com/python/mypy
 django-stubs==1.5.0  # https://github.com/typeddjango/django-stubs
 pytest==5.3.5  # https://github.com/pytest-dev/pytest
-pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
+pytest-sugar==0.9.3  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality
 # ------------------------------------------------------------------------------

From 84d871a1cdcd5118e3ea31dd86f08b8cdabd5cc0 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 27 Apr 2020 11:40:16 -0700
Subject: [PATCH 0741/2840] Update sh from 1.12.14 to 1.13.0

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

diff --git a/requirements.txt b/requirements.txt
index c5601892c..ddd77cece 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 cookiecutter==1.7.2
-sh==1.12.14
+sh==1.13.0
 binaryornot==0.4.4
 
 # Code quality

From f13f3dc2bf16f8fe40d6bb10b89846ce8c8bb503 Mon Sep 17 00:00:00 2001
From: Pilhwan Kim <pilhwankim03@gmail.com>
Date: Tue, 28 Apr 2020 12:41:51 +0900
Subject: [PATCH 0742/2840] add use drf tests

---
 hooks/post_gen_project.py                     |  2 ++
 .../users/tests/test_drf_urls.py              | 24 +++++++++++++++
 .../users/tests/test_drf_views.py             | 30 +++++++++++++++++++
 3 files changed, 56 insertions(+)
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_urls.py
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py

diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index ad1db3ee6..21d680e08 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -299,6 +299,8 @@ def remove_aws_dockerfile():
 def remove_drf_starter_files():
     os.remove(os.path.join("config", "api_router.py"))
     shutil.rmtree(os.path.join("{{cookiecutter.project_slug}}", "users", "api"))
+    os.remove(os.path.join("{{cookiecutter.project_slug}}", "users", "tests", "test_drf_urls.py"))
+    os.remove(os.path.join("{{cookiecutter.project_slug}}", "users", "tests", "test_drf_views.py"))
 
 
 def remove_storages_module():
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_urls.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_urls.py
new file mode 100644
index 000000000..83b623f45
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_urls.py
@@ -0,0 +1,24 @@
+import pytest
+from django.urls import resolve, reverse
+
+from {{ cookiecutter.project_slug }}.users.models import User
+
+pytestmark = pytest.mark.django_db
+
+
+def test_user_detail(user: User):
+    assert (
+        reverse("api:user-detail", kwargs={"username": user.username})
+        == f"/api/users/{user.username}/"
+    )
+    assert resolve(f"/api/users/{user.username}/").view_name == "api:user-detail"
+
+
+def test_user_list():
+    assert reverse("api:user-list") == "/api/users/"
+    assert resolve("/api/users/").view_name == "api:user-list"
+
+
+def test_user_me():
+    assert reverse("api:user-me") == "/api/users/me/"
+    assert resolve("/api/users/me/").view_name == "api:user-me"
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
new file mode 100644
index 000000000..89c3c1a97
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
@@ -0,0 +1,30 @@
+import pytest
+from django.test import RequestFactory
+
+from {{ cookiecutter.project_slug }}.users.models import User
+from {{ cookiecutter.project_slug }}.users.api.views import UserViewSet
+from {{ cookiecutter.project_slug }}.users.api.serializers import UserSerializer
+
+pytestmark = pytest.mark.django_db
+
+
+class TestUserViewSet:
+    def test_get_queryset(self, user: User, rf: RequestFactory):
+        view = UserViewSet()
+        request = rf.get("/fake-url/")
+        request.user = user
+
+        view.request = request
+
+        assert user in view.get_queryset()
+
+    def test_me(self, user: User, rf: RequestFactory):
+        view = UserViewSet()
+        request = rf.get("/fake-url/")
+        request.user = user
+
+        view.request = request
+
+        response = view.me(request)
+
+        assert response.data == UserSerializer(user, context={"request": request}).data

From 0c2af32b8d9808e443e36bde52f85d1b5b8e4893 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Tue, 28 Apr 2020 12:00:34 +0100
Subject: [PATCH 0743/2840] Update pytz from 2019.3 to 2020.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 0a81a003e..b9e26d397 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,4 +1,4 @@
-pytz==2019.3  # https://github.com/stub42/pytz
+pytz==2020.1  # https://github.com/stub42/pytz
 python-slugify==4.0.0  # https://github.com/un33k/python-slugify
 Pillow==7.1.2  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}

From 4eb718c6837888c19abbd59e4080ee38e40baa25 Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Sat, 14 Mar 2020 11:00:30 +0000
Subject: [PATCH 0744/2840] Update pytest from 5.3.5 to 5.4.1

---
 {{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 d4d9897b5..e3d013dc3 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -13,7 +13,7 @@ psycopg2-binary==2.8.5  # https://github.com/psycopg/psycopg2
 # ------------------------------------------------------------------------------
 mypy==0.770  # https://github.com/python/mypy
 django-stubs==1.5.0  # https://github.com/typeddjango/django-stubs
-pytest==5.3.5  # https://github.com/pytest-dev/pytest
+pytest==5.4.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.3  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From f402437fb543d07902e3571fea31bb7b6f2f361f Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 28 Apr 2020 12:49:05 +0100
Subject: [PATCH 0745/2840] Fix broken link in CONTRIBUTORS.rst

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 5f2de4713..54031c30c 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -313,6 +313,7 @@ Listed in alphabetical order.
 .. _@hackebrot: https://github.com/hackebrot
 .. _@hairychris: https://github.com/hairychris
 .. _@hanaquadara: https://github.com/hanaquadara
+.. _@hanhanhan: https://github.com/hanhanhan
 .. _@hendrikschneider: https://github.com/hendrikschneider
 .. _@highpost: https://github.com/highpost
 .. _@hjwp: https://github.com/hjwp

From ed60aa36ee39b5ade0c2e2ad2798c4197e45bced Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 28 Apr 2020 07:40:23 -0700
Subject: [PATCH 0746/2840] Update sh from 1.13.0 to 1.13.1

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

diff --git a/requirements.txt b/requirements.txt
index ddd77cece..18439a352 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 cookiecutter==1.7.2
-sh==1.13.0
+sh==1.13.1
 binaryornot==0.4.4
 
 # Code quality

From c54c4f5ef7ebe4ee85e96dd9e72df4a49a7242d1 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Tue, 28 Apr 2020 16:26:34 -0400
Subject: [PATCH 0747/2840] Fix reloading when using async

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

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start b/{{cookiecutter.project_slug}}/compose/local/django/start
index 9c0b43d1f..660eda34c 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/start
@@ -7,7 +7,7 @@ set -o nounset
 
 python manage.py migrate
 {%- if cookiecutter.use_async == 'y' %}
-/usr/local/bin/gunicorn config.asgi --bind 0.0.0.0:8000 --chdir=/app -k uvicorn.workers.UvicornWorker --reload
+uvicorn config.asgi:application --host 0.0.0.0 --reload
 {%- else %}
 python manage.py runserver_plus 0.0.0.0:8000
 {% endif %}

From 672be773a376ce27a35b81573388e12c460af11a Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 28 Apr 2020 23:18:52 +0100
Subject: [PATCH 0748/2840] Fix formatting

---
 hooks/post_gen_project.py                            | 12 ++++++++++--
 .../users/tests/test_drf_views.py                    |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index 21d680e08..13d0ff00a 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -299,8 +299,16 @@ def remove_aws_dockerfile():
 def remove_drf_starter_files():
     os.remove(os.path.join("config", "api_router.py"))
     shutil.rmtree(os.path.join("{{cookiecutter.project_slug}}", "users", "api"))
-    os.remove(os.path.join("{{cookiecutter.project_slug}}", "users", "tests", "test_drf_urls.py"))
-    os.remove(os.path.join("{{cookiecutter.project_slug}}", "users", "tests", "test_drf_views.py"))
+    os.remove(
+        os.path.join(
+            "{{cookiecutter.project_slug}}", "users", "tests", "test_drf_urls.py"
+        )
+    )
+    os.remove(
+        os.path.join(
+            "{{cookiecutter.project_slug}}", "users", "tests", "test_drf_views.py"
+        )
+    )
 
 
 def remove_storages_module():
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
index 89c3c1a97..28f7526b7 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
@@ -1,9 +1,9 @@
 import pytest
 from django.test import RequestFactory
 
-from {{ cookiecutter.project_slug }}.users.models import User
-from {{ cookiecutter.project_slug }}.users.api.views import UserViewSet
 from {{ cookiecutter.project_slug }}.users.api.serializers import UserSerializer
+from {{ cookiecutter.project_slug }}.users.api.views import UserViewSet
+from {{ cookiecutter.project_slug }}.users.models import User
 
 pytestmark = pytest.mark.django_db
 

From 5a9648fa90c10afb4a2a26b24bf82c0521ef680e Mon Sep 17 00:00:00 2001
From: Leon Kim <pilhwankim03@gmail.com>
Date: Wed, 29 Apr 2020 08:41:33 +0900
Subject: [PATCH 0749/2840] Update
 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py

OK. I agree with your idea. Even to me, this code is more explicit to check result.

Co-Authored-By: Bruno Alla <browniebroke@users.noreply.github.com>
---
 .../users/tests/test_drf_views.py                          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
index 28f7526b7..9861af32f 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
@@ -27,4 +27,9 @@ class TestUserViewSet:
 
         response = view.me(request)
 
-        assert response.data == UserSerializer(user, context={"request": request}).data
+        assert response.data == {
+            "username": user.username, 
+            "email": user.email, 
+            "name": user.name, 
+            "url": f"/api/users/{user.username}/",
+        }

From 29fea6efa375a7181ae3be3491e4b1db7a1d1219 Mon Sep 17 00:00:00 2001
From: Pilhwan Kim <pilhwankim03@gmail.com>
Date: Wed, 29 Apr 2020 08:54:32 +0900
Subject: [PATCH 0750/2840] remove import  UserSerializer in tesf_drf_views.py

---
 .../users/tests/test_drf_views.py                          | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
index 9861af32f..48147f87a 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
@@ -1,7 +1,6 @@
 import pytest
 from django.test import RequestFactory
 
-from {{ cookiecutter.project_slug }}.users.api.serializers import UserSerializer
 from {{ cookiecutter.project_slug }}.users.api.views import UserViewSet
 from {{ cookiecutter.project_slug }}.users.models import User
 
@@ -28,8 +27,8 @@ class TestUserViewSet:
         response = view.me(request)
 
         assert response.data == {
-            "username": user.username, 
-            "email": user.email, 
-            "name": user.name, 
+            "username": user.username,
+            "email": user.email,
+            "name": user.name,
             "url": f"/api/users/{user.username}/",
         }

From e46c9969ddabad3b6a4b184ecf4de7848849308a Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Wed, 29 Apr 2020 09:13:18 +0100
Subject: [PATCH 0751/2840] Run DRF tests on Travis

---
 .travis.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index b250148e0..9abf37a18 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -19,8 +19,8 @@ matrix:
       script: tox -e black-template
     - name: Basic Docker
       script: sh tests/test_docker.sh
-    - name: Docker with Celery
-      script: sh tests/test_docker.sh use_celery=y
+    - name: Extended Docker
+      script: sh tests/test_docker.sh use_celery=y use_drf=y
     - name: Bare metal
       script: sh tests/test_bare.sh use_celery=y use_compressor=y
       services:

From d1c9791e9581baed2e918c140b177eb9991038d9 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Wed, 29 Apr 2020 09:17:19 +0100
Subject: [PATCH 0752/2840] Update CONTRIBUTORS.rst

---
 CONTRIBUTORS.rst | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 39e05c3fb..81958bfd1 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -161,6 +161,7 @@ Listed in alphabetical order.
   Krzysztof Żuraw          `@krzysztofzuraw`_
   Leo won                  `@leollon`_
   Leo Zhou                 `@glasslion`_
+  Leon Kim                 `@PilhwanKim`_
   Leonardo Jimenez         `@xpostudio4`_
   Lin Xianyi               `@iynaix`_
   Luis Nell                `@originell`_
@@ -365,6 +366,7 @@ Listed in alphabetical order.
 .. _@rjsnh1522: https://github.com/rjsnh1522
 .. _@pchiquet: https://github.com/pchiquet
 .. _@phiberjenz: https://github.com/phiberjenz
+.. _@PilhwanKim: https://github.com/PilhwanKim
 .. _@purplediane: https://github.com/purplediane
 .. _@raonyguimaraes: https://github.com/raonyguimaraes
 .. _@reggieriser: https://github.com/reggieriser

From 01b84128057463999625631bd5d6874755db0f50 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Wed, 29 Apr 2020 09:23:27 +0100
Subject: [PATCH 0753/2840] Fix expected value

---
 .../{{cookiecutter.project_slug}}/users/tests/test_drf_views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
index 48147f87a..60944ad3b 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
@@ -30,5 +30,5 @@ class TestUserViewSet:
             "username": user.username,
             "email": user.email,
             "name": user.name,
-            "url": f"/api/users/{user.username}/",
+            "url": f"http://testserver/api/users/{user.username}/",
         }

From 47e82bd0849351b96f33f532b07a27a7d79f69ad Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Wed, 29 Apr 2020 12:00:30 +0100
Subject: [PATCH 0754/2840] Update uvicorn from 0.11.3 to 0.11.5

---
 {{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 b9e26d397..c2d5babf5 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -17,7 +17,7 @@ flower==0.9.4  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn==0.11.3  # https://github.com/encode/uvicorn
+uvicorn==0.11.5  # https://github.com/encode/uvicorn
 gunicorn==20.0.4  # https://github.com/benoitc/gunicorn
 {%- endif %}
 

From d16d0aa5c4e67d439234a0e7d2e0ff57da3def98 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Wed, 29 Apr 2020 15:56:09 -0400
Subject: [PATCH 0755/2840] Add watchgod for uvicorn

---
 {{cookiecutter.project_slug}}/requirements/base.txt       | 1 -
 {{cookiecutter.project_slug}}/requirements/local.txt      | 3 +++
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 --
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index c2d5babf5..1f1450c40 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -18,7 +18,6 @@ flower==0.9.4  # https://github.com/mher/flower
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
 uvicorn==0.11.5  # https://github.com/encode/uvicorn
-gunicorn==20.0.4  # https://github.com/benoitc/gunicorn
 {%- endif %}
 
 # Django
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index e3d013dc3..9860c74b2 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -8,6 +8,9 @@ psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}
 psycopg2-binary==2.8.5  # https://github.com/psycopg/psycopg2
 {%- endif %}
+{%- if cookiecutter.use_async == 'y' %}
+watchgod==0.6  # https://github.com/samuelcolvin/watchgod
+{%- endif %}
 
 # Testing
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index b45afb66e..83ed366f4 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -2,9 +2,7 @@
 
 -r ./base.txt
 
-{%- if cookiecutter.use_async == 'n' %}
 gunicorn==20.0.4  # https://github.com/benoitc/gunicorn
-{%- endif %}
 psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
 Collectfast==2.1.0  # https://github.com/antonagestam/collectfast

From dfd1ee8bb2fd62fdf40fa60aa14821263bd98f94 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Wed, 29 Apr 2020 16:31:19 -0400
Subject: [PATCH 0756/2840] Use hiredis

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

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index c13f1aebe..6edc4ada3 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -36,6 +36,7 @@ CACHES = {
             # Mimicing memcache behavior.
             # http://jazzband.github.io/django-redis/latest/#_memcached_exceptions_behavior
             "IGNORE_EXCEPTIONS": True,
+            "PARSER_CLASS": "redis.connection.HiredisParser",
         },
     }
 }
diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index c2d5babf5..1783c8c19 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -8,7 +8,8 @@ argon2-cffi==19.2.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==5.0.1  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==3.4.1 # https://github.com/andymccurdy/redis-py
+redis==3.4.1  # https://github.com/andymccurdy/redis-py
+hiredis==1.0.1  # https://github.com/redis/hiredis-py
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.4.2  # pyup: < 5.0  # https://github.com/celery/celery
 django-celery-beat==2.0.0  # https://github.com/celery/django-celery-beat

From 4d54dcaa3218327b851dcbef03d50225dc3a4cf3 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Wed, 29 Apr 2020 16:42:24 -0400
Subject: [PATCH 0757/2840] Put hiredis in production only if using Win

---
 {{cookiecutter.project_slug}}/requirements/base.txt       | 2 ++
 {{cookiecutter.project_slug}}/requirements/production.txt | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 1783c8c19..0455e749c 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -9,7 +9,9 @@ argon2-cffi==19.2.0  # https://github.com/hynek/argon2_cffi
 whitenoise==5.0.1  # https://github.com/evansd/whitenoise
 {%- endif %}
 redis==3.4.1  # https://github.com/andymccurdy/redis-py
+{%- if cookiecutter.windows == "n" %}
 hiredis==1.0.1  # https://github.com/redis/hiredis-py
+{%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.4.2  # pyup: < 5.0  # https://github.com/celery/celery
 django-celery-beat==2.0.0  # https://github.com/celery/django-celery-beat
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index b45afb66e..51389345b 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -12,6 +12,9 @@ Collectfast==2.1.0  # https://github.com/antonagestam/collectfast
 {%- if cookiecutter.use_sentry == "y" %}
 sentry-sdk==0.14.3  # https://github.com/getsentry/sentry-python
 {%- endif %}
+{%- if cookiecutter.windows == "y" %}
+hiredis==1.0.1  # https://github.com/redis/hiredis-py
+{%- endif %}
 
 # Django
 # ------------------------------------------------------------------------------

From f2a7c719e278c0ae0d8baeca64898595b2f72d6e Mon Sep 17 00:00:00 2001
From: browniebroke <alla.brunoo@gmail.com>
Date: Thu, 30 Apr 2020 12:00:30 +0100
Subject: [PATCH 0758/2840] Update redis from 3.4.1 to 3.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 c2d5babf5..4c1b55e10 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -8,7 +8,7 @@ argon2-cffi==19.2.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==5.0.1  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==3.4.1 # https://github.com/andymccurdy/redis-py
+redis==3.5.0 # https://github.com/andymccurdy/redis-py
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.4.2  # pyup: < 5.0  # https://github.com/celery/celery
 django-celery-beat==2.0.0  # https://github.com/celery/django-celery-beat

From 1247f0639552355a17fb74c816adb4f754151932 Mon Sep 17 00:00:00 2001
From: "Fabio C. Barrionuevo da Luz" <bnafta@gmail.com>
Date: Wed, 29 Apr 2020 19:07:21 -0300
Subject: [PATCH 0759/2840] Make sure to resolve symbolic links, uses an
 absolute path in ROOT_DIR and raise an error if the path does not exist by
 using the "resolve" method.

Use "parent.parent.parent" instead of "parents[2]"
---
 {{cookiecutter.project_slug}}/config/asgi.py          | 4 ++--
 {{cookiecutter.project_slug}}/config/settings/base.py | 4 ++--
 {{cookiecutter.project_slug}}/config/wsgi.py          | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/asgi.py b/{{cookiecutter.project_slug}}/config/asgi.py
index 562ecf402..8c99bbf53 100644
--- a/{{cookiecutter.project_slug}}/config/asgi.py
+++ b/{{cookiecutter.project_slug}}/config/asgi.py
@@ -15,8 +15,8 @@ from django.core.asgi import get_asgi_application
 
 # This allows easy placement of apps within the interior
 # {{ cookiecutter.project_slug }} directory.
-app_path = Path(__file__).parents[1].resolve()
-sys.path.append(str(app_path / "{{ cookiecutter.project_slug }}"))
+ROOT_DIR = Path(__file__).resolve(strict=True).parent.parent
+sys.path.append(str(ROOT_DIR / "{{ cookiecutter.project_slug }}"))
 
 # If DJANGO_SETTINGS_MODULE is unset, default to the local settings
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local")
diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 390f2252c..7f339fadc 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -5,8 +5,8 @@ from pathlib import Path
 
 import environ
 
-ROOT_DIR = Path(__file__).parents[2]
-# {{ cookiecutter.project_slug }}/)
+ROOT_DIR = Path(__file__).resolve(strict=True).parent.parent.parent
+# {{ cookiecutter.project_slug }}/
 APPS_DIR = ROOT_DIR / "{{ cookiecutter.project_slug }}"
 env = environ.Env()
 
diff --git a/{{cookiecutter.project_slug}}/config/wsgi.py b/{{cookiecutter.project_slug}}/config/wsgi.py
index fccfea354..a7de581ca 100644
--- a/{{cookiecutter.project_slug}}/config/wsgi.py
+++ b/{{cookiecutter.project_slug}}/config/wsgi.py
@@ -21,8 +21,8 @@ from django.core.wsgi import get_wsgi_application
 
 # This allows easy placement of apps within the interior
 # {{ cookiecutter.project_slug }} directory.
-app_path = Path(__file__).parents[1].resolve()
-sys.path.append(str(app_path / "{{ cookiecutter.project_slug }}"))
+ROOT_DIR = Path(__file__).resolve(strict=True).parent.parent
+sys.path.append(str(ROOT_DIR / "{{ cookiecutter.project_slug }}"))
 # We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks
 # if running multiple sites in the same mod_wsgi process. To fix this, use
 # mod_wsgi daemon mode with each site in its own daemon process, or use

From 3152bdaeb37c863a4e7942d8a243af1d7453c9ce Mon Sep 17 00:00:00 2001
From: Hannah Lazarus <hanhanhan.lazarus@gmail.com>
Date: Fri, 24 Apr 2020 10:23:41 -0400
Subject: [PATCH 0760/2840] Add sphinx defaults for cookiecutter'd project

-serve, watch + live reload for docs + code file changes
-update project makefile + make.bat
-separate _source and _build
-add packages and paths to use autodoc
-edit/add documentation with examples (both at django-cookiecutter and inside generated project)
-add formatted comments in User model for pickup by Sphinx apidoc
-serve docs from a separate docs container for docker build
---
 CONTRIBUTORS.rst                              |   1 +
 docs/document.rst                             |  36 ++++----------
 .../compose/local/docs/Dockerfile             |  30 +++++++++++
 {{cookiecutter.project_slug}}/docs/Makefile   |  34 ++++++++++---
 .../docs/_source/howto.rst                    |  47 ++++++++++++++++++
 .../docs/{ => _source}/index.rst              |   2 +
 .../{ => _source}/pycharm/configuration.rst   |   0
 .../docs/{ => _source}/pycharm/images/1.png   | Bin
 .../docs/{ => _source}/pycharm/images/2.png   | Bin
 .../docs/{ => _source}/pycharm/images/3.png   | Bin
 .../docs/{ => _source}/pycharm/images/4.png   | Bin
 .../docs/{ => _source}/pycharm/images/7.png   | Bin
 .../docs/{ => _source}/pycharm/images/8.png   | Bin
 .../docs/{ => _source}/pycharm/images/f1.png  | Bin
 .../docs/{ => _source}/pycharm/images/f2.png  | Bin
 .../docs/{ => _source}/pycharm/images/f3.png  | Bin
 .../docs/{ => _source}/pycharm/images/f4.png  | Bin
 .../{ => _source}/pycharm/images/issue1.png   | Bin
 .../{ => _source}/pycharm/images/issue2.png   | Bin
 .../docs/_source/users.rst                    |  15 ++++++
 {{cookiecutter.project_slug}}/docs/conf.py    |  26 ++++++----
 {{cookiecutter.project_slug}}/docs/make.bat   |  19 +++++--
 {{cookiecutter.project_slug}}/local.yml       |  16 ++++++
 .../requirements/local.txt                    |   6 ++-
 .../users/models.py                           |  11 +++-
 25 files changed, 193 insertions(+), 50 deletions(-)
 create mode 100644 {{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
 create mode 100644 {{cookiecutter.project_slug}}/docs/_source/howto.rst
 rename {{cookiecutter.project_slug}}/docs/{ => _source}/index.rst (96%)
 rename {{cookiecutter.project_slug}}/docs/{ => _source}/pycharm/configuration.rst (100%)
 rename {{cookiecutter.project_slug}}/docs/{ => _source}/pycharm/images/1.png (100%)
 rename {{cookiecutter.project_slug}}/docs/{ => _source}/pycharm/images/2.png (100%)
 rename {{cookiecutter.project_slug}}/docs/{ => _source}/pycharm/images/3.png (100%)
 rename {{cookiecutter.project_slug}}/docs/{ => _source}/pycharm/images/4.png (100%)
 rename {{cookiecutter.project_slug}}/docs/{ => _source}/pycharm/images/7.png (100%)
 rename {{cookiecutter.project_slug}}/docs/{ => _source}/pycharm/images/8.png (100%)
 rename {{cookiecutter.project_slug}}/docs/{ => _source}/pycharm/images/f1.png (100%)
 rename {{cookiecutter.project_slug}}/docs/{ => _source}/pycharm/images/f2.png (100%)
 rename {{cookiecutter.project_slug}}/docs/{ => _source}/pycharm/images/f3.png (100%)
 rename {{cookiecutter.project_slug}}/docs/{ => _source}/pycharm/images/f4.png (100%)
 rename {{cookiecutter.project_slug}}/docs/{ => _source}/pycharm/images/issue1.png (100%)
 rename {{cookiecutter.project_slug}}/docs/{ => _source}/pycharm/images/issue2.png (100%)
 create mode 100644 {{cookiecutter.project_slug}}/docs/_source/users.rst

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 86b529eb7..660ffc68f 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -128,6 +128,7 @@ Listed in alphabetical order.
   Guilherme Guy            `@guilherme1guy`_
   Hamish Durkin            `@durkode`_
   Hana Quadara             `@hanaquadara`_
+  Hannah Lazarus           `@hanhanhan`_
   Harry Moreno             `@morenoh149`_                @morenoh149
   Harry Percival           `@hjwp`_
   Hendrik Schneider        `@hendrikschneider`_
diff --git a/docs/document.rst b/docs/document.rst
index 7207e357c..990bbe8a7 100644
--- a/docs/document.rst
+++ b/docs/document.rst
@@ -4,42 +4,26 @@ Document
 =========
 
 This project uses Sphinx_ documentation generator.
-After you have set up to `develop locally`_, run the following commands to generate the HTML documentation: ::
 
-    $ sphinx-build docs/ docs/_build/html/
+After you have set up to `develop locally`_, run the following command from the project directory to build and serve HTML documentation: ::
+
+    $ make -C docs livehtml
 
 If you set up your project to `develop locally with docker`_, run the following command: ::
 
-    $ docker-compose -f local.yml run --rm django sphinx-build docs/ docs/_build/html/
+    $ docker-compose -f local.yml up docs
+
+Navigate to port 7000 on your host to see the documentation. This will be opened automatically at `localhost`_ for local, non-docker development.
 
 Generate API documentation
 ----------------------------
 
-Sphinx can automatically generate documentation from docstrings, to enable this feature, follow these steps:
+Edit the docs/_source files and project application docstrings to create your documentation.
 
-1. Add Sphinx extension in ``docs/conf.py`` file, like below: ::
-
-    extensions = [
-        'sphinx.ext.autodoc',
-    ]
-
-2. Uncomment the following lines in the ``docs/conf.py`` file: ::
-
-    # import django
-    # sys.path.insert(0, os.path.abspath('..'))
-    # os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local")
-    # django.setup()
-
-3. Run the following command: ::
-
-    $ sphinx-apidoc -f -o ./docs/modules/ ./tpub/ migrations/*
-
-   If you set up your project to `develop locally with docker`_, run the following command: ::
-
-    $ docker-compose -f local.yml run --rm django sphinx-apidoc -f -o ./docs/modules ./tpub/ migrations/*
-
-4. Regenerate HTML documentation as written above.
+Sphinx can automatically include class and function signatures and docstrings in generated documentation. 
+See the generated project documentation for more examples.
 
+.. _localhost: http://localhost:7000/
 .. _Sphinx: https://www.sphinx-doc.org/en/master/index.html
 .. _develop locally: ./developing-locally.html
 .. _develop locally with docker: ./developing-locally-docker.html
diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
new file mode 100644
index 000000000..7e79b0fa0
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
@@ -0,0 +1,30 @@
+FROM python:3.8-slim-buster
+
+ENV PYTHONUNBUFFERED 1
+ENV PYTHONDONTWRITEBYTECODE 1
+
+RUN apt-get update \
+    # dependencies for building Python packages
+    && apt-get install -y build-essential \
+    # psycopg2 dependencies
+    && apt-get install -y libpq-dev \
+    # Translations dependencies
+    && apt-get install -y gettext \
+    # Enable Sphinx output to latex and pdf
+    && apt-get install -y texlive-latex-recommended \
+    && apt-get install -y texlive-fonts-recommended \
+    && apt-get install -y texlive-latex-extra \
+    && apt-get install -y latexmk \
+    # cleaning up unused files
+    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+    && rm -rf /var/lib/apt/lists/*
+
+# Requirements are installed here to ensure they will be cached.
+COPY ./requirements /requirements
+# All imports needed for autodoc.
+RUN pip install -r /requirements/local.txt
+RUN pip install -r /requirements/production.txt
+
+WORKDIR /docs
+
+CMD make livehtml
diff --git a/{{cookiecutter.project_slug}}/docs/Makefile b/{{cookiecutter.project_slug}}/docs/Makefile
index d4bb2cbb9..90f61de32 100644
--- a/{{cookiecutter.project_slug}}/docs/Makefile
+++ b/{{cookiecutter.project_slug}}/docs/Makefile
@@ -3,18 +3,38 @@
 
 # You can set these variables from the command line, and also
 # from the environment for the first two.
-SPHINXOPTS    ?=
-SPHINXBUILD   ?= sphinx-build
-SOURCEDIR     = .
-BUILDDIR      = _build
+SPHINXOPTS    ?= 
+SPHINXBUILD   ?= sphinx-build -c .
+SOURCEDIR     = ./_source
+BUILDDIR      = ./_build
+{%- if cookiecutter.use_docker == 'y' %}
+APP = /app
+{%- else %}
+APP = ../{{cookiecutter.project_slug}}
+{% endif %}
+
+.PHONY: help livehtml apidocs Makefile
 
 # Put it first so that "make" without argument is like "make help".
 help:
-	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+	@$(SPHINXBUILD) help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
-.PHONY: help Makefile
+# Build, watch and serve docs with live reload
+livehtml:
+	sphinx-autobuild -b html 
+	{%- if cookiecutter.use_docker == 'y' %} -H 0.0.0.0 
+	{%- else %} --open-browser 
+	{%- endif %} -p 7000 --watch $(APP) -c . $(SOURCEDIR) $(BUILDDIR)/html
+
+# Outputs rst files from django application code
+apidocs:
+	{%- if cookiecutter.use_docker == 'y' %}
+	sphinx-apidoc -o $(SOURCEDIR)/api /app
+	{%- else %}
+	sphinx-apidoc -o $(SOURCEDIR)/api ../{{cookiecutter.project_slug}}
+	{%- endif %}
 
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %: Makefile
-	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+	@$(SPHINXBUILD) -b $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
diff --git a/{{cookiecutter.project_slug}}/docs/_source/howto.rst b/{{cookiecutter.project_slug}}/docs/_source/howto.rst
new file mode 100644
index 000000000..309277427
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/docs/_source/howto.rst
@@ -0,0 +1,47 @@
+How To - Project Documentation
+======================================================================
+
+Get Started
+----------------------------------------------------------------------
+
+Documentation can be written as rst files in the `{{cookiecutter.project_slug}}/docs/_source`.
+
+{% if cookiecutter.use_docker == 'n' %}
+To build and serve docs, use the command:
+    ::
+    
+        make livehtml 
+    
+from inside the `{{cookiecutter.project_slug}}/docs` directory. 
+{% else %}
+To build and serve docs, use the commands:
+    ::
+    
+        docker-compose -f local.yml build
+        docker run docs
+{% endif %}
+
+Changes to files in `docs/_source` will be picked up and reloaded automatically.
+
+`Sphinx <https://www.sphinx-doc.org/>`_ is the tool used to build documentation.
+
+Docstrings to Documentation
+----------------------------------------------------------------------
+
+The sphinx extension `apidoc <https://www.sphinx-doc.org/en/master/man/sphinx-apidoc.html/>`_ is used to automatically document code using signatures and docstrings.
+
+Numpy or Google style docstrings will be picked up from project files and availble for documentation. See the `Napoleon <https://sphinxcontrib-napoleon.readthedocs.io/en/latest/>`_ extension for details.
+
+For an in-use example, see the `page source <_sources/users.rst.txt>`_ for :ref:`users`.
+
+To compile all docstrings automatically into documentation source files, use the command:
+    ::
+    
+        make apidocs
+
+{% if cookiecutter.use_docker == 'y' %}
+This can be done in the docker container:
+    :: 
+        
+        docker run --rm docs make apidocs
+{% endif -%}
diff --git a/{{cookiecutter.project_slug}}/docs/index.rst b/{{cookiecutter.project_slug}}/docs/_source/index.rst
similarity index 96%
rename from {{cookiecutter.project_slug}}/docs/index.rst
rename to {{cookiecutter.project_slug}}/docs/_source/index.rst
index b107a9e5c..5fafc6966 100644
--- a/{{cookiecutter.project_slug}}/docs/index.rst
+++ b/{{cookiecutter.project_slug}}/docs/_source/index.rst
@@ -10,7 +10,9 @@ Welcome to {{ cookiecutter.project_name }}'s documentation!
    :maxdepth: 2
    :caption: Contents:
 
+   howto
    pycharm/configuration
+   users
 
 
 
diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/configuration.rst b/{{cookiecutter.project_slug}}/docs/_source/pycharm/configuration.rst
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/pycharm/configuration.rst
rename to {{cookiecutter.project_slug}}/docs/_source/pycharm/configuration.rst
diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/images/1.png b/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/1.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/pycharm/images/1.png
rename to {{cookiecutter.project_slug}}/docs/_source/pycharm/images/1.png
diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/images/2.png b/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/2.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/pycharm/images/2.png
rename to {{cookiecutter.project_slug}}/docs/_source/pycharm/images/2.png
diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/images/3.png b/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/3.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/pycharm/images/3.png
rename to {{cookiecutter.project_slug}}/docs/_source/pycharm/images/3.png
diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/images/4.png b/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/4.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/pycharm/images/4.png
rename to {{cookiecutter.project_slug}}/docs/_source/pycharm/images/4.png
diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/images/7.png b/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/7.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/pycharm/images/7.png
rename to {{cookiecutter.project_slug}}/docs/_source/pycharm/images/7.png
diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/images/8.png b/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/8.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/pycharm/images/8.png
rename to {{cookiecutter.project_slug}}/docs/_source/pycharm/images/8.png
diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/images/f1.png b/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/f1.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/pycharm/images/f1.png
rename to {{cookiecutter.project_slug}}/docs/_source/pycharm/images/f1.png
diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/images/f2.png b/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/f2.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/pycharm/images/f2.png
rename to {{cookiecutter.project_slug}}/docs/_source/pycharm/images/f2.png
diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/images/f3.png b/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/f3.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/pycharm/images/f3.png
rename to {{cookiecutter.project_slug}}/docs/_source/pycharm/images/f3.png
diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/images/f4.png b/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/f4.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/pycharm/images/f4.png
rename to {{cookiecutter.project_slug}}/docs/_source/pycharm/images/f4.png
diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/images/issue1.png b/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/issue1.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/pycharm/images/issue1.png
rename to {{cookiecutter.project_slug}}/docs/_source/pycharm/images/issue1.png
diff --git a/{{cookiecutter.project_slug}}/docs/pycharm/images/issue2.png b/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/issue2.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/pycharm/images/issue2.png
rename to {{cookiecutter.project_slug}}/docs/_source/pycharm/images/issue2.png
diff --git a/{{cookiecutter.project_slug}}/docs/_source/users.rst b/{{cookiecutter.project_slug}}/docs/_source/users.rst
new file mode 100644
index 000000000..6cf645562
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/docs/_source/users.rst
@@ -0,0 +1,15 @@
+ .. _users:
+
+Users
+======================================================================
+
+Starting a new project, it’s highly recommended to set up a custom user model, 
+even if the default User model is sufficient for you. 
+
+This model behaves identically to the default user model, 
+but you’ll be able to customize it in the future if the need arises.
+
+.. automodule:: {{cookiecutter.project_slug}}.users.models
+   :members:
+   :noindex:
+
diff --git a/{{cookiecutter.project_slug}}/docs/conf.py b/{{cookiecutter.project_slug}}/docs/conf.py
index bfde1e3a6..691f351e5 100644
--- a/{{cookiecutter.project_slug}}/docs/conf.py
+++ b/{{cookiecutter.project_slug}}/docs/conf.py
@@ -9,15 +9,19 @@
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
-#
+
 import os
 import sys
+import django
 
-# import django
-# sys.path.insert(0, os.path.abspath('..'))
-# os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local")
-# django.setup()
-
+{% if cookiecutter.use_docker == 'y' %}
+sys.path.insert(0, os.path.abspath("/app"))
+os.environ.setdefault("DATABASE_URL", "")
+{% else %}
+sys.path.insert(0, os.path.abspath(".."))
+{%- endif %}
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local")
+django.setup()
 
 # -- Project information -----------------------------------------------------
 
@@ -31,17 +35,19 @@ author = "{{ cookiecutter.author_name }}"
 # Add any Sphinx extension module names here, as strings. They can be
 # extensions coming with Sphinx (named 'sphinx.ext.*') or your custom
 # ones.
-extensions = []
+extensions = [
+    "sphinx.ext.autodoc",
+    "sphinx.ext.napoleon",
+]
 
 # Add any paths that contain templates here, relative to this directory.
-templates_path = ["_templates"]
+# templates_path = ["_templates"]
 
 # List of patterns, relative to source directory, that match files and
 # directories to ignore when looking for source files.
 # This pattern also affects html_static_path and html_extra_path.
 exclude_patterns = ["_build", "Thumbs.db", ".DS_Store"]
 
-
 # -- Options for HTML output -------------------------------------------------
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
@@ -52,4 +58,4 @@ html_theme = "alabaster"
 # Add any paths that contain custom static files (such as style sheets) here,
 # relative to this directory. They are copied after the builtin static files,
 # so a file named "default.css" will overwrite the builtin "default.css".
-html_static_path = ["_static"]
+# html_static_path = ["_static"]
diff --git a/{{cookiecutter.project_slug}}/docs/make.bat b/{{cookiecutter.project_slug}}/docs/make.bat
index 922152e96..b19f42c6a 100644
--- a/{{cookiecutter.project_slug}}/docs/make.bat
+++ b/{{cookiecutter.project_slug}}/docs/make.bat
@@ -4,11 +4,13 @@ pushd %~dp0
 
 REM Command file for Sphinx documentation
 
+
 if "%SPHINXBUILD%" == "" (
-	set SPHINXBUILD=sphinx-build
+	set SPHINXBUILD=sphinx-build -c .
 )
-set SOURCEDIR=.
+set SOURCEDIR=_source
 set BUILDDIR=_build
+set APP=..\{{cookiecutter.project_slug}}
 
 if "%1" == "" goto help
 
@@ -20,16 +22,25 @@ if errorlevel 9009 (
 	echo.to the full path of the 'sphinx-build' executable. Alternatively you
 	echo.may add the Sphinx directory to PATH.
 	echo.
+	echo.Install sphinx-autobuild for live serving.
 	echo.If you don't have Sphinx installed, grab it from
 	echo.http://sphinx-doc.org/
 	exit /b 1
 )
 
-%SPHINXBUILD% -M %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+%SPHINXBUILD% -b %1 %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
 goto end
 
+:livehtml
+sphinx-autobuild -b html --open-browser -p 7000 --watch %APP% -c . %SOURCEDIR% %BUILDDIR%/html
+GOTO :EOF
+
+:apidocs
+sphinx-apidoc -o %SOURCEDIR%/api %APP%
+GOTO :EOF
+
 :help
-%SPHINXBUILD% -M help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
+%SPHINXBUILD% -b help %SOURCEDIR% %BUILDDIR% %SPHINXOPTS% %O%
 
 :end
 popd
diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index 60f8f9228..0d9057b06 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -34,6 +34,22 @@ services:
       - local_postgres_data_backups:/backups
     env_file:
       - ./.envs/.local/.postgres
+
+  docs:
+    image: {{ cookiecutter.project_slug }}_local_docs
+    container_name: docs
+    build:
+      context: .
+      dockerfile: ./compose/local/docs/Dockerfile
+    env_file:
+      - ./.envs/.local/.django
+    volumes:
+      - ./docs:/docs
+      - ./config:/app/config
+      - ./{{ cookiecutter.project_slug }}:/app/{{ cookiecutter.project_slug }}
+    ports:
+      - "7000:7000"
+    
   {%- if cookiecutter.use_mailhog == 'y' %}
 
   mailhog:
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index f6be44b51..253cf7386 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -2,7 +2,6 @@
 
 Werkzeug==1.0.1 # https://github.com/pallets/werkzeug
 ipdb==0.13.2  # https://github.com/gotcha/ipdb
-Sphinx==3.0.2  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}
@@ -16,6 +15,11 @@ django-stubs==1.5.0  # https://github.com/typeddjango/django-stubs
 pytest==5.3.5  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
+# Documentation
+# ------------------------------------------------------------------------------
+sphinx==3.0.2  # https://github.com/sphinx-doc/sphinx
+sphinx-autobuild # https://github.com/GaretJax/sphinx-autobuild
+
 # Code quality
 # ------------------------------------------------------------------------------
 flake8==3.7.9  # https://github.com/PyCQA/flake8
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
index 8f07b15a1..adff2d66d 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
@@ -5,10 +5,17 @@ from django.utils.translation import ugettext_lazy as _
 
 
 class User(AbstractUser):
+    """Default user for {{cookiecutter.project_name}}.
+    """
 
-    # First Name and Last Name do not cover name patterns
-    # around the globe.
+    #: First and last name do not cover name patterns around the globe
     name = CharField(_("Name of User"), blank=True, max_length=255)
 
     def get_absolute_url(self):
+        """Get url for user's detail view.
+
+        Returns:
+            str: URL for user detail.
+
+        """
         return reverse("users:detail", kwargs={"username": self.username})

From bf5f557d2b1f3e9ff784e2aae3b357a34df3e722 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Fri, 1 May 2020 10:35:20 -0400
Subject: [PATCH 0761/2840] Added docker parameter to hiredis requirement

---
 {{cookiecutter.project_slug}}/config/settings/production.py | 1 -
 {{cookiecutter.project_slug}}/requirements/base.txt         | 2 +-
 {{cookiecutter.project_slug}}/requirements/production.txt   | 2 +-
 3 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 6edc4ada3..c13f1aebe 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -36,7 +36,6 @@ CACHES = {
             # Mimicing memcache behavior.
             # http://jazzband.github.io/django-redis/latest/#_memcached_exceptions_behavior
             "IGNORE_EXCEPTIONS": True,
-            "PARSER_CLASS": "redis.connection.HiredisParser",
         },
     }
 }
diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 0455e749c..7fa0aeca7 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -9,7 +9,7 @@ argon2-cffi==19.2.0  # https://github.com/hynek/argon2_cffi
 whitenoise==5.0.1  # https://github.com/evansd/whitenoise
 {%- endif %}
 redis==3.4.1  # https://github.com/andymccurdy/redis-py
-{%- if cookiecutter.windows == "n" %}
+{%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==1.0.1  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 51389345b..4f0e6119d 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -12,7 +12,7 @@ Collectfast==2.1.0  # https://github.com/antonagestam/collectfast
 {%- if cookiecutter.use_sentry == "y" %}
 sentry-sdk==0.14.3  # https://github.com/getsentry/sentry-python
 {%- endif %}
-{%- if cookiecutter.windows == "y" %}
+{%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "y" %}
 hiredis==1.0.1  # https://github.com/redis/hiredis-py
 {%- endif %}
 

From b70b6ebd7e99e8bba88fddd29653f501c513ea2b Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwang02@gmail.com>
Date: Fri, 1 May 2020 10:39:30 -0400
Subject: [PATCH 0762/2840] Fixed production.txt typo when docker and windows
 combine

---
 {{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 4f0e6119d..c5ba356c4 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -12,7 +12,7 @@ Collectfast==2.1.0  # https://github.com/antonagestam/collectfast
 {%- if cookiecutter.use_sentry == "y" %}
 sentry-sdk==0.14.3  # https://github.com/getsentry/sentry-python
 {%- endif %}
-{%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "y" %}
+{%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
 hiredis==1.0.1  # https://github.com/redis/hiredis-py
 {%- endif %}
 

From bcfcd384f823a7363c47988444342f95bcc895c9 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 17 Mar 2020 18:58:11 +0000
Subject: [PATCH 0763/2840] Test user detail view

---
 .../users/tests/test_views.py                 | 35 ++++++++++++++++++-
 1 file changed, 34 insertions(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
index ca0060595..82abecb51 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
@@ -1,8 +1,15 @@
 import pytest
+from django.contrib.auth.models import AnonymousUser
+from django.http.response import Http404
 from django.test import RequestFactory
 
 from {{ cookiecutter.project_slug }}.users.models import User
-from {{ cookiecutter.project_slug }}.users.views import UserRedirectView, UserUpdateView
+from {{ cookiecutter.project_slug }}.users.tests.factories import UserFactory
+from {{ cookiecutter.project_slug }}.users.views import (
+    UserRedirectView,
+    UserUpdateView,
+    user_detail_view,
+)
 
 pytestmark = pytest.mark.django_db
 
@@ -44,3 +51,29 @@ class TestUserRedirectView:
         view.request = request
 
         assert view.get_redirect_url() == f"/users/{user.username}/"
+
+
+class TestUserDetailView:
+    def test_authenticated(self, user: User, rf: RequestFactory):
+        request = rf.get("/fake-url/")
+        request.user = UserFactory()
+
+        response = user_detail_view(request, username=user.username)
+
+        assert response.status_code == 200
+
+    def test_not_authenticated(self, user: User, rf: RequestFactory):
+        request = rf.get("/fake-url/")
+        request.user = AnonymousUser()  # type: ignore
+
+        response = user_detail_view(request, username=user.username)
+
+        assert response.status_code == 302
+        assert response.url == f"/accounts/login/?next=/fake-url/"
+
+    def test_case_sensitivity(self, rf: RequestFactory):
+        request = rf.get("/fake-url/")
+        request.user = UserFactory(username="UserName")
+
+        with pytest.raises(Http404):
+            user_detail_view(request, username="username")

From 05a5bbbad73cf37ba7527e2efd6283697a733145 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Fri, 1 May 2020 17:57:43 +0100
Subject: [PATCH 0764/2840] Use default distribution on Travis

---
 .travis.yml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 9abf37a18..6039075a0 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,3 @@
-dist: xenial
-
 services:
   - docker
 

From e37627c4b1d74deed8a422098d3a3c0de9de8c8a Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Fri, 1 May 2020 19:10:42 +0100
Subject: [PATCH 0765/2840] Fix pre-commit config & add Black to the
 pre-commmit hooks

Fixes #2502
---
 .../.pre-commit-config.yaml                    | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index c50fefe94..60f46363b 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -3,18 +3,22 @@ default_stages: [commit]
 fail_fast: true
 
 repos:
--   repo: https://github.com/pre-commit/pre-commit-hooks
+  - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: master
     hooks:
       - id: trailing-whitespace
-        files: (^|/).+\.(py|html|sh|css|js)$
+      - id: end-of-file-fixer
+      - id: check-yaml
 
--   repo: local
+  - repo: https://github.com/psf/black
+    rev: 19.10b0
+    hooks:
+      - id: black
+
+  - repo: https://gitlab.com/pycqa/flake8
+    rev: 3.7.9
     hooks:
       - id: flake8
-        name: flake8
-        entry: flake8
-        language: python
-        types: [python]
         args: ['--config=setup.cfg']
+        additional_dependencies: [flake8-isort]
 

From 3f0ff8aae9b15b38d2480e7f3ac43b0ed0380797 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 2 May 2020 22:30:22 -0700
Subject: [PATCH 0766/2840] Update tox from 3.14.6 to 3.15.0

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

diff --git a/requirements.txt b/requirements.txt
index 18439a352..a4465791b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8-isort==3.0.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.14.6
+tox==3.15.0
 pytest==5.4.1
 pytest-cookies==0.5.1
 pytest-instafail==0.4.1.post0

From 79f6fdbee32549fd77168769c374ffdc0ff5edc0 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 9 May 2020 00:17:29 -0700
Subject: [PATCH 0767/2840] Update pytest from 5.4.1 to 5.4.2

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

diff --git a/requirements.txt b/requirements.txt
index a4465791b..12f3d898c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8-isort==3.0.0
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.15.0
-pytest==5.4.1
+pytest==5.4.2
 pytest-cookies==0.5.1
 pytest-instafail==0.4.1.post0
 pyyaml==5.3.1

From 580ef4117d148f678acb294b29503c3edca4a307 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 9 May 2020 00:17:30 -0700
Subject: [PATCH 0768/2840] Update pytest from 5.4.1 to 5.4.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 9860c74b2..79c5523d1 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -16,7 +16,7 @@ watchgod==0.6  # https://github.com/samuelcolvin/watchgod
 # ------------------------------------------------------------------------------
 mypy==0.770  # https://github.com/python/mypy
 django-stubs==1.5.0  # https://github.com/typeddjango/django-stubs
-pytest==5.4.1  # https://github.com/pytest-dev/pytest
+pytest==5.4.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.3  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From a5cb77399ef3e609739494301f25a77a27c98fa3 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 11 May 2020 14:13:47 -0700
Subject: [PATCH 0769/2840] Update pre-commit from 2.3.0 to 2.4.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 79c5523d1..91cde6091 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -29,7 +29,7 @@ pylint-django==2.0.15  # 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.3.0  # https://github.com/pre-commit/pre-commit
+pre-commit==2.4.0  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From 7b1365c564639f9983e91f5f5a752fb5db18d15c Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 12 May 2020 01:06:19 -0700
Subject: [PATCH 0770/2840] Update flake8 from 3.7.9 to 3.8.1

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

diff --git a/requirements.txt b/requirements.txt
index 12f3d898c..e109518e6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==19.10b0
-flake8==3.7.9
+flake8==3.8.1
 flake8-isort==3.0.0
 
 # Testing

From b1c6ad25d21c9969c665a5a76cd47c2a24e40cb2 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 12 May 2020 01:06:20 -0700
Subject: [PATCH 0771/2840] Update flake8 from 3.7.9 to 3.8.1

---
 {{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 79c5523d1..d4e065ff8 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -21,7 +21,7 @@ pytest-sugar==0.9.3  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality
 # ------------------------------------------------------------------------------
-flake8==3.7.9  # https://github.com/PyCQA/flake8
+flake8==3.8.1  # https://github.com/PyCQA/flake8
 flake8-isort==3.0.0  # https://github.com/gforcada/flake8-isort
 coverage==5.1  # https://github.com/nedbat/coveragepy
 black==19.10b0  # https://github.com/ambv/black

From cd740c26194d4418026dcc05fb56e2c6ccb0711b Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 12 May 2020 10:12:48 +0100
Subject: [PATCH 0772/2840] Update flake8 from 3.7.9 to 3.8.1 in pre-commit
 config

---
 {{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 60f46363b..71524052d 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://gitlab.com/pycqa/flake8
-    rev: 3.7.9
+    rev: 3.8.1
     hooks:
       - id: flake8
         args: ['--config=setup.cfg']

From 81642420c4da18fabd6cc8e9c5e3365a57e6afba Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 12 May 2020 10:14:34 +0100
Subject: [PATCH 0773/2840] Run flake8 from the generated project root

3.8.1 can't find the config if running from elsewhere:
https://gitlab.com/pycqa/flake8/-/issues/639
---
 tests/test_cookiecutter_generation.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 51500705b..664158b5a 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -156,7 +156,7 @@ def test_flake8_passes(cookies, context_override):
     result = cookies.bake(extra_context=context_override)
 
     try:
-        sh.flake8(str(result.project))
+        sh.flake8(_cwd=str(result.project))
     except sh.ErrorReturnCode as e:
         pytest.fail(e.stdout.decode())
 
@@ -167,7 +167,7 @@ def test_black_passes(cookies, context_override):
     result = cookies.bake(extra_context=context_override)
 
     try:
-        sh.black("--check", "--diff", "--exclude", "migrations", f"{result.project}/")
+        sh.black("--check", "--diff", "--exclude", "migrations", _cwd=str(result.project))
     except sh.ErrorReturnCode as e:
         pytest.fail(e.stdout.decode())
 

From 09790ee8fb73d56662c1367f53132e08452d6614 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 12 May 2020 10:18:15 +0100
Subject: [PATCH 0774/2840] Resolve new flake8 error

---
 .../{{cookiecutter.project_slug}}/users/tests/test_views.py     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
index 82abecb51..18b8da7a6 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
@@ -69,7 +69,7 @@ class TestUserDetailView:
         response = user_detail_view(request, username=user.username)
 
         assert response.status_code == 302
-        assert response.url == f"/accounts/login/?next=/fake-url/"
+        assert response.url == "/accounts/login/?next=/fake-url/"
 
     def test_case_sensitivity(self, rf: RequestFactory):
         request = rf.get("/fake-url/")

From 6f88fe6b4fa8b173ab63115387cdd7b1fa516127 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 12 May 2020 10:24:25 +0100
Subject: [PATCH 0775/2840] Reformat test file

---
 tests/test_cookiecutter_generation.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 664158b5a..aa7cc75a4 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -167,7 +167,9 @@ def test_black_passes(cookies, context_override):
     result = cookies.bake(extra_context=context_override)
 
     try:
-        sh.black("--check", "--diff", "--exclude", "migrations", _cwd=str(result.project))
+        sh.black(
+            "--check", "--diff", "--exclude", "migrations", _cwd=str(result.project)
+        )
     except sh.ErrorReturnCode as e:
         pytest.fail(e.stdout.decode())
 

From 309376ee4491134b0706cedc4ca567aa20f7229e Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 12 May 2020 19:50:12 +0100
Subject: [PATCH 0776/2840] Remove manual requirements

Issue with PyUP seems fixed
---
 .pyup.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/.pyup.yml b/.pyup.yml
index c503dabf3..bffaa06c9 100644
--- a/.pyup.yml
+++ b/.pyup.yml
@@ -12,11 +12,3 @@ pin: True
 # requires private repo permissions, even on public repos
 # default: empty
 label_prs: update
-
-# Specify requirement files by hand, pyup seems to struggle to 
-# find the ones in the project_slug folder
-requirements:
-  - "requirements.txt"
-  - "{{cookiecutter.project_slug}}/requirements/base.txt"
-  - "{{cookiecutter.project_slug}}/requirements/local.txt"
-  - "{{cookiecutter.project_slug}}/requirements/production.txt"

From ce66080f857ef9e19067c30898d88e85940a3ce1 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 13 May 2020 12:42:53 -0700
Subject: [PATCH 0777/2840] Update sentry-sdk from 0.14.3 to 0.14.4

---
 {{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 edf9a590c..2b8ac9f81 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==2.1.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.14.3  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.14.4  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
 hiredis==1.0.1  # https://github.com/redis/hiredis-py

From 70f6471c751b2eab63b3f343c87ebb60b0b3d0ca Mon Sep 17 00:00:00 2001
From: Tano Abeleyra <tano@abeleyra.com>
Date: Sun, 17 May 2020 12:37:35 -0300
Subject: [PATCH 0778/2840] Allow to use a CDN with S3

---
 .../config/settings/production.py                          | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index c13f1aebe..3d4f324cd 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -90,6 +90,9 @@ AWS_S3_OBJECT_PARAMETERS = {
 AWS_DEFAULT_ACL = None
 # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
 AWS_S3_REGION_NAME = env("DJANGO_AWS_S3_REGION_NAME", default=None)
+# https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#cloudfront
+AWS_S3_CUSTOM_DOMAIN = env("DJANGO_AWS_S3_CUSTOM_DOMAIN", default=None)
+aws_s3_domain = AWS_S3_CUSTOM_DOMAIN or f"{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com"
 {% elif cookiecutter.cloud_provider == 'GCP' %}
 GS_BUCKET_NAME = env("DJANGO_GCP_STORAGE_BUCKET_NAME")
 GS_DEFAULT_ACL = "publicRead"
@@ -104,7 +107,7 @@ STATICFILES_STORAGE = "whitenoise.storage.CompressedManifestStaticFilesStorage"
 {% elif cookiecutter.cloud_provider == 'AWS' -%}
 STATICFILES_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.StaticRootS3Boto3Storage"
 COLLECTFAST_STRATEGY = "collectfast.strategies.boto3.Boto3Strategy"
-STATIC_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/static/"
+STATIC_URL = f"https://{aws_s3_domain}/static/"
 {% elif cookiecutter.cloud_provider == 'GCP' -%}
 STATICFILES_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.StaticRootGoogleCloudStorage"
 COLLECTFAST_STRATEGY = "collectfast.strategies.gcloud.GoogleCloudStrategy"
@@ -115,7 +118,7 @@ STATIC_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/static/"
 # ------------------------------------------------------------------------------
 {%- if cookiecutter.cloud_provider == 'AWS' %}
 DEFAULT_FILE_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.MediaRootS3Boto3Storage"
-MEDIA_URL = f"https://{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws.com/media/"
+MEDIA_URL = f"https://{aws_s3_domain}/media/"
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
 DEFAULT_FILE_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.MediaRootGoogleCloudStorage"
 MEDIA_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/media/"

From 401ef31c6ce1519bc5deccb22143cfea0147ba9f Mon Sep 17 00:00:00 2001
From: Hannah Lazarus <hanhanhan.lazarus@gmail.com>
Date: Mon, 18 May 2020 10:33:57 -0400
Subject: [PATCH 0779/2840] Remove latex from sphinx docker build

Include as helper comment only
---
 {{cookiecutter.project_slug}}/compose/local/docs/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
index 7e79b0fa0..23af2e7b3 100644
--- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
@@ -10,8 +10,8 @@ RUN apt-get update \
     && apt-get install -y libpq-dev \
     # Translations dependencies
     && apt-get install -y gettext \
-    # Enable Sphinx output to latex and pdf
-    && apt-get install -y texlive-latex-recommended \
+    # Uncomment below to enable Sphinx output to latex and pdf
+    # && apt-get install -y texlive-latex-recommended \
     && apt-get install -y texlive-fonts-recommended \
     && apt-get install -y texlive-latex-extra \
     && apt-get install -y latexmk \

From 15fa899bb442da2298cdb67514da78803d2d54c6 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 20 May 2020 19:23:53 -0700
Subject: [PATCH 0780/2840] Update tox from 3.15.0 to 3.15.1

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

diff --git a/requirements.txt b/requirements.txt
index e109518e6..02548be79 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8-isort==3.0.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.15.0
+tox==3.15.1
 pytest==5.4.2
 pytest-cookies==0.5.1
 pytest-instafail==0.4.1.post0

From a8672e08cb8e0a8942c18fed0ae331a77e879c03 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 24 May 2020 03:02:08 +0200
Subject: [PATCH 0781/2840] Update flake8 to 3.8.2 (#2607)

---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 02548be79..067ad6c6e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==19.10b0
-flake8==3.8.1
+flake8==3.8.2
 flake8-isort==3.0.0
 
 # Testing
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 6f7fa2de1..78a1f6c37 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -21,7 +21,7 @@ pytest-sugar==0.9.3  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality
 # ------------------------------------------------------------------------------
-flake8==3.8.1  # https://github.com/PyCQA/flake8
+flake8==3.8.2  # https://github.com/PyCQA/flake8
 flake8-isort==3.0.0  # https://github.com/gforcada/flake8-isort
 coverage==5.1  # https://github.com/nedbat/coveragepy
 black==19.10b0  # https://github.com/ambv/black

From 286363799cfa1087b02570f6fb6ffd079b8daf36 Mon Sep 17 00:00:00 2001
From: Alexandr <stefanitsky.mozdor@gmail.com>
Date: Tue, 26 May 2020 01:25:38 +0300
Subject: [PATCH 0782/2840] :pencil: added websockets doc page #2506

* Simple explanation.
* Example of usage with JS.
* Additional nGinx config example.
---
 docs/index.rst     |  1 +
 docs/websocket.rst | 32 ++++++++++++++++++++++++++++++++
 2 files changed, 33 insertions(+)
 create mode 100644 docs/websocket.rst

diff --git a/docs/index.rst b/docs/index.rst
index b29e728e9..f62184643 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -23,6 +23,7 @@ Contents:
    deployment-on-heroku
    deployment-with-docker
    docker-postgres-backups
+   websocket
    faq
    troubleshooting
 
diff --git a/docs/websocket.rst b/docs/websocket.rst
new file mode 100644
index 000000000..a880f5691
--- /dev/null
+++ b/docs/websocket.rst
@@ -0,0 +1,32 @@
+.. _websocket:
+
+=========
+Websocket
+=========
+
+You can enable web sockets if you select ``use_async`` option when creating a project. That indicates whether the project should use web sockets with Uvicorn + Gunicorn.
+
+Usage
+-----
+
+JavaScript example: ::
+
+    > ws = new WebSocket('ws://localhost:8000/') // or 'wss://<mydomain.com>/' in prod
+    WebSocket {url: "ws://localhost:8000/", readyState: 0, bufferedAmount: 0, onopen: null, onerror: null, …}
+    > ws.onmessage = event => console.log(event.data)
+    event => console.log(event.data)
+    > ws.send("ping")
+    undefined
+    pong!
+
+If you are using nGinx instead of Traefik, you should add these lines to nGinx config: ::
+
+    location /websocket/ {
+        proxy_pass http://backend;
+        proxy_http_version 1.1;
+        proxy_set_header Upgrade $http_upgrade;
+        proxy_set_header Connection "upgrade";
+        proxy_read_timeout 86400;
+    }
+
+Source: https://www.nginx.com/blog/websocket-nginx/

From 090c62e862f61083d0cf397bf7666773ecdfd273 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 27 May 2020 02:27:13 -0700
Subject: [PATCH 0783/2840] Update sphinx from 3.0.3 to 3.0.4

---
 {{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 78a1f6c37..d38a70bc5 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -2,7 +2,7 @@
 
 Werkzeug==1.0.1 # https://github.com/pallets/werkzeug
 ipdb==0.13.2  # https://github.com/gotcha/ipdb
-Sphinx==3.0.3  # https://github.com/sphinx-doc/sphinx
+Sphinx==3.0.4  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}

From 009ca15a4c797c53dfeeff40a6620c5732a59ee3 Mon Sep 17 00:00:00 2001
From: Tano Abeleyra <tano@abeleyra.com>
Date: Thu, 28 May 2020 19:16:54 -0300
Subject: [PATCH 0784/2840] Add AWS_S3_CUSTOM_DOMAIN entry to settings.rst

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

diff --git a/docs/settings.rst b/docs/settings.rst
index 2ae8814e9..949d5f35f 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -45,6 +45,7 @@ DJANGO_AWS_ACCESS_KEY_ID                AWS_ACCESS_KEY_ID           n/a
 DJANGO_AWS_SECRET_ACCESS_KEY            AWS_SECRET_ACCESS_KEY       n/a                                            raises error
 DJANGO_AWS_STORAGE_BUCKET_NAME          AWS_STORAGE_BUCKET_NAME     n/a                                            raises error
 DJANGO_AWS_S3_REGION_NAME               AWS_S3_REGION_NAME          n/a                                            None
+DJANGO_AWS_S3_CUSTOM_DOMAIN             AWS_S3_CUSTOM_DOMAIN        n/a                                            None
 DJANGO_GCP_STORAGE_BUCKET_NAME          GS_BUCKET_NAME              n/a                                            raises error
 GOOGLE_APPLICATION_CREDENTIALS          n/a                         n/a                                            raises error
 SENTRY_DSN                              SENTRY_DSN                  n/a                                            raises error

From 7c3558fa624d3069007df3e1071bcbd93be6d6c9 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Fri, 29 May 2020 17:23:15 -0400
Subject: [PATCH 0785/2840] Fix Docker configuration for Gitlab CI #2549

* Just missing the services I believe according to @rocode?
* I'm hoping to just completely eradicate the need for this setup with a follow-up PR for completely non-Docker approach on CI that supports celery, too.
---
 {{cookiecutter.project_slug}}/.gitlab-ci.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
index a74d5de87..f7c4f24a4 100644
--- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml
+++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
@@ -23,6 +23,7 @@ pytest:
   stage: test
   image: python:3.7
   {% if cookiecutter.use_docker == 'y' -%}
+  image: docker/compose:latest
   tags:
     - docker
   services:

From d7f22a1158839d27ff898ae66f8edf39ac1943a6 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Fri, 29 May 2020 18:05:44 -0400
Subject: [PATCH 0786/2840] Changed service to Docker dind

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

diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
index f7c4f24a4..246c4c982 100644
--- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml
+++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
@@ -27,7 +27,7 @@ pytest:
   tags:
     - docker
   services:
-    - docker
+    - docker:dind
   before_script:
     - docker-compose -f local.yml build
     # Ensure celerybeat does not crash due to non-existent tables

From 433d30ec1437e282541912e111f68e92e51ea2d0 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 3 Jun 2020 00:26:12 -0700
Subject: [PATCH 0787/2840] Update pytest from 5.4.2 to 5.4.3

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

diff --git a/requirements.txt b/requirements.txt
index 067ad6c6e..80882d4c1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8-isort==3.0.0
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.15.1
-pytest==5.4.2
+pytest==5.4.3
 pytest-cookies==0.5.1
 pytest-instafail==0.4.1.post0
 pyyaml==5.3.1

From 9e87d4b189fb9b7c414a7113ecf02612962f6d73 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 3 Jun 2020 00:26:13 -0700
Subject: [PATCH 0788/2840] Update pytest from 5.4.2 to 5.4.3

---
 {{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 d38a70bc5..b5d9a250e 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -16,7 +16,7 @@ watchgod==0.6  # https://github.com/samuelcolvin/watchgod
 # ------------------------------------------------------------------------------
 mypy==0.770  # https://github.com/python/mypy
 django-stubs==1.5.0  # https://github.com/typeddjango/django-stubs
-pytest==5.4.2  # https://github.com/pytest-dev/pytest
+pytest==5.4.3  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.3  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From 9d0b570c51986ea9586240c24c2ceaf52feec25a Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 3 Jun 2020 05:12:36 -0700
Subject: [PATCH 0789/2840] Update mypy from 0.770 to 0.780

---
 {{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 d38a70bc5..3c30b1547 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -14,7 +14,7 @@ watchgod==0.6  # https://github.com/samuelcolvin/watchgod
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.770  # https://github.com/python/mypy
+mypy==0.780  # https://github.com/python/mypy
 django-stubs==1.5.0  # https://github.com/typeddjango/django-stubs
 pytest==5.4.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.3  # https://github.com/Frozenball/pytest-sugar

From 24e8a17d74a47e57dfc05a754be76a566ef504df Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 5 Jun 2020 17:08:27 -0700
Subject: [PATCH 0790/2840] Update collectfast from 2.1.0 to 2.2.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 2b8ac9f81..a614bdbe9 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -5,7 +5,7 @@
 gunicorn==20.0.4  # https://github.com/benoitc/gunicorn
 psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
-Collectfast==2.1.0  # https://github.com/antonagestam/collectfast
+Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
 sentry-sdk==0.14.4  # https://github.com/getsentry/sentry-python

From 52c4f57ecab2c10c0f5f4039b088d946df85295a Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 7 Jun 2020 14:24:38 -0700
Subject: [PATCH 0791/2840] Update tox from 3.15.1 to 3.15.2

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

diff --git a/requirements.txt b/requirements.txt
index 80882d4c1..d05ed6a4a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8-isort==3.0.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.15.1
+tox==3.15.2
 pytest==5.4.3
 pytest-cookies==0.5.1
 pytest-instafail==0.4.1.post0

From afe02f2fd19aa1df15309aaf9641d38b8783f270 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 8 Jun 2020 17:02:41 -0700
Subject: [PATCH 0792/2840] Update flake8 from 3.8.2 to 3.8.3

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

diff --git a/requirements.txt b/requirements.txt
index 80882d4c1..4044d3048 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==19.10b0
-flake8==3.8.2
+flake8==3.8.3
 flake8-isort==3.0.0
 
 # Testing

From 6038a654abdecbaf091298bdf69e628e23132b9b Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 8 Jun 2020 17:02:43 -0700
Subject: [PATCH 0793/2840] Update flake8 from 3.8.2 to 3.8.3

---
 {{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 b5d9a250e..e02bb4566 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -21,7 +21,7 @@ pytest-sugar==0.9.3  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality
 # ------------------------------------------------------------------------------
-flake8==3.8.2  # https://github.com/PyCQA/flake8
+flake8==3.8.3  # https://github.com/PyCQA/flake8
 flake8-isort==3.0.0  # https://github.com/gforcada/flake8-isort
 coverage==5.1  # https://github.com/nedbat/coveragepy
 black==19.10b0  # https://github.com/ambv/black

From 54f8e3d672671434dd68629e96ace6108f6fbd7a Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 9 Jun 2020 16:02:00 -0700
Subject: [PATCH 0794/2840] Update pre-commit from 2.4.0 to 2.5.1

---
 {{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 b5d9a250e..4986bdaf4 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -29,7 +29,7 @@ pylint-django==2.0.15  # 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.4.0  # https://github.com/pre-commit/pre-commit
+pre-commit==2.5.1  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From b7c75bccf51b19a4fd8f156f104e0f36619e8235 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 14 Jun 2020 03:12:50 -0700
Subject: [PATCH 0795/2840] Update pytest-instafail from 0.4.1.post0 to 0.4.2

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

diff --git a/requirements.txt b/requirements.txt
index 80882d4c1..e7fbe1d5e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,5 +13,5 @@ flake8-isort==3.0.0
 tox==3.15.1
 pytest==5.4.3
 pytest-cookies==0.5.1
-pytest-instafail==0.4.1.post0
+pytest-instafail==0.4.2
 pyyaml==5.3.1

From 1b6e4994ca45ef38551a4cf2573c9241e821dce6 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 14 Jun 2020 03:13:04 -0700
Subject: [PATCH 0796/2840] Update sphinx from 3.0.4 to 3.1.1

---
 {{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 b5d9a250e..e661835d2 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -2,7 +2,7 @@
 
 Werkzeug==1.0.1 # https://github.com/pallets/werkzeug
 ipdb==0.13.2  # https://github.com/gotcha/ipdb
-Sphinx==3.0.4  # https://github.com/sphinx-doc/sphinx
+Sphinx==3.1.1  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}

From 89b81452a9201fbed87598e2567ba8d629e97f2a Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Tue, 16 Jun 2020 20:21:51 -0400
Subject: [PATCH 0797/2840] Update Django to 3.0.7 due to CVEs

There were several CVE's that arose between 3.0.3 to 3.0.7. Updating quickly will resolve the vulnerabilities and fix several PRs.
---
 {{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 4f2ebe490..e1c7d9ef4 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -25,7 +25,7 @@ uvicorn==0.11.5  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.0.5  # pyup: < 3.1  # https://www.djangoproject.com/
+django==3.0.7  # pyup: < 3.1  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==4.0.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.41.0  # https://github.com/pennersr/django-allauth

From 8bdef165a893cff627a6876be887756ee13be6c7 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Tue, 16 Jun 2020 23:51:21 -0400
Subject: [PATCH 0798/2840] Fixed local async command in docs

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

diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index dc146c232..a5d598f0b 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -80,7 +80,7 @@ First things first.
 
 or if you're running asynchronously: ::
 
-    $ gunicorn config.asgi --bind 0.0.0.0:8000 -k uvicorn.workers.UvicornWorker --reload
+    $ uvicorn config.asgi:application --host 0.0.0.0 --reload
 
 .. _PostgreSQL: https://www.postgresql.org/download/
 .. _Redis: https://redis.io/download

From 4b103d1d93ab6dabf93813d270656da33d128699 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 17 Jun 2020 23:15:32 +0100
Subject: [PATCH 0799/2840] Update .pyup.yml

---
 .pyup.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.pyup.yml b/.pyup.yml
index bffaa06c9..4082eed86 100644
--- a/.pyup.yml
+++ b/.pyup.yml
@@ -12,3 +12,9 @@ pin: True
 # requires private repo permissions, even on public repos
 # default: empty
 label_prs: update
+
+requirements:
+  - requirements.txt
+  - {{cookiecutter.project_slug}}/requirements/base.txt
+  - {{cookiecutter.project_slug}}/requirements/local.txt
+  - {{cookiecutter.project_slug}}/requirements/production.txt

From d2e9e8ee3f24fd6c6064ebdac8415b4ae9474ab1 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 17 Jun 2020 23:16:13 +0100
Subject: [PATCH 0800/2840] Update .pyup.yml

---
 .pyup.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.pyup.yml b/.pyup.yml
index 4082eed86..b330b22bb 100644
--- a/.pyup.yml
+++ b/.pyup.yml
@@ -14,7 +14,7 @@ pin: True
 label_prs: update
 
 requirements:
-  - requirements.txt
-  - {{cookiecutter.project_slug}}/requirements/base.txt
-  - {{cookiecutter.project_slug}}/requirements/local.txt
-  - {{cookiecutter.project_slug}}/requirements/production.txt
+  - "requirements.txt"
+  - "{{cookiecutter.project_slug}}/requirements/base.txt"
+  - "{{cookiecutter.project_slug}}/requirements/local.txt"
+  - "{{cookiecutter.project_slug}}/requirements/production.txt"

From d3a000d76d233debb975e570f5093a2cb4e9bdb0 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 18 Jun 2020 04:45:15 -0700
Subject: [PATCH 0801/2840] Update sentry-sdk from 0.14.4 to 0.15.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 2b8ac9f81..eda39264e 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==2.1.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.14.4  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.15.1  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
 hiredis==1.0.1  # https://github.com/redis/hiredis-py

From d979c342d655a537b9f131c9cf0ae8a9ed0f30cf Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 20 Jun 2020 08:51:49 -0700
Subject: [PATCH 0802/2840] Update mypy from 0.780 to 0.781

---
 {{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 fdd9fd44e..9e2be82bf 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -14,7 +14,7 @@ watchgod==0.6  # https://github.com/samuelcolvin/watchgod
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.780  # https://github.com/python/mypy
+mypy==0.781  # https://github.com/python/mypy
 django-stubs==1.5.0  # https://github.com/typeddjango/django-stubs
 pytest==5.4.3  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.3  # https://github.com/Frozenball/pytest-sugar

From 88f9a6c289ccb9e30ff991fd5788b7b215763a20 Mon Sep 17 00:00:00 2001
From: Gil <sgy@tpay.co.kr>
Date: Sun, 21 Jun 2020 16:13:42 +0900
Subject: [PATCH 0803/2840] Replace User by get_user_model

---
 .../{{cookiecutter.project_slug}}/users/api/serializers.py     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py
index 04bf4c85e..8bd39d30e 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py
@@ -1,6 +1,7 @@
+from django.contrib.auth import get_user_model
 from rest_framework import serializers
 
-from {{ cookiecutter.project_slug }}.users.models import User
+User = get_user_model()
 
 
 class UserSerializer(serializers.ModelSerializer):

From 3961ab8dd83e2b5bd71bccee00212a731e4babfd Mon Sep 17 00:00:00 2001
From: Gil <sgy@tpay.co.kr>
Date: Sun, 21 Jun 2020 16:17:26 +0900
Subject: [PATCH 0804/2840] Add AsheKR in CONTRIBUTORS.rst

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 5962af75d..c1813e837 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -65,6 +65,7 @@ Listed in alphabetical order.
   Anuj Bansal              `@ahhda`_
   Arcuri Davide            `@dadokkio`_
   Areski Belaid            `@areski`_
+  AsheKR                   `@ashekr`_
   Ashley Camba
   Barclay Gauld            `@yunti`_
   Bartek                   `@btknu`_

From f4aee2bc68af593bd4239ae0272899efadb0f5f5 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sun, 21 Jun 2020 14:15:00 +0100
Subject: [PATCH 0805/2840] Fix broken link

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index c1813e837..32ba496e8 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -252,6 +252,7 @@ Listed in alphabetical order.
 .. _@archinal: https://github.com/archinal
 .. _@areski: https://github.com/areski
 .. _@arruda: https://github.com/arruda
+.. _@ashekr: https://github.com/ashekr
 .. _@bertdemiranda: https://github.com/bertdemiranda
 .. _@bittner: https://github.com/bittner
 .. _@blaxpy: https://github.com/blaxpy

From 793151162770d8a4538627af6638253af7d95e98 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sun, 21 Jun 2020 14:20:29 +0100
Subject: [PATCH 0806/2840] Bump version to 3.0.7

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

diff --git a/setup.py b/setup.py
index 6dfd9e50b..6b80bd9a0 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.0.5-01"
+version = "3.0.7"
 
 if sys.argv[-1] == "tag":
     os.system(f'git tag -a {version} -m "version {version}"')

From fe8a939611f123ece8a36410d5ae3c1f4b6822da Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sun, 21 Jun 2020 14:23:48 +0100
Subject: [PATCH 0807/2840] Bump flake8 in pre-commit config

---
 {{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 71524052d..6aa9207a9 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://gitlab.com/pycqa/flake8
-    rev: 3.8.1
+    rev: 3.8.3
     hooks:
       - id: flake8
         args: ['--config=setup.cfg']

From aadf66185cadaf5c5388b6e7ab9754379b1aad48 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sun, 21 Jun 2020 14:26:40 +0100
Subject: [PATCH 0808/2840] Update base requirements to latest version

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

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index e1c7d9ef4..4baf2f376 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -4,16 +4,16 @@ Pillow==7.1.2  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
 rcssmin==1.0.6{% if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} --install-option="--without-c-extensions"{% endif %}  # https://github.com/ndparker/rcssmin
 {%- endif %}
-argon2-cffi==19.2.0  # https://github.com/hynek/argon2_cffi
+argon2-cffi==20.1.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
-whitenoise==5.0.1  # https://github.com/evansd/whitenoise
+whitenoise==5.1.0  # https://github.com/evansd/whitenoise
 {%- endif %}
 redis==3.5.0  # https://github.com/andymccurdy/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==1.0.1  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
-celery==4.4.2  # pyup: < 5.0  # https://github.com/celery/celery
+celery==4.4.5  # pyup: < 5.0  # https://github.com/celery/celery
 django-celery-beat==2.0.0  # https://github.com/celery/django-celery-beat
 {%- if cookiecutter.use_docker == 'y' %}
 flower==0.9.4  # https://github.com/mher/flower
@@ -28,12 +28,12 @@ uvicorn==0.11.5  # https://github.com/encode/uvicorn
 django==3.0.7  # pyup: < 3.1  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==4.0.0  # https://github.com/jazzband/django-model-utils
-django-allauth==0.41.0  # https://github.com/pennersr/django-allauth
-django-crispy-forms==1.9.0  # https://github.com/django-crispy-forms/django-crispy-forms
+django-allauth==0.42.0  # https://github.com/pennersr/django-allauth
+django-crispy-forms==1.9.1  # https://github.com/django-crispy-forms/django-crispy-forms
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==2.4  # https://github.com/django-compressor/django-compressor
 {%- endif %}
-django-redis==4.11.0  # https://github.com/jazzband/django-redis
+django-redis==4.12.1  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == "y" %}
 # Django REST Framework
 djangorestframework==3.11.0  # https://github.com/encode/django-rest-framework

From e4a4d900688fe389eb45d40ed7d8b7808a7a5125 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sun, 21 Jun 2020 14:48:28 +0100
Subject: [PATCH 0809/2840] Add badge for documentation build status

---
 README.rst | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/README.rst b/README.rst
index 02f220cf3..cfb253787 100644
--- a/README.rst
+++ b/README.rst
@@ -5,6 +5,10 @@ Cookiecutter Django
     :target: https://travis-ci.org/pydanny/cookiecutter-django?branch=master
     :alt: Build Status
 
+.. image:: https://readthedocs.org/projects/cookiecutter-django/badge/?version=latest
+    :target: https://cookiecutter-django.readthedocs.io/en/latest/?badge=latest
+    :alt: Documentation Status
+
 .. image:: https://pyup.io/repos/github/pydanny/cookiecutter-django/shield.svg
     :target: https://pyup.io/repos/github/pydanny/cookiecutter-django/
     :alt: Updates

From 7ba61274cefdaf295fc2d1cd863dab9c6b8644b8 Mon Sep 17 00:00:00 2001
From: Alexandr <stefanitsky.mozdor@gmail.com>
Date: Mon, 22 Jun 2020 21:42:39 +0300
Subject: [PATCH 0810/2840] :pencil: docs updated after review

---
 docs/websocket.rst | 13 +++----------
 1 file changed, 3 insertions(+), 10 deletions(-)

diff --git a/docs/websocket.rst b/docs/websocket.rst
index a880f5691..9d2e3264a 100644
--- a/docs/websocket.rst
+++ b/docs/websocket.rst
@@ -4,7 +4,7 @@
 Websocket
 =========
 
-You can enable web sockets if you select ``use_async`` option when creating a project. That indicates whether the project should use web sockets with Uvicorn + Gunicorn.
+You can enable web sockets if you select ``use_async`` option when creating a project. That indicates whether the project can use web sockets with Uvicorn + Gunicorn.
 
 Usage
 -----
@@ -19,14 +19,7 @@ JavaScript example: ::
     undefined
     pong!
 
-If you are using nGinx instead of Traefik, you should add these lines to nGinx config: ::
 
-    location /websocket/ {
-        proxy_pass http://backend;
-        proxy_http_version 1.1;
-        proxy_set_header Upgrade $http_upgrade;
-        proxy_set_header Connection "upgrade";
-        proxy_read_timeout 86400;
-    }
+If you don't use Traefik, you might have to configure your reverse proxy accordingly (example with Nginx_).
 
-Source: https://www.nginx.com/blog/websocket-nginx/
+.. _Nginx: https://www.nginx.com/blog/websocket-nginx/

From 4eca81edc2417349f133379b690ead674aab6694 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 23 Jun 2020 03:55:23 -0700
Subject: [PATCH 0811/2840] Update mypy from 0.781 to 0.782

---
 {{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 f1307a226..38f4744fb 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -14,7 +14,7 @@ watchgod==0.6  # https://github.com/samuelcolvin/watchgod
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.781  # https://github.com/python/mypy
+mypy==0.782  # https://github.com/python/mypy
 django-stubs==1.5.0  # https://github.com/typeddjango/django-stubs
 pytest==5.4.3  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.3  # https://github.com/Frozenball/pytest-sugar

From f3a511a65690521bf367ff6cd6bf569f43ec3670 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 23 Jun 2020 08:34:22 -0700
Subject: [PATCH 0812/2840] Update ipdb from 0.13.2 to 0.13.3

---
 {{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 f1307a226..275e98cc7 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,7 +1,7 @@
 -r ./base.txt
 
 Werkzeug==1.0.1 # https://github.com/pallets/werkzeug
-ipdb==0.13.2  # https://github.com/gotcha/ipdb
+ipdb==0.13.3  # https://github.com/gotcha/ipdb
 Sphinx==3.1.1  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2

From 8c2f49ad3850fd19e43333ca24a11e4efd989fe0 Mon Sep 17 00:00:00 2001
From: Hannah Lazarus <hanhanhan.lazarus@gmail.com>
Date: Sat, 27 Jun 2020 13:57:50 -0400
Subject: [PATCH 0813/2840] Update
 {{cookiecutter.project_slug}}/compose/local/docs/Dockerfile

sounds good!

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/compose/local/docs/Dockerfile | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
index 23af2e7b3..d84f76ed5 100644
--- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
@@ -22,8 +22,7 @@ RUN apt-get update \
 # Requirements are installed here to ensure they will be cached.
 COPY ./requirements /requirements
 # All imports needed for autodoc.
-RUN pip install -r /requirements/local.txt
-RUN pip install -r /requirements/production.txt
+pip install -r /requirements/local.txt -r /requirements/production.txt
 
 WORKDIR /docs
 

From 916157e5006cbc2c7d0218c879429d06ac4eca66 Mon Sep 17 00:00:00 2001
From: Hannah Lazarus <hanhanhan.lazarus@gmail.com>
Date: Sat, 27 Jun 2020 14:11:57 -0400
Subject: [PATCH 0814/2840] Update
 {{cookiecutter.project_slug}}/docs/_source/howto.rst

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/docs/_source/howto.rst | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/docs/_source/howto.rst b/{{cookiecutter.project_slug}}/docs/_source/howto.rst
index 309277427..25f442c37 100644
--- a/{{cookiecutter.project_slug}}/docs/_source/howto.rst
+++ b/{{cookiecutter.project_slug}}/docs/_source/howto.rst
@@ -17,8 +17,7 @@ from inside the `{{cookiecutter.project_slug}}/docs` directory.
 To build and serve docs, use the commands:
     ::
     
-        docker-compose -f local.yml build
-        docker run docs
+        docker-compose -f local.yml up docs
 {% endif %}
 
 Changes to files in `docs/_source` will be picked up and reloaded automatically.

From 3cfea4c943891b653fa04c1940bc0ea8212efd1d Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 27 Jun 2020 12:07:08 -0700
Subject: [PATCH 0815/2840] Update tox from 3.15.2 to 3.16.0

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

diff --git a/requirements.txt b/requirements.txt
index 44804e0ee..f3cdd2f6b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8-isort==3.0.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.15.2
+tox==3.16.0
 pytest==5.4.3
 pytest-cookies==0.5.1
 pytest-instafail==0.4.2

From e1cd81e28c951effd3e23fd98d791f67464c77ee Mon Sep 17 00:00:00 2001
From: Richard Hajdu <tuskone16@gmail.com>
Date: Sun, 28 Jun 2020 18:38:29 +0200
Subject: [PATCH 0816/2840] Gulp watcher fix for win10 fixes #2642

Fix for browsersync and file watchers not working correctly on windows.
---
 {{cookiecutter.project_slug}}/gulpfile.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/gulpfile.js b/{{cookiecutter.project_slug}}/gulpfile.js
index 1f9884ec8..206f8a019 100644
--- a/{{cookiecutter.project_slug}}/gulpfile.js
+++ b/{{cookiecutter.project_slug}}/gulpfile.js
@@ -163,9 +163,9 @@ function initBrowserSync() {
 
 // Watch
 function watchPaths() {
-  watch(`${paths.sass}/*.scss`, styles)
-  watch(`${paths.templates}/**/*.html`).on("change", reload)
-  watch([`${paths.js}/*.js`, `!${paths.js}/*.min.js`], scripts).on("change", reload)
+  watch(`${paths.sass}/*.scss`{% if cookiecutter.windows == 'y' %}, { usePolling: true }{% endif %}, styles)
+  watch(`${paths.templates}/**/*.html`{% if cookiecutter.windows == 'y' %}, { usePolling: true }{% endif %}).on("change", reload)
+  watch([`${paths.js}/*.js`, `!${paths.js}/*.min.js`]{% if cookiecutter.windows == 'y' %}, { usePolling: true }{% endif %}, scripts).on("change", reload)
 }
 
 // Generate all assets

From ee9cc876a432b9b9d414c8ff69ba3be0944a8891 Mon Sep 17 00:00:00 2001
From: Richard Hajdu <tuskone16@gmail.com>
Date: Sun, 28 Jun 2020 18:41:50 +0200
Subject: [PATCH 0817/2840] Update CONTRIBUTORS.rst

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 32ba496e8..529c2c40a 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -199,6 +199,7 @@ Listed in alphabetical order.
   Raphael Pierzina         `@hackebrot`_
   Reggie Riser             `@reggieriser`_
   René Muhl                `@rm--`_
+  Richard Hajdu            `@Tusky`_
   Roman Afanaskin          `@siauPatrick`_
   Roman Osipenko           `@romanosipenko`_
   Russell Davies

From 8447699c937fd37719dd488872fe8c8155553f4c Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 29 Jun 2020 05:35:40 -0700
Subject: [PATCH 0818/2840] Update django-extensions from 2.2.9 to 3.0.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 4571fd0f6..d127e45ed 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -36,6 +36,6 @@ pre-commit==2.5.1  # https://github.com/pre-commit/pre-commit
 factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==2.2  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==2.2.9  # https://github.com/django-extensions/django-extensions
+django-extensions==3.0.0  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.9.0  # https://github.com/pytest-dev/pytest-django

From a9688adc0e58ce2afe4b328d882451e79bdd26e7 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Mon, 29 Jun 2020 15:27:53 -0400
Subject: [PATCH 0819/2840] Update ugettext_lazy to gettext_lazy

---
 .../{{cookiecutter.project_slug}}/users/forms.py                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
index 25065419a..ba848b858 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
@@ -1,6 +1,6 @@
 from django.contrib.auth import forms, get_user_model
 from django.core.exceptions import ValidationError
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 User = get_user_model()
 

From 22f542d515b0f7ea1b9761d5636161e7dcaf8f9c Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 29 Jun 2020 13:43:18 -0700
Subject: [PATCH 0820/2840] Update tox from 3.16.0 to 3.16.1

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

diff --git a/requirements.txt b/requirements.txt
index f3cdd2f6b..e6e63d634 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -10,7 +10,7 @@ flake8-isort==3.0.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.16.0
+tox==3.16.1
 pytest==5.4.3
 pytest-cookies==0.5.1
 pytest-instafail==0.4.2

From 435a0c0276036f8377bcda678470ff8cf51ded8a Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 29 Jun 2020 13:44:24 -0700
Subject: [PATCH 0821/2840] Update django-extensions from 3.0.0 to 3.0.1

---
 {{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 d127e45ed..0897d9bc5 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -36,6 +36,6 @@ pre-commit==2.5.1  # https://github.com/pre-commit/pre-commit
 factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==2.2  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==3.0.0  # https://github.com/django-extensions/django-extensions
+django-extensions==3.0.1  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.9.0  # https://github.com/pytest-dev/pytest-django

From bed885f0010eb3530f974ce641be36ac948ad539 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 29 Jun 2020 21:51:33 +0100
Subject: [PATCH 0822/2840] Comment out all lines related to LaTeX

---
 .../compose/local/docs/Dockerfile                         | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
index d84f76ed5..6d0ca271a 100644
--- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
@@ -10,11 +10,11 @@ RUN apt-get update \
     && apt-get install -y libpq-dev \
     # Translations dependencies
     && apt-get install -y gettext \
-    # Uncomment below to enable Sphinx output to latex and pdf
+    # Uncomment below lines to enable Sphinx output to latex and pdf
     # && apt-get install -y texlive-latex-recommended \
-    && apt-get install -y texlive-fonts-recommended \
-    && apt-get install -y texlive-latex-extra \
-    && apt-get install -y latexmk \
+    # && apt-get install -y texlive-fonts-recommended \
+    # && apt-get install -y texlive-latex-extra \
+    # && apt-get install -y latexmk \
     # cleaning up unused files
     && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
     && rm -rf /var/lib/apt/lists/*

From 9af7b3ad6d418773f517da535680fa112f12aaae Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 29 Jun 2020 21:52:10 +0100
Subject: [PATCH 0823/2840] Missing `RUN` command in Dockerfile

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

diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
index 6d0ca271a..7736777b3 100644
--- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
@@ -22,7 +22,7 @@ RUN apt-get update \
 # Requirements are installed here to ensure they will be cached.
 COPY ./requirements /requirements
 # All imports needed for autodoc.
-pip install -r /requirements/local.txt -r /requirements/production.txt
+RUN pip install -r /requirements/local.txt -r /requirements/production.txt
 
 WORKDIR /docs
 

From 8d066b3ab4eb3779b76326d103e7a7c39db909b5 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 29 Jun 2020 22:46:16 +0100
Subject: [PATCH 0824/2840] Use watchgod instead of watchdog

---
 .../compose/local/django/celery/worker/start                | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt        | 6 +-----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
index ef32dd69f..898dca5d3 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
@@ -4,4 +4,4 @@ set -o errexit
 set -o nounset
 
 
-watchmedo auto-restart --directory=./ --pattern="*tasks.py;*celery_app.py" --recursive -- celery -A config.celery_app worker -l INFO
+watchgod celery.__main__.main --args -A config.celery_app beat -l INFO
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index a8e7e5500..98bbbc5b1 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -5,14 +5,10 @@ ipdb==0.13.3  # https://github.com/gotcha/ipdb
 Sphinx==3.1.1  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
-{%- if cookiecutter.use_celery == 'y' %}
-argh==0.26.2  # http://github.com/neithere/argh/
-watchdog==0.10.2  # http://github.com/gorakhargosh/watchdog
-{%- endif %}
 {%- else %}
 psycopg2-binary==2.8.5  # https://github.com/psycopg/psycopg2
 {%- endif %}
-{%- if cookiecutter.use_async == 'y' %}
+{%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %}
 watchgod==0.6  # https://github.com/samuelcolvin/watchgod
 {%- endif %}
 

From 3d37e84973cdc597905d48bac03d21e2eb0adf69 Mon Sep 17 00:00:00 2001
From: Richard Hajdu <tuskone16@gmail.com>
Date: Tue, 30 Jun 2020 00:43:13 +0200
Subject: [PATCH 0825/2840] Update CONTRIBUTORS.rst

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 529c2c40a..bba9554af 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -377,6 +377,7 @@ Listed in alphabetical order.
 .. _@reggieriser: https://github.com/reggieriser
 .. _@reyesvicente: https://github.com/reyesvicente
 .. _@rm--: https://github.com/rm--
+.. _@Tusky: https://github.com/Tusky
 .. _@rolep: https://github.com/rolep
 .. _@romanosipenko: https://github.com/romanosipenko
 .. _@saschalalala: https://github.com/saschalalala

From 69611313c99f66d9fb74352c5de1844785ea3e06 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Tue, 30 Jun 2020 10:01:50 -0400
Subject: [PATCH 0826/2840] Add author name and description to HTML meta

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

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
index cba1b7cf7..aa68ece3c 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -5,8 +5,8 @@
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <title>{% block title %}{% endraw %}{{ cookiecutter.project_name }}{% raw %}{% endblock title %}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="">
-    <meta name="author" content="">
+    <meta name="description" content="{{ cookiecutter.description }}">
+    <meta name="author" content="{{ cookiecutter.author_name }}">
 
     <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>

From 21c5b787145fe1d8b8876566907c20881952f03f Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Tue, 30 Jun 2020 10:12:53 -0400
Subject: [PATCH 0827/2840] Update ugettext_lazy to gettext_lazy in views.py

---
 .../{{cookiecutter.project_slug}}/users/views.py                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
index f0e81dffc..520b1e52c 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
@@ -2,7 +2,7 @@ from django.contrib import messages
 from django.contrib.auth import get_user_model
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 from django.views.generic import DetailView, RedirectView, UpdateView
 
 User = get_user_model()

From 53e2ba2a66cac4d5c1ed91b5ad3a3c725f5b1614 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Tue, 30 Jun 2020 10:13:51 -0400
Subject: [PATCH 0828/2840] Update ugettext_lazy to gettext_lazy in models.py

---
 .../{{cookiecutter.project_slug}}/users/models.py               | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
index 8f07b15a1..57b201cc2 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
@@ -1,7 +1,7 @@
 from django.contrib.auth.models import AbstractUser
 from django.db.models import CharField
 from django.urls import reverse
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 
 class User(AbstractUser):

From 69473a4f9606bad2aecb406bc7beb2a6866998fc Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 1 Jul 2020 13:51:43 -0700
Subject: [PATCH 0829/2840] Update pre-commit from 2.5.1 to 2.6.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 0897d9bc5..63ccb153b 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -29,7 +29,7 @@ pylint-django==2.0.15  # 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.5.1  # https://github.com/pre-commit/pre-commit
+pre-commit==2.6.0  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From f5a177712cdd6d8e770c793569314ba2084ce665 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 1 Jul 2020 13:51:47 -0700
Subject: [PATCH 0830/2840] Update django-extensions from 3.0.1 to 3.0.2

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

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 0897d9bc5..5578674e2 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -36,6 +36,6 @@ pre-commit==2.5.1  # https://github.com/pre-commit/pre-commit
 factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==2.2  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==3.0.1  # https://github.com/django-extensions/django-extensions
+django-extensions==3.0.2  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.9.0  # https://github.com/pytest-dev/pytest-django

From bf95ee5ac154b9defb5973aaebc30971042383de Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 3 Jul 2020 02:35:22 -0700
Subject: [PATCH 0831/2840] Update sentry-sdk from 0.15.1 to 0.16.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 5ec4745cd..63744a26d 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.15.1  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.16.0  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
 hiredis==1.0.1  # https://github.com/redis/hiredis-py

From bb1805993e0a55e491ae0b7d82a05c5a89332203 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 4 Jul 2020 14:52:43 +0100
Subject: [PATCH 0832/2840] Pin isort to fix the build

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

diff --git a/requirements.txt b/requirements.txt
index e6e63d634..9d99d1bb0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,6 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==19.10b0
+isort==4.3.21
 flake8==3.8.3
 flake8-isort==3.0.0
 

From 09e7fce7dee8e02ae59b0c5ae63dccdb4505da86 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 4 Jul 2020 06:27:32 -0700
Subject: [PATCH 0833/2840] Pin sphinx-autobuild to latest version 0.7.1

---
 {{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 9c41385ad..fe95d4f90 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -21,7 +21,7 @@ pytest-sugar==0.9.3  # https://github.com/Frozenball/pytest-sugar
 # Documentation
 # ------------------------------------------------------------------------------
 sphinx==3.1.1  # https://github.com/sphinx-doc/sphinx
-sphinx-autobuild # https://github.com/GaretJax/sphinx-autobuild
+sphinx-autobuild==0.7.1 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality
 # ------------------------------------------------------------------------------

From d689197c2b812ee8fe6a344453174d7853ca18c4 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 4 Jul 2020 14:58:17 +0100
Subject: [PATCH 0834/2840] Some minor refactorings in tests

---
 tests/test_cookiecutter_generation.py | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index aa7cc75a4..2ce7d4120 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -132,8 +132,7 @@ def check_paths(paths):
 
         for line in open(path, "r"):
             match = RE_OBJ.search(line)
-            msg = "cookiecutter variable not replaced in {}"
-            assert match is None, msg.format(path)
+            assert match is None, f"cookiecutter variable not replaced in {path}"
 
 
 @pytest.mark.parametrize("context_override", SUPPORTED_COMBINATIONS, ids=_fixture_id)
@@ -189,7 +188,7 @@ def test_travis_invokes_pytest(cookies, context, use_docker, expected_test_scrip
 
     with open(f"{result.project}/.travis.yml", "r") as travis_yml:
         try:
-            yml = yaml.load(travis_yml, Loader=yaml.FullLoader)["jobs"]["include"]
+            yml = yaml.safe_load(travis_yml)["jobs"]["include"]
             assert yml[0]["script"] == ["flake8"]
             assert yml[1]["script"] == [expected_test_script]
         except yaml.YAMLError as e:
@@ -213,7 +212,7 @@ def test_gitlab_invokes_flake8_and_pytest(
 
     with open(f"{result.project}/.gitlab-ci.yml", "r") as gitlab_yml:
         try:
-            gitlab_config = yaml.load(gitlab_yml, Loader=yaml.FullLoader)
+            gitlab_config = yaml.safe_load(gitlab_yml)
             assert gitlab_config["flake8"]["script"] == ["flake8"]
             assert gitlab_config["pytest"]["script"] == [expected_test_script]
         except yaml.YAMLError as e:

From 68116dcdea2ba7ea10fdc900128202a3329f12da Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Fri, 1 May 2020 18:36:01 +0100
Subject: [PATCH 0835/2840] Fix issue with Heroku + Django Compressor

---
 .gitignore                                    |  1 -
 hooks/post_gen_project.py                     |  7 ++++++
 {{cookiecutter.project_slug}}/.gitignore      |  1 -
 .../bin/post_compile                          | 22 +++++++++++++++++++
 4 files changed, 29 insertions(+), 2 deletions(-)
 create mode 100644 {{cookiecutter.project_slug}}/bin/post_compile

diff --git a/.gitignore b/.gitignore
index 54fafb8be..efe33befa 100644
--- a/.gitignore
+++ b/.gitignore
@@ -211,7 +211,6 @@ tags
 ### VirtualEnv template
 # Virtualenv
 # http://iamzed.com/2009/05/07/a-primer-on-virtualenv/
-[Bb]in
 [Ii]nclude
 [Ll]ib
 [Ll]ib64
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index 13d0ff00a..fae73e110 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -75,6 +75,11 @@ def remove_heroku_files():
             # don't remove the file if we are using travisci but not using heroku
             continue
         os.remove(file_name)
+    remove_heroku_build_hooks()
+
+
+def remove_heroku_build_hooks():
+    shutil.rmtree("bin")
 
 
 def remove_gulp_files():
@@ -346,6 +351,8 @@ def main():
 
     if "{{ cookiecutter.use_heroku }}".lower() == "n":
         remove_heroku_files()
+    elif "{{ cookiecutter.use_compressor }}".lower() == "n":
+        remove_heroku_build_hooks()
 
     if (
         "{{ cookiecutter.use_docker }}".lower() == "n"
diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore
index cb8ad8358..9850b1273 100644
--- a/{{cookiecutter.project_slug}}/.gitignore
+++ b/{{cookiecutter.project_slug}}/.gitignore
@@ -325,7 +325,6 @@ tags
 
 ### VirtualEnv template
 # Virtualenv
-[Bb]in
 [Ii]nclude
 [Ll]ib
 [Ll]ib64
diff --git a/{{cookiecutter.project_slug}}/bin/post_compile b/{{cookiecutter.project_slug}}/bin/post_compile
new file mode 100644
index 000000000..a9c94b39a
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/bin/post_compile
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+
+compress_enabled() {
+python << END
+import sys
+
+from environ import Env
+
+env = Env(COMPRESS_ENABLED=(bool, True))
+if env('COMPRESS_ENABLED'):
+    sys.exit(0)
+else:
+    sys.exit(1)
+
+END
+}
+
+if compress_enabled
+then
+  python manage.py compress
+fi
+python manage.py collectstatic --noinput

From 33167946e02e007d2313df49d38bb8a4ee2b705e Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 4 Jul 2020 15:25:27 +0100
Subject: [PATCH 0836/2840] Update Heroku runtime to latest bugfix

---
 {{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 724c203e1..385705b56 100644
--- a/{{cookiecutter.project_slug}}/runtime.txt
+++ b/{{cookiecutter.project_slug}}/runtime.txt
@@ -1 +1 @@
-python-3.8.2
+python-3.8.3

From 22e0dba9bd87f0c1678ad1399691341fd1dd208d Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 4 Jul 2020 16:09:57 +0100
Subject: [PATCH 0837/2840] Split down condition into 2 lines in base.txt

maybe this might fix  the issue with PyUP not processing the file?
---
 {{cookiecutter.project_slug}}/requirements/base.txt | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 4baf2f376..0be094fcc 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -2,7 +2,11 @@ pytz==2020.1  # https://github.com/stub42/pytz
 python-slugify==4.0.0  # https://github.com/un33k/python-slugify
 Pillow==7.1.2  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
-rcssmin==1.0.6{% if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %} --install-option="--without-c-extensions"{% endif %}  # https://github.com/ndparker/rcssmin
+{%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %}
+rcssmin==1.0.6 --install-option="--without-c-extensions"  # https://github.com/ndparker/rcssmin
+{%- else %}
+rcssmin==1.0.6  # https://github.com/ndparker/rcssmin
+{%- endif %}
 {%- endif %}
 argon2-cffi==20.1.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}

From a01fc583be4f9c88c48f5408cdd0d6cf160abd4a Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 4 Jul 2020 16:15:10 +0100
Subject: [PATCH 0838/2840] Update requirements in base.txt

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

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 0be094fcc..ba62bae08 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,6 +1,6 @@
 pytz==2020.1  # https://github.com/stub42/pytz
-python-slugify==4.0.0  # https://github.com/un33k/python-slugify
-Pillow==7.1.2  # https://github.com/python-pillow/Pillow
+python-slugify==4.0.1  # https://github.com/un33k/python-slugify
+Pillow==7.2.0  # 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
@@ -12,15 +12,15 @@ argon2-cffi==20.1.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==5.1.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==3.5.0  # https://github.com/andymccurdy/redis-py
+redis==3.5.3  # https://github.com/andymccurdy/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==1.0.1  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
-celery==4.4.5  # pyup: < 5.0  # https://github.com/celery/celery
+celery==4.4.6  # pyup: < 5.0  # https://github.com/celery/celery
 django-celery-beat==2.0.0  # https://github.com/celery/django-celery-beat
 {%- if cookiecutter.use_docker == 'y' %}
-flower==0.9.4  # https://github.com/mher/flower
+flower==0.9.5  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
@@ -29,7 +29,7 @@ uvicorn==0.11.5  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.0.7  # pyup: < 3.1  # https://www.djangoproject.com/
+django==3.0.8  # pyup: < 3.1  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==4.0.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.42.0  # https://github.com/pennersr/django-allauth

From 3cd7f3a5686b674790fed7354240c1869455d3a4 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 4 Jul 2020 16:35:28 +0100
Subject: [PATCH 0839/2840] Update version to 3.0.8

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

diff --git a/setup.py b/setup.py
index 6b80bd9a0..f45db7540 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.0.7"
+version = "3.0.8"
 
 if sys.argv[-1] == "tag":
     os.system(f'git tag -a {version} -m "version {version}"')

From 21fe485d721693997702be6f8cf823ebf0d92465 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 5 Jul 2020 17:16:14 -0700
Subject: [PATCH 0840/2840] Update sphinx from 3.1.1 to 3.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 fe95d4f90..81a66f2c1 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -20,7 +20,7 @@ pytest-sugar==0.9.3  # https://github.com/Frozenball/pytest-sugar
 
 # Documentation
 # ------------------------------------------------------------------------------
-sphinx==3.1.1  # https://github.com/sphinx-doc/sphinx
+sphinx==3.1.2  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==0.7.1 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From b8dce8d6db483c7cd6fc707ad03e592d3f2d2f72 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 6 Jul 2020 06:13:23 -0700
Subject: [PATCH 0841/2840] Update coverage from 5.1 to 5.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 fe95d4f90..fb78fa85a 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -27,7 +27,7 @@ sphinx-autobuild==0.7.1 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==3.8.3  # https://github.com/PyCQA/flake8
 flake8-isort==3.0.0  # https://github.com/gforcada/flake8-isort
-coverage==5.1  # https://github.com/nedbat/coveragepy
+coverage==5.2  # https://github.com/nedbat/coveragepy
 black==19.10b0  # https://github.com/ambv/black
 pylint-django==2.0.15  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 697f5e1b6d2d18672fde2652e3bdff92504e0954 Mon Sep 17 00:00:00 2001
From: Jimmy Gitonga <jimmy@afroshok.com>
Date: Mon, 6 Jul 2020 17:31:56 +0300
Subject: [PATCH 0842/2840] FIX the link to Let's Encrypt  *Automatic HTTPS

The link was broken as it was pointing to a non-existent page.
---
 docs/deployment-with-docker.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/deployment-with-docker.rst b/docs/deployment-with-docker.rst
index 8a206885a..01df2e44d 100644
--- a/docs/deployment-with-docker.rst
+++ b/docs/deployment-with-docker.rst
@@ -82,7 +82,7 @@ The Traefik reverse proxy used in the default configuration will get you a valid
 
 You can read more about this feature and how to configure it, at `Automatic HTTPS`_ in the Traefik docs.
 
-.. _Automatic HTTPS: https://docs.traefik.io/configuration/acme/
+.. _Automatic HTTPS: https://docs.traefik.io/https/acme/
 
 
 (Optional) Postgres Data Volume Modifications

From 2ec3bdf55c0a481ccf281d02c103f1ca410d8f9d Mon Sep 17 00:00:00 2001
From: Jimmy Gitonga <jimmy@afroshok.com>
Date: Mon, 6 Jul 2020 17:54:32 +0300
Subject: [PATCH 0843/2840] FIX the link to Let's Encrypt  *Automatic HTTPS
 (#2661)

The link was broken as it was pointing to a non-existent page.
---
 docs/deployment-with-docker.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/deployment-with-docker.rst b/docs/deployment-with-docker.rst
index 8a206885a..01df2e44d 100644
--- a/docs/deployment-with-docker.rst
+++ b/docs/deployment-with-docker.rst
@@ -82,7 +82,7 @@ The Traefik reverse proxy used in the default configuration will get you a valid
 
 You can read more about this feature and how to configure it, at `Automatic HTTPS`_ in the Traefik docs.
 
-.. _Automatic HTTPS: https://docs.traefik.io/configuration/acme/
+.. _Automatic HTTPS: https://docs.traefik.io/https/acme/
 
 
 (Optional) Postgres Data Volume Modifications

From 60dfb4c5d39c3d992d8bdb10ba90ad5527571f24 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 6 Jul 2020 13:20:16 -0700
Subject: [PATCH 0844/2840] Update pytest-sugar from 0.9.3 to 0.9.4

---
 {{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 c537a7f50..08b4770b5 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -16,7 +16,7 @@ watchgod==0.6  # https://github.com/samuelcolvin/watchgod
 mypy==0.782  # https://github.com/python/mypy
 django-stubs==1.5.0  # https://github.com/typeddjango/django-stubs
 pytest==5.4.3  # https://github.com/pytest-dev/pytest
-pytest-sugar==0.9.3  # https://github.com/Frozenball/pytest-sugar
+pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 
 # Documentation
 # ------------------------------------------------------------------------------

From 9ac059011aadfe320d05307c2d7a9cc9c237604f Mon Sep 17 00:00:00 2001
From: Jimmy Gitonga <jimmy@afroshok.com>
Date: Tue, 7 Jul 2020 01:56:21 +0300
Subject: [PATCH 0845/2840] ADD instructions on how to set up a secure
 development environment.

---
 docs/developing-locally-docker.rst | 93 +++++++++++++++++++++++++++++-
 1 file changed, 91 insertions(+), 2 deletions(-)

diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index d6b4146d5..cdeba8879 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -178,8 +178,7 @@ When developing locally you can go with MailHog_ for email testing provided ``us
 
 Celery tasks in local development
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When not using docker Celery tasks are set to run in Eager mode, so that a full stack is not needed. When using docker the task
-scheduler will be used by default.
+When not using docker Celery tasks are set to run in Eager mode, so that a full stack is not needed. When using docker the task scheduler will be used by default.
 
 If you need tasks to be executed on the main thread during development set CELERY_TASK_ALWAYS_EAGER = True in config/settings/local.py.
 
@@ -200,3 +199,93 @@ Prerequisites:
 By default, it's enabled both in local and production environments (``local.yml`` and ``production.yml`` Docker Compose configs, respectively) through a ``flower`` service. For added security, ``flower`` requires its clients to provide authentication credentials specified as the corresponding environments' ``.envs/.local/.django`` and ``.envs/.production/.django`` ``CELERY_FLOWER_USER`` and ``CELERY_FLOWER_PASSWORD`` environment variables. Check out ``localhost:5555`` and see for yourself.
 
 .. _`Flower`: https://github.com/mher/flower
+
+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 ``allauth`` 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.
+
+#.  **Let's Encrypt**
+    
+    The official line from Let’s Encrypt is: 
+
+    [For local development section] ... The best option: Generate your own certificate, either self-signed or signed by a local root, and trust it in your operating system’s trust store. Then use that certificate in your local web server. See below for details. 
+
+    See `letsencrypt.org - certificates-for-localhost`_
+
+    .. _`letsencrypt.org - certificates-for-localhost`: https://letsencrypt.org/docs/certificates-for-localhost/
+
+#.  **mkcert: Valid Https Certificates For Localhost**
+    
+    `mkcert`_ is a simple by design tool that hides all the arcane knowledge required to generate valid TLS certificates. It works for any hostname or IP, including localhost. It supports macOS, Linux, and Windows, and Firefox, Chrome and Java. It even works on mobile devices with a couple manual steps.
+
+    See https://blog.filippo.io/mkcert-valid-https-certificates-for-localhost/
+
+    .. _`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.
+
+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``.
+
+local.yml
+~~~~~~~~~
+
+#. Add the ``nginx-proxy`` service. ::
+
+    ...
+
+    nginx-proxy:
+      image: jwilder/nginx-proxy:alpine
+      container_name: nginx-proxy
+      ports:
+        - "80:80"
+        - "443:443"
+      volumes:
+        - /var/run/docker.sock:/tmp/docker.sock:ro
+        - ./certs:/etc/nginx/certs
+      restart: always
+      depends_on:
+        - django
+    
+    ...
+
+#. Link the ``nginx-proxy`` to ``django`` through environmental 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.
+
+   ::
+
+      # HTTPS
+      # ------------------------------------------------------------------------------
+      VIRTUAL_HOST=my-dev-env.local
+      VIRTUAL_PORT=8000
+
+   The services run behind the reverse proxy.
+
+config/settings/local.py
+~~~~~~~~~~~~~~~~~~~~~~~
+
+You should allow the new hostname. ::
+
+  ALLOWED_HOSTS = ["localhost", "0.0.0.0", "127.0.0.1", "my-dev-env.local"]
+
+Rebuild your ``docker`` application. ::
+
+  $ docker-compose -f local.yml up -d --build
+
+Go to your browser and type in your usrl, ``
+
+See `https with nginx`_ for more information on this configuration.
+
+  .. _`https with nginx`: https://codewithhugo.com/docker-compose-local-https/
+
+
+
+*This configuration is for local development environments only. Do not use this for production since you might expose your local* ``rootCA-key.pem``.

From aacdd97c4edb4ec4ce15a51f33deb0eff490a13b Mon Sep 17 00:00:00 2001
From: Jimmy Gitonga <jimmy@afroshok.com>
Date: Tue, 7 Jul 2020 01:56:21 +0300
Subject: [PATCH 0846/2840] ADD instructions on how to set up a secure
 development environment.

---
 docs/developing-locally-docker.rst | 93 +++++++++++++++++++++++++++++-
 1 file changed, 91 insertions(+), 2 deletions(-)

diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index d6b4146d5..e96faa389 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -178,8 +178,7 @@ When developing locally you can go with MailHog_ for email testing provided ``us
 
 Celery tasks in local development
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-When not using docker Celery tasks are set to run in Eager mode, so that a full stack is not needed. When using docker the task
-scheduler will be used by default.
+When not using docker Celery tasks are set to run in Eager mode, so that a full stack is not needed. When using docker the task scheduler will be used by default.
 
 If you need tasks to be executed on the main thread during development set CELERY_TASK_ALWAYS_EAGER = True in config/settings/local.py.
 
@@ -200,3 +199,93 @@ Prerequisites:
 By default, it's enabled both in local and production environments (``local.yml`` and ``production.yml`` Docker Compose configs, respectively) through a ``flower`` service. For added security, ``flower`` requires its clients to provide authentication credentials specified as the corresponding environments' ``.envs/.local/.django`` and ``.envs/.production/.django`` ``CELERY_FLOWER_USER`` and ``CELERY_FLOWER_PASSWORD`` environment variables. Check out ``localhost:5555`` and see for yourself.
 
 .. _`Flower`: https://github.com/mher/flower
+
+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.
+
+#.  **Let's Encrypt**
+    
+    The official line from Let’s Encrypt is: 
+
+    [For local development section] ... The best option: Generate your own certificate, either self-signed or signed by a local root, and trust it in your operating system’s trust store. Then use that certificate in your local web server. See below for details. 
+
+    See `letsencrypt.org - certificates-for-localhost`_
+
+    .. _`letsencrypt.org - certificates-for-localhost`: https://letsencrypt.org/docs/certificates-for-localhost/
+
+#.  **mkcert: Valid Https Certificates For Localhost**
+    
+    `mkcert`_ is a simple by design tool that hides all the arcane knowledge required to generate valid TLS certificates. It works for any hostname or IP, including localhost. It supports macOS, Linux, and Windows, and Firefox, Chrome and Java. It even works on mobile devices with a couple manual steps.
+
+    See https://blog.filippo.io/mkcert-valid-https-certificates-for-localhost/
+
+    .. _`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.
+
+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``.
+
+local.yml
+~~~~~~~~~
+
+#. Add the ``nginx-proxy`` service. ::
+
+    ...
+
+    nginx-proxy:
+      image: jwilder/nginx-proxy:alpine
+      container_name: nginx-proxy
+      ports:
+        - "80:80"
+        - "443:443"
+      volumes:
+        - /var/run/docker.sock:/tmp/docker.sock:ro
+        - ./certs:/etc/nginx/certs
+      restart: always
+      depends_on:
+        - django
+    
+    ...
+
+#. Link the ``nginx-proxy`` to ``django`` through environmental 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.
+
+   ::
+
+      # HTTPS
+      # ------------------------------------------------------------------------------
+      VIRTUAL_HOST=my-dev-env.local
+      VIRTUAL_PORT=8000
+
+   The services run behind the reverse proxy.
+
+config/settings/local.py
+~~~~~~~~~~~~~~~~~~~~~~~
+
+You should allow the new hostname. ::
+
+  ALLOWED_HOSTS = ["localhost", "0.0.0.0", "127.0.0.1", "my-dev-env.local"]
+
+Rebuild your ``docker`` application. ::
+
+  $ docker-compose -f local.yml up -d --build
+
+Go to your browser and type in your usrl, ``
+
+See `https with nginx`_ for more information on this configuration.
+
+  .. _`https with nginx`: https://codewithhugo.com/docker-compose-local-https/
+
+
+
+*This configuration is for local development environments only. Do not use this for production since you might expose your local* ``rootCA-key.pem``.

From bd0ed76421805d3560329dcd0d32c3542529a4cb Mon Sep 17 00:00:00 2001
From: Jimmy Gitonga <jimmy@afroshok.com>
Date: Tue, 7 Jul 2020 08:07:51 +0300
Subject: [PATCH 0847/2840] ADD instructions not include the security
 certificates in the repo.

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

diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index e96faa389..b5672e224 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -286,6 +286,9 @@ See `https with nginx`_ for more information on this configuration.
 
   .. _`https with nginx`: https://codewithhugo.com/docker-compose-local-https/
 
+.gitignore
+~~~~~~~~~~
 
+Add ``certs/*`` to the ``.gitignore`` file. This allows the folder to be included in the repo but its contents to be ignored.
 
 *This configuration is for local development environments only. Do not use this for production since you might expose your local* ``rootCA-key.pem``.

From 8ebb464b33ab6aa3174bf03c06374894f9c7facc Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 7 Jul 2020 18:10:37 +0100
Subject: [PATCH 0848/2840] Fix beat -> worker

---
 .../compose/local/django/celery/worker/start                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
index 898dca5d3..d7b63cd41 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
@@ -4,4 +4,4 @@ set -o errexit
 set -o nounset
 
 
-watchgod celery.__main__.main --args -A config.celery_app beat -l INFO
+watchgod celery.__main__.main --args -A config.celery_app worker -l INFO

From 6b6faea2de0c36c39b6a54b3517cac442e68d1b7 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 8 Jul 2020 01:33:24 -0700
Subject: [PATCH 0849/2840] Update flake8-isort from 3.0.0 to 3.0.1

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

diff --git a/requirements.txt b/requirements.txt
index 9d99d1bb0..9ccfb8a2c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ binaryornot==0.4.4
 black==19.10b0
 isort==4.3.21
 flake8==3.8.3
-flake8-isort==3.0.0
+flake8-isort==3.0.1
 
 # Testing
 # ------------------------------------------------------------------------------

From 5f7d23ff7864531330eca0fff6d933bcb16d86a0 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 8 Jul 2020 01:33:25 -0700
Subject: [PATCH 0850/2840] Update flake8-isort from 3.0.0 to 3.0.1

---
 {{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 c537a7f50..134a94728 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -26,7 +26,7 @@ sphinx-autobuild==0.7.1 # https://github.com/GaretJax/sphinx-autobuild
 # Code quality
 # ------------------------------------------------------------------------------
 flake8==3.8.3  # https://github.com/PyCQA/flake8
-flake8-isort==3.0.0  # https://github.com/gforcada/flake8-isort
+flake8-isort==3.0.1  # https://github.com/gforcada/flake8-isort
 coverage==5.2  # https://github.com/nedbat/coveragepy
 black==19.10b0  # https://github.com/ambv/black
 pylint-django==2.0.15  # https://github.com/PyCQA/pylint-django

From fd3462c2b92c8a297fabc9c09ea572259b94a621 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 10 Jul 2020 12:02:49 -0700
Subject: [PATCH 0851/2840] Update sentry-sdk from 0.16.0 to 0.16.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 63744a26d..afd777b78 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.16.0  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.16.1  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
 hiredis==1.0.1  # https://github.com/redis/hiredis-py

From 4d5b6db4c19517b813fab3fa3a341d4ce76efc8c Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwangpython@gmail.com>
Date: Sat, 11 Jul 2020 21:15:17 -0400
Subject: [PATCH 0852/2840] Added PG 12.3; Dropped 9.4

---
 README.rst                            | 10 +++++-----
 cookiecutter.json                     |  6 +++---
 tests/test_cookiecutter_generation.py |  4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/README.rst b/README.rst
index cfb253787..47f2bfb7d 100644
--- a/README.rst
+++ b/README.rst
@@ -176,11 +176,11 @@ Answer the prompts with your own desired options_. For example::
     use_heroku [n]: y
     use_compressor [n]: y
     Select postgresql_version:
-    1 - 11.3
-    2 - 10.8
-    3 - 9.6
-    4 - 9.5
-    5 - 9.4
+    1 - 12.3
+    2 - 11.8
+    3 - 10.8
+    4 - 9.6
+    5 - 9.5
     Choose from 1, 2, 3, 4, 5 [1]: 1
     Select js_task_runner:
     1 - None
diff --git a/cookiecutter.json b/cookiecutter.json
index 62155ad0e..ca11b3b47 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -18,11 +18,11 @@
   "use_pycharm": "n",
   "use_docker": "n",
   "postgresql_version": [
-    "11.3",
+    "12.3",
+    "11.8",
     "10.8",
     "9.6",
-    "9.5",
-    "9.4"
+    "9.5"
   ],
   "js_task_runner": [
     "None",
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 2ce7d4120..89b9b856e 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -37,11 +37,11 @@ SUPPORTED_COMBINATIONS = [
     {"use_pycharm": "n"},
     {"use_docker": "y"},
     {"use_docker": "n"},
-    {"postgresql_version": "11.3"},
+    {"postgresql_version": "12.3"},
+    {"postgresql_version": "11.8"},
     {"postgresql_version": "10.8"},
     {"postgresql_version": "9.6"},
     {"postgresql_version": "9.5"},
-    {"postgresql_version": "9.4"},
     {"cloud_provider": "AWS", "use_whitenoise": "y"},
     {"cloud_provider": "AWS", "use_whitenoise": "n"},
     {"cloud_provider": "GCP", "use_whitenoise": "y"},

From a0c73d942f225fbd62d4cfff3737acf88069aa68 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 12 Jul 2020 06:51:40 -0700
Subject: [PATCH 0853/2840] Update pylint-django from 2.0.15 to 2.1.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 134a94728..6bc27eae3 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -29,7 +29,7 @@ flake8==3.8.3  # https://github.com/PyCQA/flake8
 flake8-isort==3.0.1  # https://github.com/gforcada/flake8-isort
 coverage==5.2  # https://github.com/nedbat/coveragepy
 black==19.10b0  # https://github.com/ambv/black
-pylint-django==2.0.15  # https://github.com/PyCQA/pylint-django
+pylint-django==2.1.0  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}

From 7a48cacdf70de1d4df9498057b0306678c440320 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 14 Jul 2020 07:20:16 -0700
Subject: [PATCH 0854/2840] Update django-extensions from 3.0.2 to 3.0.3

---
 {{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 134a94728..273ffe805 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -40,6 +40,6 @@ pre-commit==2.6.0  # https://github.com/pre-commit/pre-commit
 factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==2.2  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==3.0.2  # https://github.com/django-extensions/django-extensions
+django-extensions==3.0.3  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.9.0  # https://github.com/pytest-dev/pytest-django

From 6f368089ed01879f22eca4f7d7444aabec949a44 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 16 Jul 2020 01:43:58 -0700
Subject: [PATCH 0855/2840] Update tox from 3.16.1 to 3.17.1

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

diff --git a/requirements.txt b/requirements.txt
index 9ccfb8a2c..400fa9b15 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8-isort==3.0.1
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.16.1
+tox==3.17.1
 pytest==5.4.3
 pytest-cookies==0.5.1
 pytest-instafail==0.4.2

From f4ce1db0b50a96406c4003572b4570d12ddb7024 Mon Sep 17 00:00:00 2001
From: Aadith PM <aadithpm@gmail.com>
Date: Fri, 17 Jul 2020 08:37:15 -0500
Subject: [PATCH 0856/2840] Update requirements to include django-cors-headers
 with DRF [PR #2650]

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

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index ba62bae08..bf6152660 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -41,4 +41,6 @@ django-redis==4.12.1  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == "y" %}
 # Django REST Framework
 djangorestframework==3.11.0  # https://github.com/encode/django-rest-framework
+# Django CORS Headers
+django-cors-headers==0.01 # https://github.com/adamchainz/django-cors-headers
 {%- endif %}

From 15718f8088967ed6ba71403dafde5fd7d3ba1393 Mon Sep 17 00:00:00 2001
From: Aadith PM <aadithpm@gmail.com>
Date: Fri, 17 Jul 2020 08:49:59 -0500
Subject: [PATCH 0857/2840] Update CONTRIBUTORS.rst

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index bba9554af..cc7f0e1d6 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -44,6 +44,7 @@ Listed in alphabetical order.
   18                       `@dezoito`_
   2O4                      `@2O4`_
   a7p                      `@a7p`_
+  Aadith PM                `@aadithpm`_
   Aaron Eikenberry         `@aeikenberry`_
   Adam Bogdał              `@bogdal`_
   Adam Dobrawy             `@ad-m`_

From 1526aafab39ebbefeb577f24fe2fb8e2c5f71869 Mon Sep 17 00:00:00 2001
From: Aadith PM <aadithpm@gmail.com>
Date: Fri, 17 Jul 2020 09:07:33 -0500
Subject: [PATCH 0858/2840] Update CONTRIBUTORS.rst - add link to GH

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index cc7f0e1d6..875ece2ec 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -236,6 +236,7 @@ Listed in alphabetical order.
   Yuchen Xie               `@mapx`_
 ========================== ============================ ==============
 
+.. _@aadithpm: https://github.com/aadithpm
 .. _@a7p: https://github.com/a7p
 .. _@2O4: https://github.com/2O4
 .. _@ad-m: https://github.com/ad-m

From 349f7e1141c4d1461802220ce7de4aaba0862cc5 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 17 Jul 2020 07:46:56 -0700
Subject: [PATCH 0859/2840] Update uvicorn from 0.11.5 to 0.11.6

---
 {{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 ba62bae08..3c68b6942 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -24,7 +24,7 @@ flower==0.9.5  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn==0.11.5  # https://github.com/encode/uvicorn
+uvicorn==0.11.6  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django

From eafe74262a8c5d9e32dc1d0b8cbe643c4dc79f04 Mon Sep 17 00:00:00 2001
From: Aadith PM <aadithpm@gmail.com>
Date: Sat, 18 Jul 2020 19:53:55 -0500
Subject: [PATCH 0860/2840] Added django-cors-headers setup steps to base
 settings

---
 {{cookiecutter.project_slug}}/config/settings/base.py | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 7f339fadc..fe1329c4a 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -80,6 +80,7 @@ THIRD_PARTY_APPS = [
 {%- if cookiecutter.use_drf == "y" %}
     "rest_framework",
     "rest_framework.authtoken",
+    "corsheaders",
 {%- endif %}
 ]
 
@@ -134,6 +135,9 @@ AUTH_PASSWORD_VALIDATORS = [
 # https://docs.djangoproject.com/en/dev/ref/settings/#middleware
 MIDDLEWARE = [
     "django.middleware.security.SecurityMiddleware",
+{%- if cookiecutter.use_drf == 'y' %}
+    "corsheaders.middleware.CorsMiddleware",
+{%- endif %}
 {%- if cookiecutter.use_whitenoise == 'y' %}
     "whitenoise.middleware.WhiteNoiseMiddleware",
 {%- endif %}
@@ -321,6 +325,12 @@ REST_FRAMEWORK = {
     ),
     "DEFAULT_PERMISSION_CLASSES": ("rest_framework.permissions.IsAuthenticated",),
 }
+
+# django-cors-headers - https://github.com/adamchainz/django-cors-headers#setup
+CORS_URLS_REGEX = {
+    r'^/api.*$',
+}
+
 {%- endif %}
 # Your stuff...
 # ------------------------------------------------------------------------------

From 20986bafb7c83a8939c3fbd6bbe7bc1d58b6f032 Mon Sep 17 00:00:00 2001
From: Aadith PM <aadithpm@gmail.com>
Date: Sat, 18 Jul 2020 20:37:03 -0500
Subject: [PATCH 0861/2840] Fix style error with quotes

---
 {{cookiecutter.project_slug}}/config/settings/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index fe1329c4a..2efd2fcdd 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -328,7 +328,7 @@ REST_FRAMEWORK = {
 
 # django-cors-headers - https://github.com/adamchainz/django-cors-headers#setup
 CORS_URLS_REGEX = {
-    r'^/api.*$',
+    r"^/api.*$",
 }
 
 {%- endif %}

From ff69126087fadc479c50b27d1b1ec3b6b747e68d Mon Sep 17 00:00:00 2001
From: Aadith PM <aadithpm@gmail.com>
Date: Mon, 20 Jul 2020 11:21:06 -0500
Subject: [PATCH 0862/2840] Update
 {{cookiecutter.project_slug}}/config/settings/base.py

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/config/settings/base.py | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 2efd2fcdd..f69908c2d 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -327,9 +327,7 @@ REST_FRAMEWORK = {
 }
 
 # django-cors-headers - https://github.com/adamchainz/django-cors-headers#setup
-CORS_URLS_REGEX = {
-    r"^/api.*$",
-}
+CORS_URLS_REGEX = r"^/api/.*$"
 
 {%- endif %}
 # Your stuff...

From fee9402e4469b8532b6093b5cee5fba141cca197 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Tue, 21 Jul 2020 00:02:14 -0400
Subject: [PATCH 0863/2840] Use raw Jinja2 for cookiecutter template context

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 .../{{cookiecutter.project_slug}}/templates/base.html         | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
index aa68ece3c..99fe27ab0 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -5,8 +5,8 @@
     <meta http-equiv="x-ua-compatible" content="ie=edge">
     <title>{% block title %}{% endraw %}{{ cookiecutter.project_name }}{% raw %}{% endblock title %}</title>
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="{{ cookiecutter.description }}">
-    <meta name="author" content="{{ cookiecutter.author_name }}">
+    <meta name="description" content="{% endraw %}{{ cookiecutter.description }}{% raw %}">
+    <meta name="author" content="{% endraw %}{{ cookiecutter.author_name }}{% raw %}">
 
     <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
     <!--[if lt IE 9]>

From d31ee9afe73ce9cccb0059cbe2c2239d89a7b92c Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 22 Jul 2020 07:23:20 -0700
Subject: [PATCH 0864/2840] Update pylint-django from 2.1.0 to 2.2.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 cbb8dc319..6024e9a58 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -29,7 +29,7 @@ flake8==3.8.3  # https://github.com/PyCQA/flake8
 flake8-isort==3.0.1  # https://github.com/gforcada/flake8-isort
 coverage==5.2  # https://github.com/nedbat/coveragepy
 black==19.10b0  # https://github.com/ambv/black
-pylint-django==2.1.0  # https://github.com/PyCQA/pylint-django
+pylint-django==2.2.0  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}

From 9bdb4335380d9cde9d14d8f766b3aee4fed31bfe Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 22 Jul 2020 10:11:16 -0700
Subject: [PATCH 0865/2840] Update sentry-sdk from 0.16.1 to 0.16.2

---
 {{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 afd777b78..ca7fdc80e 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.16.1  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.16.2  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
 hiredis==1.0.1  # https://github.com/redis/hiredis-py

From fbc4491adfb6c5ec5982c62c53a02e153db6bec3 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 23 Jul 2020 03:37:15 -0700
Subject: [PATCH 0866/2840] Update tox from 3.17.1 to 3.18.0

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

diff --git a/requirements.txt b/requirements.txt
index 400fa9b15..ac6c7f18d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8-isort==3.0.1
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.17.1
+tox==3.18.0
 pytest==5.4.3
 pytest-cookies==0.5.1
 pytest-instafail==0.4.2

From 35d57d048bab0b22e54999100707833a6150b335 Mon Sep 17 00:00:00 2001
From: enchance <enchance@gmail.com>
Date: Fri, 24 Jul 2020 00:53:56 +0800
Subject: [PATCH 0867/2840] Compatibility issue for mypy 0.782. Must be mypy
 0.770 because it uses djago-stubs 1.5.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 cbb8dc319..f315d9dc7 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -13,7 +13,7 @@ watchgod==0.6  # https://github.com/samuelcolvin/watchgod
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.782  # https://github.com/python/mypy
+mypy==0.770  # https://github.com/python/mypy
 django-stubs==1.5.0  # https://github.com/typeddjango/django-stubs
 pytest==5.4.3  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar

From 160ed6cb6d5ee552bef7fc5538255a074e85624f Mon Sep 17 00:00:00 2001
From: enchance <enchance@gmail.com>
Date: Fri, 24 Jul 2020 01:00:56 +0800
Subject: [PATCH 0868/2840] Added name to CONTRIBUTORS.txt

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

diff --git a/{{cookiecutter.project_slug}}/CONTRIBUTORS.txt b/{{cookiecutter.project_slug}}/CONTRIBUTORS.txt
index 82a80bfc1..e8450c4c3 100644
--- a/{{cookiecutter.project_slug}}/CONTRIBUTORS.txt
+++ b/{{cookiecutter.project_slug}}/CONTRIBUTORS.txt
@@ -1 +1 @@
-{{ cookiecutter.author_name }}
+enchance
\ No newline at end of file

From 689e22f5b01da10231d749a8febb252b09bfc56c Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Thu, 23 Jul 2020 22:47:20 -0400
Subject: [PATCH 0869/2840] Be explicit in context processor

---
 .../{{cookiecutter.project_slug}}/utils/context_processors.py  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/context_processors.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/context_processors.py
index de405076f..def96787f 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/context_processors.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/context_processors.py
@@ -2,4 +2,5 @@ from django.conf import settings
 
 
 def settings_context(_request):
-    return {"settings": settings}
+    # Be explicit
+    return {"DEBUG": settings.DEBUG}

From c57b8976b09fcd6ec7f3ef095b4b967f3d68e8d3 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Fri, 24 Jul 2020 11:29:11 -0400
Subject: [PATCH 0870/2840] Update
 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/context_processors.py

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 .../{{cookiecutter.project_slug}}/utils/context_processors.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/context_processors.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/context_processors.py
index def96787f..3c5351418 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/context_processors.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/context_processors.py
@@ -2,5 +2,7 @@ from django.conf import settings
 
 
 def settings_context(_request):
-    # Be explicit
+    """Settings available by default to the templates context."""
+    # Note: we intentionally do NOT expose the entire settings
+    # to prevent accidental leaking of sensitive information
     return {"DEBUG": settings.DEBUG}

From 6fffaf13cab98d4ae2682fcb58d28af406d9ec95 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 24 Jul 2020 16:54:39 +0100
Subject: [PATCH 0871/2840] Fix version for django-cors-headers

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

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index bf6152660..c7fcc99de 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -41,6 +41,5 @@ django-redis==4.12.1  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == "y" %}
 # Django REST Framework
 djangorestframework==3.11.0  # https://github.com/encode/django-rest-framework
-# Django CORS Headers
-django-cors-headers==0.01 # https://github.com/adamchainz/django-cors-headers
+django-cors-headers==3.4.0 # https://github.com/adamchainz/django-cors-headers
 {%- endif %}

From c6dd8471dd590311460ae54bd6a8b8a4c1a346f5 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 24 Jul 2020 09:10:59 -0700
Subject: [PATCH 0872/2840] Update coverage from 5.2 to 5.2.1

---
 {{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 6024e9a58..2abdf136f 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -27,7 +27,7 @@ sphinx-autobuild==0.7.1 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==3.8.3  # https://github.com/PyCQA/flake8
 flake8-isort==3.0.1  # https://github.com/gforcada/flake8-isort
-coverage==5.2  # https://github.com/nedbat/coveragepy
+coverage==5.2.1  # https://github.com/nedbat/coveragepy
 black==19.10b0  # https://github.com/ambv/black
 pylint-django==2.2.0  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 21c56bb97a59d69e71fcaebdde6d7715d25a9150 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 24 Jul 2020 17:38:29 +0100
Subject: [PATCH 0873/2840] Don't include base requirements with dot in front

See https://github.com/pyupio/pyup/issues/390
---
 {{cookiecutter.project_slug}}/requirements/local.txt      | 2 +-
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 2abdf136f..793d76778 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,4 +1,4 @@
--r ./base.txt
+-r base.txt
 
 Werkzeug==1.0.1 # https://github.com/pallets/werkzeug
 ipdb==0.13.3  # https://github.com/gotcha/ipdb
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index ca7fdc80e..52b5a94c4 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -1,6 +1,6 @@
 # PRECAUTION: avoid production dependencies that aren't in development
 
--r ./base.txt
+-r base.txt
 
 gunicorn==20.0.4  # https://github.com/benoitc/gunicorn
 psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2

From ed8e3073c66d70d79cd350d39b40e55763da9d24 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 24 Jul 2020 09:58:27 -0700
Subject: [PATCH 0874/2840] Update hiredis from 1.0.1 to 1.1.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 52b5a94c4..666c0468c 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==0.16.2  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
-hiredis==1.0.1  # https://github.com/redis/hiredis-py
+hiredis==1.1.0  # https://github.com/redis/hiredis-py
 {%- endif %}
 
 # Django

From ce0f2363e01c49c5146d2239fcb15eb989cb509d Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 24 Jul 2020 09:58:28 -0700
Subject: [PATCH 0875/2840] Update hiredis from 1.0.1 to 1.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 8c0394721..540f91ab7 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -14,7 +14,7 @@ whitenoise==5.1.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.0.1  # https://github.com/redis/hiredis-py
+hiredis==1.1.0  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.4.6  # pyup: < 5.0  # https://github.com/celery/celery

From 70c11fa89432815ebbe569ac1f18e19ff8047e36 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 24 Jul 2020 09:58:32 -0700
Subject: [PATCH 0876/2840] Update django-crispy-forms from 1.9.1 to 1.9.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 8c0394721..9312680d7 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -33,7 +33,7 @@ django==3.0.8  # pyup: < 3.1  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==4.0.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.42.0  # https://github.com/pennersr/django-allauth
-django-crispy-forms==1.9.1  # https://github.com/django-crispy-forms/django-crispy-forms
+django-crispy-forms==1.9.2  # https://github.com/django-crispy-forms/django-crispy-forms
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==2.4  # https://github.com/django-compressor/django-compressor
 {%- endif %}

From b592003f87ff4a1f27dfa01e8860bb0f725e0847 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 25 Jul 2020 14:37:54 +0100
Subject: [PATCH 0877/2840] Fix snippet in documentation

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

diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index a5d598f0b..0da265484 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -24,9 +24,9 @@ First things first.
 
     $ source <virtual env path>/bin/activate
 
-#. Install cookiecutter-django
+#. Install cookiecutter-django: ::
 
-    $ cookiecutter gh:pydanny/cookiecutter-django ::
+    $ cookiecutter gh:pydanny/cookiecutter-django
 
 #. Install development requirements: ::
 

From 08a15337b35e1c11d9ef1494e9550ceaee7e9e72 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 25 Jul 2020 14:39:04 +0100
Subject: [PATCH 0878/2840] Update document.rst

---
 docs/document.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/document.rst b/docs/document.rst
index 990bbe8a7..15a5396e1 100644
--- a/docs/document.rst
+++ b/docs/document.rst
@@ -18,7 +18,7 @@ Navigate to port 7000 on your host to see the documentation. This will be opened
 Generate API documentation
 ----------------------------
 
-Edit the docs/_source files and project application docstrings to create your documentation.
+Edit the ``docs/_source`` files and project application docstrings to create your documentation.
 
 Sphinx can automatically include class and function signatures and docstrings in generated documentation. 
 See the generated project documentation for more examples.

From a706ab826c4685e61331e622e1382075ae5343a4 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 25 Jul 2020 12:51:33 -0700
Subject: [PATCH 0879/2840] Update django-anymail from 7.1.0 to 7.2

---
 {{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 666c0468c..369ee65f6 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -22,7 +22,7 @@ django-storages[boto3]==1.9.1  # https://github.com/jschneier/django-storages
 django-storages[google]==1.9.1  # https://github.com/jschneier/django-storages
 {%- endif %}
 {%- if cookiecutter.mail_service == 'Mailgun' %}
-django-anymail[mailgun]==7.1.0  # https://github.com/anymail/django-anymail
+django-anymail[mailgun]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
 django-anymail[amazon_ses]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}

From 756031c351c7e6e24e33006c21fc3b757d755b22 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 25 Jul 2020 12:51:34 -0700
Subject: [PATCH 0880/2840] Update django-anymail from 7.1.0 to 7.2

---
 {{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 369ee65f6..129e9815c 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -24,7 +24,7 @@ django-storages[google]==1.9.1  # https://github.com/jschneier/django-storages
 {%- if cookiecutter.mail_service == 'Mailgun' %}
 django-anymail[mailgun]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
-django-anymail[amazon_ses]==7.1.0  # https://github.com/anymail/django-anymail
+django-anymail[amazon_ses]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
 django-anymail[mailjet]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}

From 41dc9424f8503083d52a2808451bf9ff112d9e60 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 25 Jul 2020 12:51:35 -0700
Subject: [PATCH 0881/2840] Update django-anymail from 7.1.0 to 7.2

---
 {{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 129e9815c..53c1a999d 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -26,7 +26,7 @@ django-anymail[mailgun]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
 django-anymail[amazon_ses]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
-django-anymail[mailjet]==7.1.0  # https://github.com/anymail/django-anymail
+django-anymail[mailjet]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
 django-anymail[mandrill]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}

From a5e71ab8bfe505cbe67ba34b0bd6702d2cedb453 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 25 Jul 2020 12:51:36 -0700
Subject: [PATCH 0882/2840] Update django-anymail from 7.1.0 to 7.2

---
 {{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 53c1a999d..f365e2022 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -28,7 +28,7 @@ django-anymail[amazon_ses]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
 django-anymail[mailjet]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
-django-anymail[mandrill]==7.1.0  # https://github.com/anymail/django-anymail
+django-anymail[mandrill]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
 django-anymail[postmark]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}

From 14fad9247b0ab845f91d9c2e21f7483836fdba77 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 25 Jul 2020 12:51:37 -0700
Subject: [PATCH 0883/2840] Update django-anymail from 7.1.0 to 7.2

---
 {{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 f365e2022..db685a890 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -30,7 +30,7 @@ django-anymail[mailjet]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
 django-anymail[mandrill]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
-django-anymail[postmark]==7.1.0  # https://github.com/anymail/django-anymail
+django-anymail[postmark]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
 django-anymail[sendgrid]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}

From 1d8f637f9d9bd7db556fff133961f1dba0f4cb7f Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 25 Jul 2020 12:51:38 -0700
Subject: [PATCH 0884/2840] Update django-anymail from 7.1.0 to 7.2

---
 {{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 db685a890..9a2145e92 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -32,7 +32,7 @@ django-anymail[mandrill]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
 django-anymail[postmark]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
-django-anymail[sendgrid]==7.1.0  # https://github.com/anymail/django-anymail
+django-anymail[sendgrid]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
 django-anymail[sendinblue]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}

From 8fa56b3c6d5c3a72b9e668628921503c64d9c681 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 25 Jul 2020 12:51:39 -0700
Subject: [PATCH 0885/2840] Update django-anymail from 7.1.0 to 7.2

---
 {{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 9a2145e92..cdb18b81b 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -34,7 +34,7 @@ django-anymail[postmark]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
 django-anymail[sendgrid]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
-django-anymail[sendinblue]==7.1.0  # https://github.com/anymail/django-anymail
+django-anymail[sendinblue]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
 django-anymail[sparkpost]==7.1.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}

From 83290cb71073dd614957a1db884977519cabf84b Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 25 Jul 2020 12:51:40 -0700
Subject: [PATCH 0886/2840] Update django-anymail from 7.1.0 to 7.2

---
 {{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 cdb18b81b..27c1a8acb 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -36,7 +36,7 @@ django-anymail[sendgrid]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
 django-anymail[sendinblue]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
-django-anymail[sparkpost]==7.1.0  # https://github.com/anymail/django-anymail
+django-anymail[sparkpost]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
 django-anymail==7.1.0  # https://github.com/anymail/django-anymail
 {%- endif %}

From c3391c957284f6ec956a0ee2043e2389fb34e0db Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 25 Jul 2020 12:51:40 -0700
Subject: [PATCH 0887/2840] Update django-anymail from 7.1.0 to 7.2

---
 {{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 27c1a8acb..5ae320073 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -38,5 +38,5 @@ django-anymail[sendinblue]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
 django-anymail[sparkpost]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
-django-anymail==7.1.0  # https://github.com/anymail/django-anymail
+django-anymail==7.2  # https://github.com/anymail/django-anymail
 {%- endif %}

From 5500af7364e3ff0d2ead6b7100e8884e0ace785b Mon Sep 17 00:00:00 2001
From: Matthias Sieber <matthiasksieber@gmail.com>
Date: Mon, 27 Jul 2020 14:08:56 -0700
Subject: [PATCH 0888/2840] update Readme w/ current PostgreSQL version support

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 47f2bfb7d..ec663d3e1 100644
--- a/README.rst
+++ b/README.rst
@@ -96,7 +96,7 @@ Constraints
 -----------
 
 * Only maintained 3rd party libraries are used.
-* Uses PostgreSQL everywhere (9.4 - 11.3)
+* Uses PostgreSQL everywhere (9.4 - 12.3)
 * Environment variables for configuration (This won't work with Apache/mod_wsgi).
 
 Support this Project!

From d5d4941d2286671dd7f7eda19f0001b98dbb9095 Mon Sep 17 00:00:00 2001
From: Matthias Sieber <matthiasksieber@gmail.com>
Date: Mon, 27 Jul 2020 14:12:33 -0700
Subject: [PATCH 0889/2840] added to list of other contributors

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 875ece2ec..26bcec91d 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -181,6 +181,7 @@ Listed in alphabetical order.
   Matt Menzenski           `@menzenski`_
   Matt Warren              `@mfwarren`_
   Matthew Sisley           `@mjsisley`_
+  Matthias Sieber          `@manonthemat`                @MatzeOne
   Meghan Heintz            `@dot2dotseurat`_
   Mesut Yılmaz             `@myilmaz`_
   Michael Gecht            `@mimischi`_                  @_mischi

From 279175a3447b7754769a33a69441d9cd566025e0 Mon Sep 17 00:00:00 2001
From: Matthias Sieber <matthiasksieber@gmail.com>
Date: Mon, 27 Jul 2020 14:14:15 -0700
Subject: [PATCH 0890/2840] updated docs

---
 docs/project-generation-options.rst | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index 1c2fc3149..ec52e2183 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -49,11 +49,11 @@ use_docker:
 postgresql_version:
     Select a PostgreSQL_ version to use. The choices are:
 
-    1. 11.3
-    2. 10.8
-    3. 9.6
-    4. 9.5
-    5. 9.4
+    1. 12.3
+    2. 11.8
+    3. 10.8
+    4. 9.6
+    5. 9.5
 
 js_task_runner:
     Select a JavaScript task runner. The choices are:

From 84a3082527d322f4f9bd64ab0675ecd3a256d2af Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 28 Jul 2020 06:34:45 -0700
Subject: [PATCH 0891/2840] Update tox from 3.18.0 to 3.18.1

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

diff --git a/requirements.txt b/requirements.txt
index ac6c7f18d..b8235a820 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8-isort==3.0.1
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.18.0
+tox==3.18.1
 pytest==5.4.3
 pytest-cookies==0.5.1
 pytest-instafail==0.4.2

From 4b4bda783518954fa4816947a83a357ea8b0000a Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 28 Jul 2020 06:34:49 -0700
Subject: [PATCH 0892/2840] Update uvicorn from 0.11.6 to 0.11.7

---
 {{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 62ef3d325..3de679b4c 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -24,7 +24,7 @@ flower==0.9.5  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn==0.11.6  # https://github.com/encode/uvicorn
+uvicorn==0.11.7  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django

From 58882b6a7d169628aa37219967b79ce0ded25500 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 29 Jul 2020 12:32:19 +0100
Subject: [PATCH 0893/2840] Add missing link to Github profile

---
 CONTRIBUTORS.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 26bcec91d..f1b5e0f0e 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -181,7 +181,7 @@ Listed in alphabetical order.
   Matt Menzenski           `@menzenski`_
   Matt Warren              `@mfwarren`_
   Matthew Sisley           `@mjsisley`_
-  Matthias Sieber          `@manonthemat`                @MatzeOne
+  Matthias Sieber          `@manonthemat`_               @MatzeOne
   Meghan Heintz            `@dot2dotseurat`_
   Mesut Yılmaz             `@myilmaz`_
   Michael Gecht            `@mimischi`_                  @_mischi
@@ -350,6 +350,7 @@ Listed in alphabetical order.
 .. _@leollon: https://github.com/leollon
 .. _@MathijsHoogland: https://github.com/MathijsHoogland
 .. _@mapx: https://github.com/mapx
+.. _@manonthemat: https://github.com/manonthemat
 .. _@mattayes: https://github.com/mattayes
 .. _@menzenski: https://github.com/menzenski
 .. _@mfwarren: https://github.com/mfwarren

From 5754a79dbe54ba9c4a14afc0a111eca3138135f8 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 30 Jul 2020 16:54:49 -0700
Subject: [PATCH 0894/2840] Update pytest from 5.4.3 to 6.0.1

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

diff --git a/requirements.txt b/requirements.txt
index b8235a820..10a93f35f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ flake8-isort==3.0.1
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.18.1
-pytest==5.4.3
+pytest==6.0.1
 pytest-cookies==0.5.1
 pytest-instafail==0.4.2
 pyyaml==5.3.1

From b9b7e9b7ddf5af0ca135eeb5782a829723290f9b Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 30 Jul 2020 16:54:50 -0700
Subject: [PATCH 0895/2840] Update pytest from 5.4.3 to 6.0.1

---
 {{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 793d76778..7393a8694 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -15,7 +15,7 @@ watchgod==0.6  # https://github.com/samuelcolvin/watchgod
 # ------------------------------------------------------------------------------
 mypy==0.782  # https://github.com/python/mypy
 django-stubs==1.5.0  # https://github.com/typeddjango/django-stubs
-pytest==5.4.3  # https://github.com/pytest-dev/pytest
+pytest==6.0.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 
 # Documentation

From a5f6b56c38e53c245a1a8eadf3337cb6b8fc88e2 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 31 Jul 2020 10:04:55 -0700
Subject: [PATCH 0896/2840] Update uvicorn from 0.11.7 to 0.11.8

---
 {{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 3de679b4c..dcffc6717 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -24,7 +24,7 @@ flower==0.9.5  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn==0.11.7  # https://github.com/encode/uvicorn
+uvicorn==0.11.8  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django

From 7cf0bbdf0d024d0339bb72fc1b868be849926af6 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 31 Jul 2020 12:52:55 -0700
Subject: [PATCH 0897/2840] Update celery from 4.4.6 to 4.4.7

---
 {{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 3de679b4c..26d134b17 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -17,7 +17,7 @@ redis==3.5.3  # https://github.com/andymccurdy/redis-py
 hiredis==1.1.0  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
-celery==4.4.6  # pyup: < 5.0  # https://github.com/celery/celery
+celery==4.4.7  # pyup: < 5.0  # https://github.com/celery/celery
 django-celery-beat==2.0.0  # https://github.com/celery/django-celery-beat
 {%- if cookiecutter.use_docker == 'y' %}
 flower==0.9.5  # https://github.com/mher/flower

From db8de7dafcac18f3d3b3975b3b2e718b2ee42f8c Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 1 Aug 2020 14:41:44 -0700
Subject: [PATCH 0898/2840] Update sentry-sdk from 0.16.2 to 0.16.3

---
 {{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 5ae320073..617437679 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.16.2  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.16.3  # 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 7e8e10de92bcee48286f15e90a88d2dbeda60a50 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 3 Aug 2020 00:55:51 -0700
Subject: [PATCH 0899/2840] Update django from 3.0.8 to 3.0.9

---
 {{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 3de679b4c..c4fa95ec1 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,7 +29,7 @@ uvicorn==0.11.7  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.0.8  # pyup: < 3.1  # https://www.djangoproject.com/
+django==3.0.9  # pyup: < 3.1  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==4.0.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.42.0  # https://github.com/pennersr/django-allauth

From 4451f4505e0028cd5a5c36c608f67e3500a172b8 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 3 Aug 2020 10:00:47 +0200
Subject: [PATCH 0900/2840] Update template version to 3.0.8-01

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

diff --git a/setup.py b/setup.py
index f45db7540..3891548f2 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.0.8"
+version = "3.0.8-01"
 
 if sys.argv[-1] == "tag":
     os.system(f'git tag -a {version} -m "version {version}"')

From ed90a04bdb981e7e7c5c7419e2727a822f5efc01 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 3 Aug 2020 10:15:04 +0200
Subject: [PATCH 0901/2840] Update template version to 3.0.9

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

diff --git a/setup.py b/setup.py
index 3891548f2..d12165463 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.0.8-01"
+version = "3.0.9"
 
 if sys.argv[-1] == "tag":
     os.system(f'git tag -a {version} -m "version {version}"')

From 8a74fee736a59f5bada3677c8b4ab12f5101ecc6 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 4 Aug 2020 04:15:53 -0700
Subject: [PATCH 0902/2840] Update whitenoise from 5.1.0 to 5.2.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 369944f90..c6b6b61f8 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.1.0  # https://github.com/evansd/whitenoise
+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" %}

From dd6c76f3be0aec82ac131b7cbbd2ba8f12e6a789 Mon Sep 17 00:00:00 2001
From: Jan Fabry <jan.fabry@monkeyman.be>
Date: Tue, 4 Aug 2020 17:06:37 +0200
Subject: [PATCH 0903/2840] Run isort as pre-commit hook

Run it before flake8, so any errors will get fixed automatically.

Fixes #2711
---
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index 6aa9207a9..734a0a715 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -15,6 +15,11 @@ repos:
     hooks:
       - id: black
 
+  - repo: https://github.com/timothycrosley/isort
+    rev: 4.3.21
+    hooks:
+      - id: isort
+
   - repo: https://gitlab.com/pycqa/flake8
     rev: 3.8.3
     hooks:

From 4c9f338ec9e35b8c6af4a763c6b15c1bc1434ae7 Mon Sep 17 00:00:00 2001
From: Jan Fabry <jan.fabry@monkeyman.be>
Date: Tue, 4 Aug 2020 17:12:20 +0200
Subject: [PATCH 0904/2840] Update CONTRIBUTORS.md

Add myself, and fix link to @Sorasful
---
 CONTRIBUTORS.rst | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index f1b5e0f0e..eab2132fb 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -141,6 +141,7 @@ Listed in alphabetical order.
   Isaac12x                 `@Isaac12x`_
   Ivan Khomutov            `@ikhomutov`_
   James Williams           `@jameswilliams1`_
+  Jan Fabry                `@janfabry`_
   Jan Van Bruggen          `@jvanbrug`_
   Jelmer Draaijer          `@foarsitter`_
   Jerome Caisip            `@jeromecaisip`_
@@ -331,6 +332,7 @@ Listed in alphabetical order.
 .. _@ikkebr: https://github.com/ikkebr
 .. _@Isaac12x: https://github.com/Isaac12x
 .. _@iynaix: https://github.com/iynaix
+.. _@janfabry: https://github.com/janfabry
 .. _@jangeador: https://github.com/jangeador
 .. _@jazztpt: https://github.com/jazztpt
 .. _@jcass77: https://github.com/jcass77
@@ -392,7 +394,7 @@ Listed in alphabetical order.
 .. _@siauPatrick: https://github.com/siauPatrick
 .. _@sladinji: https://github.com/sladinji
 .. _@slafs: https://github.com/slafs
-.. _@sorasful:: https://github.com/sorasful
+.. _@sorasful: https://github.com/sorasful
 .. _@ssteinerX: https://github.com/ssteinerx
 .. _@step21: https://github.com/step21
 .. _@stepmr: https://github.com/stepmr

From 0ea47997e0022bf6fd21c263d3f47d079c136477 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 5 Aug 2020 04:44:48 -0700
Subject: [PATCH 0905/2840] Update djangorestframework from 3.11.0 to 3.11.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 c6b6b61f8..d24b50718 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -40,6 +40,6 @@ django-compressor==2.4  # https://github.com/django-compressor/django-compressor
 django-redis==4.12.1  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == "y" %}
 # Django REST Framework
-djangorestframework==3.11.0  # https://github.com/encode/django-rest-framework
+djangorestframework==3.11.1  # https://github.com/encode/django-rest-framework
 django-cors-headers==3.4.0 # https://github.com/adamchainz/django-cors-headers
 {%- endif %}

From e288f1ff4fed6a20c7b2795db13723da0d3d6cd9 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 5 Aug 2020 04:44:52 -0700
Subject: [PATCH 0906/2840] Update django-extensions from 3.0.3 to 3.0.4

---
 {{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 7393a8694..26b463e3b 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -40,6 +40,6 @@ pre-commit==2.6.0  # https://github.com/pre-commit/pre-commit
 factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==2.2  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==3.0.3  # https://github.com/django-extensions/django-extensions
+django-extensions==3.0.4  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.9.0  # https://github.com/pytest-dev/pytest-django

From 35a9a02baecf7213aea9282c2a2fc38c078b3f92 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 5 Aug 2020 05:39:58 -0700
Subject: [PATCH 0907/2840] Update pylint-django from 2.2.0 to 2.3.0

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

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 7393a8694..30fd2c7ed 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -29,7 +29,7 @@ flake8==3.8.3  # https://github.com/PyCQA/flake8
 flake8-isort==3.0.1  # https://github.com/gforcada/flake8-isort
 coverage==5.2.1  # https://github.com/nedbat/coveragepy
 black==19.10b0  # https://github.com/ambv/black
-pylint-django==2.2.0  # https://github.com/PyCQA/pylint-django
+pylint-django==2.3.0  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}

From 405be0114fb8e580e4bb8c388f64ab3513bdea03 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 5 Aug 2020 13:36:58 -0700
Subject: [PATCH 0908/2840] Update django-anymail from 7.2 to 7.2.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 617437679..a0deab597 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -22,7 +22,7 @@ django-storages[boto3]==1.9.1  # https://github.com/jschneier/django-storages
 django-storages[google]==1.9.1  # https://github.com/jschneier/django-storages
 {%- endif %}
 {%- if cookiecutter.mail_service == 'Mailgun' %}
-django-anymail[mailgun]==7.2  # https://github.com/anymail/django-anymail
+django-anymail[mailgun]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
 django-anymail[amazon_ses]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}

From e869f355b525c2d315cdbc6ba4e20757df22c07b Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 5 Aug 2020 13:36:59 -0700
Subject: [PATCH 0909/2840] Update django-anymail from 7.2 to 7.2.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 a0deab597..122e69614 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -24,7 +24,7 @@ django-storages[google]==1.9.1  # https://github.com/jschneier/django-storages
 {%- if cookiecutter.mail_service == 'Mailgun' %}
 django-anymail[mailgun]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
-django-anymail[amazon_ses]==7.2  # https://github.com/anymail/django-anymail
+django-anymail[amazon_ses]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
 django-anymail[mailjet]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}

From 9536e757732d7a404f288c52775230cd93377c67 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 5 Aug 2020 13:37:00 -0700
Subject: [PATCH 0910/2840] Update django-anymail from 7.2 to 7.2.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 122e69614..26a9a9894 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -26,7 +26,7 @@ django-anymail[mailgun]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
 django-anymail[amazon_ses]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
-django-anymail[mailjet]==7.2  # https://github.com/anymail/django-anymail
+django-anymail[mailjet]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
 django-anymail[mandrill]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}

From 0a6c8bf40f6b5cb15919a2504eaef1c55f6875f1 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 5 Aug 2020 13:37:01 -0700
Subject: [PATCH 0911/2840] Update django-anymail from 7.2 to 7.2.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 26a9a9894..f767af523 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -28,7 +28,7 @@ django-anymail[amazon_ses]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
 django-anymail[mailjet]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
-django-anymail[mandrill]==7.2  # https://github.com/anymail/django-anymail
+django-anymail[mandrill]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
 django-anymail[postmark]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}

From 0cbb2c46c42eb7097ab5e62d04ebf46d1bc69966 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 5 Aug 2020 13:37:01 -0700
Subject: [PATCH 0912/2840] Update django-anymail from 7.2 to 7.2.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 f767af523..3ea8c58a3 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -30,7 +30,7 @@ django-anymail[mailjet]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
 django-anymail[mandrill]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
-django-anymail[postmark]==7.2  # https://github.com/anymail/django-anymail
+django-anymail[postmark]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
 django-anymail[sendgrid]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}

From dac0ee23e44497468fba9981ce2210c9844be218 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 5 Aug 2020 13:37:02 -0700
Subject: [PATCH 0913/2840] Update django-anymail from 7.2 to 7.2.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 3ea8c58a3..ecbeee21d 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -32,7 +32,7 @@ django-anymail[mandrill]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
 django-anymail[postmark]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
-django-anymail[sendgrid]==7.2  # https://github.com/anymail/django-anymail
+django-anymail[sendgrid]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
 django-anymail[sendinblue]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}

From 92f466a3a772af46c9659838987ea2ab03008ac4 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 5 Aug 2020 13:37:03 -0700
Subject: [PATCH 0914/2840] Update django-anymail from 7.2 to 7.2.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 ecbeee21d..3556a5c32 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -34,7 +34,7 @@ django-anymail[postmark]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
 django-anymail[sendgrid]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
-django-anymail[sendinblue]==7.2  # https://github.com/anymail/django-anymail
+django-anymail[sendinblue]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
 django-anymail[sparkpost]==7.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}

From f65d5332aff2575e9a0994a4f64a078850bf2ad0 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 5 Aug 2020 13:37:04 -0700
Subject: [PATCH 0915/2840] Update django-anymail from 7.2 to 7.2.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 3556a5c32..dc8508ad7 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -36,7 +36,7 @@ django-anymail[sendgrid]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
 django-anymail[sendinblue]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
-django-anymail[sparkpost]==7.2  # https://github.com/anymail/django-anymail
+django-anymail[sparkpost]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
 django-anymail==7.2  # https://github.com/anymail/django-anymail
 {%- endif %}

From bdc9ad199796df7be308c365d1c2d0400153f3db Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 5 Aug 2020 13:37:05 -0700
Subject: [PATCH 0916/2840] Update django-anymail from 7.2 to 7.2.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 dc8508ad7..385c7489f 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -38,5 +38,5 @@ django-anymail[sendinblue]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
 django-anymail[sparkpost]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
-django-anymail==7.2  # https://github.com/anymail/django-anymail
+django-anymail==7.2.1  # https://github.com/anymail/django-anymail
 {%- endif %}

From 1fe32f1bbaf5b13b4d12069b76ac74b434ee0c5b Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 6 Aug 2020 10:44:47 -0700
Subject: [PATCH 0917/2840] Update tox from 3.18.1 to 3.19.0

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

diff --git a/requirements.txt b/requirements.txt
index 10a93f35f..1fbc8d165 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8-isort==3.0.1
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.18.1
+tox==3.19.0
 pytest==6.0.1
 pytest-cookies==0.5.1
 pytest-instafail==0.4.2

From 2dc212581762721250f41ad2ed27f240396be38c Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 8 Aug 2020 15:39:21 -0700
Subject: [PATCH 0918/2840] Update sphinx from 3.1.2 to 3.2.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 5e87d0d0d..73c7533e9 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==3.1.2  # https://github.com/sphinx-doc/sphinx
+sphinx==3.2.0  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==0.7.1 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From dc0347871716ac35d390bcf2b560ab3779cbf311 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 10 Aug 2020 02:38:22 -0700
Subject: [PATCH 0919/2840] Update django-extensions from 3.0.4 to 3.0.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 73c7533e9..028b36a94 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -40,6 +40,6 @@ pre-commit==2.6.0  # https://github.com/pre-commit/pre-commit
 factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==2.2  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==3.0.4  # https://github.com/django-extensions/django-extensions
+django-extensions==3.0.5  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.9.0  # https://github.com/pytest-dev/pytest-django

From 5ba525ad095b92157dc54c84da1ee21d92d48f30 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 3 Aug 2020 09:57:44 +0200
Subject: [PATCH 0920/2840] Automatically update list of contributors

---
 .github/browniebroke.json                 |   34 +
 .github/commits.json                      | 2417 +++++++++++++++++++++
 .github/contributors.json                 |  991 +++++++++
 .github/workflows/update-contributors.yml |   26 +
 .gitignore                                |    1 -
 CONTRIBUTORS.md                           |   96 +
 CONTRIBUTORS.rst                          |    4 +-
 requirements.txt                          |    5 +
 scripts/__init__.py                       |    1 +
 scripts/rst_to_json.py                    |  102 +
 scripts/update_contributors.py            |  130 ++
 11 files changed, 3804 insertions(+), 3 deletions(-)
 create mode 100644 .github/browniebroke.json
 create mode 100644 .github/commits.json
 create mode 100644 .github/contributors.json
 create mode 100644 .github/workflows/update-contributors.yml
 create mode 100644 CONTRIBUTORS.md
 create mode 100644 scripts/__init__.py
 create mode 100644 scripts/rst_to_json.py
 create mode 100644 scripts/update_contributors.py

diff --git a/.github/browniebroke.json b/.github/browniebroke.json
new file mode 100644
index 000000000..9f9199319
--- /dev/null
+++ b/.github/browniebroke.json
@@ -0,0 +1,34 @@
+{
+  "login": "browniebroke",
+  "id": 861044,
+  "node_id": "MDQ6VXNlcjg2MTA0NA==",
+  "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
+  "gravatar_id": "",
+  "url": "https://api.github.com/users/browniebroke",
+  "html_url": "https://github.com/browniebroke",
+  "followers_url": "https://api.github.com/users/browniebroke/followers",
+  "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
+  "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
+  "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
+  "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
+  "organizations_url": "https://api.github.com/users/browniebroke/orgs",
+  "repos_url": "https://api.github.com/users/browniebroke/repos",
+  "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
+  "received_events_url": "https://api.github.com/users/browniebroke/received_events",
+  "type": "User",
+  "site_admin": false,
+  "name": "Bruno Alla",
+  "company": "Festicket",
+  "blog": "https://browniebroke.com",
+  "location": "London, UK",
+  "email": null,
+  "hireable": null,
+  "bio": null,
+  "twitter_username": "_BrunoAlla",
+  "public_repos": 149,
+  "public_gists": 5,
+  "followers": 70,
+  "following": 73,
+  "created_at": "2011-06-20T07:06:17Z",
+  "updated_at": "2020-07-27T15:48:03Z"
+}
diff --git a/.github/commits.json b/.github/commits.json
new file mode 100644
index 000000000..69e6c72a9
--- /dev/null
+++ b/.github/commits.json
@@ -0,0 +1,2417 @@
+[
+  {
+    "sha": "58882b6a7d169628aa37219967b79ce0ded25500",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6NTg4ODJiNmE3ZDE2OTYyOGFhMzcyMTk5NjdiNzljZTBkZWQyNTUwMA==",
+    "commit": {
+      "author": {
+        "name": "Bruno Alla",
+        "email": "browniebroke@users.noreply.github.com",
+        "date": "2020-07-29T11:32:19Z"
+      },
+      "committer": {
+        "name": "Bruno Alla",
+        "email": "browniebroke@users.noreply.github.com",
+        "date": "2020-07-29T11:32:19Z"
+      },
+      "message": "Add missing link to Github profile",
+      "tree": {
+        "sha": "0ab2decf022f1cdbd319e2d5a897144c80dabc48",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/0ab2decf022f1cdbd319e2d5a897144c80dabc48"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/58882b6a7d169628aa37219967b79ce0ded25500",
+      "comment_count": 0,
+      "verification": {
+        "verified": false,
+        "reason": "unsigned",
+        "signature": null,
+        "payload": null
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/58882b6a7d169628aa37219967b79ce0ded25500",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/58882b6a7d169628aa37219967b79ce0ded25500",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/58882b6a7d169628aa37219967b79ce0ded25500/comments",
+    "author": {
+      "login": "browniebroke",
+      "id": 861044,
+      "node_id": "MDQ6VXNlcjg2MTA0NA==",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/browniebroke",
+      "html_url": "https://github.com/browniebroke",
+      "followers_url": "https://api.github.com/users/browniebroke/followers",
+      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
+      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
+      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
+      "repos_url": "https://api.github.com/users/browniebroke/repos",
+      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "browniebroke",
+      "id": 861044,
+      "node_id": "MDQ6VXNlcjg2MTA0NA==",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/browniebroke",
+      "html_url": "https://github.com/browniebroke",
+      "followers_url": "https://api.github.com/users/browniebroke/followers",
+      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
+      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
+      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
+      "repos_url": "https://api.github.com/users/browniebroke/repos",
+      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "b148740a212a5c1ec57f6749315117cb6944236f",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/b148740a212a5c1ec57f6749315117cb6944236f",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/b148740a212a5c1ec57f6749315117cb6944236f"
+      }
+    ]
+  },
+  {
+    "sha": "b148740a212a5c1ec57f6749315117cb6944236f",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6YjE0ODc0MGEyMTJhNWMxZWM1N2Y2NzQ5MzE1MTE3Y2I2OTQ0MjM2Zg==",
+    "commit": {
+      "author": {
+        "name": "Bruno Alla",
+        "email": "browniebroke@users.noreply.github.com",
+        "date": "2020-07-29T08:29:30Z"
+      },
+      "committer": {
+        "name": "GitHub",
+        "email": "noreply@github.com",
+        "date": "2020-07-29T08:29:30Z"
+      },
+      "message": "Merge pull request #2707 from pydanny/pyup-update-uvicorn-0.11.6-to-0.11.7\n\nUpdate uvicorn to 0.11.7",
+      "tree": {
+        "sha": "9ca4e7226bdd7aae06fff696382f0fa0c70da970",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/9ca4e7226bdd7aae06fff696382f0fa0c70da970"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/b148740a212a5c1ec57f6749315117cb6944236f",
+      "comment_count": 0,
+      "verification": {
+        "verified": true,
+        "reason": "valid",
+        "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfITNqCRBK7hj4Ov3rIwAAdHIIAG3B72SRxhLE4zvAi3CKWXJd\nMHL4JSe6JNxPME3si8AxmG3SJCTo4V6yZkpnmq5mRwgk4x5q3ofQOyZBDOhWaX9d\nFLOk0fSP266zw2oSY0ilsaS7sFxnlo98Cdr3ZJKdaKv5ldSgXeotwD2yavQbP7Rx\njT04r/9tMYuRY0nQJvJ+7HF9PVWm4ecokf9iHU9Iz/sG5SS7fNLrRFcMb+fZ6OKt\nQ1sBS1++Lnkk+IMR1r7H09+ANjCeUeuPbxUWj+cVMr0PNAsTjU213pMoTpYVY7bY\nnUF4XLz36ohhFlTBLHLMwYRwgCagh6y83iWQUaJHa+E0sgMBBcAaljm7DfNjFtM=\n=sEH3\n-----END PGP SIGNATURE-----\n",
+        "payload": "tree 9ca4e7226bdd7aae06fff696382f0fa0c70da970\nparent d41bf740b43bba0084307e24dcdbdea128bf45f7\nparent 4b4bda783518954fa4816947a83a357ea8b0000a\nauthor Bruno Alla <browniebroke@users.noreply.github.com> 1596011370 +0100\ncommitter GitHub <noreply@github.com> 1596011370 +0100\n\nMerge pull request #2707 from pydanny/pyup-update-uvicorn-0.11.6-to-0.11.7\n\nUpdate uvicorn to 0.11.7"
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/b148740a212a5c1ec57f6749315117cb6944236f",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/b148740a212a5c1ec57f6749315117cb6944236f",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/b148740a212a5c1ec57f6749315117cb6944236f/comments",
+    "author": {
+      "login": "browniebroke",
+      "id": 861044,
+      "node_id": "MDQ6VXNlcjg2MTA0NA==",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/browniebroke",
+      "html_url": "https://github.com/browniebroke",
+      "followers_url": "https://api.github.com/users/browniebroke/followers",
+      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
+      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
+      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
+      "repos_url": "https://api.github.com/users/browniebroke/repos",
+      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "web-flow",
+      "id": 19864447,
+      "node_id": "MDQ6VXNlcjE5ODY0NDQ3",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/web-flow",
+      "html_url": "https://github.com/web-flow",
+      "followers_url": "https://api.github.com/users/web-flow/followers",
+      "following_url": "https://api.github.com/users/web-flow/following{/other_user}",
+      "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions",
+      "organizations_url": "https://api.github.com/users/web-flow/orgs",
+      "repos_url": "https://api.github.com/users/web-flow/repos",
+      "events_url": "https://api.github.com/users/web-flow/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/web-flow/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "d41bf740b43bba0084307e24dcdbdea128bf45f7",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/d41bf740b43bba0084307e24dcdbdea128bf45f7",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/d41bf740b43bba0084307e24dcdbdea128bf45f7"
+      },
+      {
+        "sha": "4b4bda783518954fa4816947a83a357ea8b0000a",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/4b4bda783518954fa4816947a83a357ea8b0000a",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/4b4bda783518954fa4816947a83a357ea8b0000a"
+      }
+    ]
+  },
+  {
+    "sha": "d41bf740b43bba0084307e24dcdbdea128bf45f7",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6ZDQxYmY3NDBiNDNiYmEwMDg0MzA3ZTI0ZGNkYmRlYTEyOGJmNDVmNw==",
+    "commit": {
+      "author": {
+        "name": "Bruno Alla",
+        "email": "browniebroke@users.noreply.github.com",
+        "date": "2020-07-29T08:28:28Z"
+      },
+      "committer": {
+        "name": "GitHub",
+        "email": "noreply@github.com",
+        "date": "2020-07-29T08:28:28Z"
+      },
+      "message": "Merge pull request #2706 from pydanny/pyup-update-tox-3.18.0-to-3.18.1\n\nUpdate tox to 3.18.1",
+      "tree": {
+        "sha": "4e42b5dad2bdbeaf7431eee6b4ce34349cefa277",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/4e42b5dad2bdbeaf7431eee6b4ce34349cefa277"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/d41bf740b43bba0084307e24dcdbdea128bf45f7",
+      "comment_count": 0,
+      "verification": {
+        "verified": true,
+        "reason": "valid",
+        "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfITMsCRBK7hj4Ov3rIwAAdHIIAETVssfXHqUeUnUUXbZfxCyY\nNcJ5Uj2K6AfKt9DyM2/5UdqzDIRb3WNrAt+rjaZvlu3onUPKKJAiP38hMIZklTiJ\nLuqMema8u0ED3h3TpgLcUlpziNCEzFRkANg/XVvhYQc9uVnzVRD375NXyRYuUtZw\nBc9C/l5D0P/hsAYxzgaxg+bVqyqNfzHB+e+/FIyGbgYaVetMydaey2uDCWk/Wd7z\n1u9DVRnK8KylkkUEN7Swjz4PFftyHlCmWNJ9Ee4mTrOIhiAOZlzfkMz3ihTiZnrp\nxfN8eUqjSEsIPXEaMTgedtm8WfuOgR5dTTgpmcB9/L1NZslTJ91dwgpkcvj0Odg=\n=TCyB\n-----END PGP SIGNATURE-----\n",
+        "payload": "tree 4e42b5dad2bdbeaf7431eee6b4ce34349cefa277\nparent 0f1dfdd72edc05f5c56fceeb0ab5632458f72c12\nparent 84a3082527d322f4f9bd64ab0675ecd3a256d2af\nauthor Bruno Alla <browniebroke@users.noreply.github.com> 1596011308 +0100\ncommitter GitHub <noreply@github.com> 1596011308 +0100\n\nMerge pull request #2706 from pydanny/pyup-update-tox-3.18.0-to-3.18.1\n\nUpdate tox to 3.18.1"
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/d41bf740b43bba0084307e24dcdbdea128bf45f7",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/d41bf740b43bba0084307e24dcdbdea128bf45f7",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/d41bf740b43bba0084307e24dcdbdea128bf45f7/comments",
+    "author": {
+      "login": "browniebroke",
+      "id": 861044,
+      "node_id": "MDQ6VXNlcjg2MTA0NA==",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/browniebroke",
+      "html_url": "https://github.com/browniebroke",
+      "followers_url": "https://api.github.com/users/browniebroke/followers",
+      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
+      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
+      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
+      "repos_url": "https://api.github.com/users/browniebroke/repos",
+      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "web-flow",
+      "id": 19864447,
+      "node_id": "MDQ6VXNlcjE5ODY0NDQ3",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/web-flow",
+      "html_url": "https://github.com/web-flow",
+      "followers_url": "https://api.github.com/users/web-flow/followers",
+      "following_url": "https://api.github.com/users/web-flow/following{/other_user}",
+      "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions",
+      "organizations_url": "https://api.github.com/users/web-flow/orgs",
+      "repos_url": "https://api.github.com/users/web-flow/repos",
+      "events_url": "https://api.github.com/users/web-flow/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/web-flow/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "0f1dfdd72edc05f5c56fceeb0ab5632458f72c12",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12"
+      },
+      {
+        "sha": "84a3082527d322f4f9bd64ab0675ecd3a256d2af",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/84a3082527d322f4f9bd64ab0675ecd3a256d2af",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/84a3082527d322f4f9bd64ab0675ecd3a256d2af"
+      }
+    ]
+  },
+  {
+    "sha": "4b4bda783518954fa4816947a83a357ea8b0000a",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6NGI0YmRhNzgzNTE4OTU0ZmE0ODE2OTQ3YTgzYTM1N2VhOGIwMDAwYQ==",
+    "commit": {
+      "author": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-28T13:34:49Z"
+      },
+      "committer": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-28T13:34:49Z"
+      },
+      "message": "Update uvicorn from 0.11.6 to 0.11.7",
+      "tree": {
+        "sha": "d9ddd166ad5771852efcc336de4a94b072562c1f",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/d9ddd166ad5771852efcc336de4a94b072562c1f"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/4b4bda783518954fa4816947a83a357ea8b0000a",
+      "comment_count": 0,
+      "verification": {
+        "verified": false,
+        "reason": "unsigned",
+        "signature": null,
+        "payload": null
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/4b4bda783518954fa4816947a83a357ea8b0000a",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/4b4bda783518954fa4816947a83a357ea8b0000a",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/4b4bda783518954fa4816947a83a357ea8b0000a/comments",
+    "author": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "0f1dfdd72edc05f5c56fceeb0ab5632458f72c12",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12"
+      }
+    ]
+  },
+  {
+    "sha": "84a3082527d322f4f9bd64ab0675ecd3a256d2af",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6ODRhMzA4MjUyN2QzMjJmNGY5YmQ2NGFiMDY3NWVjZDNhMjU2ZDJhZg==",
+    "commit": {
+      "author": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-28T13:34:45Z"
+      },
+      "committer": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-28T13:34:45Z"
+      },
+      "message": "Update tox from 3.18.0 to 3.18.1",
+      "tree": {
+        "sha": "4e42b5dad2bdbeaf7431eee6b4ce34349cefa277",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/4e42b5dad2bdbeaf7431eee6b4ce34349cefa277"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/84a3082527d322f4f9bd64ab0675ecd3a256d2af",
+      "comment_count": 0,
+      "verification": {
+        "verified": false,
+        "reason": "unsigned",
+        "signature": null,
+        "payload": null
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/84a3082527d322f4f9bd64ab0675ecd3a256d2af",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/84a3082527d322f4f9bd64ab0675ecd3a256d2af",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/84a3082527d322f4f9bd64ab0675ecd3a256d2af/comments",
+    "author": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "0f1dfdd72edc05f5c56fceeb0ab5632458f72c12",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12"
+      }
+    ]
+  },
+  {
+    "sha": "0f1dfdd72edc05f5c56fceeb0ab5632458f72c12",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6MGYxZGZkZDcyZWRjMDVmNWM1NmZjZWViMGFiNTYzMjQ1OGY3MmMxMg==",
+    "commit": {
+      "author": {
+        "name": "Fábio C. Barrionuevo da Luz",
+        "email": "bnafta@gmail.com",
+        "date": "2020-07-27T21:22:54Z"
+      },
+      "committer": {
+        "name": "GitHub",
+        "email": "noreply@github.com",
+        "date": "2020-07-27T21:22:54Z"
+      },
+      "message": "Merge pull request #2704 from manonthemat/master\n\nAdded most recent supported PostgreSQL version in documentation",
+      "tree": {
+        "sha": "65b3bf322fc9661584a23fb498566e56d3d81f5a",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/65b3bf322fc9661584a23fb498566e56d3d81f5a"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12",
+      "comment_count": 0,
+      "verification": {
+        "verified": true,
+        "reason": "valid",
+        "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfH0WuCRBK7hj4Ov3rIwAAdHIIAIHvd/XGFoeYyWFPH0i8T9nZ\nCn0jCJTcV4sgzUt2NrvCniNotKUzJAIguAcQpZACNhrzHwL5vSi7FoOtNtqyy5L8\nLI6aonjcS9D8Ug2LvnSAJpQ9R/BR1VDWNPsHytWbeHDjmVfXRmX9Ngt+GvUPMMUV\nu+k2QXQtLaLzSusDuwMWgO7ekfwJrrPXou9MF0GGbRDEtVHEz14vdgM7cJ2Y/O42\nObfDAQyL1KEn6jgJR55hZzQgAYPl5tO5q3FCpRWyVzlK0ZgMNvSDykxJ/h4KfAtj\n8VId/yKH2odHHgYeT+xkx638bI13XEDUL0FibyWBA13XqriUDVEf2sRslE24d04=\n=p3nH\n-----END PGP SIGNATURE-----\n",
+        "payload": "tree 65b3bf322fc9661584a23fb498566e56d3d81f5a\nparent a4f7fb41d77679ff11891c0c04bf38c1a2712086\nparent 279175a3447b7754769a33a69441d9cd566025e0\nauthor Fábio C. Barrionuevo da Luz <bnafta@gmail.com> 1595884974 -0300\ncommitter GitHub <noreply@github.com> 1595884974 -0300\n\nMerge pull request #2704 from manonthemat/master\n\nAdded most recent supported PostgreSQL version in documentation"
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12/comments",
+    "author": {
+      "login": "luzfcb",
+      "id": 807599,
+      "node_id": "MDQ6VXNlcjgwNzU5OQ==",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/807599?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/luzfcb",
+      "html_url": "https://github.com/luzfcb",
+      "followers_url": "https://api.github.com/users/luzfcb/followers",
+      "following_url": "https://api.github.com/users/luzfcb/following{/other_user}",
+      "gists_url": "https://api.github.com/users/luzfcb/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/luzfcb/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/luzfcb/subscriptions",
+      "organizations_url": "https://api.github.com/users/luzfcb/orgs",
+      "repos_url": "https://api.github.com/users/luzfcb/repos",
+      "events_url": "https://api.github.com/users/luzfcb/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/luzfcb/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "web-flow",
+      "id": 19864447,
+      "node_id": "MDQ6VXNlcjE5ODY0NDQ3",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/web-flow",
+      "html_url": "https://github.com/web-flow",
+      "followers_url": "https://api.github.com/users/web-flow/followers",
+      "following_url": "https://api.github.com/users/web-flow/following{/other_user}",
+      "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions",
+      "organizations_url": "https://api.github.com/users/web-flow/orgs",
+      "repos_url": "https://api.github.com/users/web-flow/repos",
+      "events_url": "https://api.github.com/users/web-flow/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/web-flow/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "a4f7fb41d77679ff11891c0c04bf38c1a2712086",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a4f7fb41d77679ff11891c0c04bf38c1a2712086",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/a4f7fb41d77679ff11891c0c04bf38c1a2712086"
+      },
+      {
+        "sha": "279175a3447b7754769a33a69441d9cd566025e0",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/279175a3447b7754769a33a69441d9cd566025e0",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/279175a3447b7754769a33a69441d9cd566025e0"
+      }
+    ]
+  },
+  {
+    "sha": "279175a3447b7754769a33a69441d9cd566025e0",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6Mjc5MTc1YTM0NDdiNzc1NDc2OWEzM2E2OTQ0MWQ5Y2Q1NjYwMjVlMA==",
+    "commit": {
+      "author": {
+        "name": "Matthias Sieber",
+        "email": "matthiasksieber@gmail.com",
+        "date": "2020-07-27T21:14:15Z"
+      },
+      "committer": {
+        "name": "Matthias Sieber",
+        "email": "matthiasksieber@gmail.com",
+        "date": "2020-07-27T21:14:15Z"
+      },
+      "message": "updated docs",
+      "tree": {
+        "sha": "65b3bf322fc9661584a23fb498566e56d3d81f5a",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/65b3bf322fc9661584a23fb498566e56d3d81f5a"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/279175a3447b7754769a33a69441d9cd566025e0",
+      "comment_count": 0,
+      "verification": {
+        "verified": false,
+        "reason": "unsigned",
+        "signature": null,
+        "payload": null
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/279175a3447b7754769a33a69441d9cd566025e0",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/279175a3447b7754769a33a69441d9cd566025e0",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/279175a3447b7754769a33a69441d9cd566025e0/comments",
+    "author": {
+      "login": "manonthemat",
+      "id": 5065940,
+      "node_id": "MDQ6VXNlcjUwNjU5NDA=",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/5065940?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/manonthemat",
+      "html_url": "https://github.com/manonthemat",
+      "followers_url": "https://api.github.com/users/manonthemat/followers",
+      "following_url": "https://api.github.com/users/manonthemat/following{/other_user}",
+      "gists_url": "https://api.github.com/users/manonthemat/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/manonthemat/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/manonthemat/subscriptions",
+      "organizations_url": "https://api.github.com/users/manonthemat/orgs",
+      "repos_url": "https://api.github.com/users/manonthemat/repos",
+      "events_url": "https://api.github.com/users/manonthemat/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/manonthemat/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "manonthemat",
+      "id": 5065940,
+      "node_id": "MDQ6VXNlcjUwNjU5NDA=",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/5065940?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/manonthemat",
+      "html_url": "https://github.com/manonthemat",
+      "followers_url": "https://api.github.com/users/manonthemat/followers",
+      "following_url": "https://api.github.com/users/manonthemat/following{/other_user}",
+      "gists_url": "https://api.github.com/users/manonthemat/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/manonthemat/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/manonthemat/subscriptions",
+      "organizations_url": "https://api.github.com/users/manonthemat/orgs",
+      "repos_url": "https://api.github.com/users/manonthemat/repos",
+      "events_url": "https://api.github.com/users/manonthemat/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/manonthemat/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "d5d4941d2286671dd7f7eda19f0001b98dbb9095",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/d5d4941d2286671dd7f7eda19f0001b98dbb9095",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/d5d4941d2286671dd7f7eda19f0001b98dbb9095"
+      }
+    ]
+  },
+  {
+    "sha": "d5d4941d2286671dd7f7eda19f0001b98dbb9095",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6ZDVkNDk0MWQyMjg2NjcxZGQ3ZjdlZGExOWYwMDAxYjk4ZGJiOTA5NQ==",
+    "commit": {
+      "author": {
+        "name": "Matthias Sieber",
+        "email": "matthiasksieber@gmail.com",
+        "date": "2020-07-27T21:12:33Z"
+      },
+      "committer": {
+        "name": "Matthias Sieber",
+        "email": "matthiasksieber@gmail.com",
+        "date": "2020-07-27T21:12:33Z"
+      },
+      "message": "added to list of other contributors",
+      "tree": {
+        "sha": "deb68fe1649f8b5346277947378d224645d52aff",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/deb68fe1649f8b5346277947378d224645d52aff"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/d5d4941d2286671dd7f7eda19f0001b98dbb9095",
+      "comment_count": 0,
+      "verification": {
+        "verified": false,
+        "reason": "unsigned",
+        "signature": null,
+        "payload": null
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/d5d4941d2286671dd7f7eda19f0001b98dbb9095",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/d5d4941d2286671dd7f7eda19f0001b98dbb9095",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/d5d4941d2286671dd7f7eda19f0001b98dbb9095/comments",
+    "author": {
+      "login": "manonthemat",
+      "id": 5065940,
+      "node_id": "MDQ6VXNlcjUwNjU5NDA=",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/5065940?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/manonthemat",
+      "html_url": "https://github.com/manonthemat",
+      "followers_url": "https://api.github.com/users/manonthemat/followers",
+      "following_url": "https://api.github.com/users/manonthemat/following{/other_user}",
+      "gists_url": "https://api.github.com/users/manonthemat/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/manonthemat/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/manonthemat/subscriptions",
+      "organizations_url": "https://api.github.com/users/manonthemat/orgs",
+      "repos_url": "https://api.github.com/users/manonthemat/repos",
+      "events_url": "https://api.github.com/users/manonthemat/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/manonthemat/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "manonthemat",
+      "id": 5065940,
+      "node_id": "MDQ6VXNlcjUwNjU5NDA=",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/5065940?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/manonthemat",
+      "html_url": "https://github.com/manonthemat",
+      "followers_url": "https://api.github.com/users/manonthemat/followers",
+      "following_url": "https://api.github.com/users/manonthemat/following{/other_user}",
+      "gists_url": "https://api.github.com/users/manonthemat/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/manonthemat/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/manonthemat/subscriptions",
+      "organizations_url": "https://api.github.com/users/manonthemat/orgs",
+      "repos_url": "https://api.github.com/users/manonthemat/repos",
+      "events_url": "https://api.github.com/users/manonthemat/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/manonthemat/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "5500af7364e3ff0d2ead6b7100e8884e0ace785b",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/5500af7364e3ff0d2ead6b7100e8884e0ace785b",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/5500af7364e3ff0d2ead6b7100e8884e0ace785b"
+      }
+    ]
+  },
+  {
+    "sha": "5500af7364e3ff0d2ead6b7100e8884e0ace785b",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6NTUwMGFmNzM2NGUzZmYwZDJlYWQ2YjcxMDBlODg4NGUwYWNlNzg1Yg==",
+    "commit": {
+      "author": {
+        "name": "Matthias Sieber",
+        "email": "matthiasksieber@gmail.com",
+        "date": "2020-07-27T21:08:56Z"
+      },
+      "committer": {
+        "name": "Matthias Sieber",
+        "email": "matthiasksieber@gmail.com",
+        "date": "2020-07-27T21:08:56Z"
+      },
+      "message": "update Readme w/ current PostgreSQL version support",
+      "tree": {
+        "sha": "76b325e32d6e4ad0ce77075efc485722922180ca",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/76b325e32d6e4ad0ce77075efc485722922180ca"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/5500af7364e3ff0d2ead6b7100e8884e0ace785b",
+      "comment_count": 0,
+      "verification": {
+        "verified": false,
+        "reason": "unsigned",
+        "signature": null,
+        "payload": null
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/5500af7364e3ff0d2ead6b7100e8884e0ace785b",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/5500af7364e3ff0d2ead6b7100e8884e0ace785b",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/5500af7364e3ff0d2ead6b7100e8884e0ace785b/comments",
+    "author": {
+      "login": "manonthemat",
+      "id": 5065940,
+      "node_id": "MDQ6VXNlcjUwNjU5NDA=",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/5065940?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/manonthemat",
+      "html_url": "https://github.com/manonthemat",
+      "followers_url": "https://api.github.com/users/manonthemat/followers",
+      "following_url": "https://api.github.com/users/manonthemat/following{/other_user}",
+      "gists_url": "https://api.github.com/users/manonthemat/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/manonthemat/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/manonthemat/subscriptions",
+      "organizations_url": "https://api.github.com/users/manonthemat/orgs",
+      "repos_url": "https://api.github.com/users/manonthemat/repos",
+      "events_url": "https://api.github.com/users/manonthemat/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/manonthemat/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "manonthemat",
+      "id": 5065940,
+      "node_id": "MDQ6VXNlcjUwNjU5NDA=",
+      "avatar_url": "https://avatars2.githubusercontent.com/u/5065940?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/manonthemat",
+      "html_url": "https://github.com/manonthemat",
+      "followers_url": "https://api.github.com/users/manonthemat/followers",
+      "following_url": "https://api.github.com/users/manonthemat/following{/other_user}",
+      "gists_url": "https://api.github.com/users/manonthemat/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/manonthemat/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/manonthemat/subscriptions",
+      "organizations_url": "https://api.github.com/users/manonthemat/orgs",
+      "repos_url": "https://api.github.com/users/manonthemat/repos",
+      "events_url": "https://api.github.com/users/manonthemat/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/manonthemat/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "a4f7fb41d77679ff11891c0c04bf38c1a2712086",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a4f7fb41d77679ff11891c0c04bf38c1a2712086",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/a4f7fb41d77679ff11891c0c04bf38c1a2712086"
+      }
+    ]
+  },
+  {
+    "sha": "a4f7fb41d77679ff11891c0c04bf38c1a2712086",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6YTRmN2ZiNDFkNzc2NzlmZjExODkxYzBjMDRiZjM4YzFhMjcxMjA4Ng==",
+    "commit": {
+      "author": {
+        "name": "Bruno Alla",
+        "email": "browniebroke@users.noreply.github.com",
+        "date": "2020-07-26T15:07:29Z"
+      },
+      "committer": {
+        "name": "GitHub",
+        "email": "noreply@github.com",
+        "date": "2020-07-26T15:07:29Z"
+      },
+      "message": "Merge pull request #2702 from pydanny/pyup-update-django-anymail-7.1.0-to-7.2",
+      "tree": {
+        "sha": "0375fcc81dcd9233ec3f230f56cc22ee203dae6e",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/0375fcc81dcd9233ec3f230f56cc22ee203dae6e"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/a4f7fb41d77679ff11891c0c04bf38c1a2712086",
+      "comment_count": 0,
+      "verification": {
+        "verified": true,
+        "reason": "valid",
+        "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfHZwxCRBK7hj4Ov3rIwAAdHIIABXB6C6RqSDq9/p853HsQlTq\nUS4hczA2CkyBsf3j7v+bxchKq3t6ilG6XOhnuaTYA9PcfOb8cXYjVl1prmZZ/wO0\nczIZ1qlo5lMJWr6OGvo5/oY58LM7zbq8LDpBz/v5qghBbL9GDMbF8gwmyS2CH+DV\nzPRwzf3P0q9mbBXgw/t1lkUJ5C3KzM/lYaBI0SdZJR39HM7FbOuOTytkHuyr+SPw\nPRUo0CMoTiaGXikdNF8QaYDnEMZ+3pr1rTt3dkejivRlgrNLnhEKOsS1LU/tlyyP\ndah6pgIk7Q2b7PndjHwjpqTK4uBXX1g410gxMrPck48hRXh06qUzRqg43/Fq/RI=\n=bQej\n-----END PGP SIGNATURE-----\n",
+        "payload": "tree 0375fcc81dcd9233ec3f230f56cc22ee203dae6e\nparent 08a15337b35e1c11d9ef1494e9550ceaee7e9e72\nparent c3391c957284f6ec956a0ee2043e2389fb34e0db\nauthor Bruno Alla <browniebroke@users.noreply.github.com> 1595776049 +0100\ncommitter GitHub <noreply@github.com> 1595776049 +0100\n\nMerge pull request #2702 from pydanny/pyup-update-django-anymail-7.1.0-to-7.2\n\n"
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a4f7fb41d77679ff11891c0c04bf38c1a2712086",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/a4f7fb41d77679ff11891c0c04bf38c1a2712086",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a4f7fb41d77679ff11891c0c04bf38c1a2712086/comments",
+    "author": {
+      "login": "browniebroke",
+      "id": 861044,
+      "node_id": "MDQ6VXNlcjg2MTA0NA==",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/browniebroke",
+      "html_url": "https://github.com/browniebroke",
+      "followers_url": "https://api.github.com/users/browniebroke/followers",
+      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
+      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
+      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
+      "repos_url": "https://api.github.com/users/browniebroke/repos",
+      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "web-flow",
+      "id": 19864447,
+      "node_id": "MDQ6VXNlcjE5ODY0NDQ3",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/web-flow",
+      "html_url": "https://github.com/web-flow",
+      "followers_url": "https://api.github.com/users/web-flow/followers",
+      "following_url": "https://api.github.com/users/web-flow/following{/other_user}",
+      "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions",
+      "organizations_url": "https://api.github.com/users/web-flow/orgs",
+      "repos_url": "https://api.github.com/users/web-flow/repos",
+      "events_url": "https://api.github.com/users/web-flow/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/web-flow/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "08a15337b35e1c11d9ef1494e9550ceaee7e9e72",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/08a15337b35e1c11d9ef1494e9550ceaee7e9e72",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/08a15337b35e1c11d9ef1494e9550ceaee7e9e72"
+      },
+      {
+        "sha": "c3391c957284f6ec956a0ee2043e2389fb34e0db",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/c3391c957284f6ec956a0ee2043e2389fb34e0db",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/c3391c957284f6ec956a0ee2043e2389fb34e0db"
+      }
+    ]
+  },
+  {
+    "sha": "c3391c957284f6ec956a0ee2043e2389fb34e0db",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6YzMzOTFjOTU3Mjg0ZjZlYzk1NmEwZWUyMDQzZTIzODlmYjM0ZTBkYg==",
+    "commit": {
+      "author": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-25T19:51:40Z"
+      },
+      "committer": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-25T19:51:40Z"
+      },
+      "message": "Update django-anymail from 7.1.0 to 7.2",
+      "tree": {
+        "sha": "0375fcc81dcd9233ec3f230f56cc22ee203dae6e",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/0375fcc81dcd9233ec3f230f56cc22ee203dae6e"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/c3391c957284f6ec956a0ee2043e2389fb34e0db",
+      "comment_count": 0,
+      "verification": {
+        "verified": false,
+        "reason": "unsigned",
+        "signature": null,
+        "payload": null
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/c3391c957284f6ec956a0ee2043e2389fb34e0db",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/c3391c957284f6ec956a0ee2043e2389fb34e0db",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/c3391c957284f6ec956a0ee2043e2389fb34e0db/comments",
+    "author": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "83290cb71073dd614957a1db884977519cabf84b",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/83290cb71073dd614957a1db884977519cabf84b",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/83290cb71073dd614957a1db884977519cabf84b"
+      }
+    ]
+  },
+  {
+    "sha": "83290cb71073dd614957a1db884977519cabf84b",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6ODMyOTBjYjcxMDczZGQ2MTQ5NTdhMWRiODg0OTc3NTE5Y2FiZjg0Yg==",
+    "commit": {
+      "author": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-25T19:51:40Z"
+      },
+      "committer": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-25T19:51:40Z"
+      },
+      "message": "Update django-anymail from 7.1.0 to 7.2",
+      "tree": {
+        "sha": "05060edb8aac5e351483de491e141c9fd2589f28",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/05060edb8aac5e351483de491e141c9fd2589f28"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/83290cb71073dd614957a1db884977519cabf84b",
+      "comment_count": 0,
+      "verification": {
+        "verified": false,
+        "reason": "unsigned",
+        "signature": null,
+        "payload": null
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/83290cb71073dd614957a1db884977519cabf84b",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/83290cb71073dd614957a1db884977519cabf84b",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/83290cb71073dd614957a1db884977519cabf84b/comments",
+    "author": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "8fa56b3c6d5c3a72b9e668628921503c64d9c681",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/8fa56b3c6d5c3a72b9e668628921503c64d9c681",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/8fa56b3c6d5c3a72b9e668628921503c64d9c681"
+      }
+    ]
+  },
+  {
+    "sha": "8fa56b3c6d5c3a72b9e668628921503c64d9c681",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6OGZhNTZiM2M2ZDVjM2E3MmI5ZTY2ODYyODkyMTUwM2M2NGQ5YzY4MQ==",
+    "commit": {
+      "author": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-25T19:51:39Z"
+      },
+      "committer": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-25T19:51:39Z"
+      },
+      "message": "Update django-anymail from 7.1.0 to 7.2",
+      "tree": {
+        "sha": "1e62554b19d68a420a9163292319bbec73de0ef2",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/1e62554b19d68a420a9163292319bbec73de0ef2"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/8fa56b3c6d5c3a72b9e668628921503c64d9c681",
+      "comment_count": 0,
+      "verification": {
+        "verified": false,
+        "reason": "unsigned",
+        "signature": null,
+        "payload": null
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/8fa56b3c6d5c3a72b9e668628921503c64d9c681",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/8fa56b3c6d5c3a72b9e668628921503c64d9c681",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/8fa56b3c6d5c3a72b9e668628921503c64d9c681/comments",
+    "author": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "1d8f637f9d9bd7db556fff133961f1dba0f4cb7f",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/1d8f637f9d9bd7db556fff133961f1dba0f4cb7f",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/1d8f637f9d9bd7db556fff133961f1dba0f4cb7f"
+      }
+    ]
+  },
+  {
+    "sha": "1d8f637f9d9bd7db556fff133961f1dba0f4cb7f",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6MWQ4ZjYzN2Y5ZDliZDdkYjU1NmZmZjEzMzk2MWYxZGJhMGY0Y2I3Zg==",
+    "commit": {
+      "author": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-25T19:51:38Z"
+      },
+      "committer": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-25T19:51:38Z"
+      },
+      "message": "Update django-anymail from 7.1.0 to 7.2",
+      "tree": {
+        "sha": "900ca3b2da13177d4c3d1f6efea392f1523aa181",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/900ca3b2da13177d4c3d1f6efea392f1523aa181"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/1d8f637f9d9bd7db556fff133961f1dba0f4cb7f",
+      "comment_count": 0,
+      "verification": {
+        "verified": false,
+        "reason": "unsigned",
+        "signature": null,
+        "payload": null
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/1d8f637f9d9bd7db556fff133961f1dba0f4cb7f",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/1d8f637f9d9bd7db556fff133961f1dba0f4cb7f",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/1d8f637f9d9bd7db556fff133961f1dba0f4cb7f/comments",
+    "author": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "14fad9247b0ab845f91d9c2e21f7483836fdba77",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/14fad9247b0ab845f91d9c2e21f7483836fdba77",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/14fad9247b0ab845f91d9c2e21f7483836fdba77"
+      }
+    ]
+  },
+  {
+    "sha": "14fad9247b0ab845f91d9c2e21f7483836fdba77",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6MTRmYWQ5MjQ3YjBhYjg0NWY5MWQ5YzJlMjFmNzQ4MzgzNmZkYmE3Nw==",
+    "commit": {
+      "author": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-25T19:51:37Z"
+      },
+      "committer": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-25T19:51:37Z"
+      },
+      "message": "Update django-anymail from 7.1.0 to 7.2",
+      "tree": {
+        "sha": "dcdbfb44993b3a6530ba8476f20d981278354bc2",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/dcdbfb44993b3a6530ba8476f20d981278354bc2"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/14fad9247b0ab845f91d9c2e21f7483836fdba77",
+      "comment_count": 0,
+      "verification": {
+        "verified": false,
+        "reason": "unsigned",
+        "signature": null,
+        "payload": null
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/14fad9247b0ab845f91d9c2e21f7483836fdba77",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/14fad9247b0ab845f91d9c2e21f7483836fdba77",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/14fad9247b0ab845f91d9c2e21f7483836fdba77/comments",
+    "author": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "a5e71ab8bfe505cbe67ba34b0bd6702d2cedb453",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a5e71ab8bfe505cbe67ba34b0bd6702d2cedb453",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/a5e71ab8bfe505cbe67ba34b0bd6702d2cedb453"
+      }
+    ]
+  },
+  {
+    "sha": "a5e71ab8bfe505cbe67ba34b0bd6702d2cedb453",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6YTVlNzFhYjhiZmU1MDVjYmU2N2JhMzRiMGJkNjcwMmQyY2VkYjQ1Mw==",
+    "commit": {
+      "author": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-25T19:51:36Z"
+      },
+      "committer": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-25T19:51:36Z"
+      },
+      "message": "Update django-anymail from 7.1.0 to 7.2",
+      "tree": {
+        "sha": "9d650cd11c7238557d41e8fc9f2d4d8925869069",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/9d650cd11c7238557d41e8fc9f2d4d8925869069"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/a5e71ab8bfe505cbe67ba34b0bd6702d2cedb453",
+      "comment_count": 0,
+      "verification": {
+        "verified": false,
+        "reason": "unsigned",
+        "signature": null,
+        "payload": null
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a5e71ab8bfe505cbe67ba34b0bd6702d2cedb453",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/a5e71ab8bfe505cbe67ba34b0bd6702d2cedb453",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a5e71ab8bfe505cbe67ba34b0bd6702d2cedb453/comments",
+    "author": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "41dc9424f8503083d52a2808451bf9ff112d9e60",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/41dc9424f8503083d52a2808451bf9ff112d9e60",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/41dc9424f8503083d52a2808451bf9ff112d9e60"
+      }
+    ]
+  },
+  {
+    "sha": "41dc9424f8503083d52a2808451bf9ff112d9e60",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6NDFkYzk0MjRmODUwMzA4M2Q1MmEyODA4NDUxYmY5ZmYxMTJkOWU2MA==",
+    "commit": {
+      "author": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-25T19:51:35Z"
+      },
+      "committer": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-25T19:51:35Z"
+      },
+      "message": "Update django-anymail from 7.1.0 to 7.2",
+      "tree": {
+        "sha": "cb0e7670c5dd2e7011707a9cd2abbb6357f8099b",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/cb0e7670c5dd2e7011707a9cd2abbb6357f8099b"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/41dc9424f8503083d52a2808451bf9ff112d9e60",
+      "comment_count": 0,
+      "verification": {
+        "verified": false,
+        "reason": "unsigned",
+        "signature": null,
+        "payload": null
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/41dc9424f8503083d52a2808451bf9ff112d9e60",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/41dc9424f8503083d52a2808451bf9ff112d9e60",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/41dc9424f8503083d52a2808451bf9ff112d9e60/comments",
+    "author": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "756031c351c7e6e24e33006c21fc3b757d755b22",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/756031c351c7e6e24e33006c21fc3b757d755b22",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/756031c351c7e6e24e33006c21fc3b757d755b22"
+      }
+    ]
+  },
+  {
+    "sha": "756031c351c7e6e24e33006c21fc3b757d755b22",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6NzU2MDMxYzM1MWM3ZTZlMjRlMzMwMDZjMjFmYzNiNzU3ZDc1NWIyMg==",
+    "commit": {
+      "author": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-25T19:51:34Z"
+      },
+      "committer": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-25T19:51:34Z"
+      },
+      "message": "Update django-anymail from 7.1.0 to 7.2",
+      "tree": {
+        "sha": "8d9efbdbfbd9d9aefa59ba54869fea143b010819",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/8d9efbdbfbd9d9aefa59ba54869fea143b010819"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/756031c351c7e6e24e33006c21fc3b757d755b22",
+      "comment_count": 0,
+      "verification": {
+        "verified": false,
+        "reason": "unsigned",
+        "signature": null,
+        "payload": null
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/756031c351c7e6e24e33006c21fc3b757d755b22",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/756031c351c7e6e24e33006c21fc3b757d755b22",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/756031c351c7e6e24e33006c21fc3b757d755b22/comments",
+    "author": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "a706ab826c4685e61331e622e1382075ae5343a4",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a706ab826c4685e61331e622e1382075ae5343a4",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/a706ab826c4685e61331e622e1382075ae5343a4"
+      }
+    ]
+  },
+  {
+    "sha": "a706ab826c4685e61331e622e1382075ae5343a4",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6YTcwNmFiODI2YzQ2ODVlNjEzMzFlNjIyZTEzODIwNzVhZTUzNDNhNA==",
+    "commit": {
+      "author": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-25T19:51:33Z"
+      },
+      "committer": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-25T19:51:33Z"
+      },
+      "message": "Update django-anymail from 7.1.0 to 7.2",
+      "tree": {
+        "sha": "a4ce2b76d7b4cc7b609702844ad9d0d2bcf063a7",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/a4ce2b76d7b4cc7b609702844ad9d0d2bcf063a7"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/a706ab826c4685e61331e622e1382075ae5343a4",
+      "comment_count": 0,
+      "verification": {
+        "verified": false,
+        "reason": "unsigned",
+        "signature": null,
+        "payload": null
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a706ab826c4685e61331e622e1382075ae5343a4",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/a706ab826c4685e61331e622e1382075ae5343a4",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a706ab826c4685e61331e622e1382075ae5343a4/comments",
+    "author": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "08a15337b35e1c11d9ef1494e9550ceaee7e9e72",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/08a15337b35e1c11d9ef1494e9550ceaee7e9e72",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/08a15337b35e1c11d9ef1494e9550ceaee7e9e72"
+      }
+    ]
+  },
+  {
+    "sha": "08a15337b35e1c11d9ef1494e9550ceaee7e9e72",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6MDhhMTUzMzdiMzVlMWMxMWQ5ZWYxNDk0ZTk1NTBjZWFlZTdlOWU3Mg==",
+    "commit": {
+      "author": {
+        "name": "Bruno Alla",
+        "email": "browniebroke@users.noreply.github.com",
+        "date": "2020-07-25T13:39:04Z"
+      },
+      "committer": {
+        "name": "GitHub",
+        "email": "noreply@github.com",
+        "date": "2020-07-25T13:39:04Z"
+      },
+      "message": "Update document.rst",
+      "tree": {
+        "sha": "7789dbf8a3fa174c424491e150d08aa6edd05701",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/7789dbf8a3fa174c424491e150d08aa6edd05701"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/08a15337b35e1c11d9ef1494e9550ceaee7e9e72",
+      "comment_count": 0,
+      "verification": {
+        "verified": true,
+        "reason": "valid",
+        "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfHDX4CRBK7hj4Ov3rIwAAdHIIADQkdEs2ZlxuGXwM6MZG+5IM\n1dwuGXOx3R/kfpEJ0M6VrXqgpN0SemKGLsYFzEZ7V/v+Mpw8J74lYvvx6qRtpTUO\nT9MU8bVkxNaLN03ecxz42rI2zIT3frsQ1tVLvlXT387OknLiZOwa0G5uAb9jyEUO\n95umUw/RcKmNASABuLsEiRYNuAEDc1LKLR+uiVHJulfpdcEydnvB7JdzKlOeYvi9\nwnmJk658PqDTl03jo7NvGYTzmw8vY5N0wHPDnzvYQExuiGi8w1WawA7piychTwJ3\ngfLl6xAwKL2jYYZdhdiJAzf5LMZFGpRI2Ox9KSy8hjHcz5nwChYsO2Gp5ORSIz0=\n=O8Me\n-----END PGP SIGNATURE-----\n",
+        "payload": "tree 7789dbf8a3fa174c424491e150d08aa6edd05701\nparent b592003f87ff4a1f27dfa01e8860bb0f725e0847\nauthor Bruno Alla <browniebroke@users.noreply.github.com> 1595684344 +0100\ncommitter GitHub <noreply@github.com> 1595684344 +0100\n\nUpdate document.rst"
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/08a15337b35e1c11d9ef1494e9550ceaee7e9e72",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/08a15337b35e1c11d9ef1494e9550ceaee7e9e72",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/08a15337b35e1c11d9ef1494e9550ceaee7e9e72/comments",
+    "author": {
+      "login": "browniebroke",
+      "id": 861044,
+      "node_id": "MDQ6VXNlcjg2MTA0NA==",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/browniebroke",
+      "html_url": "https://github.com/browniebroke",
+      "followers_url": "https://api.github.com/users/browniebroke/followers",
+      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
+      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
+      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
+      "repos_url": "https://api.github.com/users/browniebroke/repos",
+      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "web-flow",
+      "id": 19864447,
+      "node_id": "MDQ6VXNlcjE5ODY0NDQ3",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/web-flow",
+      "html_url": "https://github.com/web-flow",
+      "followers_url": "https://api.github.com/users/web-flow/followers",
+      "following_url": "https://api.github.com/users/web-flow/following{/other_user}",
+      "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions",
+      "organizations_url": "https://api.github.com/users/web-flow/orgs",
+      "repos_url": "https://api.github.com/users/web-flow/repos",
+      "events_url": "https://api.github.com/users/web-flow/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/web-flow/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "b592003f87ff4a1f27dfa01e8860bb0f725e0847",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/b592003f87ff4a1f27dfa01e8860bb0f725e0847",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/b592003f87ff4a1f27dfa01e8860bb0f725e0847"
+      }
+    ]
+  },
+  {
+    "sha": "b592003f87ff4a1f27dfa01e8860bb0f725e0847",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6YjU5MjAwM2Y4N2ZmNGExZjI3ZGZhMDFlODg2MGJiMGY3MjVlMDg0Nw==",
+    "commit": {
+      "author": {
+        "name": "Bruno Alla",
+        "email": "browniebroke@users.noreply.github.com",
+        "date": "2020-07-25T13:37:54Z"
+      },
+      "committer": {
+        "name": "GitHub",
+        "email": "noreply@github.com",
+        "date": "2020-07-25T13:37:54Z"
+      },
+      "message": "Fix snippet in documentation",
+      "tree": {
+        "sha": "d5ca93ca4e670725066520ed2bb755f11a403e11",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/d5ca93ca4e670725066520ed2bb755f11a403e11"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/b592003f87ff4a1f27dfa01e8860bb0f725e0847",
+      "comment_count": 0,
+      "verification": {
+        "verified": true,
+        "reason": "valid",
+        "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfHDWyCRBK7hj4Ov3rIwAAdHIIAHv6JNwk75EgGqHQO1an+G3C\njcz00Hm40CJOPYHT8z3A24qoAMVrYMbgKob4f74FiVRiA88fA3BXFvOD/MiO1TAp\nI+nx54gJ8Kf7/Rj+szVcZoQ722Jc1Cnh/IaMZDJvYUQNzSkHLH4Hc+dyh5CI4WLc\nhNrXUMliwLQMShs68lCaoCZWl17APPUrUsQO8s2z32fVusm9VoJbSPBRSrtne27M\nxYjs1PfrqUTtNq3/bCUmlGVrKFviUMXaTvUjKk3842kEirDZL2DOosierkDKKga1\n6w+RM3uxU17g+d/nchjJJwhGYAtvSscJpXMjPgjUu/5SmcPkfvXt2tLjY5XJE1g=\n=3CyH\n-----END PGP SIGNATURE-----\n",
+        "payload": "tree d5ca93ca4e670725066520ed2bb755f11a403e11\nparent c085afef18a2643652c60422fb60718797324f4a\nauthor Bruno Alla <browniebroke@users.noreply.github.com> 1595684274 +0100\ncommitter GitHub <noreply@github.com> 1595684274 +0100\n\nFix snippet in documentation"
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/b592003f87ff4a1f27dfa01e8860bb0f725e0847",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/b592003f87ff4a1f27dfa01e8860bb0f725e0847",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/b592003f87ff4a1f27dfa01e8860bb0f725e0847/comments",
+    "author": {
+      "login": "browniebroke",
+      "id": 861044,
+      "node_id": "MDQ6VXNlcjg2MTA0NA==",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/browniebroke",
+      "html_url": "https://github.com/browniebroke",
+      "followers_url": "https://api.github.com/users/browniebroke/followers",
+      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
+      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
+      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
+      "repos_url": "https://api.github.com/users/browniebroke/repos",
+      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "web-flow",
+      "id": 19864447,
+      "node_id": "MDQ6VXNlcjE5ODY0NDQ3",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/web-flow",
+      "html_url": "https://github.com/web-flow",
+      "followers_url": "https://api.github.com/users/web-flow/followers",
+      "following_url": "https://api.github.com/users/web-flow/following{/other_user}",
+      "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions",
+      "organizations_url": "https://api.github.com/users/web-flow/orgs",
+      "repos_url": "https://api.github.com/users/web-flow/repos",
+      "events_url": "https://api.github.com/users/web-flow/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/web-flow/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "c085afef18a2643652c60422fb60718797324f4a",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/c085afef18a2643652c60422fb60718797324f4a",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/c085afef18a2643652c60422fb60718797324f4a"
+      }
+    ]
+  },
+  {
+    "sha": "c085afef18a2643652c60422fb60718797324f4a",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6YzA4NWFmZWYxOGEyNjQzNjUyYzYwNDIyZmI2MDcxODc5NzMyNGY0YQ==",
+    "commit": {
+      "author": {
+        "name": "Bruno Alla",
+        "email": "browniebroke@users.noreply.github.com",
+        "date": "2020-07-24T17:20:45Z"
+      },
+      "committer": {
+        "name": "GitHub",
+        "email": "noreply@github.com",
+        "date": "2020-07-24T17:20:45Z"
+      },
+      "message": "Merge pull request #2700 from pydanny/pyup-update-hiredis-1.0.1-to-1.1.0",
+      "tree": {
+        "sha": "a578541fa3d3fa7e46b9d99865a6fc4c1fd8aead",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/a578541fa3d3fa7e46b9d99865a6fc4c1fd8aead"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/c085afef18a2643652c60422fb60718797324f4a",
+      "comment_count": 0,
+      "verification": {
+        "verified": true,
+        "reason": "valid",
+        "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfGxhtCRBK7hj4Ov3rIwAAdHIIAJSOFFFcVkCc7RA1WYjvswmi\nW9FeGeh5XCdJCOhomhlyNWTcD9EAeNxJZh3YxNNNwiNqA00K6fBDwppnw+ZXt+wo\n+xiipqL/RJ4nqZV3LkEDdRs/Upl0013eseuw1NoYb41vw0ouvehmlGetCbyOt3Yx\n487mo2l2jJ7yLSErYQ97RllN44JOqye7Kzwdd9RpkFrSiuLynPGIBHMa5Tk3HuRV\nYOl2XTKrfGEI6jcMUXyPqvjoxvAZttURqcDzHC7F41o2HbsDSW1pxpID/RTOLEZV\n5RrwZ75Um9bkyuUya+XXtlmYCleoXDOgp3HNCumN3JNylLdT314vg/uigs2wOZo=\n=7Z4H\n-----END PGP SIGNATURE-----\n",
+        "payload": "tree a578541fa3d3fa7e46b9d99865a6fc4c1fd8aead\nparent 10224378748331db092e60b52a700d93062ecbb5\nparent ce0f2363e01c49c5146d2239fcb15eb989cb509d\nauthor Bruno Alla <browniebroke@users.noreply.github.com> 1595611245 +0100\ncommitter GitHub <noreply@github.com> 1595611245 +0100\n\nMerge pull request #2700 from pydanny/pyup-update-hiredis-1.0.1-to-1.1.0\n\n"
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/c085afef18a2643652c60422fb60718797324f4a",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/c085afef18a2643652c60422fb60718797324f4a",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/c085afef18a2643652c60422fb60718797324f4a/comments",
+    "author": {
+      "login": "browniebroke",
+      "id": 861044,
+      "node_id": "MDQ6VXNlcjg2MTA0NA==",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/browniebroke",
+      "html_url": "https://github.com/browniebroke",
+      "followers_url": "https://api.github.com/users/browniebroke/followers",
+      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
+      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
+      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
+      "repos_url": "https://api.github.com/users/browniebroke/repos",
+      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "web-flow",
+      "id": 19864447,
+      "node_id": "MDQ6VXNlcjE5ODY0NDQ3",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/web-flow",
+      "html_url": "https://github.com/web-flow",
+      "followers_url": "https://api.github.com/users/web-flow/followers",
+      "following_url": "https://api.github.com/users/web-flow/following{/other_user}",
+      "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions",
+      "organizations_url": "https://api.github.com/users/web-flow/orgs",
+      "repos_url": "https://api.github.com/users/web-flow/repos",
+      "events_url": "https://api.github.com/users/web-flow/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/web-flow/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "10224378748331db092e60b52a700d93062ecbb5",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/10224378748331db092e60b52a700d93062ecbb5",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/10224378748331db092e60b52a700d93062ecbb5"
+      },
+      {
+        "sha": "ce0f2363e01c49c5146d2239fcb15eb989cb509d",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/ce0f2363e01c49c5146d2239fcb15eb989cb509d",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/ce0f2363e01c49c5146d2239fcb15eb989cb509d"
+      }
+    ]
+  },
+  {
+    "sha": "10224378748331db092e60b52a700d93062ecbb5",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6MTAyMjQzNzg3NDgzMzFkYjA5MmU2MGI1MmE3MDBkOTMwNjJlY2JiNQ==",
+    "commit": {
+      "author": {
+        "name": "Bruno Alla",
+        "email": "browniebroke@users.noreply.github.com",
+        "date": "2020-07-24T17:18:49Z"
+      },
+      "committer": {
+        "name": "GitHub",
+        "email": "noreply@github.com",
+        "date": "2020-07-24T17:18:49Z"
+      },
+      "message": "Merge pull request #2701 from pydanny/pyup-update-django-crispy-forms-1.9.1-to-1.9.2\n\nUpdate django-crispy-forms to 1.9.2",
+      "tree": {
+        "sha": "2dbe79439e622583fa67bbb91e75a741bec93339",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/2dbe79439e622583fa67bbb91e75a741bec93339"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/10224378748331db092e60b52a700d93062ecbb5",
+      "comment_count": 0,
+      "verification": {
+        "verified": true,
+        "reason": "valid",
+        "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfGxf5CRBK7hj4Ov3rIwAAdHIIAD+elAUiHpBeqyB5zY5lYfE1\n+HgpvqFdS0bZLhYQw8tnOnrJLmXxZ+bx4uiAMjQuBnR5CkhXnyiaApt9kcT8xDyc\ngw9sbmnSq2Qe3C1wef+am62iEqBbujHvNJp/x9td2w6bzLYP3Hdezmkmx85+f0Ql\n0y1BM4c4BjJNPNBJRkf9oHpMkBQ21xu1qruVRjEYp/rK0Ijtj5sY/8Ih9f2xPut6\ndMGCBRFA/91LSDDlKIJUDcslrphAbagU3wqOe5rEDFIt6jfmz0UyWD8Bq4vj66g5\n+rtMDoH0Mto1Y4fT5OodU/BNKjEshY3hel0yQShd+7Qe2FmLco4qSFj4B3JS1JI=\n=UAz/\n-----END PGP SIGNATURE-----\n",
+        "payload": "tree 2dbe79439e622583fa67bbb91e75a741bec93339\nparent 8d52025c20af27b988d7cf53485740e4293b7b24\nparent 70c11fa89432815ebbe569ac1f18e19ff8047e36\nauthor Bruno Alla <browniebroke@users.noreply.github.com> 1595611129 +0100\ncommitter GitHub <noreply@github.com> 1595611129 +0100\n\nMerge pull request #2701 from pydanny/pyup-update-django-crispy-forms-1.9.1-to-1.9.2\n\nUpdate django-crispy-forms to 1.9.2"
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/10224378748331db092e60b52a700d93062ecbb5",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/10224378748331db092e60b52a700d93062ecbb5",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/10224378748331db092e60b52a700d93062ecbb5/comments",
+    "author": {
+      "login": "browniebroke",
+      "id": 861044,
+      "node_id": "MDQ6VXNlcjg2MTA0NA==",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/browniebroke",
+      "html_url": "https://github.com/browniebroke",
+      "followers_url": "https://api.github.com/users/browniebroke/followers",
+      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
+      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
+      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
+      "repos_url": "https://api.github.com/users/browniebroke/repos",
+      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "web-flow",
+      "id": 19864447,
+      "node_id": "MDQ6VXNlcjE5ODY0NDQ3",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/web-flow",
+      "html_url": "https://github.com/web-flow",
+      "followers_url": "https://api.github.com/users/web-flow/followers",
+      "following_url": "https://api.github.com/users/web-flow/following{/other_user}",
+      "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions",
+      "organizations_url": "https://api.github.com/users/web-flow/orgs",
+      "repos_url": "https://api.github.com/users/web-flow/repos",
+      "events_url": "https://api.github.com/users/web-flow/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/web-flow/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "8d52025c20af27b988d7cf53485740e4293b7b24",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/8d52025c20af27b988d7cf53485740e4293b7b24",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/8d52025c20af27b988d7cf53485740e4293b7b24"
+      },
+      {
+        "sha": "70c11fa89432815ebbe569ac1f18e19ff8047e36",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/70c11fa89432815ebbe569ac1f18e19ff8047e36",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/70c11fa89432815ebbe569ac1f18e19ff8047e36"
+      }
+    ]
+  },
+  {
+    "sha": "70c11fa89432815ebbe569ac1f18e19ff8047e36",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6NzBjMTFmYTg5NDMyODE1ZWJiZTU2OWFjMWYxOGUxOWZmODA0N2UzNg==",
+    "commit": {
+      "author": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-24T16:58:32Z"
+      },
+      "committer": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-24T16:58:32Z"
+      },
+      "message": "Update django-crispy-forms from 1.9.1 to 1.9.2",
+      "tree": {
+        "sha": "2dbe79439e622583fa67bbb91e75a741bec93339",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/2dbe79439e622583fa67bbb91e75a741bec93339"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/70c11fa89432815ebbe569ac1f18e19ff8047e36",
+      "comment_count": 0,
+      "verification": {
+        "verified": false,
+        "reason": "unsigned",
+        "signature": null,
+        "payload": null
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/70c11fa89432815ebbe569ac1f18e19ff8047e36",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/70c11fa89432815ebbe569ac1f18e19ff8047e36",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/70c11fa89432815ebbe569ac1f18e19ff8047e36/comments",
+    "author": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "8d52025c20af27b988d7cf53485740e4293b7b24",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/8d52025c20af27b988d7cf53485740e4293b7b24",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/8d52025c20af27b988d7cf53485740e4293b7b24"
+      }
+    ]
+  },
+  {
+    "sha": "ce0f2363e01c49c5146d2239fcb15eb989cb509d",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6Y2UwZjIzNjNlMDFjNDljNTE0NmQyMjM5ZmNiMTVlYjk4OWNiNTA5ZA==",
+    "commit": {
+      "author": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-24T16:58:28Z"
+      },
+      "committer": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-24T16:58:28Z"
+      },
+      "message": "Update hiredis from 1.0.1 to 1.1.0",
+      "tree": {
+        "sha": "965de49b571e261b7d25fa32593cea9afbce6850",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/965de49b571e261b7d25fa32593cea9afbce6850"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/ce0f2363e01c49c5146d2239fcb15eb989cb509d",
+      "comment_count": 0,
+      "verification": {
+        "verified": false,
+        "reason": "unsigned",
+        "signature": null,
+        "payload": null
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/ce0f2363e01c49c5146d2239fcb15eb989cb509d",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/ce0f2363e01c49c5146d2239fcb15eb989cb509d",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/ce0f2363e01c49c5146d2239fcb15eb989cb509d/comments",
+    "author": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "ed8e3073c66d70d79cd350d39b40e55763da9d24",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/ed8e3073c66d70d79cd350d39b40e55763da9d24",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/ed8e3073c66d70d79cd350d39b40e55763da9d24"
+      }
+    ]
+  },
+  {
+    "sha": "ed8e3073c66d70d79cd350d39b40e55763da9d24",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6ZWQ4ZTMwNzNjNjZkNzBkNzljZDM1MGQzOWI0MGU1NTc2M2RhOWQyNA==",
+    "commit": {
+      "author": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-24T16:58:27Z"
+      },
+      "committer": {
+        "name": "pyup-bot",
+        "email": "github-bot@pyup.io",
+        "date": "2020-07-24T16:58:27Z"
+      },
+      "message": "Update hiredis from 1.0.1 to 1.1.0",
+      "tree": {
+        "sha": "e4102b18d87a2b4e74b1de5d6652bf0f9de11653",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/e4102b18d87a2b4e74b1de5d6652bf0f9de11653"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/ed8e3073c66d70d79cd350d39b40e55763da9d24",
+      "comment_count": 0,
+      "verification": {
+        "verified": false,
+        "reason": "unsigned",
+        "signature": null,
+        "payload": null
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/ed8e3073c66d70d79cd350d39b40e55763da9d24",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/ed8e3073c66d70d79cd350d39b40e55763da9d24",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/ed8e3073c66d70d79cd350d39b40e55763da9d24/comments",
+    "author": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "pyup-bot",
+      "id": 16239342,
+      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/pyup-bot",
+      "html_url": "https://github.com/pyup-bot",
+      "followers_url": "https://api.github.com/users/pyup-bot/followers",
+      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
+      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
+      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
+      "repos_url": "https://api.github.com/users/pyup-bot/repos",
+      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "8d52025c20af27b988d7cf53485740e4293b7b24",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/8d52025c20af27b988d7cf53485740e4293b7b24",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/8d52025c20af27b988d7cf53485740e4293b7b24"
+      }
+    ]
+  },
+  {
+    "sha": "8d52025c20af27b988d7cf53485740e4293b7b24",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6OGQ1MjAyNWMyMGFmMjdiOTg4ZDdjZjUzNDg1NzQwZTQyOTNiN2IyNA==",
+    "commit": {
+      "author": {
+        "name": "Bruno Alla",
+        "email": "browniebroke@users.noreply.github.com",
+        "date": "2020-07-24T16:55:47Z"
+      },
+      "committer": {
+        "name": "GitHub",
+        "email": "noreply@github.com",
+        "date": "2020-07-24T16:55:47Z"
+      },
+      "message": "Merge pull request #2699 from pydanny/fix-pyup-duplicated-requirements\n\nImport base requirements without the leading dot",
+      "tree": {
+        "sha": "0c1fb9ac5638d2b89124f15a960c2e441469d37e",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/0c1fb9ac5638d2b89124f15a960c2e441469d37e"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/8d52025c20af27b988d7cf53485740e4293b7b24",
+      "comment_count": 0,
+      "verification": {
+        "verified": true,
+        "reason": "valid",
+        "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfGxKTCRBK7hj4Ov3rIwAAdHIIAKB6P/vt541Qe+EtHBzTQ458\nGskZViSFx+3pBVPZX0iKzAGyi/1DYt/s0yq5JwZqh720ag3yyrc57EjDMpWa2oIc\nsszzRCZ318XWQgJWdeixug4Bfu54vZn1WqDRIg3HcFv5m6J4VH4jQNJvD5OAz11O\nvfhnm4nuYxju3qiJMLpck5HdWiePjNapnTZQcqbFH72+OCttDcuydEJh8RExs1JV\nET9IEG7YBy9jy3ORsdh7Rkz2eYtRN22bKd6rUDWWLVZMadSTiOmiDsyg0PDi3Xn9\nTjQJpBFus9sUx+izsZwtyy+hwiK5u7If0qHbPitMx6JxbLZ2zj/eqLYX9Nmp6HA=\n=Stvk\n-----END PGP SIGNATURE-----\n",
+        "payload": "tree 0c1fb9ac5638d2b89124f15a960c2e441469d37e\nparent e2910a322216fc8f15e0eaaf806805d6b744a8c2\nparent 21c56bb97a59d69e71fcaebdde6d7715d25a9150\nauthor Bruno Alla <browniebroke@users.noreply.github.com> 1595609747 +0100\ncommitter GitHub <noreply@github.com> 1595609747 +0100\n\nMerge pull request #2699 from pydanny/fix-pyup-duplicated-requirements\n\nImport base requirements without the leading dot"
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/8d52025c20af27b988d7cf53485740e4293b7b24",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/8d52025c20af27b988d7cf53485740e4293b7b24",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/8d52025c20af27b988d7cf53485740e4293b7b24/comments",
+    "author": {
+      "login": "browniebroke",
+      "id": 861044,
+      "node_id": "MDQ6VXNlcjg2MTA0NA==",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/browniebroke",
+      "html_url": "https://github.com/browniebroke",
+      "followers_url": "https://api.github.com/users/browniebroke/followers",
+      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
+      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
+      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
+      "repos_url": "https://api.github.com/users/browniebroke/repos",
+      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "web-flow",
+      "id": 19864447,
+      "node_id": "MDQ6VXNlcjE5ODY0NDQ3",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/web-flow",
+      "html_url": "https://github.com/web-flow",
+      "followers_url": "https://api.github.com/users/web-flow/followers",
+      "following_url": "https://api.github.com/users/web-flow/following{/other_user}",
+      "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions",
+      "organizations_url": "https://api.github.com/users/web-flow/orgs",
+      "repos_url": "https://api.github.com/users/web-flow/repos",
+      "events_url": "https://api.github.com/users/web-flow/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/web-flow/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "e2910a322216fc8f15e0eaaf806805d6b744a8c2",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/e2910a322216fc8f15e0eaaf806805d6b744a8c2",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/e2910a322216fc8f15e0eaaf806805d6b744a8c2"
+      },
+      {
+        "sha": "21c56bb97a59d69e71fcaebdde6d7715d25a9150",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/21c56bb97a59d69e71fcaebdde6d7715d25a9150",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/21c56bb97a59d69e71fcaebdde6d7715d25a9150"
+      }
+    ]
+  },
+  {
+    "sha": "e2910a322216fc8f15e0eaaf806805d6b744a8c2",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6ZTI5MTBhMzIyMjE2ZmM4ZjE1ZTBlYWFmODA2ODA1ZDZiNzQ0YThjMg==",
+    "commit": {
+      "author": {
+        "name": "Bruno Alla",
+        "email": "browniebroke@users.noreply.github.com",
+        "date": "2020-07-24T16:40:23Z"
+      },
+      "committer": {
+        "name": "GitHub",
+        "email": "noreply@github.com",
+        "date": "2020-07-24T16:40:23Z"
+      },
+      "message": "Merge pull request #2694 from Andrew-Chen-Wang/patch-7",
+      "tree": {
+        "sha": "2a20bcceea76b92fe7f695653db4874f4ef4ad0e",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/2a20bcceea76b92fe7f695653db4874f4ef4ad0e"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/e2910a322216fc8f15e0eaaf806805d6b744a8c2",
+      "comment_count": 0,
+      "verification": {
+        "verified": true,
+        "reason": "valid",
+        "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfGw73CRBK7hj4Ov3rIwAAdHIIAEJOH6/+qipOrjlfCtv5GpSH\nzlfv0qISPl3xz28C+kLC5uDGmGUL5rTRNdcZIFlDwr1oFfsLkSpCHDhMXJ1Lfp0b\nN0sq0VP4OHug46jiQplV1rtN0oif+xJlNNUMpq9pP5Cq5QL2lTlss/f9nAY1Hqr/\nvNeKxxRf57wbDXJARyaHFdG7FZK7qmQeObif4Q/Zp0pg0Cpn9yr5Jv0t/hJawxr5\nFVY50NHNtPLufBnrK8czh4mikzfx2po3Ly0iPXTcKN4U4JyJBG3FlCsw7ynQW97j\nx0AaJfqVXXOIJJAaTBE/HRL5l5Q4HK/teNVOcjZMKfUcPzZH0X7+xuriifEkXfQ=\n=Dh/9\n-----END PGP SIGNATURE-----\n",
+        "payload": "tree 2a20bcceea76b92fe7f695653db4874f4ef4ad0e\nparent 3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188\nparent c57b8976b09fcd6ec7f3ef095b4b967f3d68e8d3\nauthor Bruno Alla <browniebroke@users.noreply.github.com> 1595608823 +0100\ncommitter GitHub <noreply@github.com> 1595608823 +0100\n\nMerge pull request #2694 from Andrew-Chen-Wang/patch-7\n\n"
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/e2910a322216fc8f15e0eaaf806805d6b744a8c2",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/e2910a322216fc8f15e0eaaf806805d6b744a8c2",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/e2910a322216fc8f15e0eaaf806805d6b744a8c2/comments",
+    "author": {
+      "login": "browniebroke",
+      "id": 861044,
+      "node_id": "MDQ6VXNlcjg2MTA0NA==",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/browniebroke",
+      "html_url": "https://github.com/browniebroke",
+      "followers_url": "https://api.github.com/users/browniebroke/followers",
+      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
+      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
+      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
+      "repos_url": "https://api.github.com/users/browniebroke/repos",
+      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "web-flow",
+      "id": 19864447,
+      "node_id": "MDQ6VXNlcjE5ODY0NDQ3",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/web-flow",
+      "html_url": "https://github.com/web-flow",
+      "followers_url": "https://api.github.com/users/web-flow/followers",
+      "following_url": "https://api.github.com/users/web-flow/following{/other_user}",
+      "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions",
+      "organizations_url": "https://api.github.com/users/web-flow/orgs",
+      "repos_url": "https://api.github.com/users/web-flow/repos",
+      "events_url": "https://api.github.com/users/web-flow/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/web-flow/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188"
+      },
+      {
+        "sha": "c57b8976b09fcd6ec7f3ef095b4b967f3d68e8d3",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/c57b8976b09fcd6ec7f3ef095b4b967f3d68e8d3",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/c57b8976b09fcd6ec7f3ef095b4b967f3d68e8d3"
+      }
+    ]
+  },
+  {
+    "sha": "21c56bb97a59d69e71fcaebdde6d7715d25a9150",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6MjFjNTZiYjk3YTU5ZDY5ZTcxZmNhZWJkZGU2ZDc3MTVkMjVhOTE1MA==",
+    "commit": {
+      "author": {
+        "name": "Bruno Alla",
+        "email": "browniebroke@users.noreply.github.com",
+        "date": "2020-07-24T16:38:29Z"
+      },
+      "committer": {
+        "name": "Bruno Alla",
+        "email": "browniebroke@users.noreply.github.com",
+        "date": "2020-07-24T16:38:29Z"
+      },
+      "message": "Don't include base requirements with dot in front\n\nSee https://github.com/pyupio/pyup/issues/390",
+      "tree": {
+        "sha": "9b1624d69fc4b22a0ad40e1e245b62f5b1b44595",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/9b1624d69fc4b22a0ad40e1e245b62f5b1b44595"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/21c56bb97a59d69e71fcaebdde6d7715d25a9150",
+      "comment_count": 0,
+      "verification": {
+        "verified": false,
+        "reason": "unsigned",
+        "signature": null,
+        "payload": null
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/21c56bb97a59d69e71fcaebdde6d7715d25a9150",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/21c56bb97a59d69e71fcaebdde6d7715d25a9150",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/21c56bb97a59d69e71fcaebdde6d7715d25a9150/comments",
+    "author": {
+      "login": "browniebroke",
+      "id": 861044,
+      "node_id": "MDQ6VXNlcjg2MTA0NA==",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/browniebroke",
+      "html_url": "https://github.com/browniebroke",
+      "followers_url": "https://api.github.com/users/browniebroke/followers",
+      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
+      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
+      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
+      "repos_url": "https://api.github.com/users/browniebroke/repos",
+      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "browniebroke",
+      "id": 861044,
+      "node_id": "MDQ6VXNlcjg2MTA0NA==",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/browniebroke",
+      "html_url": "https://github.com/browniebroke",
+      "followers_url": "https://api.github.com/users/browniebroke/followers",
+      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
+      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
+      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
+      "repos_url": "https://api.github.com/users/browniebroke/repos",
+      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188"
+      }
+    ]
+  },
+  {
+    "sha": "3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188",
+    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6M2RlZGQ0ZGQ0YjU1MjU0YTBmZTZlZjI3MmM3MGMwYTU0YzVlNTE4OA==",
+    "commit": {
+      "author": {
+        "name": "Bruno Alla",
+        "email": "browniebroke@users.noreply.github.com",
+        "date": "2020-07-24T16:26:54Z"
+      },
+      "committer": {
+        "name": "GitHub",
+        "email": "noreply@github.com",
+        "date": "2020-07-24T16:26:54Z"
+      },
+      "message": "Merge pull request #2698 from pydanny/pyup-update-uvicorn-0.11.5-to-0.11.6\n\nUpdate uvicorn from 0.11.5 to 0.11.6",
+      "tree": {
+        "sha": "0cbda3c2af7b6bd652c432a1fde7d3d4ab8a57ab",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/0cbda3c2af7b6bd652c432a1fde7d3d4ab8a57ab"
+      },
+      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188",
+      "comment_count": 0,
+      "verification": {
+        "verified": true,
+        "reason": "valid",
+        "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfGwvOCRBK7hj4Ov3rIwAAdHIIAA3/T2wR/VruzNEB2BJlr9+z\nZAAT0KmPkSyHd1BHdp7RaDB5XbRIrBfUHJgI9L6mRZEd1dZFQH5vitUrmLKFLLmn\nqbuAVjRzmzPwOChXmYRH0pDHJfdYvCqMkmD6ydhX56EL8+vuiYsNDDSviQygehX8\nBze3tGTk9wZwbN4hQSixREuTFiOhGF08ZgDxVjm9LvC6wKe+CXlbNGrTNYe+2AKO\ntU+RvCbfywMV264c+y9c4W4Z5Pwlk0u3mcjNevha/tyyNDk6MApvZ0see0BssAYG\n0M9f4prMOFkXUJs9wzw/r59DyvY3nhm3ovZ4pNmjqmsy1Tg5tuADbVXDEt7daw0=\n=fTep\n-----END PGP SIGNATURE-----\n",
+        "payload": "tree 0cbda3c2af7b6bd652c432a1fde7d3d4ab8a57ab\nparent cb0020cd1d88fcd8c005aae2d88aa7fe26cd2033\nparent 349f7e1141c4d1461802220ce7de4aaba0862cc5\nauthor Bruno Alla <browniebroke@users.noreply.github.com> 1595608014 +0100\ncommitter GitHub <noreply@github.com> 1595608014 +0100\n\nMerge pull request #2698 from pydanny/pyup-update-uvicorn-0.11.5-to-0.11.6\n\nUpdate uvicorn from 0.11.5 to 0.11.6"
+      }
+    },
+    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188",
+    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188",
+    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188/comments",
+    "author": {
+      "login": "browniebroke",
+      "id": 861044,
+      "node_id": "MDQ6VXNlcjg2MTA0NA==",
+      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/browniebroke",
+      "html_url": "https://github.com/browniebroke",
+      "followers_url": "https://api.github.com/users/browniebroke/followers",
+      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
+      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
+      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
+      "repos_url": "https://api.github.com/users/browniebroke/repos",
+      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "committer": {
+      "login": "web-flow",
+      "id": 19864447,
+      "node_id": "MDQ6VXNlcjE5ODY0NDQ3",
+      "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4",
+      "gravatar_id": "",
+      "url": "https://api.github.com/users/web-flow",
+      "html_url": "https://github.com/web-flow",
+      "followers_url": "https://api.github.com/users/web-flow/followers",
+      "following_url": "https://api.github.com/users/web-flow/following{/other_user}",
+      "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}",
+      "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}",
+      "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions",
+      "organizations_url": "https://api.github.com/users/web-flow/orgs",
+      "repos_url": "https://api.github.com/users/web-flow/repos",
+      "events_url": "https://api.github.com/users/web-flow/events{/privacy}",
+      "received_events_url": "https://api.github.com/users/web-flow/received_events",
+      "type": "User",
+      "site_admin": false
+    },
+    "parents": [
+      {
+        "sha": "cb0020cd1d88fcd8c005aae2d88aa7fe26cd2033",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/cb0020cd1d88fcd8c005aae2d88aa7fe26cd2033",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/cb0020cd1d88fcd8c005aae2d88aa7fe26cd2033"
+      },
+      {
+        "sha": "349f7e1141c4d1461802220ce7de4aaba0862cc5",
+        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/349f7e1141c4d1461802220ce7de4aaba0862cc5",
+        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/349f7e1141c4d1461802220ce7de4aaba0862cc5"
+      }
+    ]
+  }
+]
diff --git a/.github/contributors.json b/.github/contributors.json
new file mode 100644
index 000000000..1703b4260
--- /dev/null
+++ b/.github/contributors.json
@@ -0,0 +1,991 @@
+[
+  {
+    "name": "18",
+    "github_login": "dezoito",
+    "twitter_username": ""
+  },
+  {
+    "name": "2O4",
+    "github_login": "2O4",
+    "twitter_username": ""
+  },
+  {
+    "name": "a7p",
+    "github_login": "a7p",
+    "twitter_username": ""
+  },
+  {
+    "name": "Aaron Eikenberry",
+    "github_login": "aeikenberry",
+    "twitter_username": ""
+  },
+  {
+    "name": "Adam Bogdał",
+    "github_login": "bogdal",
+    "twitter_username": ""
+  },
+  {
+    "name": "Adam Dobrawy",
+    "github_login": "ad-m",
+    "twitter_username": ""
+  },
+  {
+    "name": "Adam Steele",
+    "github_login": "adammsteele",
+    "twitter_username": ""
+  },
+  {
+    "name": "Agam Dua",
+    "github_login": "",
+    "twitter_username": ""
+  },
+  {
+    "name": "Agustín Scaramuzza",
+    "github_login": "scaramagus",
+    "twitter_username": "scaramagus"
+  },
+  {
+    "name": "Alberto Sanchez",
+    "github_login": "alb3rto",
+    "twitter_username": ""
+  },
+  {
+    "name": "Alex Tsai",
+    "github_login": "caffodian",
+    "twitter_username": ""
+  },
+  {
+    "name": "Alvaro [Andor]",
+    "github_login": "andor-pierdelacabeza",
+    "twitter_username": ""
+  },
+  {
+    "name": "Amjith Ramanujam",
+    "github_login": "amjith",
+    "twitter_username": ""
+  },
+  {
+    "name": "Andreas Meistad",
+    "github_login": "ameistad",
+    "twitter_username": ""
+  },
+  {
+    "name": "Andres Gonzalez",
+    "github_login": "andresgz",
+    "twitter_username": ""
+  },
+  {
+    "name": "Andrew Mikhnevich",
+    "github_login": "zcho",
+    "twitter_username": ""
+  },
+  {
+    "name": "Andrew Chen Wang",
+    "github_login": "Andrew-Chen-Wang",
+    "twitter_username": ""
+  },
+  {
+    "name": "Andy Rose",
+    "github_login": "",
+    "twitter_username": ""
+  },
+  {
+    "name": "Anna Callahan",
+    "github_login": "jazztpt",
+    "twitter_username": ""
+  },
+  {
+    "name": "Anna Sidwell",
+    "github_login": "takkaria",
+    "twitter_username": ""
+  },
+  {
+    "name": "Antonia Blair",
+    "github_login": "antoniablair",
+    "twitter_username": "antoniablairart"
+  },
+  {
+    "name": "Anuj Bansal",
+    "github_login": "ahhda",
+    "twitter_username": ""
+  },
+  {
+    "name": "Arcuri Davide",
+    "github_login": "dadokkio",
+    "twitter_username": ""
+  },
+  {
+    "name": "Areski Belaid",
+    "github_login": "areski",
+    "twitter_username": ""
+  },
+  {
+    "name": "Ashley Camba",
+    "github_login": "",
+    "twitter_username": ""
+  },
+  {
+    "name": "Audrey Roy Greenfeld",
+    "github_login": "audreyr",
+    "twitter_username": "audreyr",
+    "is_core": true
+  },
+  {
+    "name": "Barclay Gauld",
+    "github_login": "yunti",
+    "twitter_username": ""
+  },
+  {
+    "name": "Bartek",
+    "github_login": "btknu",
+    "twitter_username": ""
+  },
+  {
+    "name": "Ben Lopatin",
+    "github_login": "",
+    "twitter_username": ""
+  },
+  {
+    "name": "Ben Warren",
+    "github_login": "bwarren2",
+    "twitter_username": ""
+  },
+  {
+    "name": "Benjamin Abel",
+    "github_login": "",
+    "twitter_username": ""
+  },
+  {
+    "name": "Bert de Miranda",
+    "github_login": "bertdemiranda",
+    "twitter_username": ""
+  },
+  {
+    "name": "Bo Lopker",
+    "github_login": "blopker",
+    "twitter_username": ""
+  },
+  {
+    "name": "Bo Peng",
+    "github_login": "BoPeng",
+    "twitter_username": ""
+  },
+  {
+    "name": "Bouke Haarsma",
+    "github_login": "",
+    "twitter_username": ""
+  },
+  {
+    "name": "Brent Payne",
+    "github_login": "brentpayne",
+    "twitter_username": "brentpayne"
+  },
+  {
+    "name": "Bruce Olivier",
+    "github_login": "bolivierjr",
+    "twitter_username": ""
+  },
+  {
+    "name": "Bruno Alla",
+    "github_login": "browniebroke",
+    "twitter_username": "_BrunoAlla",
+    "is_core": true
+  },
+  {
+    "name": "Burhan Khalid",
+    "github_login": "burhan",
+    "twitter_username": "burhan",
+    "is_core": true
+  },
+  {
+    "name": "Caio Ariede",
+    "github_login": "caioariede",
+    "twitter_username": "caioariede"
+  },
+  {
+    "name": "Carl Johnson",
+    "github_login": "carlmjohnson",
+    "twitter_username": "carlmjohnson"
+  },
+  {
+    "name": "Catherine Devlin",
+    "github_login": "catherinedevlin",
+    "twitter_username": ""
+  },
+  {
+    "name": "Cédric Gaspoz",
+    "github_login": "cgaspoz",
+    "twitter_username": ""
+  },
+  {
+    "name": "Charlie Smith",
+    "github_login": "chuckus",
+    "twitter_username": ""
+  },
+  {
+    "name": "Chris Curvey",
+    "github_login": "ccurvey",
+    "twitter_username": ""
+  },
+  {
+    "name": "Chris Franklin",
+    "github_login": "",
+    "twitter_username": ""
+  },
+  {
+    "name": "Chris Franklin",
+    "github_login": "hairychris",
+    "twitter_username": ""
+  },
+  {
+    "name": "Chris Pappalardo",
+    "github_login": "ChrisPappalardo",
+    "twitter_username": ""
+  },
+  {
+    "name": "Christopher Clarke",
+    "github_login": "chrisdev",
+    "twitter_username": ""
+  },
+  {
+    "name": "Cole Mackenzie",
+    "github_login": "cmackenzie1",
+    "twitter_username": ""
+  },
+  {
+    "name": "Cole Maclean",
+    "github_login": "cole",
+    "twitter_username": "cole"
+  },
+  {
+    "name": "Collederas",
+    "github_login": "Collederas",
+    "twitter_username": ""
+  },
+  {
+    "name": "Craig Margieson",
+    "github_login": "cmargieson",
+    "twitter_username": ""
+  },
+  {
+    "name": "Cristian Vargas",
+    "github_login": "cdvv7788",
+    "twitter_username": ""
+  },
+  {
+    "name": "Cullen Rhodes",
+    "github_login": "c-rhodes",
+    "twitter_username": ""
+  },
+  {
+    "name": "Curtis St Pierre",
+    "github_login": "curtisstpierre",
+    "twitter_username": "cstpierre1388"
+  },
+  {
+    "name": "Dan Shultz",
+    "github_login": "shultz",
+    "twitter_username": ""
+  },
+  {
+    "name": "Dani Hodovic",
+    "github_login": "danihodovic",
+    "twitter_username": ""
+  },
+  {
+    "name": "Daniel Hepper",
+    "github_login": "dhepper",
+    "twitter_username": "danielhepper"
+  },
+  {
+    "name": "Daniel Hillier",
+    "github_login": "danifus",
+    "twitter_username": ""
+  },
+  {
+    "name": "Daniel Roy Greenfeld",
+    "github_login": "pydanny",
+    "twitter_username": "pydanny",
+    "is_core": true
+  },
+  {
+    "name": "Daniel Sears",
+    "github_login": "highpost",
+    "twitter_username": "highpost"
+  },
+  {
+    "name": "Daniele Tricoli",
+    "github_login": "eriol",
+    "twitter_username": ""
+  },
+  {
+    "name": "David Díaz",
+    "github_login": "ddiazpinto",
+    "twitter_username": "DavidDiazPinto"
+  },
+  {
+    "name": "Davit Tovmasyan",
+    "github_login": "davitovmasyan",
+    "twitter_username": ""
+  },
+  {
+    "name": "Davur Clementsen",
+    "github_login": "dsclementsen",
+    "twitter_username": "davur"
+  },
+  {
+    "name": "Delio Castillo",
+    "github_login": "jangeador",
+    "twitter_username": "jangeador"
+  },
+  {
+    "name": "Demetris Stavrou",
+    "github_login": "demestav",
+    "twitter_username": ""
+  },
+  {
+    "name": "Denis Bobrov",
+    "github_login": "delneg",
+    "twitter_username": ""
+  },
+  {
+    "name": "Denis Orehovsky",
+    "github_login": "apirobot",
+    "twitter_username": ""
+  },
+  {
+    "name": "Denis Savran",
+    "github_login": "blaxpy",
+    "twitter_username": ""
+  },
+  {
+    "name": "Diane Chen",
+    "github_login": "purplediane",
+    "twitter_username": "purplediane88"
+  },
+  {
+    "name": "Dónal Adams",
+    "github_login": "epileptic-fish",
+    "twitter_username": ""
+  },
+  {
+    "name": "Dong Huynh",
+    "github_login": "trungdong",
+    "twitter_username": ""
+  },
+  {
+    "name": "Duda Nogueira",
+    "github_login": "dudanogueira",
+    "twitter_username": "dudanogueira"
+  },
+  {
+    "name": "Emanuel Calso",
+    "github_login": "bloodpet",
+    "twitter_username": "bloodpet"
+  },
+  {
+    "name": "Eraldo Energy",
+    "github_login": "eraldo",
+    "twitter_username": ""
+  },
+  {
+    "name": "Eric Groom",
+    "github_login": "ericgroom",
+    "twitter_username": ""
+  },
+  {
+    "name": "Ernesto Cedeno",
+    "github_login": "codnee",
+    "twitter_username": ""
+  },
+  {
+    "name": "Eyad Al Sibai",
+    "github_login": "eyadsibai",
+    "twitter_username": ""
+  },
+  {
+    "name": "Fábio C. Barrionuevo da Luz",
+    "github_login": "luzfcb",
+    "twitter_username": "luzfcb",
+    "is_core": true
+  },
+  {
+    "name": "Felipe Arruda",
+    "github_login": "arruda",
+    "twitter_username": ""
+  },
+  {
+    "name": "Florian Idelberger",
+    "github_login": "step21",
+    "twitter_username": "windrush"
+  },
+  {
+    "name": "Gabriel Mejia",
+    "github_login": "elgartoinf",
+    "twitter_username": "elgartoinf"
+  },
+  {
+    "name": "Garry Cairns",
+    "github_login": "garry-cairns",
+    "twitter_username": ""
+  },
+  {
+    "name": "Garry Polley",
+    "github_login": "garrypolley",
+    "twitter_username": ""
+  },
+  {
+    "name": "Gilbishkosma",
+    "github_login": "Gilbishkosma",
+    "twitter_username": ""
+  },
+  {
+    "name": "Glenn Wiskur",
+    "github_login": "gwiskur",
+    "twitter_username": ""
+  },
+  {
+    "name": "Guilherme Guy",
+    "github_login": "guilherme1guy",
+    "twitter_username": ""
+  },
+  {
+    "name": "Hamish Durkin",
+    "github_login": "durkode",
+    "twitter_username": ""
+  },
+  {
+    "name": "Hana Quadara",
+    "github_login": "hanaquadara",
+    "twitter_username": ""
+  },
+  {
+    "name": "Hannah Lazarus",
+    "github_login": "hanhanhan",
+    "twitter_username": ""
+  },
+  {
+    "name": "Harry Moreno",
+    "github_login": "morenoh149",
+    "twitter_username": "morenoh149"
+  },
+  {
+    "name": "Harry Percival",
+    "github_login": "hjwp",
+    "twitter_username": ""
+  },
+  {
+    "name": "Hendrik Schneider",
+    "github_login": "hendrikschneider",
+    "twitter_username": ""
+  },
+  {
+    "name": "Henrique G. G. Pereira",
+    "github_login": "ikkebr",
+    "twitter_username": ""
+  },
+  {
+    "name": "Howie Zhao",
+    "github_login": "howiezhao",
+    "twitter_username": ""
+  },
+  {
+    "name": "Ian Lee",
+    "github_login": "IanLee1521",
+    "twitter_username": ""
+  },
+  {
+    "name": "Irfan Ahmad",
+    "github_login": "erfaan",
+    "twitter_username": "erfaan"
+  },
+  {
+    "name": "Isaac12x",
+    "github_login": "Isaac12x",
+    "twitter_username": ""
+  },
+  {
+    "name": "Ivan Khomutov",
+    "github_login": "ikhomutov",
+    "twitter_username": ""
+  },
+  {
+    "name": "James Williams",
+    "github_login": "jameswilliams1",
+    "twitter_username": ""
+  },
+  {
+    "name": "Jan Van Bruggen",
+    "github_login": "jvanbrug",
+    "twitter_username": ""
+  },
+  {
+    "name": "Jannis Gebauer",
+    "github_login": "jayfk",
+    "twitter_username": "",
+    "is_core": true
+  },
+  {
+    "name": "Jelmer Draaijer",
+    "github_login": "foarsitter",
+    "twitter_username": ""
+  },
+  {
+    "name": "Jerome Caisip",
+    "github_login": "jeromecaisip",
+    "twitter_username": ""
+  },
+  {
+    "name": "Jens Nilsson",
+    "github_login": "phiberjenz",
+    "twitter_username": ""
+  },
+  {
+    "name": "Jerome Leclanche",
+    "github_login": "jleclanche",
+    "twitter_username": "Adys"
+  },
+  {
+    "name": "Jimmy Gitonga",
+    "github_login": "afrowave",
+    "twitter_username": "afrowave"
+  },
+  {
+    "name": "John Cass",
+    "github_login": "jcass77",
+    "twitter_username": "cass_john"
+  },
+  {
+    "name": "Jonathan Thompson",
+    "github_login": "nojanath",
+    "twitter_username": ""
+  },
+  {
+    "name": "Jules Cheron",
+    "github_login": "jules-ch",
+    "twitter_username": ""
+  },
+  {
+    "name": "Julien Almarcha",
+    "github_login": "sladinji",
+    "twitter_username": ""
+  },
+  {
+    "name": "Julio Castillo",
+    "github_login": "juliocc",
+    "twitter_username": ""
+  },
+  {
+    "name": "Kaido Kert",
+    "github_login": "kaidokert",
+    "twitter_username": ""
+  },
+  {
+    "name": "kappataumu",
+    "github_login": "kappataumu",
+    "twitter_username": "kappataumu"
+  },
+  {
+    "name": "Kaveh",
+    "github_login": "ka7eh",
+    "twitter_username": ""
+  },
+  {
+    "name": "Keith Bailey",
+    "github_login": "keithjeb",
+    "twitter_username": ""
+  },
+  {
+    "name": "Keith Webber",
+    "github_login": "townie",
+    "twitter_username": ""
+  },
+  {
+    "name": "Kevin A. Stone",
+    "github_login": "",
+    "twitter_username": ""
+  },
+  {
+    "name": "Kevin Ndung'u",
+    "github_login": "kevgathuku",
+    "twitter_username": ""
+  },
+  {
+    "name": "Keyvan Mosharraf",
+    "github_login": "keyvanm",
+    "twitter_username": ""
+  },
+  {
+    "name": "Krzysztof Szumny",
+    "github_login": "noisy",
+    "twitter_username": ""
+  },
+  {
+    "name": "Krzysztof Żuraw",
+    "github_login": "krzysztofzuraw",
+    "twitter_username": ""
+  },
+  {
+    "name": "Leo won",
+    "github_login": "leollon",
+    "twitter_username": ""
+  },
+  {
+    "name": "Leo Zhou",
+    "github_login": "glasslion",
+    "twitter_username": ""
+  },
+  {
+    "name": "Leonardo Jimenez",
+    "github_login": "xpostudio4",
+    "twitter_username": ""
+  },
+  {
+    "name": "Lin Xianyi",
+    "github_login": "iynaix",
+    "twitter_username": ""
+  },
+  {
+    "name": "Luis Nell",
+    "github_login": "originell",
+    "twitter_username": ""
+  },
+  {
+    "name": "Lukas Klein",
+    "github_login": "",
+    "twitter_username": ""
+  },
+  {
+    "name": "Lyla Fischer",
+    "github_login": "",
+    "twitter_username": ""
+  },
+  {
+    "name": "Malik Sulaimanov",
+    "github_login": "flyudvik",
+    "twitter_username": "flyudvik"
+  },
+  {
+    "name": "Martin Blech",
+    "github_login": "",
+    "twitter_username": ""
+  },
+  {
+    "name": "Martin Saizar",
+    "github_login": "msaizar",
+    "twitter_username": ""
+  },
+  {
+    "name": "Mateusz Ostaszewski",
+    "github_login": "mostaszewski",
+    "twitter_username": ""
+  },
+  {
+    "name": "Mathijs Hoogland",
+    "github_login": "MathijsHoogland",
+    "twitter_username": ""
+  },
+  {
+    "name": "Matt Braymer-Hayes",
+    "github_login": "mattayes",
+    "twitter_username": "mattayes"
+  },
+  {
+    "name": "Matt Knapper",
+    "github_login": "mknapper1",
+    "twitter_username": ""
+  },
+  {
+    "name": "Matt Linares",
+    "github_login": "",
+    "twitter_username": ""
+  },
+  {
+    "name": "Matt Menzenski",
+    "github_login": "menzenski",
+    "twitter_username": ""
+  },
+  {
+    "name": "Matt Warren",
+    "github_login": "mfwarren",
+    "twitter_username": ""
+  },
+  {
+    "name": "Matthew Sisley",
+    "github_login": "mjsisley",
+    "twitter_username": ""
+  },
+  {
+    "name": "Meghan Heintz",
+    "github_login": "dot2dotseurat",
+    "twitter_username": ""
+  },
+  {
+    "name": "Mesut Yılmaz",
+    "github_login": "myilmaz",
+    "twitter_username": ""
+  },
+  {
+    "name": "Michael Gecht",
+    "github_login": "mimischi",
+    "twitter_username": "_mischi"
+  },
+  {
+    "name": "Michael Samoylov",
+    "github_login": "msamoylov",
+    "twitter_username": ""
+  },
+  {
+    "name": "Min ho Kim",
+    "github_login": "minho42",
+    "twitter_username": ""
+  },
+  {
+    "name": "mozillazg",
+    "github_login": "mozillazg",
+    "twitter_username": ""
+  },
+  {
+    "name": "Nico Stefani",
+    "github_login": "nicolas471",
+    "twitter_username": "moby_dick91"
+  },
+  {
+    "name": "Oleg Russkin",
+    "github_login": "rolep",
+    "twitter_username": ""
+  },
+  {
+    "name": "Pablo",
+    "github_login": "oubiga",
+    "twitter_username": ""
+  },
+  {
+    "name": "Parbhat Puri",
+    "github_login": "parbhat",
+    "twitter_username": ""
+  },
+  {
+    "name": "Pawan Chaurasia",
+    "github_login": "rjsnh1522",
+    "twitter_username": ""
+  },
+  {
+    "name": "Peter Bittner",
+    "github_login": "bittner",
+    "twitter_username": ""
+  },
+  {
+    "name": "Peter Coles",
+    "github_login": "mrcoles",
+    "twitter_username": ""
+  },
+  {
+    "name": "Philipp Matthies",
+    "github_login": "canonnervio",
+    "twitter_username": ""
+  },
+  {
+    "name": "Pierre Chiquet",
+    "github_login": "pchiquet",
+    "twitter_username": ""
+  },
+  {
+    "name": "Raony Guimarães Corrêa",
+    "github_login": "raonyguimaraes",
+    "twitter_username": ""
+  },
+  {
+    "name": "Raphael Pierzina",
+    "github_login": "hackebrot",
+    "twitter_username": ""
+  },
+  {
+    "name": "Reggie Riser",
+    "github_login": "reggieriser",
+    "twitter_username": ""
+  },
+  {
+    "name": "René Muhl",
+    "github_login": "rm--",
+    "twitter_username": ""
+  },
+  {
+    "name": "Roman Afanaskin",
+    "github_login": "siauPatrick",
+    "twitter_username": ""
+  },
+  {
+    "name": "Roman Osipenko",
+    "github_login": "romanosipenko",
+    "twitter_username": ""
+  },
+  {
+    "name": "Russell Davies",
+    "github_login": "",
+    "twitter_username": ""
+  },
+  {
+    "name": "Sam Collins",
+    "github_login": "MightySCollins",
+    "twitter_username": ""
+  },
+  {
+    "name": "Saurabh Kumar",
+    "github_login": "theskumar",
+    "twitter_username": "_theskumar",
+    "is_core": true
+  },
+  {
+    "name": "Sascha",
+    "github_login": "saschalalala",
+    "twitter_username": "saschalalala"
+  },
+  {
+    "name": "Shupeyko Nikita",
+    "github_login": "webyneter",
+    "twitter_username": "",
+    "is_core": true
+  },
+  {
+    "name": "Sławek Ehlert",
+    "github_login": "slafs",
+    "twitter_username": ""
+  },
+  {
+    "name": "Sorasful",
+    "github_login": "sorasful",
+    "twitter_username": ""
+  },
+  {
+    "name": "Srinivas Nyayapati",
+    "github_login": "shireenrao",
+    "twitter_username": ""
+  },
+  {
+    "name": "stepmr",
+    "github_login": "stepmr",
+    "twitter_username": ""
+  },
+  {
+    "name": "Steve Steiner",
+    "github_login": "ssteinerX",
+    "twitter_username": ""
+  },
+  {
+    "name": "Sudarshan Wadkar",
+    "github_login": "wadkar",
+    "twitter_username": ""
+  },
+  {
+    "name": "Sule Marshall",
+    "github_login": "suledev",
+    "twitter_username": ""
+  },
+  {
+    "name": "Tano Abeleyra",
+    "github_login": "tanoabeleyra",
+    "twitter_username": ""
+  },
+  {
+    "name": "Taylor Baldwin",
+    "github_login": "",
+    "twitter_username": ""
+  },
+  {
+    "name": "Théo Segonds",
+    "github_login": "show0k",
+    "twitter_username": ""
+  },
+  {
+    "name": "Tim Claessens",
+    "github_login": "timclaessens",
+    "twitter_username": ""
+  },
+  {
+    "name": "Tim Freund",
+    "github_login": "timfreund",
+    "twitter_username": ""
+  },
+  {
+    "name": "Tom Atkins",
+    "github_login": "knitatoms",
+    "twitter_username": ""
+  },
+  {
+    "name": "Tom Offermann",
+    "github_login": "",
+    "twitter_username": ""
+  },
+  {
+    "name": "Travis McNeill",
+    "github_login": "Travistock",
+    "twitter_username": "tavistock_esq"
+  },
+  {
+    "name": "Tubo Shi",
+    "github_login": "Tubo",
+    "twitter_username": ""
+  },
+  {
+    "name": "Umair Ashraf",
+    "github_login": "umrashrf",
+    "twitter_username": "fabumair"
+  },
+  {
+    "name": "Vadim Iskuchekov",
+    "github_login": "Egregors",
+    "twitter_username": "egregors"
+  },
+  {
+    "name": "Vicente G. Reyes",
+    "github_login": "reyesvicente",
+    "twitter_username": "highcenburg"
+  },
+  {
+    "name": "Vitaly Babiy",
+    "github_login": "",
+    "twitter_username": ""
+  },
+  {
+    "name": "Vivian Guillen",
+    "github_login": "viviangb",
+    "twitter_username": ""
+  },
+  {
+    "name": "Vlad Doster",
+    "github_login": "vladdoster",
+    "twitter_username": ""
+  },
+  {
+    "name": "Will Farley",
+    "github_login": "goldhand",
+    "twitter_username": "g01dhand"
+  },
+  {
+    "name": "William Archinal",
+    "github_login": "archinal",
+    "twitter_username": ""
+  },
+  {
+    "name": "Wan Liuyang",
+    "github_login": "sfdye",
+    "twitter_username": "sfdye",
+    "is_core": true
+  },
+  {
+    "name": "Xaver Y.R. Chen",
+    "github_login": "yrchen",
+    "twitter_username": "yrchen"
+  },
+  {
+    "name": "Yaroslav Halchenko",
+    "github_login": "",
+    "twitter_username": ""
+  },
+  {
+    "name": "Yuchen Xie",
+    "github_login": "mapx",
+    "twitter_username": ""
+  }
+]
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
new file mode 100644
index 000000000..20593be44
--- /dev/null
+++ b/.github/workflows/update-contributors.yml
@@ -0,0 +1,26 @@
+name: Update Contributors
+
+on:
+  push:
+    branches:
+      - master
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+      with:
+        fetch-depth: 0
+
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: "3.8"
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+    - name: Update list
+      run: python scripts/update_contributors.py $GITHUB_EVENT_PATH
diff --git a/.gitignore b/.gitignore
index efe33befa..386b2651a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -214,7 +214,6 @@ tags
 [Ii]nclude
 [Ll]ib
 [Ll]ib64
-[Ss]cripts
 pyvenv.cfg
 pip-selfcheck.json
 
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
new file mode 100644
index 000000000..b7cc186d1
--- /dev/null
+++ b/CONTRIBUTORS.md
@@ -0,0 +1,96 @@
+# Contributors
+
+## Core Developers
+
+These contributors have commit flags for the repository, and are able to
+accept and merge pull requests.
+
+<table>
+  <tr>
+    <th>Name</th>
+    <th>Github</th>
+    <th>Twitter</th>
+  </tr>
+  <tr>
+    <td>Daniel Roy Greenfeld</td>
+    <td>
+      <a href="https://github.com/pydanny">pydanny</a>
+    </td>
+    <td>pydanny</td>
+  </tr>
+  <tr>
+    <td>Audrey Roy Greenfeld</td>
+    <td>
+      <a href="https://github.com/audreyr">audreyr</a>
+    </td>
+    <td>audreyr</td>
+  </tr>
+  <tr>
+    <td>Fábio C. Barrionuevo da Luz</td>
+    <td>
+      <a href="https://github.com/luzfcb">luzfcb</a>
+    </td>
+    <td>luzfcb</td>
+  </tr>
+  <tr>
+    <td>Saurabh Kumar</td>
+    <td>
+      <a href="https://github.com/theskumar">theskumar</a>
+    </td>
+    <td>_theskumar</td>
+  </tr>
+  <tr>
+    <td>Jannis Gebauer</td>
+    <td>
+      <a href="https://github.com/jayfk">jayfk</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Burhan Khalid</td>
+    <td>
+      <a href="https://github.com/burhan">burhan</a>
+    </td>
+    <td>burhan</td>
+  </tr>
+  <tr>
+    <td>Nikita Shupeyko</td>
+    <td>
+      <a href="https://github.com/webyneter">webyneter</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Bruno Alla</td>
+    <td>
+      <a href="https://github.com/browniebroke">browniebroke</a>
+    </td>
+    <td>_BrunoAlla</td>
+  </tr>
+  <tr>
+    <td>Wan Liuyang</td>
+    <td>
+      <a href="https://github.com/sfdye">sfdye</a>
+    </td>
+    <td>sfdye</td>
+  </tr>
+</table>
+
+*Audrey is also the creator of Cookiecutter. Audrey and Daniel are on
+the Cookiecutter core team.*
+
+## Other Contributors
+
+Listed in alphabetical order.
+
+<!-- BEGIN-GENERATED-CONTENT -->
+<!-- END-GENERATED-CONTENT -->
+
+### Special Thanks
+
+The following haven't provided code directly, but have provided
+guidance and advice.
+
+-   Jannis Leidel
+-   Nate Aune
+-   Barry Morrison
diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index f1b5e0f0e..c564dfaf3 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -17,7 +17,7 @@ Saurabh Kumar               `@theskumar`_      @_theskumar
 Jannis Gebauer              `@jayfk`_
 Burhan Khalid               `@burhan`_         @burhan
 Nikita Shupeyko             `@webyneter`_      @webyneter
-Bruno Alla                  `@browniebroke`_   @_BrunoAlla
+Bruno Alla                  `@browniebroke`_   @_BrunoAlla
 Wan Liuyang                 `@sfdye`_          @sfdye
 =========================== ================= ===========
 
@@ -29,6 +29,7 @@ Daniel are on the Cookiecutter core team.*
 .. _@theskumar: https://github.com/theskumar
 .. _@audreyr: https://github.com/audreyr
 .. _@jayfk: https://github.com/jayfk
+.. _@burhan: https://github.com/burhan
 .. _@webyneter: https://github.com/webyneter
 .. _@browniebroke: https://github.com/browniebroke
 .. _@sfdye: https://github.com/sfdye
@@ -267,7 +268,6 @@ Listed in alphabetical order.
 .. _@BoPeng: https://github.com/BoPeng
 .. _@brentpayne: https://github.com/brentpayne
 .. _@btknu: https://github.com/btknu
-.. _@burhan: https://github.com/burhan
 .. _@bwarren2: https://github.com/bwarren2
 .. _@c-rhodes: https://github.com/c-rhodes
 .. _@caffodian: https://github.com/caffodian
diff --git a/requirements.txt b/requirements.txt
index 1fbc8d165..b04e40126 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,3 +16,8 @@ pytest==6.0.1
 pytest-cookies==0.5.1
 pytest-instafail==0.4.2
 pyyaml==5.3.1
+
+# Scripting
+# ------------------------------------------------------------------------------
+requests
+jinja2
diff --git a/scripts/__init__.py b/scripts/__init__.py
new file mode 100644
index 000000000..8b1378917
--- /dev/null
+++ b/scripts/__init__.py
@@ -0,0 +1 @@
+
diff --git a/scripts/rst_to_json.py b/scripts/rst_to_json.py
new file mode 100644
index 000000000..37f5b2193
--- /dev/null
+++ b/scripts/rst_to_json.py
@@ -0,0 +1,102 @@
+import json
+from pathlib import Path
+
+CURRENT_FILE = Path(__file__)
+ROOT = CURRENT_FILE.parents[1]
+
+
+def main():
+    input_file_path = ROOT / "CONTRIBUTORS.rst"
+    with input_file_path.open() as ifd:
+        content = ifd.read()
+
+    table_separator = (
+        "============================= ========================== =================="
+    )
+    table_content = content.split(table_separator)[2]
+
+    profiles_list = [
+        {
+            "name": "Audrey Roy Greenfeld",
+            "github_login": "audreyr",
+            "twitter_username": "audreyr",
+            "is_core": True,
+        },
+        {
+            "name": "Bruno Alla",
+            "github_login": "browniebroke",
+            "twitter_username": "_BrunoAlla",
+            "is_core": True,
+        },
+        {
+            "name": "Burhan Khalid",
+            "github_login": "burhan",
+            "twitter_username": "burhan",
+            "is_core": True,
+        },
+        {
+            "name": "Daniel Roy Greenfeld",
+            "github_login": "pydanny",
+            "twitter_username": "pydanny",
+            "is_core": True,
+        },
+        {
+            "name": "Fábio C. Barrionuevo da Luz",
+            "github_login": "luzfcb",
+            "twitter_username": "luzfcb",
+            "is_core": True,
+        },
+        {
+            "name": "Jannis Gebauer",
+            "github_login": "jayfk",
+            "twitter_username": "",
+            "is_core": True,
+        },
+        {
+            "name": "Saurabh Kumar",
+            "github_login": "theskumar",
+            "twitter_username": "_theskumar",
+            "is_core": True,
+        },
+        {
+            "name": "Shupeyko Nikita",
+            "github_login": "webyneter",
+            "twitter_username": "",
+            "is_core": True,
+        },
+        {
+            "name": "Wan Liuyang",
+            "github_login": "sfdye",
+            "twitter_username": "sfdye",
+            "is_core": True,
+        },
+    ]
+    core_members = [member["github_login"] for member in profiles_list]
+
+    for contrib in table_content.split("\n"):
+        if not contrib:
+            continue
+        line_parts = contrib.split("`")
+        name = line_parts[0].strip()
+        github_login = line_parts[1].lstrip("@") if len(line_parts) > 1 else ""
+        if github_login in core_members:
+            continue
+        twitter_username = (
+            line_parts[2].lstrip("_").strip().lstrip("@")
+            if len(line_parts) == 3
+            else ""
+        )
+        profile = {
+            "name": name,
+            "github_login": github_login,
+            "twitter_username": twitter_username,
+        }
+        profiles_list.append(profile)
+
+    output_file_path = ROOT / ".github" / "contributors.json"
+    with output_file_path.open("w") as ofd:
+        json.dump(profiles_list, ofd, indent=2, ensure_ascii=False)
+
+
+if __name__ == "__main__":
+    main()
diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py
new file mode 100644
index 000000000..2a8058bb4
--- /dev/null
+++ b/scripts/update_contributors.py
@@ -0,0 +1,130 @@
+import json
+from pathlib import Path
+
+import requests
+from jinja2 import Template
+
+CURRENT_FILE = Path(__file__)
+ROOT = CURRENT_FILE.parents[1]
+BOT_LOGINS = ["pyup-bot"]
+OUTPUT_FILE_PATH = ROOT / "CONTRIBUTORS.rst"
+
+CONTRIBUTORS_TABLE_TEMPLATE = """
+<table>
+  <tr>
+    <th>Name</th>
+    <th>Github</th>
+    <th>Twitter</th>
+  </tr>
+  {%- for contributor in contributors %}
+  <tr>
+    <td>{{ contributor.name }}</td>
+    <td>
+      <a href="https://github.com/{{ contributor.github_login }}">{{ contributor.github_login }}</a>
+    </td>
+    <td>{{ contributor.twitter_username }}</td>
+  </tr>
+  {%- endfor %}
+</table>
+"""
+
+
+def main() -> None:
+    gh = GitHub()
+    recent_authors = set(gh.iter_recent_authors())
+    contrib_file = ContributorsJSONFile()
+    for username in recent_authors:
+        if username not in contrib_file:
+            user_data = gh.fetch_user_info(username)
+            contrib_file.add_contributor(user_data)
+    contrib_file.save()
+
+    rst_file = ContributorsRSTFile()
+    rst_file.generate_table(contrib_file.content)
+    rst_file.save()
+
+
+class GitHub:
+    base_url = "https://api.github.com"
+
+    def __init__(self) -> None:
+        self.session = requests.Session()
+
+    def request(self, endpoint):
+        response = self.session.get(f"{self.base_url}{endpoint}")
+        response.raise_for_status()
+        return response.json()
+
+    def iter_recent_authors(self):
+        commits = self.request("/repos/pydanny/cookiecutter-django/commits")
+        for commit in commits:
+            login = commit["author"]["login"]
+            if login not in BOT_LOGINS:
+                yield login
+
+    def fetch_user_info(self, username):
+        return self.request(f"/users/{username}")
+
+
+class ContributorsJSONFile:
+    file_path = ROOT / ".github" / "contributors.json"
+    content = None
+
+    def __init__(self) -> None:
+        with self.file_path.open() as fd:
+            self.content = json.load(fd)
+
+    def __contains__(self, github_login: str):
+        return any(github_login == contrib["github_login"] for contrib in self.content)
+
+    def add_contributor(self, user_data):
+        contributor_data = {
+            "name": user_data["name"],
+            "github_login": user_data["login"],
+            "twitter_username": user_data["twitter_username"],
+        }
+        new_content = self.content + [contributor_data]
+        self.content = sorted(new_content, key=lambda user: user["name"])
+
+    def save(self):
+        with self.file_path.open("w") as fd:
+            json.dump(self.content, fd, indent=2)
+
+
+class ContributorsRSTFile:
+    file_path = ROOT / "CONTRIBUTORS.md"
+    content = None
+    marker_start = "<!-- BEGIN-GENERATED-CONTENT -->"
+    marker_end = "<!-- END-GENERATED-CONTENT -->"
+
+    def __init__(self) -> None:
+        with self.file_path.open() as fd:
+            content = fd.read()
+        self.before, rest_initial = content.split(f"{self.marker_start}")
+        self.middle, self.after = rest_initial.split(f"{self.marker_end}")
+
+    def generate_table(self, profiles_list):
+        template = Template(CONTRIBUTORS_TABLE_TEMPLATE, autoescape=True)
+        contributors = [profile for profile in profiles_list if not profile.get("is_core", False)]
+        self.middle = template.render(contributors=contributors)
+
+    def save(self):
+        with self.file_path.open("w") as fd:
+            new_content = "\n".join(
+                [
+                    self.before,
+                    self.marker_start,
+                    self.middle,
+                    self.marker_end,
+                    self.after,
+                ]
+            )
+
+            fd.write(new_content)
+
+
+if __name__ == "__main__":
+    template = Template(CONTRIBUTORS_TABLE_TEMPLATE, autoescape=True)
+    contrib_file = ContributorsJSONFile()
+    contributors = [profile for profile in contrib_file.content if profile.get("is_core", False)]
+    print(template.render(contributors=contributors))

From c57439e52206e9b70e998108310ac6a281e70a12 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 10 Aug 2020 17:42:01 +0100
Subject: [PATCH 0921/2840] Enhancements to the script

---
 CONTRIBUTORS.md                |  96 ------------------------------
 scripts/update_contributors.py | 105 ++++++++++++++++++---------------
 2 files changed, 59 insertions(+), 142 deletions(-)
 delete mode 100644 CONTRIBUTORS.md

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
deleted file mode 100644
index b7cc186d1..000000000
--- a/CONTRIBUTORS.md
+++ /dev/null
@@ -1,96 +0,0 @@
-# Contributors
-
-## Core Developers
-
-These contributors have commit flags for the repository, and are able to
-accept and merge pull requests.
-
-<table>
-  <tr>
-    <th>Name</th>
-    <th>Github</th>
-    <th>Twitter</th>
-  </tr>
-  <tr>
-    <td>Daniel Roy Greenfeld</td>
-    <td>
-      <a href="https://github.com/pydanny">pydanny</a>
-    </td>
-    <td>pydanny</td>
-  </tr>
-  <tr>
-    <td>Audrey Roy Greenfeld</td>
-    <td>
-      <a href="https://github.com/audreyr">audreyr</a>
-    </td>
-    <td>audreyr</td>
-  </tr>
-  <tr>
-    <td>Fábio C. Barrionuevo da Luz</td>
-    <td>
-      <a href="https://github.com/luzfcb">luzfcb</a>
-    </td>
-    <td>luzfcb</td>
-  </tr>
-  <tr>
-    <td>Saurabh Kumar</td>
-    <td>
-      <a href="https://github.com/theskumar">theskumar</a>
-    </td>
-    <td>_theskumar</td>
-  </tr>
-  <tr>
-    <td>Jannis Gebauer</td>
-    <td>
-      <a href="https://github.com/jayfk">jayfk</a>
-    </td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>Burhan Khalid</td>
-    <td>
-      <a href="https://github.com/burhan">burhan</a>
-    </td>
-    <td>burhan</td>
-  </tr>
-  <tr>
-    <td>Nikita Shupeyko</td>
-    <td>
-      <a href="https://github.com/webyneter">webyneter</a>
-    </td>
-    <td></td>
-  </tr>
-  <tr>
-    <td>Bruno Alla</td>
-    <td>
-      <a href="https://github.com/browniebroke">browniebroke</a>
-    </td>
-    <td>_BrunoAlla</td>
-  </tr>
-  <tr>
-    <td>Wan Liuyang</td>
-    <td>
-      <a href="https://github.com/sfdye">sfdye</a>
-    </td>
-    <td>sfdye</td>
-  </tr>
-</table>
-
-*Audrey is also the creator of Cookiecutter. Audrey and Daniel are on
-the Cookiecutter core team.*
-
-## Other Contributors
-
-Listed in alphabetical order.
-
-<!-- BEGIN-GENERATED-CONTENT -->
-<!-- END-GENERATED-CONTENT -->
-
-### Special Thanks
-
-The following haven't provided code directly, but have provided
-guidance and advice.
-
--   Jannis Leidel
--   Nate Aune
--   Barry Morrison
diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py
index 2a8058bb4..6d4c34162 100644
--- a/scripts/update_contributors.py
+++ b/scripts/update_contributors.py
@@ -7,16 +7,22 @@ from jinja2 import Template
 CURRENT_FILE = Path(__file__)
 ROOT = CURRENT_FILE.parents[1]
 BOT_LOGINS = ["pyup-bot"]
-OUTPUT_FILE_PATH = ROOT / "CONTRIBUTORS.rst"
 
-CONTRIBUTORS_TABLE_TEMPLATE = """
+CONTRIBUTORS_TEMPLATE = """
+# Contributors
+
+## Core Developers
+
+These contributors have commit flags for the repository, and are able to
+accept and merge pull requests.
+
 <table>
   <tr>
     <th>Name</th>
     <th>Github</th>
     <th>Twitter</th>
   </tr>
-  {%- for contributor in contributors %}
+  {%- for contributor in core_contributors %}
   <tr>
     <td>{{ contributor.name }}</td>
     <td>
@@ -26,6 +32,39 @@ CONTRIBUTORS_TABLE_TEMPLATE = """
   </tr>
   {%- endfor %}
 </table>
+
+*Audrey is also the creator of Cookiecutter. Audrey and Daniel are on
+the Cookiecutter core team.*
+
+## Other Contributors
+
+Listed in alphabetical order.
+
+<table>
+  <tr>
+    <th>Name</th>
+    <th>Github</th>
+    <th>Twitter</th>
+  </tr>
+  {%- for contributor in other_contributors %}
+  <tr>
+    <td>{{ contributor.name }}</td>
+    <td>
+      <a href="https://github.com/{{ contributor.github_login }}">{{ contributor.github_login }}</a>
+    </td>
+    <td>{{ contributor.twitter_username }}</td>
+  </tr>
+  {%- endfor %}
+</table>
+
+### Special Thanks
+
+The following haven't provided code directly, but have provided
+guidance and advice.
+
+-   Jannis Leidel
+-   Nate Aune
+-   Barry Morrison
 """
 
 
@@ -34,14 +73,12 @@ def main() -> None:
     recent_authors = set(gh.iter_recent_authors())
     contrib_file = ContributorsJSONFile()
     for username in recent_authors:
-        if username not in contrib_file:
+        if username not in contrib_file and username not in BOT_LOGINS:
             user_data = gh.fetch_user_info(username)
             contrib_file.add_contributor(user_data)
     contrib_file.save()
 
-    rst_file = ContributorsRSTFile()
-    rst_file.generate_table(contrib_file.content)
-    rst_file.save()
+    write_md_file(contrib_file.content)
 
 
 class GitHub:
@@ -71,8 +108,7 @@ class ContributorsJSONFile:
     content = None
 
     def __init__(self) -> None:
-        with self.file_path.open() as fd:
-            self.content = json.load(fd)
+        self.content = json.loads(self.file_path.read_text())
 
     def __contains__(self, github_login: str):
         return any(github_login == contrib["github_login"] for contrib in self.content)
@@ -83,48 +119,25 @@ class ContributorsJSONFile:
             "github_login": user_data["login"],
             "twitter_username": user_data["twitter_username"],
         }
-        new_content = self.content + [contributor_data]
-        self.content = sorted(new_content, key=lambda user: user["name"])
+        self.content.extend(contributor_data)
 
     def save(self):
-        with self.file_path.open("w") as fd:
-            json.dump(self.content, fd, indent=2)
+        self.file_path.write_text(json.dumps(self.content, indent=2))
 
 
-class ContributorsRSTFile:
+def write_md_file(contributors):
+    template = Template(CONTRIBUTORS_TEMPLATE, autoescape=True)
+    core_contributors = [
+        c for c in contributors if c.get("is_core", False)
+    ]
+    other_contributors = sorted(
+        c for c in contributors if not c.get("is_core", False)
+    )
+    content = template.render(core_contributors=core_contributors, other_contributors=other_contributors)
+
     file_path = ROOT / "CONTRIBUTORS.md"
-    content = None
-    marker_start = "<!-- BEGIN-GENERATED-CONTENT -->"
-    marker_end = "<!-- END-GENERATED-CONTENT -->"
-
-    def __init__(self) -> None:
-        with self.file_path.open() as fd:
-            content = fd.read()
-        self.before, rest_initial = content.split(f"{self.marker_start}")
-        self.middle, self.after = rest_initial.split(f"{self.marker_end}")
-
-    def generate_table(self, profiles_list):
-        template = Template(CONTRIBUTORS_TABLE_TEMPLATE, autoescape=True)
-        contributors = [profile for profile in profiles_list if not profile.get("is_core", False)]
-        self.middle = template.render(contributors=contributors)
-
-    def save(self):
-        with self.file_path.open("w") as fd:
-            new_content = "\n".join(
-                [
-                    self.before,
-                    self.marker_start,
-                    self.middle,
-                    self.marker_end,
-                    self.after,
-                ]
-            )
-
-            fd.write(new_content)
+    file_path.write_text(content)
 
 
 if __name__ == "__main__":
-    template = Template(CONTRIBUTORS_TABLE_TEMPLATE, autoescape=True)
-    contrib_file = ContributorsJSONFile()
-    contributors = [profile for profile in contrib_file.content if profile.get("is_core", False)]
-    print(template.render(contributors=contributors))
+    main()

From ea8cfd55a48e090ebbeb586a11a84c862c1e7006 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 10 Aug 2020 17:46:34 +0100
Subject: [PATCH 0922/2840] More tweaks

---
 .github/contributors.json      |  2 +-
 scripts/update_contributors.py | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/contributors.json b/.github/contributors.json
index 1703b4260..b915f5d5a 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -988,4 +988,4 @@
     "github_login": "mapx",
     "twitter_username": ""
   }
-]
+]
\ No newline at end of file
diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py
index 6d4c34162..88b6ffa88 100644
--- a/scripts/update_contributors.py
+++ b/scripts/update_contributors.py
@@ -122,18 +122,18 @@ class ContributorsJSONFile:
         self.content.extend(contributor_data)
 
     def save(self):
-        self.file_path.write_text(json.dumps(self.content, indent=2))
+        text_content = json.dumps(self.content, indent=2, ensure_ascii=False)
+        self.file_path.write_text(text_content)
 
 
 def write_md_file(contributors):
     template = Template(CONTRIBUTORS_TEMPLATE, autoescape=True)
-    core_contributors = [
-        c for c in contributors if c.get("is_core", False)
-    ]
-    other_contributors = sorted(
-        c for c in contributors if not c.get("is_core", False)
+    core_contributors = [c for c in contributors if c.get("is_core", False)]
+    other_contributors = (c for c in contributors if not c.get("is_core", False))
+    other_contributors = sorted(other_contributors, key=lambda c: c["name"])
+    content = template.render(
+        core_contributors=core_contributors, other_contributors=other_contributors
     )
-    content = template.render(core_contributors=core_contributors, other_contributors=other_contributors)
 
     file_path = ROOT / "CONTRIBUTORS.md"
     file_path.write_text(content)

From ceb96dddc1a4a3362f8fd35bb72d1017d0476ee4 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 10 Aug 2020 17:49:38 +0100
Subject: [PATCH 0923/2840] Organise core contributors by date joined

---
 .github/contributors.json | 110 +++++++++++++++++++-------------------
 1 file changed, 55 insertions(+), 55 deletions(-)

diff --git a/.github/contributors.json b/.github/contributors.json
index b915f5d5a..7a932526e 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1,4 +1,58 @@
 [
+  {
+    "name": "Daniel Roy Greenfeld",
+    "github_login": "pydanny",
+    "twitter_username": "pydanny",
+    "is_core": true
+  },
+  {
+    "name": "Audrey Roy Greenfeld",
+    "github_login": "audreyr",
+    "twitter_username": "audreyr",
+    "is_core": true
+  },
+  {
+    "name": "Fábio C. Barrionuevo da Luz",
+    "github_login": "luzfcb",
+    "twitter_username": "luzfcb",
+    "is_core": true
+  },
+  {
+    "name": "Saurabh Kumar",
+    "github_login": "theskumar",
+    "twitter_username": "_theskumar",
+    "is_core": true
+  },
+  {
+    "name": "Jannis Gebauer",
+    "github_login": "jayfk",
+    "twitter_username": "",
+    "is_core": true
+  },
+  {
+    "name": "Burhan Khalid",
+    "github_login": "burhan",
+    "twitter_username": "burhan",
+    "is_core": true
+  },
+  {
+    "name": "Shupeyko Nikita",
+    "github_login": "webyneter",
+    "twitter_username": "webyneter",
+    "is_core": true
+  },
+  {
+    "name": "Bruno Alla",
+    "github_login": "browniebroke",
+    "twitter_username": "_BrunoAlla",
+    "is_core": true
+  },
+  {
+    "name": "Wan Liuyang",
+    "github_login": "sfdye",
+    "twitter_username": "sfdye",
+    "is_core": true
+  },
   {
     "name": "18",
     "github_login": "dezoito",
@@ -124,12 +178,6 @@
     "github_login": "",
     "twitter_username": ""
   },
-  {
-    "name": "Audrey Roy Greenfeld",
-    "github_login": "audreyr",
-    "twitter_username": "audreyr",
-    "is_core": true
-  },
   {
     "name": "Barclay Gauld",
     "github_login": "yunti",
@@ -185,18 +233,6 @@
     "github_login": "bolivierjr",
     "twitter_username": ""
   },
-  {
-    "name": "Bruno Alla",
-    "github_login": "browniebroke",
-    "twitter_username": "_BrunoAlla",
-    "is_core": true
-  },
-  {
-    "name": "Burhan Khalid",
-    "github_login": "burhan",
-    "twitter_username": "burhan",
-    "is_core": true
-  },
   {
     "name": "Caio Ariede",
     "github_login": "caioariede",
@@ -302,12 +338,6 @@
     "github_login": "danifus",
     "twitter_username": ""
   },
-  {
-    "name": "Daniel Roy Greenfeld",
-    "github_login": "pydanny",
-    "twitter_username": "pydanny",
-    "is_core": true
-  },
   {
     "name": "Daniel Sears",
     "github_login": "highpost",
@@ -403,12 +433,6 @@
     "github_login": "eyadsibai",
     "twitter_username": ""
   },
-  {
-    "name": "Fábio C. Barrionuevo da Luz",
-    "github_login": "luzfcb",
-    "twitter_username": "luzfcb",
-    "is_core": true
-  },
   {
     "name": "Felipe Arruda",
     "github_login": "arruda",
@@ -519,12 +543,6 @@
     "github_login": "jvanbrug",
     "twitter_username": ""
   },
-  {
-    "name": "Jannis Gebauer",
-    "github_login": "jayfk",
-    "twitter_username": "",
-    "is_core": true
-  },
   {
     "name": "Jelmer Draaijer",
     "github_login": "foarsitter",
@@ -830,23 +848,11 @@
     "github_login": "MightySCollins",
     "twitter_username": ""
   },
-  {
-    "name": "Saurabh Kumar",
-    "github_login": "theskumar",
-    "twitter_username": "_theskumar",
-    "is_core": true
-  },
   {
     "name": "Sascha",
     "github_login": "saschalalala",
     "twitter_username": "saschalalala"
   },
-  {
-    "name": "Shupeyko Nikita",
-    "github_login": "webyneter",
-    "twitter_username": "",
-    "is_core": true
-  },
   {
     "name": "Sławek Ehlert",
     "github_login": "slafs",
@@ -967,12 +973,6 @@
     "github_login": "archinal",
     "twitter_username": ""
   },
-  {
-    "name": "Wan Liuyang",
-    "github_login": "sfdye",
-    "twitter_username": "sfdye",
-    "is_core": true
-  },
   {
     "name": "Xaver Y.R. Chen",
     "github_login": "yrchen",
@@ -988,4 +988,4 @@
     "github_login": "mapx",
     "twitter_username": ""
   }
-]
\ No newline at end of file
+]

From bd381ea0bfd8aa18ccc2f6ff5d4e8e3a1a766528 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 10 Aug 2020 17:56:26 +0100
Subject: [PATCH 0924/2840] Update the Github workflow

---
 .github/workflows/update-contributors.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 20593be44..9809e234b 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -4,6 +4,7 @@ on:
   push:
     branches:
       - master
+      - auto-generate-contributors
 
 jobs:
   build:
@@ -11,8 +12,6 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-      with:
-        fetch-depth: 0
 
     - name: Set up Python
       uses: actions/setup-python@v2
@@ -23,4 +22,4 @@ jobs:
         python -m pip install --upgrade pip
         pip install -r requirements.txt
     - name: Update list
-      run: python scripts/update_contributors.py $GITHUB_EVENT_PATH
+      run: python scripts/update_contributors.py

From 100a91eec33b51dc4520e521a0f367026c37b3f4 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 10 Aug 2020 18:06:11 +0100
Subject: [PATCH 0925/2840] Update contributors.json with recent contributors

---
 .github/contributors.json | 27 ++++++++++++++++-
 scripts/rst_to_json.py    | 61 ++++++++++++++++++++-------------------
 2 files changed, 57 insertions(+), 31 deletions(-)

diff --git a/.github/contributors.json b/.github/contributors.json
index 7a932526e..aeb0b61fd 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -68,6 +68,11 @@
     "github_login": "a7p",
     "twitter_username": ""
   },
+  {
+    "name": "Aadith PM",
+    "github_login": "aadithpm",
+    "twitter_username": ""
+  },
   {
     "name": "Aaron Eikenberry",
     "github_login": "aeikenberry",
@@ -173,6 +178,11 @@
     "github_login": "areski",
     "twitter_username": ""
   },
+  {
+    "name": "AsheKR",
+    "github_login": "ashekr",
+    "twitter_username": ""
+  },
   {
     "name": "Ashley Camba",
     "github_login": "",
@@ -653,6 +663,11 @@
     "github_login": "glasslion",
     "twitter_username": ""
   },
+  {
+    "name": "Leon Kim",
+    "github_login": "PilhwanKim",
+    "twitter_username": ""
+  },
   {
     "name": "Leonardo Jimenez",
     "github_login": "xpostudio4",
@@ -733,6 +748,11 @@
     "github_login": "mjsisley",
     "twitter_username": ""
   },
+  {
+    "name": "Matthias Sieber",
+    "github_login": "manonthemat",
+    "twitter_username": "MatzeOne"
+  },
   {
     "name": "Meghan Heintz",
     "github_login": "dot2dotseurat",
@@ -828,6 +848,11 @@
     "github_login": "rm--",
     "twitter_username": ""
   },
+  {
+    "name": "Richard Hajdu",
+    "github_login": "Tusky",
+    "twitter_username": ""
+  },
   {
     "name": "Roman Afanaskin",
     "github_login": "siauPatrick",
@@ -988,4 +1013,4 @@
     "github_login": "mapx",
     "twitter_username": ""
   }
-]
+]
\ No newline at end of file
diff --git a/scripts/rst_to_json.py b/scripts/rst_to_json.py
index 37f5b2193..1cb3f585c 100644
--- a/scripts/rst_to_json.py
+++ b/scripts/rst_to_json.py
@@ -7,61 +7,60 @@ ROOT = CURRENT_FILE.parents[1]
 
 def main():
     input_file_path = ROOT / "CONTRIBUTORS.rst"
-    with input_file_path.open() as ifd:
-        content = ifd.read()
+    content = input_file_path.read_text()
 
     table_separator = (
-        "============================= ========================== =================="
+        "========================== ============================ =============="
     )
     table_content = content.split(table_separator)[2]
 
     profiles_list = [
-        {
-            "name": "Audrey Roy Greenfeld",
-            "github_login": "audreyr",
-            "twitter_username": "audreyr",
-            "is_core": True,
-        },
-        {
-            "name": "Bruno Alla",
-            "github_login": "browniebroke",
-            "twitter_username": "_BrunoAlla",
-            "is_core": True,
-        },
-        {
-            "name": "Burhan Khalid",
-            "github_login": "burhan",
-            "twitter_username": "burhan",
-            "is_core": True,
-        },
         {
             "name": "Daniel Roy Greenfeld",
             "github_login": "pydanny",
             "twitter_username": "pydanny",
             "is_core": True,
         },
+        {
+            "name": "Audrey Roy Greenfeld",
+            "github_login": "audreyr",
+            "twitter_username": "audreyr",
+            "is_core": True,
+        },
         {
             "name": "Fábio C. Barrionuevo da Luz",
             "github_login": "luzfcb",
             "twitter_username": "luzfcb",
             "is_core": True,
         },
-        {
-            "name": "Jannis Gebauer",
-            "github_login": "jayfk",
-            "twitter_username": "",
-            "is_core": True,
-        },
         {
             "name": "Saurabh Kumar",
             "github_login": "theskumar",
             "twitter_username": "_theskumar",
             "is_core": True,
         },
+        {
+            "name": "Jannis Gebauer",
+            "github_login": "jayfk",
+            "twitter_username": "",
+            "is_core": True,
+        },
+        {
+            "name": "Burhan Khalid",
+            "github_login": "burhan",
+            "twitter_username": "burhan",
+            "is_core": True,
+        },
         {
             "name": "Shupeyko Nikita",
             "github_login": "webyneter",
-            "twitter_username": "",
+            "twitter_username": "webyneter",
+            "is_core": True,
+        },
+        {
+            "name": "Bruno Alla",
+            "github_login": "browniebroke",
+            "twitter_username": "_BrunoAlla",
             "is_core": True,
         },
         {
@@ -94,8 +93,10 @@ def main():
         profiles_list.append(profile)
 
     output_file_path = ROOT / ".github" / "contributors.json"
-    with output_file_path.open("w") as ofd:
-        json.dump(profiles_list, ofd, indent=2, ensure_ascii=False)
+    output_file_path.write_text(
+        json.dumps(profiles_list, indent=2, ensure_ascii=False)
+    )
+
 
 
 if __name__ == "__main__":

From 9344038479f7418284c0152ec9072cb35354d0b3 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 10 Aug 2020 18:09:03 +0100
Subject: [PATCH 0926/2840] Update workflow to commit updated file

---
 .github/workflows/update-contributors.yml | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 9809e234b..a6c0e9c40 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -23,3 +23,9 @@ jobs:
         pip install -r requirements.txt
     - name: Update list
       run: python scripts/update_contributors.py
+
+    - name: Commit changes
+      uses: stefanzweifel/git-auto-commit-action@v4
+      with:
+        commit_message: Update Contributors
+        file_pattern: CONTRIBUTORS.md

From 673997a389a2df1f5b82c2e357c963bec995d28e Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 10 Aug 2020 18:13:42 +0100
Subject: [PATCH 0927/2840] Some small cleanups

---
 .github/browniebroke.json                 |   34 -
 .github/commits.json                      | 2417 ---------------------
 .github/workflows/update-contributors.yml |    2 +-
 scripts/rst_to_json.py                    |    5 +-
 scripts/update_contributors.py            |    3 +
 5 files changed, 5 insertions(+), 2456 deletions(-)
 delete mode 100644 .github/browniebroke.json
 delete mode 100644 .github/commits.json

diff --git a/.github/browniebroke.json b/.github/browniebroke.json
deleted file mode 100644
index 9f9199319..000000000
--- a/.github/browniebroke.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "login": "browniebroke",
-  "id": 861044,
-  "node_id": "MDQ6VXNlcjg2MTA0NA==",
-  "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
-  "gravatar_id": "",
-  "url": "https://api.github.com/users/browniebroke",
-  "html_url": "https://github.com/browniebroke",
-  "followers_url": "https://api.github.com/users/browniebroke/followers",
-  "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
-  "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
-  "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
-  "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
-  "organizations_url": "https://api.github.com/users/browniebroke/orgs",
-  "repos_url": "https://api.github.com/users/browniebroke/repos",
-  "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
-  "received_events_url": "https://api.github.com/users/browniebroke/received_events",
-  "type": "User",
-  "site_admin": false,
-  "name": "Bruno Alla",
-  "company": "Festicket",
-  "blog": "https://browniebroke.com",
-  "location": "London, UK",
-  "email": null,
-  "hireable": null,
-  "bio": null,
-  "twitter_username": "_BrunoAlla",
-  "public_repos": 149,
-  "public_gists": 5,
-  "followers": 70,
-  "following": 73,
-  "created_at": "2011-06-20T07:06:17Z",
-  "updated_at": "2020-07-27T15:48:03Z"
-}
diff --git a/.github/commits.json b/.github/commits.json
deleted file mode 100644
index 69e6c72a9..000000000
--- a/.github/commits.json
+++ /dev/null
@@ -1,2417 +0,0 @@
-[
-  {
-    "sha": "58882b6a7d169628aa37219967b79ce0ded25500",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6NTg4ODJiNmE3ZDE2OTYyOGFhMzcyMTk5NjdiNzljZTBkZWQyNTUwMA==",
-    "commit": {
-      "author": {
-        "name": "Bruno Alla",
-        "email": "browniebroke@users.noreply.github.com",
-        "date": "2020-07-29T11:32:19Z"
-      },
-      "committer": {
-        "name": "Bruno Alla",
-        "email": "browniebroke@users.noreply.github.com",
-        "date": "2020-07-29T11:32:19Z"
-      },
-      "message": "Add missing link to Github profile",
-      "tree": {
-        "sha": "0ab2decf022f1cdbd319e2d5a897144c80dabc48",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/0ab2decf022f1cdbd319e2d5a897144c80dabc48"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/58882b6a7d169628aa37219967b79ce0ded25500",
-      "comment_count": 0,
-      "verification": {
-        "verified": false,
-        "reason": "unsigned",
-        "signature": null,
-        "payload": null
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/58882b6a7d169628aa37219967b79ce0ded25500",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/58882b6a7d169628aa37219967b79ce0ded25500",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/58882b6a7d169628aa37219967b79ce0ded25500/comments",
-    "author": {
-      "login": "browniebroke",
-      "id": 861044,
-      "node_id": "MDQ6VXNlcjg2MTA0NA==",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/browniebroke",
-      "html_url": "https://github.com/browniebroke",
-      "followers_url": "https://api.github.com/users/browniebroke/followers",
-      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
-      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
-      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
-      "repos_url": "https://api.github.com/users/browniebroke/repos",
-      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "browniebroke",
-      "id": 861044,
-      "node_id": "MDQ6VXNlcjg2MTA0NA==",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/browniebroke",
-      "html_url": "https://github.com/browniebroke",
-      "followers_url": "https://api.github.com/users/browniebroke/followers",
-      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
-      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
-      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
-      "repos_url": "https://api.github.com/users/browniebroke/repos",
-      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "b148740a212a5c1ec57f6749315117cb6944236f",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/b148740a212a5c1ec57f6749315117cb6944236f",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/b148740a212a5c1ec57f6749315117cb6944236f"
-      }
-    ]
-  },
-  {
-    "sha": "b148740a212a5c1ec57f6749315117cb6944236f",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6YjE0ODc0MGEyMTJhNWMxZWM1N2Y2NzQ5MzE1MTE3Y2I2OTQ0MjM2Zg==",
-    "commit": {
-      "author": {
-        "name": "Bruno Alla",
-        "email": "browniebroke@users.noreply.github.com",
-        "date": "2020-07-29T08:29:30Z"
-      },
-      "committer": {
-        "name": "GitHub",
-        "email": "noreply@github.com",
-        "date": "2020-07-29T08:29:30Z"
-      },
-      "message": "Merge pull request #2707 from pydanny/pyup-update-uvicorn-0.11.6-to-0.11.7\n\nUpdate uvicorn to 0.11.7",
-      "tree": {
-        "sha": "9ca4e7226bdd7aae06fff696382f0fa0c70da970",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/9ca4e7226bdd7aae06fff696382f0fa0c70da970"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/b148740a212a5c1ec57f6749315117cb6944236f",
-      "comment_count": 0,
-      "verification": {
-        "verified": true,
-        "reason": "valid",
-        "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfITNqCRBK7hj4Ov3rIwAAdHIIAG3B72SRxhLE4zvAi3CKWXJd\nMHL4JSe6JNxPME3si8AxmG3SJCTo4V6yZkpnmq5mRwgk4x5q3ofQOyZBDOhWaX9d\nFLOk0fSP266zw2oSY0ilsaS7sFxnlo98Cdr3ZJKdaKv5ldSgXeotwD2yavQbP7Rx\njT04r/9tMYuRY0nQJvJ+7HF9PVWm4ecokf9iHU9Iz/sG5SS7fNLrRFcMb+fZ6OKt\nQ1sBS1++Lnkk+IMR1r7H09+ANjCeUeuPbxUWj+cVMr0PNAsTjU213pMoTpYVY7bY\nnUF4XLz36ohhFlTBLHLMwYRwgCagh6y83iWQUaJHa+E0sgMBBcAaljm7DfNjFtM=\n=sEH3\n-----END PGP SIGNATURE-----\n",
-        "payload": "tree 9ca4e7226bdd7aae06fff696382f0fa0c70da970\nparent d41bf740b43bba0084307e24dcdbdea128bf45f7\nparent 4b4bda783518954fa4816947a83a357ea8b0000a\nauthor Bruno Alla <browniebroke@users.noreply.github.com> 1596011370 +0100\ncommitter GitHub <noreply@github.com> 1596011370 +0100\n\nMerge pull request #2707 from pydanny/pyup-update-uvicorn-0.11.6-to-0.11.7\n\nUpdate uvicorn to 0.11.7"
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/b148740a212a5c1ec57f6749315117cb6944236f",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/b148740a212a5c1ec57f6749315117cb6944236f",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/b148740a212a5c1ec57f6749315117cb6944236f/comments",
-    "author": {
-      "login": "browniebroke",
-      "id": 861044,
-      "node_id": "MDQ6VXNlcjg2MTA0NA==",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/browniebroke",
-      "html_url": "https://github.com/browniebroke",
-      "followers_url": "https://api.github.com/users/browniebroke/followers",
-      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
-      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
-      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
-      "repos_url": "https://api.github.com/users/browniebroke/repos",
-      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "web-flow",
-      "id": 19864447,
-      "node_id": "MDQ6VXNlcjE5ODY0NDQ3",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/web-flow",
-      "html_url": "https://github.com/web-flow",
-      "followers_url": "https://api.github.com/users/web-flow/followers",
-      "following_url": "https://api.github.com/users/web-flow/following{/other_user}",
-      "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions",
-      "organizations_url": "https://api.github.com/users/web-flow/orgs",
-      "repos_url": "https://api.github.com/users/web-flow/repos",
-      "events_url": "https://api.github.com/users/web-flow/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/web-flow/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "d41bf740b43bba0084307e24dcdbdea128bf45f7",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/d41bf740b43bba0084307e24dcdbdea128bf45f7",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/d41bf740b43bba0084307e24dcdbdea128bf45f7"
-      },
-      {
-        "sha": "4b4bda783518954fa4816947a83a357ea8b0000a",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/4b4bda783518954fa4816947a83a357ea8b0000a",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/4b4bda783518954fa4816947a83a357ea8b0000a"
-      }
-    ]
-  },
-  {
-    "sha": "d41bf740b43bba0084307e24dcdbdea128bf45f7",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6ZDQxYmY3NDBiNDNiYmEwMDg0MzA3ZTI0ZGNkYmRlYTEyOGJmNDVmNw==",
-    "commit": {
-      "author": {
-        "name": "Bruno Alla",
-        "email": "browniebroke@users.noreply.github.com",
-        "date": "2020-07-29T08:28:28Z"
-      },
-      "committer": {
-        "name": "GitHub",
-        "email": "noreply@github.com",
-        "date": "2020-07-29T08:28:28Z"
-      },
-      "message": "Merge pull request #2706 from pydanny/pyup-update-tox-3.18.0-to-3.18.1\n\nUpdate tox to 3.18.1",
-      "tree": {
-        "sha": "4e42b5dad2bdbeaf7431eee6b4ce34349cefa277",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/4e42b5dad2bdbeaf7431eee6b4ce34349cefa277"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/d41bf740b43bba0084307e24dcdbdea128bf45f7",
-      "comment_count": 0,
-      "verification": {
-        "verified": true,
-        "reason": "valid",
-        "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfITMsCRBK7hj4Ov3rIwAAdHIIAETVssfXHqUeUnUUXbZfxCyY\nNcJ5Uj2K6AfKt9DyM2/5UdqzDIRb3WNrAt+rjaZvlu3onUPKKJAiP38hMIZklTiJ\nLuqMema8u0ED3h3TpgLcUlpziNCEzFRkANg/XVvhYQc9uVnzVRD375NXyRYuUtZw\nBc9C/l5D0P/hsAYxzgaxg+bVqyqNfzHB+e+/FIyGbgYaVetMydaey2uDCWk/Wd7z\n1u9DVRnK8KylkkUEN7Swjz4PFftyHlCmWNJ9Ee4mTrOIhiAOZlzfkMz3ihTiZnrp\nxfN8eUqjSEsIPXEaMTgedtm8WfuOgR5dTTgpmcB9/L1NZslTJ91dwgpkcvj0Odg=\n=TCyB\n-----END PGP SIGNATURE-----\n",
-        "payload": "tree 4e42b5dad2bdbeaf7431eee6b4ce34349cefa277\nparent 0f1dfdd72edc05f5c56fceeb0ab5632458f72c12\nparent 84a3082527d322f4f9bd64ab0675ecd3a256d2af\nauthor Bruno Alla <browniebroke@users.noreply.github.com> 1596011308 +0100\ncommitter GitHub <noreply@github.com> 1596011308 +0100\n\nMerge pull request #2706 from pydanny/pyup-update-tox-3.18.0-to-3.18.1\n\nUpdate tox to 3.18.1"
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/d41bf740b43bba0084307e24dcdbdea128bf45f7",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/d41bf740b43bba0084307e24dcdbdea128bf45f7",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/d41bf740b43bba0084307e24dcdbdea128bf45f7/comments",
-    "author": {
-      "login": "browniebroke",
-      "id": 861044,
-      "node_id": "MDQ6VXNlcjg2MTA0NA==",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/browniebroke",
-      "html_url": "https://github.com/browniebroke",
-      "followers_url": "https://api.github.com/users/browniebroke/followers",
-      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
-      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
-      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
-      "repos_url": "https://api.github.com/users/browniebroke/repos",
-      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "web-flow",
-      "id": 19864447,
-      "node_id": "MDQ6VXNlcjE5ODY0NDQ3",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/web-flow",
-      "html_url": "https://github.com/web-flow",
-      "followers_url": "https://api.github.com/users/web-flow/followers",
-      "following_url": "https://api.github.com/users/web-flow/following{/other_user}",
-      "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions",
-      "organizations_url": "https://api.github.com/users/web-flow/orgs",
-      "repos_url": "https://api.github.com/users/web-flow/repos",
-      "events_url": "https://api.github.com/users/web-flow/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/web-flow/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "0f1dfdd72edc05f5c56fceeb0ab5632458f72c12",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12"
-      },
-      {
-        "sha": "84a3082527d322f4f9bd64ab0675ecd3a256d2af",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/84a3082527d322f4f9bd64ab0675ecd3a256d2af",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/84a3082527d322f4f9bd64ab0675ecd3a256d2af"
-      }
-    ]
-  },
-  {
-    "sha": "4b4bda783518954fa4816947a83a357ea8b0000a",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6NGI0YmRhNzgzNTE4OTU0ZmE0ODE2OTQ3YTgzYTM1N2VhOGIwMDAwYQ==",
-    "commit": {
-      "author": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-28T13:34:49Z"
-      },
-      "committer": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-28T13:34:49Z"
-      },
-      "message": "Update uvicorn from 0.11.6 to 0.11.7",
-      "tree": {
-        "sha": "d9ddd166ad5771852efcc336de4a94b072562c1f",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/d9ddd166ad5771852efcc336de4a94b072562c1f"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/4b4bda783518954fa4816947a83a357ea8b0000a",
-      "comment_count": 0,
-      "verification": {
-        "verified": false,
-        "reason": "unsigned",
-        "signature": null,
-        "payload": null
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/4b4bda783518954fa4816947a83a357ea8b0000a",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/4b4bda783518954fa4816947a83a357ea8b0000a",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/4b4bda783518954fa4816947a83a357ea8b0000a/comments",
-    "author": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "0f1dfdd72edc05f5c56fceeb0ab5632458f72c12",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12"
-      }
-    ]
-  },
-  {
-    "sha": "84a3082527d322f4f9bd64ab0675ecd3a256d2af",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6ODRhMzA4MjUyN2QzMjJmNGY5YmQ2NGFiMDY3NWVjZDNhMjU2ZDJhZg==",
-    "commit": {
-      "author": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-28T13:34:45Z"
-      },
-      "committer": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-28T13:34:45Z"
-      },
-      "message": "Update tox from 3.18.0 to 3.18.1",
-      "tree": {
-        "sha": "4e42b5dad2bdbeaf7431eee6b4ce34349cefa277",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/4e42b5dad2bdbeaf7431eee6b4ce34349cefa277"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/84a3082527d322f4f9bd64ab0675ecd3a256d2af",
-      "comment_count": 0,
-      "verification": {
-        "verified": false,
-        "reason": "unsigned",
-        "signature": null,
-        "payload": null
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/84a3082527d322f4f9bd64ab0675ecd3a256d2af",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/84a3082527d322f4f9bd64ab0675ecd3a256d2af",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/84a3082527d322f4f9bd64ab0675ecd3a256d2af/comments",
-    "author": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "0f1dfdd72edc05f5c56fceeb0ab5632458f72c12",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12"
-      }
-    ]
-  },
-  {
-    "sha": "0f1dfdd72edc05f5c56fceeb0ab5632458f72c12",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6MGYxZGZkZDcyZWRjMDVmNWM1NmZjZWViMGFiNTYzMjQ1OGY3MmMxMg==",
-    "commit": {
-      "author": {
-        "name": "Fábio C. Barrionuevo da Luz",
-        "email": "bnafta@gmail.com",
-        "date": "2020-07-27T21:22:54Z"
-      },
-      "committer": {
-        "name": "GitHub",
-        "email": "noreply@github.com",
-        "date": "2020-07-27T21:22:54Z"
-      },
-      "message": "Merge pull request #2704 from manonthemat/master\n\nAdded most recent supported PostgreSQL version in documentation",
-      "tree": {
-        "sha": "65b3bf322fc9661584a23fb498566e56d3d81f5a",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/65b3bf322fc9661584a23fb498566e56d3d81f5a"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12",
-      "comment_count": 0,
-      "verification": {
-        "verified": true,
-        "reason": "valid",
-        "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfH0WuCRBK7hj4Ov3rIwAAdHIIAIHvd/XGFoeYyWFPH0i8T9nZ\nCn0jCJTcV4sgzUt2NrvCniNotKUzJAIguAcQpZACNhrzHwL5vSi7FoOtNtqyy5L8\nLI6aonjcS9D8Ug2LvnSAJpQ9R/BR1VDWNPsHytWbeHDjmVfXRmX9Ngt+GvUPMMUV\nu+k2QXQtLaLzSusDuwMWgO7ekfwJrrPXou9MF0GGbRDEtVHEz14vdgM7cJ2Y/O42\nObfDAQyL1KEn6jgJR55hZzQgAYPl5tO5q3FCpRWyVzlK0ZgMNvSDykxJ/h4KfAtj\n8VId/yKH2odHHgYeT+xkx638bI13XEDUL0FibyWBA13XqriUDVEf2sRslE24d04=\n=p3nH\n-----END PGP SIGNATURE-----\n",
-        "payload": "tree 65b3bf322fc9661584a23fb498566e56d3d81f5a\nparent a4f7fb41d77679ff11891c0c04bf38c1a2712086\nparent 279175a3447b7754769a33a69441d9cd566025e0\nauthor Fábio C. Barrionuevo da Luz <bnafta@gmail.com> 1595884974 -0300\ncommitter GitHub <noreply@github.com> 1595884974 -0300\n\nMerge pull request #2704 from manonthemat/master\n\nAdded most recent supported PostgreSQL version in documentation"
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/0f1dfdd72edc05f5c56fceeb0ab5632458f72c12/comments",
-    "author": {
-      "login": "luzfcb",
-      "id": 807599,
-      "node_id": "MDQ6VXNlcjgwNzU5OQ==",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/807599?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/luzfcb",
-      "html_url": "https://github.com/luzfcb",
-      "followers_url": "https://api.github.com/users/luzfcb/followers",
-      "following_url": "https://api.github.com/users/luzfcb/following{/other_user}",
-      "gists_url": "https://api.github.com/users/luzfcb/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/luzfcb/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/luzfcb/subscriptions",
-      "organizations_url": "https://api.github.com/users/luzfcb/orgs",
-      "repos_url": "https://api.github.com/users/luzfcb/repos",
-      "events_url": "https://api.github.com/users/luzfcb/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/luzfcb/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "web-flow",
-      "id": 19864447,
-      "node_id": "MDQ6VXNlcjE5ODY0NDQ3",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/web-flow",
-      "html_url": "https://github.com/web-flow",
-      "followers_url": "https://api.github.com/users/web-flow/followers",
-      "following_url": "https://api.github.com/users/web-flow/following{/other_user}",
-      "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions",
-      "organizations_url": "https://api.github.com/users/web-flow/orgs",
-      "repos_url": "https://api.github.com/users/web-flow/repos",
-      "events_url": "https://api.github.com/users/web-flow/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/web-flow/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "a4f7fb41d77679ff11891c0c04bf38c1a2712086",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a4f7fb41d77679ff11891c0c04bf38c1a2712086",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/a4f7fb41d77679ff11891c0c04bf38c1a2712086"
-      },
-      {
-        "sha": "279175a3447b7754769a33a69441d9cd566025e0",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/279175a3447b7754769a33a69441d9cd566025e0",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/279175a3447b7754769a33a69441d9cd566025e0"
-      }
-    ]
-  },
-  {
-    "sha": "279175a3447b7754769a33a69441d9cd566025e0",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6Mjc5MTc1YTM0NDdiNzc1NDc2OWEzM2E2OTQ0MWQ5Y2Q1NjYwMjVlMA==",
-    "commit": {
-      "author": {
-        "name": "Matthias Sieber",
-        "email": "matthiasksieber@gmail.com",
-        "date": "2020-07-27T21:14:15Z"
-      },
-      "committer": {
-        "name": "Matthias Sieber",
-        "email": "matthiasksieber@gmail.com",
-        "date": "2020-07-27T21:14:15Z"
-      },
-      "message": "updated docs",
-      "tree": {
-        "sha": "65b3bf322fc9661584a23fb498566e56d3d81f5a",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/65b3bf322fc9661584a23fb498566e56d3d81f5a"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/279175a3447b7754769a33a69441d9cd566025e0",
-      "comment_count": 0,
-      "verification": {
-        "verified": false,
-        "reason": "unsigned",
-        "signature": null,
-        "payload": null
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/279175a3447b7754769a33a69441d9cd566025e0",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/279175a3447b7754769a33a69441d9cd566025e0",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/279175a3447b7754769a33a69441d9cd566025e0/comments",
-    "author": {
-      "login": "manonthemat",
-      "id": 5065940,
-      "node_id": "MDQ6VXNlcjUwNjU5NDA=",
-      "avatar_url": "https://avatars2.githubusercontent.com/u/5065940?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/manonthemat",
-      "html_url": "https://github.com/manonthemat",
-      "followers_url": "https://api.github.com/users/manonthemat/followers",
-      "following_url": "https://api.github.com/users/manonthemat/following{/other_user}",
-      "gists_url": "https://api.github.com/users/manonthemat/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/manonthemat/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/manonthemat/subscriptions",
-      "organizations_url": "https://api.github.com/users/manonthemat/orgs",
-      "repos_url": "https://api.github.com/users/manonthemat/repos",
-      "events_url": "https://api.github.com/users/manonthemat/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/manonthemat/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "manonthemat",
-      "id": 5065940,
-      "node_id": "MDQ6VXNlcjUwNjU5NDA=",
-      "avatar_url": "https://avatars2.githubusercontent.com/u/5065940?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/manonthemat",
-      "html_url": "https://github.com/manonthemat",
-      "followers_url": "https://api.github.com/users/manonthemat/followers",
-      "following_url": "https://api.github.com/users/manonthemat/following{/other_user}",
-      "gists_url": "https://api.github.com/users/manonthemat/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/manonthemat/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/manonthemat/subscriptions",
-      "organizations_url": "https://api.github.com/users/manonthemat/orgs",
-      "repos_url": "https://api.github.com/users/manonthemat/repos",
-      "events_url": "https://api.github.com/users/manonthemat/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/manonthemat/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "d5d4941d2286671dd7f7eda19f0001b98dbb9095",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/d5d4941d2286671dd7f7eda19f0001b98dbb9095",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/d5d4941d2286671dd7f7eda19f0001b98dbb9095"
-      }
-    ]
-  },
-  {
-    "sha": "d5d4941d2286671dd7f7eda19f0001b98dbb9095",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6ZDVkNDk0MWQyMjg2NjcxZGQ3ZjdlZGExOWYwMDAxYjk4ZGJiOTA5NQ==",
-    "commit": {
-      "author": {
-        "name": "Matthias Sieber",
-        "email": "matthiasksieber@gmail.com",
-        "date": "2020-07-27T21:12:33Z"
-      },
-      "committer": {
-        "name": "Matthias Sieber",
-        "email": "matthiasksieber@gmail.com",
-        "date": "2020-07-27T21:12:33Z"
-      },
-      "message": "added to list of other contributors",
-      "tree": {
-        "sha": "deb68fe1649f8b5346277947378d224645d52aff",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/deb68fe1649f8b5346277947378d224645d52aff"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/d5d4941d2286671dd7f7eda19f0001b98dbb9095",
-      "comment_count": 0,
-      "verification": {
-        "verified": false,
-        "reason": "unsigned",
-        "signature": null,
-        "payload": null
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/d5d4941d2286671dd7f7eda19f0001b98dbb9095",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/d5d4941d2286671dd7f7eda19f0001b98dbb9095",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/d5d4941d2286671dd7f7eda19f0001b98dbb9095/comments",
-    "author": {
-      "login": "manonthemat",
-      "id": 5065940,
-      "node_id": "MDQ6VXNlcjUwNjU5NDA=",
-      "avatar_url": "https://avatars2.githubusercontent.com/u/5065940?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/manonthemat",
-      "html_url": "https://github.com/manonthemat",
-      "followers_url": "https://api.github.com/users/manonthemat/followers",
-      "following_url": "https://api.github.com/users/manonthemat/following{/other_user}",
-      "gists_url": "https://api.github.com/users/manonthemat/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/manonthemat/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/manonthemat/subscriptions",
-      "organizations_url": "https://api.github.com/users/manonthemat/orgs",
-      "repos_url": "https://api.github.com/users/manonthemat/repos",
-      "events_url": "https://api.github.com/users/manonthemat/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/manonthemat/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "manonthemat",
-      "id": 5065940,
-      "node_id": "MDQ6VXNlcjUwNjU5NDA=",
-      "avatar_url": "https://avatars2.githubusercontent.com/u/5065940?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/manonthemat",
-      "html_url": "https://github.com/manonthemat",
-      "followers_url": "https://api.github.com/users/manonthemat/followers",
-      "following_url": "https://api.github.com/users/manonthemat/following{/other_user}",
-      "gists_url": "https://api.github.com/users/manonthemat/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/manonthemat/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/manonthemat/subscriptions",
-      "organizations_url": "https://api.github.com/users/manonthemat/orgs",
-      "repos_url": "https://api.github.com/users/manonthemat/repos",
-      "events_url": "https://api.github.com/users/manonthemat/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/manonthemat/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "5500af7364e3ff0d2ead6b7100e8884e0ace785b",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/5500af7364e3ff0d2ead6b7100e8884e0ace785b",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/5500af7364e3ff0d2ead6b7100e8884e0ace785b"
-      }
-    ]
-  },
-  {
-    "sha": "5500af7364e3ff0d2ead6b7100e8884e0ace785b",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6NTUwMGFmNzM2NGUzZmYwZDJlYWQ2YjcxMDBlODg4NGUwYWNlNzg1Yg==",
-    "commit": {
-      "author": {
-        "name": "Matthias Sieber",
-        "email": "matthiasksieber@gmail.com",
-        "date": "2020-07-27T21:08:56Z"
-      },
-      "committer": {
-        "name": "Matthias Sieber",
-        "email": "matthiasksieber@gmail.com",
-        "date": "2020-07-27T21:08:56Z"
-      },
-      "message": "update Readme w/ current PostgreSQL version support",
-      "tree": {
-        "sha": "76b325e32d6e4ad0ce77075efc485722922180ca",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/76b325e32d6e4ad0ce77075efc485722922180ca"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/5500af7364e3ff0d2ead6b7100e8884e0ace785b",
-      "comment_count": 0,
-      "verification": {
-        "verified": false,
-        "reason": "unsigned",
-        "signature": null,
-        "payload": null
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/5500af7364e3ff0d2ead6b7100e8884e0ace785b",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/5500af7364e3ff0d2ead6b7100e8884e0ace785b",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/5500af7364e3ff0d2ead6b7100e8884e0ace785b/comments",
-    "author": {
-      "login": "manonthemat",
-      "id": 5065940,
-      "node_id": "MDQ6VXNlcjUwNjU5NDA=",
-      "avatar_url": "https://avatars2.githubusercontent.com/u/5065940?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/manonthemat",
-      "html_url": "https://github.com/manonthemat",
-      "followers_url": "https://api.github.com/users/manonthemat/followers",
-      "following_url": "https://api.github.com/users/manonthemat/following{/other_user}",
-      "gists_url": "https://api.github.com/users/manonthemat/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/manonthemat/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/manonthemat/subscriptions",
-      "organizations_url": "https://api.github.com/users/manonthemat/orgs",
-      "repos_url": "https://api.github.com/users/manonthemat/repos",
-      "events_url": "https://api.github.com/users/manonthemat/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/manonthemat/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "manonthemat",
-      "id": 5065940,
-      "node_id": "MDQ6VXNlcjUwNjU5NDA=",
-      "avatar_url": "https://avatars2.githubusercontent.com/u/5065940?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/manonthemat",
-      "html_url": "https://github.com/manonthemat",
-      "followers_url": "https://api.github.com/users/manonthemat/followers",
-      "following_url": "https://api.github.com/users/manonthemat/following{/other_user}",
-      "gists_url": "https://api.github.com/users/manonthemat/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/manonthemat/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/manonthemat/subscriptions",
-      "organizations_url": "https://api.github.com/users/manonthemat/orgs",
-      "repos_url": "https://api.github.com/users/manonthemat/repos",
-      "events_url": "https://api.github.com/users/manonthemat/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/manonthemat/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "a4f7fb41d77679ff11891c0c04bf38c1a2712086",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a4f7fb41d77679ff11891c0c04bf38c1a2712086",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/a4f7fb41d77679ff11891c0c04bf38c1a2712086"
-      }
-    ]
-  },
-  {
-    "sha": "a4f7fb41d77679ff11891c0c04bf38c1a2712086",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6YTRmN2ZiNDFkNzc2NzlmZjExODkxYzBjMDRiZjM4YzFhMjcxMjA4Ng==",
-    "commit": {
-      "author": {
-        "name": "Bruno Alla",
-        "email": "browniebroke@users.noreply.github.com",
-        "date": "2020-07-26T15:07:29Z"
-      },
-      "committer": {
-        "name": "GitHub",
-        "email": "noreply@github.com",
-        "date": "2020-07-26T15:07:29Z"
-      },
-      "message": "Merge pull request #2702 from pydanny/pyup-update-django-anymail-7.1.0-to-7.2",
-      "tree": {
-        "sha": "0375fcc81dcd9233ec3f230f56cc22ee203dae6e",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/0375fcc81dcd9233ec3f230f56cc22ee203dae6e"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/a4f7fb41d77679ff11891c0c04bf38c1a2712086",
-      "comment_count": 0,
-      "verification": {
-        "verified": true,
-        "reason": "valid",
-        "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfHZwxCRBK7hj4Ov3rIwAAdHIIABXB6C6RqSDq9/p853HsQlTq\nUS4hczA2CkyBsf3j7v+bxchKq3t6ilG6XOhnuaTYA9PcfOb8cXYjVl1prmZZ/wO0\nczIZ1qlo5lMJWr6OGvo5/oY58LM7zbq8LDpBz/v5qghBbL9GDMbF8gwmyS2CH+DV\nzPRwzf3P0q9mbBXgw/t1lkUJ5C3KzM/lYaBI0SdZJR39HM7FbOuOTytkHuyr+SPw\nPRUo0CMoTiaGXikdNF8QaYDnEMZ+3pr1rTt3dkejivRlgrNLnhEKOsS1LU/tlyyP\ndah6pgIk7Q2b7PndjHwjpqTK4uBXX1g410gxMrPck48hRXh06qUzRqg43/Fq/RI=\n=bQej\n-----END PGP SIGNATURE-----\n",
-        "payload": "tree 0375fcc81dcd9233ec3f230f56cc22ee203dae6e\nparent 08a15337b35e1c11d9ef1494e9550ceaee7e9e72\nparent c3391c957284f6ec956a0ee2043e2389fb34e0db\nauthor Bruno Alla <browniebroke@users.noreply.github.com> 1595776049 +0100\ncommitter GitHub <noreply@github.com> 1595776049 +0100\n\nMerge pull request #2702 from pydanny/pyup-update-django-anymail-7.1.0-to-7.2\n\n"
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a4f7fb41d77679ff11891c0c04bf38c1a2712086",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/a4f7fb41d77679ff11891c0c04bf38c1a2712086",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a4f7fb41d77679ff11891c0c04bf38c1a2712086/comments",
-    "author": {
-      "login": "browniebroke",
-      "id": 861044,
-      "node_id": "MDQ6VXNlcjg2MTA0NA==",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/browniebroke",
-      "html_url": "https://github.com/browniebroke",
-      "followers_url": "https://api.github.com/users/browniebroke/followers",
-      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
-      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
-      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
-      "repos_url": "https://api.github.com/users/browniebroke/repos",
-      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "web-flow",
-      "id": 19864447,
-      "node_id": "MDQ6VXNlcjE5ODY0NDQ3",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/web-flow",
-      "html_url": "https://github.com/web-flow",
-      "followers_url": "https://api.github.com/users/web-flow/followers",
-      "following_url": "https://api.github.com/users/web-flow/following{/other_user}",
-      "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions",
-      "organizations_url": "https://api.github.com/users/web-flow/orgs",
-      "repos_url": "https://api.github.com/users/web-flow/repos",
-      "events_url": "https://api.github.com/users/web-flow/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/web-flow/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "08a15337b35e1c11d9ef1494e9550ceaee7e9e72",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/08a15337b35e1c11d9ef1494e9550ceaee7e9e72",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/08a15337b35e1c11d9ef1494e9550ceaee7e9e72"
-      },
-      {
-        "sha": "c3391c957284f6ec956a0ee2043e2389fb34e0db",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/c3391c957284f6ec956a0ee2043e2389fb34e0db",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/c3391c957284f6ec956a0ee2043e2389fb34e0db"
-      }
-    ]
-  },
-  {
-    "sha": "c3391c957284f6ec956a0ee2043e2389fb34e0db",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6YzMzOTFjOTU3Mjg0ZjZlYzk1NmEwZWUyMDQzZTIzODlmYjM0ZTBkYg==",
-    "commit": {
-      "author": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-25T19:51:40Z"
-      },
-      "committer": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-25T19:51:40Z"
-      },
-      "message": "Update django-anymail from 7.1.0 to 7.2",
-      "tree": {
-        "sha": "0375fcc81dcd9233ec3f230f56cc22ee203dae6e",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/0375fcc81dcd9233ec3f230f56cc22ee203dae6e"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/c3391c957284f6ec956a0ee2043e2389fb34e0db",
-      "comment_count": 0,
-      "verification": {
-        "verified": false,
-        "reason": "unsigned",
-        "signature": null,
-        "payload": null
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/c3391c957284f6ec956a0ee2043e2389fb34e0db",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/c3391c957284f6ec956a0ee2043e2389fb34e0db",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/c3391c957284f6ec956a0ee2043e2389fb34e0db/comments",
-    "author": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "83290cb71073dd614957a1db884977519cabf84b",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/83290cb71073dd614957a1db884977519cabf84b",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/83290cb71073dd614957a1db884977519cabf84b"
-      }
-    ]
-  },
-  {
-    "sha": "83290cb71073dd614957a1db884977519cabf84b",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6ODMyOTBjYjcxMDczZGQ2MTQ5NTdhMWRiODg0OTc3NTE5Y2FiZjg0Yg==",
-    "commit": {
-      "author": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-25T19:51:40Z"
-      },
-      "committer": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-25T19:51:40Z"
-      },
-      "message": "Update django-anymail from 7.1.0 to 7.2",
-      "tree": {
-        "sha": "05060edb8aac5e351483de491e141c9fd2589f28",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/05060edb8aac5e351483de491e141c9fd2589f28"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/83290cb71073dd614957a1db884977519cabf84b",
-      "comment_count": 0,
-      "verification": {
-        "verified": false,
-        "reason": "unsigned",
-        "signature": null,
-        "payload": null
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/83290cb71073dd614957a1db884977519cabf84b",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/83290cb71073dd614957a1db884977519cabf84b",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/83290cb71073dd614957a1db884977519cabf84b/comments",
-    "author": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "8fa56b3c6d5c3a72b9e668628921503c64d9c681",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/8fa56b3c6d5c3a72b9e668628921503c64d9c681",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/8fa56b3c6d5c3a72b9e668628921503c64d9c681"
-      }
-    ]
-  },
-  {
-    "sha": "8fa56b3c6d5c3a72b9e668628921503c64d9c681",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6OGZhNTZiM2M2ZDVjM2E3MmI5ZTY2ODYyODkyMTUwM2M2NGQ5YzY4MQ==",
-    "commit": {
-      "author": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-25T19:51:39Z"
-      },
-      "committer": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-25T19:51:39Z"
-      },
-      "message": "Update django-anymail from 7.1.0 to 7.2",
-      "tree": {
-        "sha": "1e62554b19d68a420a9163292319bbec73de0ef2",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/1e62554b19d68a420a9163292319bbec73de0ef2"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/8fa56b3c6d5c3a72b9e668628921503c64d9c681",
-      "comment_count": 0,
-      "verification": {
-        "verified": false,
-        "reason": "unsigned",
-        "signature": null,
-        "payload": null
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/8fa56b3c6d5c3a72b9e668628921503c64d9c681",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/8fa56b3c6d5c3a72b9e668628921503c64d9c681",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/8fa56b3c6d5c3a72b9e668628921503c64d9c681/comments",
-    "author": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "1d8f637f9d9bd7db556fff133961f1dba0f4cb7f",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/1d8f637f9d9bd7db556fff133961f1dba0f4cb7f",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/1d8f637f9d9bd7db556fff133961f1dba0f4cb7f"
-      }
-    ]
-  },
-  {
-    "sha": "1d8f637f9d9bd7db556fff133961f1dba0f4cb7f",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6MWQ4ZjYzN2Y5ZDliZDdkYjU1NmZmZjEzMzk2MWYxZGJhMGY0Y2I3Zg==",
-    "commit": {
-      "author": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-25T19:51:38Z"
-      },
-      "committer": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-25T19:51:38Z"
-      },
-      "message": "Update django-anymail from 7.1.0 to 7.2",
-      "tree": {
-        "sha": "900ca3b2da13177d4c3d1f6efea392f1523aa181",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/900ca3b2da13177d4c3d1f6efea392f1523aa181"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/1d8f637f9d9bd7db556fff133961f1dba0f4cb7f",
-      "comment_count": 0,
-      "verification": {
-        "verified": false,
-        "reason": "unsigned",
-        "signature": null,
-        "payload": null
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/1d8f637f9d9bd7db556fff133961f1dba0f4cb7f",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/1d8f637f9d9bd7db556fff133961f1dba0f4cb7f",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/1d8f637f9d9bd7db556fff133961f1dba0f4cb7f/comments",
-    "author": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "14fad9247b0ab845f91d9c2e21f7483836fdba77",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/14fad9247b0ab845f91d9c2e21f7483836fdba77",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/14fad9247b0ab845f91d9c2e21f7483836fdba77"
-      }
-    ]
-  },
-  {
-    "sha": "14fad9247b0ab845f91d9c2e21f7483836fdba77",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6MTRmYWQ5MjQ3YjBhYjg0NWY5MWQ5YzJlMjFmNzQ4MzgzNmZkYmE3Nw==",
-    "commit": {
-      "author": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-25T19:51:37Z"
-      },
-      "committer": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-25T19:51:37Z"
-      },
-      "message": "Update django-anymail from 7.1.0 to 7.2",
-      "tree": {
-        "sha": "dcdbfb44993b3a6530ba8476f20d981278354bc2",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/dcdbfb44993b3a6530ba8476f20d981278354bc2"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/14fad9247b0ab845f91d9c2e21f7483836fdba77",
-      "comment_count": 0,
-      "verification": {
-        "verified": false,
-        "reason": "unsigned",
-        "signature": null,
-        "payload": null
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/14fad9247b0ab845f91d9c2e21f7483836fdba77",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/14fad9247b0ab845f91d9c2e21f7483836fdba77",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/14fad9247b0ab845f91d9c2e21f7483836fdba77/comments",
-    "author": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "a5e71ab8bfe505cbe67ba34b0bd6702d2cedb453",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a5e71ab8bfe505cbe67ba34b0bd6702d2cedb453",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/a5e71ab8bfe505cbe67ba34b0bd6702d2cedb453"
-      }
-    ]
-  },
-  {
-    "sha": "a5e71ab8bfe505cbe67ba34b0bd6702d2cedb453",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6YTVlNzFhYjhiZmU1MDVjYmU2N2JhMzRiMGJkNjcwMmQyY2VkYjQ1Mw==",
-    "commit": {
-      "author": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-25T19:51:36Z"
-      },
-      "committer": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-25T19:51:36Z"
-      },
-      "message": "Update django-anymail from 7.1.0 to 7.2",
-      "tree": {
-        "sha": "9d650cd11c7238557d41e8fc9f2d4d8925869069",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/9d650cd11c7238557d41e8fc9f2d4d8925869069"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/a5e71ab8bfe505cbe67ba34b0bd6702d2cedb453",
-      "comment_count": 0,
-      "verification": {
-        "verified": false,
-        "reason": "unsigned",
-        "signature": null,
-        "payload": null
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a5e71ab8bfe505cbe67ba34b0bd6702d2cedb453",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/a5e71ab8bfe505cbe67ba34b0bd6702d2cedb453",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a5e71ab8bfe505cbe67ba34b0bd6702d2cedb453/comments",
-    "author": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "41dc9424f8503083d52a2808451bf9ff112d9e60",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/41dc9424f8503083d52a2808451bf9ff112d9e60",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/41dc9424f8503083d52a2808451bf9ff112d9e60"
-      }
-    ]
-  },
-  {
-    "sha": "41dc9424f8503083d52a2808451bf9ff112d9e60",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6NDFkYzk0MjRmODUwMzA4M2Q1MmEyODA4NDUxYmY5ZmYxMTJkOWU2MA==",
-    "commit": {
-      "author": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-25T19:51:35Z"
-      },
-      "committer": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-25T19:51:35Z"
-      },
-      "message": "Update django-anymail from 7.1.0 to 7.2",
-      "tree": {
-        "sha": "cb0e7670c5dd2e7011707a9cd2abbb6357f8099b",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/cb0e7670c5dd2e7011707a9cd2abbb6357f8099b"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/41dc9424f8503083d52a2808451bf9ff112d9e60",
-      "comment_count": 0,
-      "verification": {
-        "verified": false,
-        "reason": "unsigned",
-        "signature": null,
-        "payload": null
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/41dc9424f8503083d52a2808451bf9ff112d9e60",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/41dc9424f8503083d52a2808451bf9ff112d9e60",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/41dc9424f8503083d52a2808451bf9ff112d9e60/comments",
-    "author": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "756031c351c7e6e24e33006c21fc3b757d755b22",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/756031c351c7e6e24e33006c21fc3b757d755b22",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/756031c351c7e6e24e33006c21fc3b757d755b22"
-      }
-    ]
-  },
-  {
-    "sha": "756031c351c7e6e24e33006c21fc3b757d755b22",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6NzU2MDMxYzM1MWM3ZTZlMjRlMzMwMDZjMjFmYzNiNzU3ZDc1NWIyMg==",
-    "commit": {
-      "author": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-25T19:51:34Z"
-      },
-      "committer": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-25T19:51:34Z"
-      },
-      "message": "Update django-anymail from 7.1.0 to 7.2",
-      "tree": {
-        "sha": "8d9efbdbfbd9d9aefa59ba54869fea143b010819",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/8d9efbdbfbd9d9aefa59ba54869fea143b010819"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/756031c351c7e6e24e33006c21fc3b757d755b22",
-      "comment_count": 0,
-      "verification": {
-        "verified": false,
-        "reason": "unsigned",
-        "signature": null,
-        "payload": null
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/756031c351c7e6e24e33006c21fc3b757d755b22",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/756031c351c7e6e24e33006c21fc3b757d755b22",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/756031c351c7e6e24e33006c21fc3b757d755b22/comments",
-    "author": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "a706ab826c4685e61331e622e1382075ae5343a4",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a706ab826c4685e61331e622e1382075ae5343a4",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/a706ab826c4685e61331e622e1382075ae5343a4"
-      }
-    ]
-  },
-  {
-    "sha": "a706ab826c4685e61331e622e1382075ae5343a4",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6YTcwNmFiODI2YzQ2ODVlNjEzMzFlNjIyZTEzODIwNzVhZTUzNDNhNA==",
-    "commit": {
-      "author": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-25T19:51:33Z"
-      },
-      "committer": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-25T19:51:33Z"
-      },
-      "message": "Update django-anymail from 7.1.0 to 7.2",
-      "tree": {
-        "sha": "a4ce2b76d7b4cc7b609702844ad9d0d2bcf063a7",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/a4ce2b76d7b4cc7b609702844ad9d0d2bcf063a7"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/a706ab826c4685e61331e622e1382075ae5343a4",
-      "comment_count": 0,
-      "verification": {
-        "verified": false,
-        "reason": "unsigned",
-        "signature": null,
-        "payload": null
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a706ab826c4685e61331e622e1382075ae5343a4",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/a706ab826c4685e61331e622e1382075ae5343a4",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/a706ab826c4685e61331e622e1382075ae5343a4/comments",
-    "author": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "08a15337b35e1c11d9ef1494e9550ceaee7e9e72",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/08a15337b35e1c11d9ef1494e9550ceaee7e9e72",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/08a15337b35e1c11d9ef1494e9550ceaee7e9e72"
-      }
-    ]
-  },
-  {
-    "sha": "08a15337b35e1c11d9ef1494e9550ceaee7e9e72",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6MDhhMTUzMzdiMzVlMWMxMWQ5ZWYxNDk0ZTk1NTBjZWFlZTdlOWU3Mg==",
-    "commit": {
-      "author": {
-        "name": "Bruno Alla",
-        "email": "browniebroke@users.noreply.github.com",
-        "date": "2020-07-25T13:39:04Z"
-      },
-      "committer": {
-        "name": "GitHub",
-        "email": "noreply@github.com",
-        "date": "2020-07-25T13:39:04Z"
-      },
-      "message": "Update document.rst",
-      "tree": {
-        "sha": "7789dbf8a3fa174c424491e150d08aa6edd05701",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/7789dbf8a3fa174c424491e150d08aa6edd05701"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/08a15337b35e1c11d9ef1494e9550ceaee7e9e72",
-      "comment_count": 0,
-      "verification": {
-        "verified": true,
-        "reason": "valid",
-        "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfHDX4CRBK7hj4Ov3rIwAAdHIIADQkdEs2ZlxuGXwM6MZG+5IM\n1dwuGXOx3R/kfpEJ0M6VrXqgpN0SemKGLsYFzEZ7V/v+Mpw8J74lYvvx6qRtpTUO\nT9MU8bVkxNaLN03ecxz42rI2zIT3frsQ1tVLvlXT387OknLiZOwa0G5uAb9jyEUO\n95umUw/RcKmNASABuLsEiRYNuAEDc1LKLR+uiVHJulfpdcEydnvB7JdzKlOeYvi9\nwnmJk658PqDTl03jo7NvGYTzmw8vY5N0wHPDnzvYQExuiGi8w1WawA7piychTwJ3\ngfLl6xAwKL2jYYZdhdiJAzf5LMZFGpRI2Ox9KSy8hjHcz5nwChYsO2Gp5ORSIz0=\n=O8Me\n-----END PGP SIGNATURE-----\n",
-        "payload": "tree 7789dbf8a3fa174c424491e150d08aa6edd05701\nparent b592003f87ff4a1f27dfa01e8860bb0f725e0847\nauthor Bruno Alla <browniebroke@users.noreply.github.com> 1595684344 +0100\ncommitter GitHub <noreply@github.com> 1595684344 +0100\n\nUpdate document.rst"
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/08a15337b35e1c11d9ef1494e9550ceaee7e9e72",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/08a15337b35e1c11d9ef1494e9550ceaee7e9e72",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/08a15337b35e1c11d9ef1494e9550ceaee7e9e72/comments",
-    "author": {
-      "login": "browniebroke",
-      "id": 861044,
-      "node_id": "MDQ6VXNlcjg2MTA0NA==",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/browniebroke",
-      "html_url": "https://github.com/browniebroke",
-      "followers_url": "https://api.github.com/users/browniebroke/followers",
-      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
-      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
-      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
-      "repos_url": "https://api.github.com/users/browniebroke/repos",
-      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "web-flow",
-      "id": 19864447,
-      "node_id": "MDQ6VXNlcjE5ODY0NDQ3",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/web-flow",
-      "html_url": "https://github.com/web-flow",
-      "followers_url": "https://api.github.com/users/web-flow/followers",
-      "following_url": "https://api.github.com/users/web-flow/following{/other_user}",
-      "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions",
-      "organizations_url": "https://api.github.com/users/web-flow/orgs",
-      "repos_url": "https://api.github.com/users/web-flow/repos",
-      "events_url": "https://api.github.com/users/web-flow/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/web-flow/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "b592003f87ff4a1f27dfa01e8860bb0f725e0847",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/b592003f87ff4a1f27dfa01e8860bb0f725e0847",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/b592003f87ff4a1f27dfa01e8860bb0f725e0847"
-      }
-    ]
-  },
-  {
-    "sha": "b592003f87ff4a1f27dfa01e8860bb0f725e0847",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6YjU5MjAwM2Y4N2ZmNGExZjI3ZGZhMDFlODg2MGJiMGY3MjVlMDg0Nw==",
-    "commit": {
-      "author": {
-        "name": "Bruno Alla",
-        "email": "browniebroke@users.noreply.github.com",
-        "date": "2020-07-25T13:37:54Z"
-      },
-      "committer": {
-        "name": "GitHub",
-        "email": "noreply@github.com",
-        "date": "2020-07-25T13:37:54Z"
-      },
-      "message": "Fix snippet in documentation",
-      "tree": {
-        "sha": "d5ca93ca4e670725066520ed2bb755f11a403e11",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/d5ca93ca4e670725066520ed2bb755f11a403e11"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/b592003f87ff4a1f27dfa01e8860bb0f725e0847",
-      "comment_count": 0,
-      "verification": {
-        "verified": true,
-        "reason": "valid",
-        "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfHDWyCRBK7hj4Ov3rIwAAdHIIAHv6JNwk75EgGqHQO1an+G3C\njcz00Hm40CJOPYHT8z3A24qoAMVrYMbgKob4f74FiVRiA88fA3BXFvOD/MiO1TAp\nI+nx54gJ8Kf7/Rj+szVcZoQ722Jc1Cnh/IaMZDJvYUQNzSkHLH4Hc+dyh5CI4WLc\nhNrXUMliwLQMShs68lCaoCZWl17APPUrUsQO8s2z32fVusm9VoJbSPBRSrtne27M\nxYjs1PfrqUTtNq3/bCUmlGVrKFviUMXaTvUjKk3842kEirDZL2DOosierkDKKga1\n6w+RM3uxU17g+d/nchjJJwhGYAtvSscJpXMjPgjUu/5SmcPkfvXt2tLjY5XJE1g=\n=3CyH\n-----END PGP SIGNATURE-----\n",
-        "payload": "tree d5ca93ca4e670725066520ed2bb755f11a403e11\nparent c085afef18a2643652c60422fb60718797324f4a\nauthor Bruno Alla <browniebroke@users.noreply.github.com> 1595684274 +0100\ncommitter GitHub <noreply@github.com> 1595684274 +0100\n\nFix snippet in documentation"
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/b592003f87ff4a1f27dfa01e8860bb0f725e0847",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/b592003f87ff4a1f27dfa01e8860bb0f725e0847",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/b592003f87ff4a1f27dfa01e8860bb0f725e0847/comments",
-    "author": {
-      "login": "browniebroke",
-      "id": 861044,
-      "node_id": "MDQ6VXNlcjg2MTA0NA==",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/browniebroke",
-      "html_url": "https://github.com/browniebroke",
-      "followers_url": "https://api.github.com/users/browniebroke/followers",
-      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
-      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
-      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
-      "repos_url": "https://api.github.com/users/browniebroke/repos",
-      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "web-flow",
-      "id": 19864447,
-      "node_id": "MDQ6VXNlcjE5ODY0NDQ3",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/web-flow",
-      "html_url": "https://github.com/web-flow",
-      "followers_url": "https://api.github.com/users/web-flow/followers",
-      "following_url": "https://api.github.com/users/web-flow/following{/other_user}",
-      "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions",
-      "organizations_url": "https://api.github.com/users/web-flow/orgs",
-      "repos_url": "https://api.github.com/users/web-flow/repos",
-      "events_url": "https://api.github.com/users/web-flow/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/web-flow/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "c085afef18a2643652c60422fb60718797324f4a",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/c085afef18a2643652c60422fb60718797324f4a",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/c085afef18a2643652c60422fb60718797324f4a"
-      }
-    ]
-  },
-  {
-    "sha": "c085afef18a2643652c60422fb60718797324f4a",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6YzA4NWFmZWYxOGEyNjQzNjUyYzYwNDIyZmI2MDcxODc5NzMyNGY0YQ==",
-    "commit": {
-      "author": {
-        "name": "Bruno Alla",
-        "email": "browniebroke@users.noreply.github.com",
-        "date": "2020-07-24T17:20:45Z"
-      },
-      "committer": {
-        "name": "GitHub",
-        "email": "noreply@github.com",
-        "date": "2020-07-24T17:20:45Z"
-      },
-      "message": "Merge pull request #2700 from pydanny/pyup-update-hiredis-1.0.1-to-1.1.0",
-      "tree": {
-        "sha": "a578541fa3d3fa7e46b9d99865a6fc4c1fd8aead",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/a578541fa3d3fa7e46b9d99865a6fc4c1fd8aead"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/c085afef18a2643652c60422fb60718797324f4a",
-      "comment_count": 0,
-      "verification": {
-        "verified": true,
-        "reason": "valid",
-        "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfGxhtCRBK7hj4Ov3rIwAAdHIIAJSOFFFcVkCc7RA1WYjvswmi\nW9FeGeh5XCdJCOhomhlyNWTcD9EAeNxJZh3YxNNNwiNqA00K6fBDwppnw+ZXt+wo\n+xiipqL/RJ4nqZV3LkEDdRs/Upl0013eseuw1NoYb41vw0ouvehmlGetCbyOt3Yx\n487mo2l2jJ7yLSErYQ97RllN44JOqye7Kzwdd9RpkFrSiuLynPGIBHMa5Tk3HuRV\nYOl2XTKrfGEI6jcMUXyPqvjoxvAZttURqcDzHC7F41o2HbsDSW1pxpID/RTOLEZV\n5RrwZ75Um9bkyuUya+XXtlmYCleoXDOgp3HNCumN3JNylLdT314vg/uigs2wOZo=\n=7Z4H\n-----END PGP SIGNATURE-----\n",
-        "payload": "tree a578541fa3d3fa7e46b9d99865a6fc4c1fd8aead\nparent 10224378748331db092e60b52a700d93062ecbb5\nparent ce0f2363e01c49c5146d2239fcb15eb989cb509d\nauthor Bruno Alla <browniebroke@users.noreply.github.com> 1595611245 +0100\ncommitter GitHub <noreply@github.com> 1595611245 +0100\n\nMerge pull request #2700 from pydanny/pyup-update-hiredis-1.0.1-to-1.1.0\n\n"
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/c085afef18a2643652c60422fb60718797324f4a",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/c085afef18a2643652c60422fb60718797324f4a",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/c085afef18a2643652c60422fb60718797324f4a/comments",
-    "author": {
-      "login": "browniebroke",
-      "id": 861044,
-      "node_id": "MDQ6VXNlcjg2MTA0NA==",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/browniebroke",
-      "html_url": "https://github.com/browniebroke",
-      "followers_url": "https://api.github.com/users/browniebroke/followers",
-      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
-      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
-      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
-      "repos_url": "https://api.github.com/users/browniebroke/repos",
-      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "web-flow",
-      "id": 19864447,
-      "node_id": "MDQ6VXNlcjE5ODY0NDQ3",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/web-flow",
-      "html_url": "https://github.com/web-flow",
-      "followers_url": "https://api.github.com/users/web-flow/followers",
-      "following_url": "https://api.github.com/users/web-flow/following{/other_user}",
-      "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions",
-      "organizations_url": "https://api.github.com/users/web-flow/orgs",
-      "repos_url": "https://api.github.com/users/web-flow/repos",
-      "events_url": "https://api.github.com/users/web-flow/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/web-flow/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "10224378748331db092e60b52a700d93062ecbb5",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/10224378748331db092e60b52a700d93062ecbb5",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/10224378748331db092e60b52a700d93062ecbb5"
-      },
-      {
-        "sha": "ce0f2363e01c49c5146d2239fcb15eb989cb509d",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/ce0f2363e01c49c5146d2239fcb15eb989cb509d",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/ce0f2363e01c49c5146d2239fcb15eb989cb509d"
-      }
-    ]
-  },
-  {
-    "sha": "10224378748331db092e60b52a700d93062ecbb5",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6MTAyMjQzNzg3NDgzMzFkYjA5MmU2MGI1MmE3MDBkOTMwNjJlY2JiNQ==",
-    "commit": {
-      "author": {
-        "name": "Bruno Alla",
-        "email": "browniebroke@users.noreply.github.com",
-        "date": "2020-07-24T17:18:49Z"
-      },
-      "committer": {
-        "name": "GitHub",
-        "email": "noreply@github.com",
-        "date": "2020-07-24T17:18:49Z"
-      },
-      "message": "Merge pull request #2701 from pydanny/pyup-update-django-crispy-forms-1.9.1-to-1.9.2\n\nUpdate django-crispy-forms to 1.9.2",
-      "tree": {
-        "sha": "2dbe79439e622583fa67bbb91e75a741bec93339",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/2dbe79439e622583fa67bbb91e75a741bec93339"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/10224378748331db092e60b52a700d93062ecbb5",
-      "comment_count": 0,
-      "verification": {
-        "verified": true,
-        "reason": "valid",
-        "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfGxf5CRBK7hj4Ov3rIwAAdHIIAD+elAUiHpBeqyB5zY5lYfE1\n+HgpvqFdS0bZLhYQw8tnOnrJLmXxZ+bx4uiAMjQuBnR5CkhXnyiaApt9kcT8xDyc\ngw9sbmnSq2Qe3C1wef+am62iEqBbujHvNJp/x9td2w6bzLYP3Hdezmkmx85+f0Ql\n0y1BM4c4BjJNPNBJRkf9oHpMkBQ21xu1qruVRjEYp/rK0Ijtj5sY/8Ih9f2xPut6\ndMGCBRFA/91LSDDlKIJUDcslrphAbagU3wqOe5rEDFIt6jfmz0UyWD8Bq4vj66g5\n+rtMDoH0Mto1Y4fT5OodU/BNKjEshY3hel0yQShd+7Qe2FmLco4qSFj4B3JS1JI=\n=UAz/\n-----END PGP SIGNATURE-----\n",
-        "payload": "tree 2dbe79439e622583fa67bbb91e75a741bec93339\nparent 8d52025c20af27b988d7cf53485740e4293b7b24\nparent 70c11fa89432815ebbe569ac1f18e19ff8047e36\nauthor Bruno Alla <browniebroke@users.noreply.github.com> 1595611129 +0100\ncommitter GitHub <noreply@github.com> 1595611129 +0100\n\nMerge pull request #2701 from pydanny/pyup-update-django-crispy-forms-1.9.1-to-1.9.2\n\nUpdate django-crispy-forms to 1.9.2"
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/10224378748331db092e60b52a700d93062ecbb5",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/10224378748331db092e60b52a700d93062ecbb5",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/10224378748331db092e60b52a700d93062ecbb5/comments",
-    "author": {
-      "login": "browniebroke",
-      "id": 861044,
-      "node_id": "MDQ6VXNlcjg2MTA0NA==",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/browniebroke",
-      "html_url": "https://github.com/browniebroke",
-      "followers_url": "https://api.github.com/users/browniebroke/followers",
-      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
-      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
-      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
-      "repos_url": "https://api.github.com/users/browniebroke/repos",
-      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "web-flow",
-      "id": 19864447,
-      "node_id": "MDQ6VXNlcjE5ODY0NDQ3",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/web-flow",
-      "html_url": "https://github.com/web-flow",
-      "followers_url": "https://api.github.com/users/web-flow/followers",
-      "following_url": "https://api.github.com/users/web-flow/following{/other_user}",
-      "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions",
-      "organizations_url": "https://api.github.com/users/web-flow/orgs",
-      "repos_url": "https://api.github.com/users/web-flow/repos",
-      "events_url": "https://api.github.com/users/web-flow/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/web-flow/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "8d52025c20af27b988d7cf53485740e4293b7b24",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/8d52025c20af27b988d7cf53485740e4293b7b24",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/8d52025c20af27b988d7cf53485740e4293b7b24"
-      },
-      {
-        "sha": "70c11fa89432815ebbe569ac1f18e19ff8047e36",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/70c11fa89432815ebbe569ac1f18e19ff8047e36",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/70c11fa89432815ebbe569ac1f18e19ff8047e36"
-      }
-    ]
-  },
-  {
-    "sha": "70c11fa89432815ebbe569ac1f18e19ff8047e36",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6NzBjMTFmYTg5NDMyODE1ZWJiZTU2OWFjMWYxOGUxOWZmODA0N2UzNg==",
-    "commit": {
-      "author": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-24T16:58:32Z"
-      },
-      "committer": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-24T16:58:32Z"
-      },
-      "message": "Update django-crispy-forms from 1.9.1 to 1.9.2",
-      "tree": {
-        "sha": "2dbe79439e622583fa67bbb91e75a741bec93339",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/2dbe79439e622583fa67bbb91e75a741bec93339"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/70c11fa89432815ebbe569ac1f18e19ff8047e36",
-      "comment_count": 0,
-      "verification": {
-        "verified": false,
-        "reason": "unsigned",
-        "signature": null,
-        "payload": null
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/70c11fa89432815ebbe569ac1f18e19ff8047e36",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/70c11fa89432815ebbe569ac1f18e19ff8047e36",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/70c11fa89432815ebbe569ac1f18e19ff8047e36/comments",
-    "author": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "8d52025c20af27b988d7cf53485740e4293b7b24",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/8d52025c20af27b988d7cf53485740e4293b7b24",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/8d52025c20af27b988d7cf53485740e4293b7b24"
-      }
-    ]
-  },
-  {
-    "sha": "ce0f2363e01c49c5146d2239fcb15eb989cb509d",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6Y2UwZjIzNjNlMDFjNDljNTE0NmQyMjM5ZmNiMTVlYjk4OWNiNTA5ZA==",
-    "commit": {
-      "author": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-24T16:58:28Z"
-      },
-      "committer": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-24T16:58:28Z"
-      },
-      "message": "Update hiredis from 1.0.1 to 1.1.0",
-      "tree": {
-        "sha": "965de49b571e261b7d25fa32593cea9afbce6850",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/965de49b571e261b7d25fa32593cea9afbce6850"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/ce0f2363e01c49c5146d2239fcb15eb989cb509d",
-      "comment_count": 0,
-      "verification": {
-        "verified": false,
-        "reason": "unsigned",
-        "signature": null,
-        "payload": null
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/ce0f2363e01c49c5146d2239fcb15eb989cb509d",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/ce0f2363e01c49c5146d2239fcb15eb989cb509d",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/ce0f2363e01c49c5146d2239fcb15eb989cb509d/comments",
-    "author": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "ed8e3073c66d70d79cd350d39b40e55763da9d24",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/ed8e3073c66d70d79cd350d39b40e55763da9d24",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/ed8e3073c66d70d79cd350d39b40e55763da9d24"
-      }
-    ]
-  },
-  {
-    "sha": "ed8e3073c66d70d79cd350d39b40e55763da9d24",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6ZWQ4ZTMwNzNjNjZkNzBkNzljZDM1MGQzOWI0MGU1NTc2M2RhOWQyNA==",
-    "commit": {
-      "author": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-24T16:58:27Z"
-      },
-      "committer": {
-        "name": "pyup-bot",
-        "email": "github-bot@pyup.io",
-        "date": "2020-07-24T16:58:27Z"
-      },
-      "message": "Update hiredis from 1.0.1 to 1.1.0",
-      "tree": {
-        "sha": "e4102b18d87a2b4e74b1de5d6652bf0f9de11653",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/e4102b18d87a2b4e74b1de5d6652bf0f9de11653"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/ed8e3073c66d70d79cd350d39b40e55763da9d24",
-      "comment_count": 0,
-      "verification": {
-        "verified": false,
-        "reason": "unsigned",
-        "signature": null,
-        "payload": null
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/ed8e3073c66d70d79cd350d39b40e55763da9d24",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/ed8e3073c66d70d79cd350d39b40e55763da9d24",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/ed8e3073c66d70d79cd350d39b40e55763da9d24/comments",
-    "author": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "pyup-bot",
-      "id": 16239342,
-      "node_id": "MDQ6VXNlcjE2MjM5MzQy",
-      "avatar_url": "https://avatars0.githubusercontent.com/u/16239342?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/pyup-bot",
-      "html_url": "https://github.com/pyup-bot",
-      "followers_url": "https://api.github.com/users/pyup-bot/followers",
-      "following_url": "https://api.github.com/users/pyup-bot/following{/other_user}",
-      "gists_url": "https://api.github.com/users/pyup-bot/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/pyup-bot/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/pyup-bot/subscriptions",
-      "organizations_url": "https://api.github.com/users/pyup-bot/orgs",
-      "repos_url": "https://api.github.com/users/pyup-bot/repos",
-      "events_url": "https://api.github.com/users/pyup-bot/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/pyup-bot/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "8d52025c20af27b988d7cf53485740e4293b7b24",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/8d52025c20af27b988d7cf53485740e4293b7b24",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/8d52025c20af27b988d7cf53485740e4293b7b24"
-      }
-    ]
-  },
-  {
-    "sha": "8d52025c20af27b988d7cf53485740e4293b7b24",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6OGQ1MjAyNWMyMGFmMjdiOTg4ZDdjZjUzNDg1NzQwZTQyOTNiN2IyNA==",
-    "commit": {
-      "author": {
-        "name": "Bruno Alla",
-        "email": "browniebroke@users.noreply.github.com",
-        "date": "2020-07-24T16:55:47Z"
-      },
-      "committer": {
-        "name": "GitHub",
-        "email": "noreply@github.com",
-        "date": "2020-07-24T16:55:47Z"
-      },
-      "message": "Merge pull request #2699 from pydanny/fix-pyup-duplicated-requirements\n\nImport base requirements without the leading dot",
-      "tree": {
-        "sha": "0c1fb9ac5638d2b89124f15a960c2e441469d37e",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/0c1fb9ac5638d2b89124f15a960c2e441469d37e"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/8d52025c20af27b988d7cf53485740e4293b7b24",
-      "comment_count": 0,
-      "verification": {
-        "verified": true,
-        "reason": "valid",
-        "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfGxKTCRBK7hj4Ov3rIwAAdHIIAKB6P/vt541Qe+EtHBzTQ458\nGskZViSFx+3pBVPZX0iKzAGyi/1DYt/s0yq5JwZqh720ag3yyrc57EjDMpWa2oIc\nsszzRCZ318XWQgJWdeixug4Bfu54vZn1WqDRIg3HcFv5m6J4VH4jQNJvD5OAz11O\nvfhnm4nuYxju3qiJMLpck5HdWiePjNapnTZQcqbFH72+OCttDcuydEJh8RExs1JV\nET9IEG7YBy9jy3ORsdh7Rkz2eYtRN22bKd6rUDWWLVZMadSTiOmiDsyg0PDi3Xn9\nTjQJpBFus9sUx+izsZwtyy+hwiK5u7If0qHbPitMx6JxbLZ2zj/eqLYX9Nmp6HA=\n=Stvk\n-----END PGP SIGNATURE-----\n",
-        "payload": "tree 0c1fb9ac5638d2b89124f15a960c2e441469d37e\nparent e2910a322216fc8f15e0eaaf806805d6b744a8c2\nparent 21c56bb97a59d69e71fcaebdde6d7715d25a9150\nauthor Bruno Alla <browniebroke@users.noreply.github.com> 1595609747 +0100\ncommitter GitHub <noreply@github.com> 1595609747 +0100\n\nMerge pull request #2699 from pydanny/fix-pyup-duplicated-requirements\n\nImport base requirements without the leading dot"
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/8d52025c20af27b988d7cf53485740e4293b7b24",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/8d52025c20af27b988d7cf53485740e4293b7b24",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/8d52025c20af27b988d7cf53485740e4293b7b24/comments",
-    "author": {
-      "login": "browniebroke",
-      "id": 861044,
-      "node_id": "MDQ6VXNlcjg2MTA0NA==",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/browniebroke",
-      "html_url": "https://github.com/browniebroke",
-      "followers_url": "https://api.github.com/users/browniebroke/followers",
-      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
-      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
-      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
-      "repos_url": "https://api.github.com/users/browniebroke/repos",
-      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "web-flow",
-      "id": 19864447,
-      "node_id": "MDQ6VXNlcjE5ODY0NDQ3",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/web-flow",
-      "html_url": "https://github.com/web-flow",
-      "followers_url": "https://api.github.com/users/web-flow/followers",
-      "following_url": "https://api.github.com/users/web-flow/following{/other_user}",
-      "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions",
-      "organizations_url": "https://api.github.com/users/web-flow/orgs",
-      "repos_url": "https://api.github.com/users/web-flow/repos",
-      "events_url": "https://api.github.com/users/web-flow/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/web-flow/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "e2910a322216fc8f15e0eaaf806805d6b744a8c2",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/e2910a322216fc8f15e0eaaf806805d6b744a8c2",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/e2910a322216fc8f15e0eaaf806805d6b744a8c2"
-      },
-      {
-        "sha": "21c56bb97a59d69e71fcaebdde6d7715d25a9150",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/21c56bb97a59d69e71fcaebdde6d7715d25a9150",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/21c56bb97a59d69e71fcaebdde6d7715d25a9150"
-      }
-    ]
-  },
-  {
-    "sha": "e2910a322216fc8f15e0eaaf806805d6b744a8c2",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6ZTI5MTBhMzIyMjE2ZmM4ZjE1ZTBlYWFmODA2ODA1ZDZiNzQ0YThjMg==",
-    "commit": {
-      "author": {
-        "name": "Bruno Alla",
-        "email": "browniebroke@users.noreply.github.com",
-        "date": "2020-07-24T16:40:23Z"
-      },
-      "committer": {
-        "name": "GitHub",
-        "email": "noreply@github.com",
-        "date": "2020-07-24T16:40:23Z"
-      },
-      "message": "Merge pull request #2694 from Andrew-Chen-Wang/patch-7",
-      "tree": {
-        "sha": "2a20bcceea76b92fe7f695653db4874f4ef4ad0e",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/2a20bcceea76b92fe7f695653db4874f4ef4ad0e"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/e2910a322216fc8f15e0eaaf806805d6b744a8c2",
-      "comment_count": 0,
-      "verification": {
-        "verified": true,
-        "reason": "valid",
-        "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfGw73CRBK7hj4Ov3rIwAAdHIIAEJOH6/+qipOrjlfCtv5GpSH\nzlfv0qISPl3xz28C+kLC5uDGmGUL5rTRNdcZIFlDwr1oFfsLkSpCHDhMXJ1Lfp0b\nN0sq0VP4OHug46jiQplV1rtN0oif+xJlNNUMpq9pP5Cq5QL2lTlss/f9nAY1Hqr/\nvNeKxxRf57wbDXJARyaHFdG7FZK7qmQeObif4Q/Zp0pg0Cpn9yr5Jv0t/hJawxr5\nFVY50NHNtPLufBnrK8czh4mikzfx2po3Ly0iPXTcKN4U4JyJBG3FlCsw7ynQW97j\nx0AaJfqVXXOIJJAaTBE/HRL5l5Q4HK/teNVOcjZMKfUcPzZH0X7+xuriifEkXfQ=\n=Dh/9\n-----END PGP SIGNATURE-----\n",
-        "payload": "tree 2a20bcceea76b92fe7f695653db4874f4ef4ad0e\nparent 3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188\nparent c57b8976b09fcd6ec7f3ef095b4b967f3d68e8d3\nauthor Bruno Alla <browniebroke@users.noreply.github.com> 1595608823 +0100\ncommitter GitHub <noreply@github.com> 1595608823 +0100\n\nMerge pull request #2694 from Andrew-Chen-Wang/patch-7\n\n"
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/e2910a322216fc8f15e0eaaf806805d6b744a8c2",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/e2910a322216fc8f15e0eaaf806805d6b744a8c2",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/e2910a322216fc8f15e0eaaf806805d6b744a8c2/comments",
-    "author": {
-      "login": "browniebroke",
-      "id": 861044,
-      "node_id": "MDQ6VXNlcjg2MTA0NA==",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/browniebroke",
-      "html_url": "https://github.com/browniebroke",
-      "followers_url": "https://api.github.com/users/browniebroke/followers",
-      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
-      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
-      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
-      "repos_url": "https://api.github.com/users/browniebroke/repos",
-      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "web-flow",
-      "id": 19864447,
-      "node_id": "MDQ6VXNlcjE5ODY0NDQ3",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/web-flow",
-      "html_url": "https://github.com/web-flow",
-      "followers_url": "https://api.github.com/users/web-flow/followers",
-      "following_url": "https://api.github.com/users/web-flow/following{/other_user}",
-      "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions",
-      "organizations_url": "https://api.github.com/users/web-flow/orgs",
-      "repos_url": "https://api.github.com/users/web-flow/repos",
-      "events_url": "https://api.github.com/users/web-flow/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/web-flow/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188"
-      },
-      {
-        "sha": "c57b8976b09fcd6ec7f3ef095b4b967f3d68e8d3",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/c57b8976b09fcd6ec7f3ef095b4b967f3d68e8d3",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/c57b8976b09fcd6ec7f3ef095b4b967f3d68e8d3"
-      }
-    ]
-  },
-  {
-    "sha": "21c56bb97a59d69e71fcaebdde6d7715d25a9150",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6MjFjNTZiYjk3YTU5ZDY5ZTcxZmNhZWJkZGU2ZDc3MTVkMjVhOTE1MA==",
-    "commit": {
-      "author": {
-        "name": "Bruno Alla",
-        "email": "browniebroke@users.noreply.github.com",
-        "date": "2020-07-24T16:38:29Z"
-      },
-      "committer": {
-        "name": "Bruno Alla",
-        "email": "browniebroke@users.noreply.github.com",
-        "date": "2020-07-24T16:38:29Z"
-      },
-      "message": "Don't include base requirements with dot in front\n\nSee https://github.com/pyupio/pyup/issues/390",
-      "tree": {
-        "sha": "9b1624d69fc4b22a0ad40e1e245b62f5b1b44595",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/9b1624d69fc4b22a0ad40e1e245b62f5b1b44595"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/21c56bb97a59d69e71fcaebdde6d7715d25a9150",
-      "comment_count": 0,
-      "verification": {
-        "verified": false,
-        "reason": "unsigned",
-        "signature": null,
-        "payload": null
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/21c56bb97a59d69e71fcaebdde6d7715d25a9150",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/21c56bb97a59d69e71fcaebdde6d7715d25a9150",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/21c56bb97a59d69e71fcaebdde6d7715d25a9150/comments",
-    "author": {
-      "login": "browniebroke",
-      "id": 861044,
-      "node_id": "MDQ6VXNlcjg2MTA0NA==",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/browniebroke",
-      "html_url": "https://github.com/browniebroke",
-      "followers_url": "https://api.github.com/users/browniebroke/followers",
-      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
-      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
-      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
-      "repos_url": "https://api.github.com/users/browniebroke/repos",
-      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "browniebroke",
-      "id": 861044,
-      "node_id": "MDQ6VXNlcjg2MTA0NA==",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/browniebroke",
-      "html_url": "https://github.com/browniebroke",
-      "followers_url": "https://api.github.com/users/browniebroke/followers",
-      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
-      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
-      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
-      "repos_url": "https://api.github.com/users/browniebroke/repos",
-      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188"
-      }
-    ]
-  },
-  {
-    "sha": "3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188",
-    "node_id": "MDY6Q29tbWl0MTIxMTUyNjk6M2RlZGQ0ZGQ0YjU1MjU0YTBmZTZlZjI3MmM3MGMwYTU0YzVlNTE4OA==",
-    "commit": {
-      "author": {
-        "name": "Bruno Alla",
-        "email": "browniebroke@users.noreply.github.com",
-        "date": "2020-07-24T16:26:54Z"
-      },
-      "committer": {
-        "name": "GitHub",
-        "email": "noreply@github.com",
-        "date": "2020-07-24T16:26:54Z"
-      },
-      "message": "Merge pull request #2698 from pydanny/pyup-update-uvicorn-0.11.5-to-0.11.6\n\nUpdate uvicorn from 0.11.5 to 0.11.6",
-      "tree": {
-        "sha": "0cbda3c2af7b6bd652c432a1fde7d3d4ab8a57ab",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/trees/0cbda3c2af7b6bd652c432a1fde7d3d4ab8a57ab"
-      },
-      "url": "https://api.github.com/repos/pydanny/cookiecutter-django/git/commits/3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188",
-      "comment_count": 0,
-      "verification": {
-        "verified": true,
-        "reason": "valid",
-        "signature": "-----BEGIN PGP SIGNATURE-----\n\nwsBcBAABCAAQBQJfGwvOCRBK7hj4Ov3rIwAAdHIIAA3/T2wR/VruzNEB2BJlr9+z\nZAAT0KmPkSyHd1BHdp7RaDB5XbRIrBfUHJgI9L6mRZEd1dZFQH5vitUrmLKFLLmn\nqbuAVjRzmzPwOChXmYRH0pDHJfdYvCqMkmD6ydhX56EL8+vuiYsNDDSviQygehX8\nBze3tGTk9wZwbN4hQSixREuTFiOhGF08ZgDxVjm9LvC6wKe+CXlbNGrTNYe+2AKO\ntU+RvCbfywMV264c+y9c4W4Z5Pwlk0u3mcjNevha/tyyNDk6MApvZ0see0BssAYG\n0M9f4prMOFkXUJs9wzw/r59DyvY3nhm3ovZ4pNmjqmsy1Tg5tuADbVXDEt7daw0=\n=fTep\n-----END PGP SIGNATURE-----\n",
-        "payload": "tree 0cbda3c2af7b6bd652c432a1fde7d3d4ab8a57ab\nparent cb0020cd1d88fcd8c005aae2d88aa7fe26cd2033\nparent 349f7e1141c4d1461802220ce7de4aaba0862cc5\nauthor Bruno Alla <browniebroke@users.noreply.github.com> 1595608014 +0100\ncommitter GitHub <noreply@github.com> 1595608014 +0100\n\nMerge pull request #2698 from pydanny/pyup-update-uvicorn-0.11.5-to-0.11.6\n\nUpdate uvicorn from 0.11.5 to 0.11.6"
-      }
-    },
-    "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188",
-    "html_url": "https://github.com/pydanny/cookiecutter-django/commit/3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188",
-    "comments_url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/3dedd4dd4b55254a0fe6ef272c70c0a54c5e5188/comments",
-    "author": {
-      "login": "browniebroke",
-      "id": 861044,
-      "node_id": "MDQ6VXNlcjg2MTA0NA==",
-      "avatar_url": "https://avatars1.githubusercontent.com/u/861044?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/browniebroke",
-      "html_url": "https://github.com/browniebroke",
-      "followers_url": "https://api.github.com/users/browniebroke/followers",
-      "following_url": "https://api.github.com/users/browniebroke/following{/other_user}",
-      "gists_url": "https://api.github.com/users/browniebroke/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/browniebroke/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/browniebroke/subscriptions",
-      "organizations_url": "https://api.github.com/users/browniebroke/orgs",
-      "repos_url": "https://api.github.com/users/browniebroke/repos",
-      "events_url": "https://api.github.com/users/browniebroke/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/browniebroke/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "committer": {
-      "login": "web-flow",
-      "id": 19864447,
-      "node_id": "MDQ6VXNlcjE5ODY0NDQ3",
-      "avatar_url": "https://avatars3.githubusercontent.com/u/19864447?v=4",
-      "gravatar_id": "",
-      "url": "https://api.github.com/users/web-flow",
-      "html_url": "https://github.com/web-flow",
-      "followers_url": "https://api.github.com/users/web-flow/followers",
-      "following_url": "https://api.github.com/users/web-flow/following{/other_user}",
-      "gists_url": "https://api.github.com/users/web-flow/gists{/gist_id}",
-      "starred_url": "https://api.github.com/users/web-flow/starred{/owner}{/repo}",
-      "subscriptions_url": "https://api.github.com/users/web-flow/subscriptions",
-      "organizations_url": "https://api.github.com/users/web-flow/orgs",
-      "repos_url": "https://api.github.com/users/web-flow/repos",
-      "events_url": "https://api.github.com/users/web-flow/events{/privacy}",
-      "received_events_url": "https://api.github.com/users/web-flow/received_events",
-      "type": "User",
-      "site_admin": false
-    },
-    "parents": [
-      {
-        "sha": "cb0020cd1d88fcd8c005aae2d88aa7fe26cd2033",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/cb0020cd1d88fcd8c005aae2d88aa7fe26cd2033",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/cb0020cd1d88fcd8c005aae2d88aa7fe26cd2033"
-      },
-      {
-        "sha": "349f7e1141c4d1461802220ce7de4aaba0862cc5",
-        "url": "https://api.github.com/repos/pydanny/cookiecutter-django/commits/349f7e1141c4d1461802220ce7de4aaba0862cc5",
-        "html_url": "https://github.com/pydanny/cookiecutter-django/commit/349f7e1141c4d1461802220ce7de4aaba0862cc5"
-      }
-    ]
-  }
-]
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index a6c0e9c40..f95532578 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -28,4 +28,4 @@ jobs:
       uses: stefanzweifel/git-auto-commit-action@v4
       with:
         commit_message: Update Contributors
-        file_pattern: CONTRIBUTORS.md
+        file_pattern: CONTRIBUTORS.md .github/contributors.json
diff --git a/scripts/rst_to_json.py b/scripts/rst_to_json.py
index 1cb3f585c..8c41c3a9c 100644
--- a/scripts/rst_to_json.py
+++ b/scripts/rst_to_json.py
@@ -93,10 +93,7 @@ def main():
         profiles_list.append(profile)
 
     output_file_path = ROOT / ".github" / "contributors.json"
-    output_file_path.write_text(
-        json.dumps(profiles_list, indent=2, ensure_ascii=False)
-    )
-
+    output_file_path.write_text(json.dumps(profiles_list, indent=2, ensure_ascii=False))
 
 
 if __name__ == "__main__":
diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py
index 88b6ffa88..748756682 100644
--- a/scripts/update_contributors.py
+++ b/scripts/update_contributors.py
@@ -71,11 +71,14 @@ guidance and advice.
 def main() -> None:
     gh = GitHub()
     recent_authors = set(gh.iter_recent_authors())
+
     contrib_file = ContributorsJSONFile()
     for username in recent_authors:
+        print(f"Checking if {username} should be added")
         if username not in contrib_file and username not in BOT_LOGINS:
             user_data = gh.fetch_user_info(username)
             contrib_file.add_contributor(user_data)
+            print(f"Added {username} to contributors")
     contrib_file.save()
 
     write_md_file(contrib_file.content)

From dbfcab2e12490497212f8ac1b87fbcf26396d8dd Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 10 Aug 2020 18:18:09 +0100
Subject: [PATCH 0928/2840] Case insensitive sort for other contributors

---
 scripts/update_contributors.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py
index 748756682..cc22f33cd 100644
--- a/scripts/update_contributors.py
+++ b/scripts/update_contributors.py
@@ -133,7 +133,7 @@ def write_md_file(contributors):
     template = Template(CONTRIBUTORS_TEMPLATE, autoescape=True)
     core_contributors = [c for c in contributors if c.get("is_core", False)]
     other_contributors = (c for c in contributors if not c.get("is_core", False))
-    other_contributors = sorted(other_contributors, key=lambda c: c["name"])
+    other_contributors = sorted(other_contributors, key=lambda c: c["name"].lower())
     content = template.render(
         core_contributors=core_contributors, other_contributors=other_contributors
     )

From 5c77042b590742c6546bc5ac9737c90902ce8259 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 10 Aug 2020 18:30:21 +0100
Subject: [PATCH 0929/2840] Remove rst file and script to migrate

---
 CONTRIBUTORS.rst       | 424 -----------------------------------------
 scripts/rst_to_json.py | 100 ----------
 2 files changed, 524 deletions(-)
 delete mode 100644 CONTRIBUTORS.rst
 delete mode 100644 scripts/rst_to_json.py

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
deleted file mode 100644
index c564dfaf3..000000000
--- a/CONTRIBUTORS.rst
+++ /dev/null
@@ -1,424 +0,0 @@
-Contributors
-============
-
-Core Developers
----------------
-
-These contributors have commit flags for the repository,
-and are able to accept and merge pull requests.
-
-=========================== ================= ===========
-Name                        Github            Twitter
-=========================== ================= ===========
-Daniel Roy Greenfeld        `@pydanny`_        @pydanny
-Audrey Roy Greenfeld*       `@audreyr`_        @audreyr
-Fábio C. Barrionuevo da Luz `@luzfcb`_         @luzfcb
-Saurabh Kumar               `@theskumar`_      @_theskumar
-Jannis Gebauer              `@jayfk`_
-Burhan Khalid               `@burhan`_         @burhan
-Nikita Shupeyko             `@webyneter`_      @webyneter
-Bruno Alla                  `@browniebroke`_   @_BrunoAlla
-Wan Liuyang                 `@sfdye`_          @sfdye
-=========================== ================= ===========
-
-*Audrey is also the creator of Cookiecutter. Audrey and
-Daniel are on the Cookiecutter core team.*
-
-.. _@pydanny: https://github.com/pydanny
-.. _@luzfcb: https://github.com/luzfcb
-.. _@theskumar: https://github.com/theskumar
-.. _@audreyr: https://github.com/audreyr
-.. _@jayfk: https://github.com/jayfk
-.. _@burhan: https://github.com/burhan
-.. _@webyneter: https://github.com/webyneter
-.. _@browniebroke: https://github.com/browniebroke
-.. _@sfdye: https://github.com/sfdye
-
-Other Contributors
-------------------
-
-Listed in alphabetical order.
-
-========================== ============================ ==============
-  Name                     Github                        Twitter
-========================== ============================ ==============
-  18                       `@dezoito`_
-  2O4                      `@2O4`_
-  a7p                      `@a7p`_
-  Aadith PM                `@aadithpm`_
-  Aaron Eikenberry         `@aeikenberry`_
-  Adam Bogdał              `@bogdal`_
-  Adam Dobrawy             `@ad-m`_
-  Adam Steele              `@adammsteele`_
-  Agam Dua
-  Agustín Scaramuzza       `@scaramagus`_               @scaramagus
-  Alberto Sanchez          `@alb3rto`_
-  Alex Tsai                `@caffodian`_
-  Alvaro [Andor]           `@andor-pierdelacabeza`_
-  Amjith Ramanujam         `@amjith`_
-  Andreas Meistad          `@ameistad`_
-  Andres Gonzalez          `@andresgz`_
-  Andrew Mikhnevich        `@zcho`_
-  Andrew Chen Wang         `@Andrew-Chen-Wang`_
-  Andy Rose
-  Anna Callahan            `@jazztpt`_
-  Anna Sidwell             `@takkaria`_
-  Antonia Blair            `@antoniablair`_             @antoniablairart
-  Anuj Bansal              `@ahhda`_
-  Arcuri Davide            `@dadokkio`_
-  Areski Belaid            `@areski`_
-  AsheKR                   `@ashekr`_
-  Ashley Camba
-  Barclay Gauld            `@yunti`_
-  Bartek                   `@btknu`_
-  Ben Lopatin
-  Ben Warren               `@bwarren2`_
-  Benjamin Abel
-  Bert de Miranda          `@bertdemiranda`_
-  Bo Lopker                `@blopker`_
-  Bo Peng                  `@BoPeng`_
-  Bouke Haarsma
-  Brent Payne              `@brentpayne`_               @brentpayne
-  Bruce Olivier            `@bolivierjr`_
-  Burhan Khalid            `@burhan`_                   @burhan
-  Caio Ariede              `@caioariede`_               @caioariede
-  Carl Johnson             `@carlmjohnson`_             @carlmjohnson
-  Catherine Devlin         `@catherinedevlin`_
-  Cédric Gaspoz            `@cgaspoz`_
-  Charlie Smith            `@chuckus`_
-  Chris Curvey             `@ccurvey`_
-  Chris Franklin
-  Chris Franklin           `@hairychris`_
-  Chris Pappalardo         `@ChrisPappalardo`_
-  Christopher Clarke       `@chrisdev`_
-  Cole Mackenzie           `@cmackenzie1`_
-  Cole Maclean             `@cole`_                      @cole
-  Collederas               `@Collederas`_
-  Craig Margieson          `@cmargieson`_
-  Cristian Vargas          `@cdvv7788`_
-  Cullen Rhodes            `@c-rhodes`_
-  Curtis St Pierre         `@curtisstpierre`_            @cstpierre1388
-  Dan Shultz               `@shultz`_
-  Dani Hodovic             `@danihodovic`_
-  Daniel Hepper            `@dhepper`_                   @danielhepper
-  Daniel Hillier           `@danifus`_
-  Daniel Sears             `@highpost`_                  @highpost
-  Daniele Tricoli          `@eriol`_
-  David Díaz               `@ddiazpinto`_                @DavidDiazPinto
-  Davit Tovmasyan          `@davitovmasyan`_
-  Davur Clementsen         `@dsclementsen`_              @davur
-  Delio Castillo           `@jangeador`_                 @jangeador
-  Demetris Stavrou         `@demestav`_
-  Denis Bobrov             `@delneg`_
-  Denis Orehovsky          `@apirobot`_
-  Denis Savran             `@blaxpy`_
-  Diane Chen               `@purplediane`_               @purplediane88
-  Dónal Adams              `@epileptic-fish`_
-  Dong Huynh               `@trungdong`_
-  Duda Nogueira            `@dudanogueira`_              @dudanogueira
-  Emanuel Calso            `@bloodpet`_                  @bloodpet
-  Eraldo Energy            `@eraldo`_
-  Eric Groom               `@ericgroom`_
-  Ernesto Cedeno           `@codnee`_
-  Eyad Al Sibai            `@eyadsibai`_
-  Felipe Arruda            `@arruda`_
-  Florian Idelberger       `@step21`_                    @windrush
-  Gabriel Mejia            `@elgartoinf`_                @elgartoinf
-  Garry Cairns             `@garry-cairns`_
-  Garry Polley             `@garrypolley`_
-  Gilbishkosma             `@Gilbishkosma`_
-  Glenn Wiskur             `@gwiskur`_
-  Guilherme Guy            `@guilherme1guy`_
-  Hamish Durkin            `@durkode`_
-  Hana Quadara             `@hanaquadara`_
-  Hannah Lazarus           `@hanhanhan`_
-  Harry Moreno             `@morenoh149`_                @morenoh149
-  Harry Percival           `@hjwp`_
-  Hendrik Schneider        `@hendrikschneider`_
-  Henrique G. G. Pereira   `@ikkebr`_
-  Howie Zhao               `@howiezhao`_
-  Ian Lee                  `@IanLee1521`_
-  Irfan Ahmad              `@erfaan`_                    @erfaan
-  Isaac12x                 `@Isaac12x`_
-  Ivan Khomutov            `@ikhomutov`_
-  James Williams           `@jameswilliams1`_
-  Jan Van Bruggen          `@jvanbrug`_
-  Jelmer Draaijer          `@foarsitter`_
-  Jerome Caisip            `@jeromecaisip`_
-  Jens Nilsson             `@phiberjenz`_
-  Jerome Leclanche         `@jleclanche`_                @Adys
-  Jimmy Gitonga            `@afrowave`_                  @afrowave
-  John Cass                `@jcass77`_                   @cass_john
-  Jonathan Thompson        `@nojanath`_
-  Jules Cheron             `@jules-ch`_
-  Julien Almarcha          `@sladinji`_
-  Julio Castillo           `@juliocc`_
-  Kaido Kert               `@kaidokert`_
-  kappataumu               `@kappataumu`_                @kappataumu
-  Kaveh                    `@ka7eh`_
-  Keith Bailey             `@keithjeb`_
-  Keith Webber             `@townie`_
-  Kevin A. Stone
-  Kevin Ndung'u            `@kevgathuku`_
-  Keyvan Mosharraf         `@keyvanm`_
-  Krzysztof Szumny         `@noisy`_
-  Krzysztof Żuraw          `@krzysztofzuraw`_
-  Leo won                  `@leollon`_
-  Leo Zhou                 `@glasslion`_
-  Leon Kim                 `@PilhwanKim`_
-  Leonardo Jimenez         `@xpostudio4`_
-  Lin Xianyi               `@iynaix`_
-  Luis Nell                `@originell`_
-  Lukas Klein
-  Lyla Fischer
-  Malik Sulaimanov         `@flyudvik`_                  @flyudvik
-  Martin Blech
-  Martin Saizar            `@msaizar`_
-  Mateusz Ostaszewski      `@mostaszewski`_
-  Mathijs Hoogland         `@MathijsHoogland`_
-  Matt Braymer-Hayes       `@mattayes`_                  @mattayes
-  Matt Knapper             `@mknapper1`_
-  Matt Linares
-  Matt Menzenski           `@menzenski`_
-  Matt Warren              `@mfwarren`_
-  Matthew Sisley           `@mjsisley`_
-  Matthias Sieber          `@manonthemat`_               @MatzeOne
-  Meghan Heintz            `@dot2dotseurat`_
-  Mesut Yılmaz             `@myilmaz`_
-  Michael Gecht            `@mimischi`_                  @_mischi
-  Michael Samoylov         `@msamoylov`_
-  Min ho Kim               `@minho42`_
-  mozillazg                `@mozillazg`_
-  Nico Stefani             `@nicolas471`_                @moby_dick91
-  Oleg Russkin             `@rolep`_
-  Pablo                    `@oubiga`_
-  Parbhat Puri             `@parbhat`_
-  Pawan Chaurasia          `@rjsnh1522`_
-  Peter Bittner            `@bittner`_
-  Peter Coles              `@mrcoles`_
-  Philipp Matthies         `@canonnervio`_
-  Pierre Chiquet           `@pchiquet`_
-  Raony Guimarães Corrêa   `@raonyguimaraes`_
-  Raphael Pierzina         `@hackebrot`_
-  Reggie Riser             `@reggieriser`_
-  René Muhl                `@rm--`_
-  Richard Hajdu            `@Tusky`_
-  Roman Afanaskin          `@siauPatrick`_
-  Roman Osipenko           `@romanosipenko`_
-  Russell Davies
-  Sam Collins              `@MightySCollins`_
-  Sascha                   `@saschalalala`_             @saschalalala
-  Shupeyko Nikita          `@webyneter`_
-  Sławek Ehlert            `@slafs`_
-  Sorasful                 `@sorasful`_
-  Srinivas Nyayapati       `@shireenrao`_
-  stepmr                   `@stepmr`_
-  Steve Steiner            `@ssteinerX`_
-  Sudarshan Wadkar         `@wadkar`_
-  Sule Marshall            `@suledev`_
-  Tano Abeleyra            `@tanoabeleyra`_
-  Taylor Baldwin
-  Théo Segonds             `@show0k`_
-  Tim Claessens            `@timclaessens`_
-  Tim Freund               `@timfreund`_
-  Tom Atkins               `@knitatoms`_
-  Tom Offermann
-  Travis McNeill           `@Travistock`_               @tavistock_esq
-  Tubo Shi                 `@Tubo`_
-  Umair Ashraf             `@umrashrf`_                 @fabumair
-  Vadim Iskuchekov         `@Egregors`_                 @egregors
-  Vicente G. Reyes         `@reyesvicente`_             @highcenburg
-  Vitaly Babiy
-  Vivian Guillen           `@viviangb`_
-  Vlad Doster              `@vladdoster`_
-  Will Farley              `@goldhand`_                 @g01dhand
-  William Archinal         `@archinal`_
-  Xaver Y.R. Chen          `@yrchen`_                   @yrchen
-  Yaroslav Halchenko
-  Yuchen Xie               `@mapx`_
-========================== ============================ ==============
-
-.. _@aadithpm: https://github.com/aadithpm
-.. _@a7p: https://github.com/a7p
-.. _@2O4: https://github.com/2O4
-.. _@ad-m: https://github.com/ad-m
-.. _@adammsteele: https://github.com/adammsteele
-.. _@aeikenberry: https://github.com/aeikenberry
-.. _@afrowave: https://github.com/afrowave
-.. _@ahhda: https://github.com/ahhda
-.. _@alb3rto: https://github.com/alb3rto
-.. _@ameistad: https://github.com/ameistad
-.. _@amjith: https://github.com/amjith
-.. _@andor-pierdelacabeza: https://github.com/andor-pierdelacabeza
-.. _@andresgz: https://github.com/andresgz
-.. _@antoniablair: https://github.com/antoniablair
-.. _@Andrew-Chen-Wang: https://github.com/Andrew-Chen-Wang
-.. _@apirobot: https://github.com/apirobot
-.. _@archinal: https://github.com/archinal
-.. _@areski: https://github.com/areski
-.. _@arruda: https://github.com/arruda
-.. _@ashekr: https://github.com/ashekr
-.. _@bertdemiranda: https://github.com/bertdemiranda
-.. _@bittner: https://github.com/bittner
-.. _@blaxpy: https://github.com/blaxpy
-.. _@bloodpet: https://github.com/bloodpet
-.. _@blopker: https://github.com/blopker
-.. _@bogdal: https://github.com/bogdal
-.. _@bolivierjr: https://github.com/bolivierjr
-.. _@BoPeng: https://github.com/BoPeng
-.. _@brentpayne: https://github.com/brentpayne
-.. _@btknu: https://github.com/btknu
-.. _@bwarren2: https://github.com/bwarren2
-.. _@c-rhodes: https://github.com/c-rhodes
-.. _@caffodian: https://github.com/caffodian
-.. _@canonnervio: https://github.com/canonnervio
-.. _@caioariede: https://github.com/caioariede
-.. _@carlmjohnson: https://github.com/carlmjohnson
-.. _@catherinedevlin: https://github.com/catherinedevlin
-.. _@ccurvey: https://github.com/ccurvey
-.. _@cdvv7788: https://github.com/cdvv7788
-.. _@cgaspoz: https://github.com/cgaspoz
-.. _@chrisdev: https://github.com/chrisdev
-.. _@ChrisPappalardo: https://github.com/ChrisPappalardo
-.. _@chuckus: https://github.com/chuckus
-.. _@cmackenzie1: https://github.com/cmackenzie1
-.. _@cmargieson: https://github.com/cmargieson
-.. _@codnee: https://github.com/codnee
-.. _@cole: https://github.com/cole
-.. _@Collederas: https://github.com/Collederas
-.. _@curtisstpierre: https://github.com/curtisstpierre
-.. _@dadokkio: https://github.com/dadokkio
-.. _@danihodovic: https://github.com/danihodovic
-.. _@danifus: https://github.com/danifus
-.. _@davitovmasyan: https://github.com/davitovmasyan
-.. _@ddiazpinto: https://github.com/ddiazpinto
-.. _@delneg: https://github.com/delneg
-.. _@demestav: https://github.com/demestav
-.. _@dezoito: https://github.com/dezoito
-.. _@dhepper: https://github.com/dhepper
-.. _@dot2dotseurat: https://github.com/dot2dotseurat
-.. _@dudanogueira: https://github.com/dudanogueira
-.. _@dsclementsen: https://github.com/dsclementsen
-.. _@guilherme1guy: https://github.com/guilherme1guy
-.. _@durkode: https://github.com/durkode
-.. _@Egregors: https://github.com/Egregors
-.. _@elgartoinf: https://gihub.com/elgartoinf
-.. _@epileptic-fish: https://gihub.com/epileptic-fish
-.. _@eraldo: https://github.com/eraldo
-.. _@erfaan: https://github.com/erfaan
-.. _@ericgroom: https://github.com/ericgroom
-.. _@eriol: https://github.com/eriol
-.. _@eyadsibai: https://github.com/eyadsibai
-.. _@flyudvik: https://github.com/flyudvik
-.. _@foarsitter: https://github.com/foarsitter
-.. _@garry-cairns: https://github.com/garry-cairns
-.. _@garrypolley: https://github.com/garrypolley
-.. _@Gilbishkosma: https://github.com/Gilbishkosma
-.. _@gwiskur: https://github.com/gwiskur
-.. _@glasslion: https://github.com/glasslion
-.. _@goldhand: https://github.com/goldhand
-.. _@hackebrot: https://github.com/hackebrot
-.. _@hairychris: https://github.com/hairychris
-.. _@hanaquadara: https://github.com/hanaquadara
-.. _@hanhanhan: https://github.com/hanhanhan
-.. _@hendrikschneider: https://github.com/hendrikschneider
-.. _@highpost: https://github.com/highpost
-.. _@hjwp: https://github.com/hjwp
-.. _@howiezhao: https://github.com/howiezhao
-.. _@IanLee1521: https://github.com/IanLee1521
-.. _@ikhomutov: https://github.com/ikhomutov
-.. _@jameswilliams1: https://github.com/jameswilliams1
-.. _@ikkebr: https://github.com/ikkebr
-.. _@Isaac12x: https://github.com/Isaac12x
-.. _@iynaix: https://github.com/iynaix
-.. _@jangeador: https://github.com/jangeador
-.. _@jazztpt: https://github.com/jazztpt
-.. _@jcass77: https://github.com/jcass77
-.. _@jeromecaisip: https://github.com/jeromecaisip
-.. _@jleclanche: https://github.com/jleclanche
-.. _@jules-ch: https://github.com/jules-ch
-.. _@juliocc: https://github.com/juliocc
-.. _@jvanbrug: https://github.com/jvanbrug
-.. _@ka7eh: https://github.com/ka7eh
-.. _@kaidokert: https://github.com/kaidokert
-.. _@kappataumu: https://github.com/kappataumu
-.. _@keithjeb: https://github.com/keithjeb
-.. _@kevgathuku: https://github.com/kevgathuku
-.. _@keyvanm: https://github.com/keyvanm
-.. _@knitatoms: https://github.com/knitatoms
-.. _@krzysztofzuraw: https://github.com/krzysztofzuraw
-.. _@leollon: https://github.com/leollon
-.. _@MathijsHoogland: https://github.com/MathijsHoogland
-.. _@mapx: https://github.com/mapx
-.. _@manonthemat: https://github.com/manonthemat
-.. _@mattayes: https://github.com/mattayes
-.. _@menzenski: https://github.com/menzenski
-.. _@mfwarren: https://github.com/mfwarren
-.. _@MightySCollins: https://github.com/MightySCollins
-.. _@mimischi: https://github.com/mimischi
-.. _@minho42: https://github.com/minho42
-.. _@mjsisley: https://github.com/mjsisley
-.. _@mknapper1: https://github.com/mknapper1
-.. _@morenoh149: https://github.com/morenoh149
-.. _@mostaszewski: https://github.com/mostaszewski
-.. _@mozillazg: https://github.com/mozillazg
-.. _@mrcoles: https://github.com/mrcoles
-.. _@msaizar: https://github.com/msaizar
-.. _@msamoylov: https://github.com/msamoylov
-.. _@myilmaz: https://github.com/myilmaz
-.. _@nicolas471: https://github.com/nicolas471
-.. _@noisy: https://github.com/noisy
-.. _@nojanath: https://github.com/nojanath
-.. _@originell: https://github.com/originell
-.. _@oubiga: https://github.com/oubiga
-.. _@parbhat: https://github.com/parbhat
-.. _@rjsnh1522: https://github.com/rjsnh1522
-.. _@pchiquet: https://github.com/pchiquet
-.. _@phiberjenz: https://github.com/phiberjenz
-.. _@PilhwanKim: https://github.com/PilhwanKim
-.. _@purplediane: https://github.com/purplediane
-.. _@raonyguimaraes: https://github.com/raonyguimaraes
-.. _@reggieriser: https://github.com/reggieriser
-.. _@reyesvicente: https://github.com/reyesvicente
-.. _@rm--: https://github.com/rm--
-.. _@Tusky: https://github.com/Tusky
-.. _@rolep: https://github.com/rolep
-.. _@romanosipenko: https://github.com/romanosipenko
-.. _@saschalalala: https://github.com/saschalalala
-.. _@scaramagus: https://github.com/scaramagus
-.. _@shireenrao: https://github.com/shireenrao
-.. _@show0k: https://github.com/show0k
-.. _@shultz: https://github.com/shultz
-.. _@siauPatrick: https://github.com/siauPatrick
-.. _@sladinji: https://github.com/sladinji
-.. _@slafs: https://github.com/slafs
-.. _@sorasful:: https://github.com/sorasful
-.. _@ssteinerX: https://github.com/ssteinerx
-.. _@step21: https://github.com/step21
-.. _@stepmr: https://github.com/stepmr
-.. _@suledev: https://github.com/suledev
-.. _@takkaria: https://github.com/takkaria
-.. _@tanoabeleyra: https://github.com/tanoabeleyra
-.. _@timclaessens: https://github.com/timclaessens
-.. _@timfreund: https://github.com/timfreund
-.. _@townie: https://github.com/townie
-.. _@Travistock: https://github.com/Tavistock
-.. _@trungdong: https://github.com/trungdong
-.. _@Tubo: https://github.com/tubo
-.. _@umrashrf: https://github.com/umrashrf
-.. _@viviangb: https://github.com/viviangb
-.. _@vladdoster: https://github.com/vladdoster
-.. _@wadkar: https://github.com/wadkar
-.. _@xpostudio4: https://github.com/xpostudio4
-.. _@yrchen: https://github.com/yrchen
-.. _@yunti: https://github.com/yunti
-.. _@zcho: https://github.com/zcho
-
-Special Thanks
-~~~~~~~~~~~~~~
-
-The following haven't provided code directly, but have provided guidance and advice.
-
-* Jannis Leidel
-* Nate Aune
-* Barry Morrison
diff --git a/scripts/rst_to_json.py b/scripts/rst_to_json.py
deleted file mode 100644
index 8c41c3a9c..000000000
--- a/scripts/rst_to_json.py
+++ /dev/null
@@ -1,100 +0,0 @@
-import json
-from pathlib import Path
-
-CURRENT_FILE = Path(__file__)
-ROOT = CURRENT_FILE.parents[1]
-
-
-def main():
-    input_file_path = ROOT / "CONTRIBUTORS.rst"
-    content = input_file_path.read_text()
-
-    table_separator = (
-        "========================== ============================ =============="
-    )
-    table_content = content.split(table_separator)[2]
-
-    profiles_list = [
-        {
-            "name": "Daniel Roy Greenfeld",
-            "github_login": "pydanny",
-            "twitter_username": "pydanny",
-            "is_core": True,
-        },
-        {
-            "name": "Audrey Roy Greenfeld",
-            "github_login": "audreyr",
-            "twitter_username": "audreyr",
-            "is_core": True,
-        },
-        {
-            "name": "Fábio C. Barrionuevo da Luz",
-            "github_login": "luzfcb",
-            "twitter_username": "luzfcb",
-            "is_core": True,
-        },
-        {
-            "name": "Saurabh Kumar",
-            "github_login": "theskumar",
-            "twitter_username": "_theskumar",
-            "is_core": True,
-        },
-        {
-            "name": "Jannis Gebauer",
-            "github_login": "jayfk",
-            "twitter_username": "",
-            "is_core": True,
-        },
-        {
-            "name": "Burhan Khalid",
-            "github_login": "burhan",
-            "twitter_username": "burhan",
-            "is_core": True,
-        },
-        {
-            "name": "Shupeyko Nikita",
-            "github_login": "webyneter",
-            "twitter_username": "webyneter",
-            "is_core": True,
-        },
-        {
-            "name": "Bruno Alla",
-            "github_login": "browniebroke",
-            "twitter_username": "_BrunoAlla",
-            "is_core": True,
-        },
-        {
-            "name": "Wan Liuyang",
-            "github_login": "sfdye",
-            "twitter_username": "sfdye",
-            "is_core": True,
-        },
-    ]
-    core_members = [member["github_login"] for member in profiles_list]
-
-    for contrib in table_content.split("\n"):
-        if not contrib:
-            continue
-        line_parts = contrib.split("`")
-        name = line_parts[0].strip()
-        github_login = line_parts[1].lstrip("@") if len(line_parts) > 1 else ""
-        if github_login in core_members:
-            continue
-        twitter_username = (
-            line_parts[2].lstrip("_").strip().lstrip("@")
-            if len(line_parts) == 3
-            else ""
-        )
-        profile = {
-            "name": name,
-            "github_login": github_login,
-            "twitter_username": twitter_username,
-        }
-        profiles_list.append(profile)
-
-    output_file_path = ROOT / ".github" / "contributors.json"
-    output_file_path.write_text(json.dumps(profiles_list, indent=2, ensure_ascii=False))
-
-
-if __name__ == "__main__":
-    main()

From 333da12f51a09733c6fe172edea697e60984246d Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 10 Aug 2020 18:30:36 +0100
Subject: [PATCH 0930/2840] Add docstrings to the update_contributors.py file

---
 scripts/update_contributors.py | 23 ++++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py
index cc22f33cd..0f157595c 100644
--- a/scripts/update_contributors.py
+++ b/scripts/update_contributors.py
@@ -8,6 +8,7 @@ CURRENT_FILE = Path(__file__)
 ROOT = CURRENT_FILE.parents[1]
 BOT_LOGINS = ["pyup-bot"]
 
+# Jinja template for CONTRIBUTORS.md
 CONTRIBUTORS_TEMPLATE = """
 # Contributors
 
@@ -69,9 +70,19 @@ guidance and advice.
 
 
 def main() -> None:
+    """
+    Script entry point.
+
+    1. Fetch recent contribtors from the Github API
+    2. Add missing ones to the JSON file
+    3. Generate Markdown from JSON file
+    """
+    # Use Github API to fetch recent authors rather than
+    # git CLI because we need to know their GH username
     gh = GitHub()
     recent_authors = set(gh.iter_recent_authors())
 
+    # Add missing users to the JSON file
     contrib_file = ContributorsJSONFile()
     for username in recent_authors:
         print(f"Checking if {username} should be added")
@@ -81,10 +92,13 @@ def main() -> None:
             print(f"Added {username} to contributors")
     contrib_file.save()
 
+    # Generate MD file from JSON file
     write_md_file(contrib_file.content)
 
 
 class GitHub:
+    """Small wrapper around Github REST API."""
+
     base_url = "https://api.github.com"
 
     def __init__(self) -> None:
@@ -107,29 +121,36 @@ class GitHub:
 
 
 class ContributorsJSONFile:
+    """Helper to interact with the JSON file."""
+
     file_path = ROOT / ".github" / "contributors.json"
     content = None
 
     def __init__(self) -> None:
+        """Read initial content."""
         self.content = json.loads(self.file_path.read_text())
 
     def __contains__(self, github_login: str):
+        """Provide a nice API to do: `username in file`."""
         return any(github_login == contrib["github_login"] for contrib in self.content)
 
     def add_contributor(self, user_data):
+        """Append the contributor data we care about at the end."""
         contributor_data = {
             "name": user_data["name"],
             "github_login": user_data["login"],
             "twitter_username": user_data["twitter_username"],
         }
-        self.content.extend(contributor_data)
+        self.content.append(contributor_data)
 
     def save(self):
+        """Write the file to disk with indentation."""
         text_content = json.dumps(self.content, indent=2, ensure_ascii=False)
         self.file_path.write_text(text_content)
 
 
 def write_md_file(contributors):
+    """Generate markdown file from Jinja template."""
     template = Template(CONTRIBUTORS_TEMPLATE, autoescape=True)
     core_contributors = [c for c in contributors if c.get("is_core", False)]
     other_contributors = (c for c in contributors if not c.get("is_core", False))

From c8c6951dd22bb0510b907b0f98292f259b6229e8 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 10 Aug 2020 18:35:04 +0100
Subject: [PATCH 0931/2840] Move template outside of the python script

---
 .github/CONTRIBUTORS-template.md | 56 ++++++++++++++++++++++++++++
 scripts/update_contributors.py   | 63 +-------------------------------
 2 files changed, 58 insertions(+), 61 deletions(-)
 create mode 100644 .github/CONTRIBUTORS-template.md

diff --git a/.github/CONTRIBUTORS-template.md b/.github/CONTRIBUTORS-template.md
new file mode 100644
index 000000000..d8ba28c63
--- /dev/null
+++ b/.github/CONTRIBUTORS-template.md
@@ -0,0 +1,56 @@
+# Contributors
+
+## Core Developers
+
+These contributors have commit flags for the repository, and are able to
+accept and merge pull requests.
+
+<table>
+  <tr>
+    <th>Name</th>
+    <th>Github</th>
+    <th>Twitter</th>
+  </tr>
+  {%- for contributor in core_contributors %}
+  <tr>
+    <td>{{ contributor.name }}</td>
+    <td>
+      <a href="https://github.com/{{ contributor.github_login }}">{{ contributor.github_login }}</a>
+    </td>
+    <td>{{ contributor.twitter_username }}</td>
+  </tr>
+  {%- endfor %}
+</table>
+
+*Audrey is also the creator of Cookiecutter. Audrey and Daniel are on
+the Cookiecutter core team.*
+
+## Other Contributors
+
+Listed in alphabetical order.
+
+<table>
+  <tr>
+    <th>Name</th>
+    <th>Github</th>
+    <th>Twitter</th>
+  </tr>
+  {%- for contributor in other_contributors %}
+  <tr>
+    <td>{{ contributor.name }}</td>
+    <td>
+      <a href="https://github.com/{{ contributor.github_login }}">{{ contributor.github_login }}</a>
+    </td>
+    <td>{{ contributor.twitter_username }}</td>
+  </tr>
+  {%- endfor %}
+</table>
+
+### Special Thanks
+
+The following haven't provided code directly, but have provided
+guidance and advice.
+
+-   Jannis Leidel
+-   Nate Aune
+-   Barry Morrison
diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py
index 0f157595c..8ad013d42 100644
--- a/scripts/update_contributors.py
+++ b/scripts/update_contributors.py
@@ -8,66 +8,6 @@ CURRENT_FILE = Path(__file__)
 ROOT = CURRENT_FILE.parents[1]
 BOT_LOGINS = ["pyup-bot"]
 
-# Jinja template for CONTRIBUTORS.md
-CONTRIBUTORS_TEMPLATE = """
-# Contributors
-
-## Core Developers
-
-These contributors have commit flags for the repository, and are able to
-accept and merge pull requests.
-
-<table>
-  <tr>
-    <th>Name</th>
-    <th>Github</th>
-    <th>Twitter</th>
-  </tr>
-  {%- for contributor in core_contributors %}
-  <tr>
-    <td>{{ contributor.name }}</td>
-    <td>
-      <a href="https://github.com/{{ contributor.github_login }}">{{ contributor.github_login }}</a>
-    </td>
-    <td>{{ contributor.twitter_username }}</td>
-  </tr>
-  {%- endfor %}
-</table>
-
-*Audrey is also the creator of Cookiecutter. Audrey and Daniel are on
-the Cookiecutter core team.*
-
-## Other Contributors
-
-Listed in alphabetical order.
-
-<table>
-  <tr>
-    <th>Name</th>
-    <th>Github</th>
-    <th>Twitter</th>
-  </tr>
-  {%- for contributor in other_contributors %}
-  <tr>
-    <td>{{ contributor.name }}</td>
-    <td>
-      <a href="https://github.com/{{ contributor.github_login }}">{{ contributor.github_login }}</a>
-    </td>
-    <td>{{ contributor.twitter_username }}</td>
-  </tr>
-  {%- endfor %}
-</table>
-
-### Special Thanks
-
-The following haven't provided code directly, but have provided
-guidance and advice.
-
--   Jannis Leidel
--   Nate Aune
--   Barry Morrison
-"""
-
 
 def main() -> None:
     """
@@ -151,7 +91,8 @@ class ContributorsJSONFile:
 
 def write_md_file(contributors):
     """Generate markdown file from Jinja template."""
-    template = Template(CONTRIBUTORS_TEMPLATE, autoescape=True)
+    contributors_template = ROOT / ".github" / "CONTRIBUTORS-template.md"
+    template = Template(contributors_template.read_text(), autoescape=True)
     core_contributors = [c for c in contributors if c.get("is_core", False)]
     other_contributors = (c for c in contributors if not c.get("is_core", False))
     other_contributors = sorted(other_contributors, key=lambda c: c["name"].lower())

From 81bc4fb73d25dd4dd621b29140c79dedf70e6c32 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 10 Aug 2020 18:35:18 +0100
Subject: [PATCH 0932/2840] Run black on our custom scripts

---
 tox.ini | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tox.ini b/tox.ini
index 242183c39..cecc7435f 100644
--- a/tox.ini
+++ b/tox.ini
@@ -8,4 +8,4 @@ commands = pytest {posargs:./tests}
 
 [testenv:black-template]
 deps = black
-commands = black --check hooks tests setup.py docs
+commands = black --check hooks tests setup.py docs scripts

From 7570ed9c5a48b03512ce6a434fd21c78bfe72999 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 10 Aug 2020 18:39:15 +0100
Subject: [PATCH 0933/2840] Bot usernames are excluded in the generator

---
 scripts/update_contributors.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py
index 8ad013d42..206d7aab3 100644
--- a/scripts/update_contributors.py
+++ b/scripts/update_contributors.py
@@ -26,7 +26,7 @@ def main() -> None:
     contrib_file = ContributorsJSONFile()
     for username in recent_authors:
         print(f"Checking if {username} should be added")
-        if username not in contrib_file and username not in BOT_LOGINS:
+        if username not in contrib_file:
             user_data = gh.fetch_user_info(username)
             contrib_file.add_contributor(user_data)
             print(f"Added {username} to contributors")

From 4e137c00edef917c7b0a0e0375aa94187f426f7b Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 10 Aug 2020 18:44:35 +0100
Subject: [PATCH 0934/2840] Update contributing guidelines and PR template

---
 .github/PULL_REQUEST_TEMPLATE.md | 8 ++------
 CONTRIBUTING.rst                 | 1 -
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 8dbff6c25..45e67c69b 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -2,8 +2,8 @@
 
 [//]: # (Before you proceed:)
 
-[//]: # (1. Make sure to add yourself to `CONTRIBUTORS.rst` through this PR provided you're contributing here for the first time)
-[//]: # (2. Don't forget to update the `docs/` presuming others would benefit from a concise description of whatever that you're proposing)
+[//]: # (- Don't forget to update the `docs/` presuming others would benefit from a concise description of whatever that you're proposing)
+[//]: # (- If you're adding a new option, please make sure that tests/test_cookiecutter_generation.py is updated accordingly)
 
 
 ## Description
@@ -11,15 +11,11 @@
 [//]: # (What's it you're proposing?)
 
 
-
-
 ## Rationale
 
 [//]: # (Why does the project need that?)
 
 
-
-
 ## Use case(s) / visualization(s)
 
 [//]: # ("Better to see something once than to hear about it a thousand times.")
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 0a64e628b..5d88bf5bf 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -8,7 +8,6 @@ Getting your pull request merged in
 
 #. Keep it small. The smaller the pull request the more likely I'll pull it in.
 #. Pull requests that fix a current issue get priority for review.
-#. If you're not already in the `CONTRIBUTORS.rst` file, add yourself!
 
 Testing
 -------

From 8287a87de36c7e071a8635fdbbb538c623fd5e7e Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Mon, 10 Aug 2020 17:45:27 +0000
Subject: [PATCH 0935/2840] Update Contributors

---
 CONTRIBUTORS.md | 1445 +++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 1445 insertions(+)
 create mode 100644 CONTRIBUTORS.md

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
new file mode 100644
index 000000000..d033b1d98
--- /dev/null
+++ b/CONTRIBUTORS.md
@@ -0,0 +1,1445 @@
+# Contributors
+
+## Core Developers
+
+These contributors have commit flags for the repository, and are able to
+accept and merge pull requests.
+
+<table>
+  <tr>
+    <th>Name</th>
+    <th>Github</th>
+    <th>Twitter</th>
+  </tr>
+  <tr>
+    <td>Daniel Roy Greenfeld</td>
+    <td>
+      <a href="https://github.com/pydanny">pydanny</a>
+    </td>
+    <td>pydanny</td>
+  </tr>
+  <tr>
+    <td>Audrey Roy Greenfeld</td>
+    <td>
+      <a href="https://github.com/audreyr">audreyr</a>
+    </td>
+    <td>audreyr</td>
+  </tr>
+  <tr>
+    <td>Fábio C. Barrionuevo da Luz</td>
+    <td>
+      <a href="https://github.com/luzfcb">luzfcb</a>
+    </td>
+    <td>luzfcb</td>
+  </tr>
+  <tr>
+    <td>Saurabh Kumar</td>
+    <td>
+      <a href="https://github.com/theskumar">theskumar</a>
+    </td>
+    <td>_theskumar</td>
+  </tr>
+  <tr>
+    <td>Jannis Gebauer</td>
+    <td>
+      <a href="https://github.com/jayfk">jayfk</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Burhan Khalid</td>
+    <td>
+      <a href="https://github.com/burhan">burhan</a>
+    </td>
+    <td>burhan</td>
+  </tr>
+  <tr>
+    <td>Shupeyko Nikita</td>
+    <td>
+      <a href="https://github.com/webyneter">webyneter</a>
+    </td>
+    <td>webyneter</td>
+  </tr>
+  <tr>
+    <td>Bruno Alla</td>
+    <td>
+      <a href="https://github.com/browniebroke">browniebroke</a>
+    </td>
+    <td>_BrunoAlla</td>
+  </tr>
+  <tr>
+    <td>Wan Liuyang</td>
+    <td>
+      <a href="https://github.com/sfdye">sfdye</a>
+    </td>
+    <td>sfdye</td>
+  </tr>
+</table>
+
+*Audrey is also the creator of Cookiecutter. Audrey and Daniel are on
+the Cookiecutter core team.*
+
+## Other Contributors
+
+Listed in alphabetical order.
+
+<table>
+  <tr>
+    <th>Name</th>
+    <th>Github</th>
+    <th>Twitter</th>
+  </tr>
+  <tr>
+    <td>18</td>
+    <td>
+      <a href="https://github.com/dezoito">dezoito</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>2O4</td>
+    <td>
+      <a href="https://github.com/2O4">2O4</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>a7p</td>
+    <td>
+      <a href="https://github.com/a7p">a7p</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Aadith PM</td>
+    <td>
+      <a href="https://github.com/aadithpm">aadithpm</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Aaron Eikenberry</td>
+    <td>
+      <a href="https://github.com/aeikenberry">aeikenberry</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Adam Bogdał</td>
+    <td>
+      <a href="https://github.com/bogdal">bogdal</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Adam Dobrawy</td>
+    <td>
+      <a href="https://github.com/ad-m">ad-m</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Adam Steele</td>
+    <td>
+      <a href="https://github.com/adammsteele">adammsteele</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Agam Dua</td>
+    <td>
+      <a href="https://github.com/"></a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Agustín Scaramuzza</td>
+    <td>
+      <a href="https://github.com/scaramagus">scaramagus</a>
+    </td>
+    <td>scaramagus</td>
+  </tr>
+  <tr>
+    <td>Alberto Sanchez</td>
+    <td>
+      <a href="https://github.com/alb3rto">alb3rto</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Alex Tsai</td>
+    <td>
+      <a href="https://github.com/caffodian">caffodian</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Alvaro [Andor]</td>
+    <td>
+      <a href="https://github.com/andor-pierdelacabeza">andor-pierdelacabeza</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Amjith Ramanujam</td>
+    <td>
+      <a href="https://github.com/amjith">amjith</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Andreas Meistad</td>
+    <td>
+      <a href="https://github.com/ameistad">ameistad</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Andres Gonzalez</td>
+    <td>
+      <a href="https://github.com/andresgz">andresgz</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Andrew Chen Wang</td>
+    <td>
+      <a href="https://github.com/Andrew-Chen-Wang">Andrew-Chen-Wang</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Andrew Mikhnevich</td>
+    <td>
+      <a href="https://github.com/zcho">zcho</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Andy Rose</td>
+    <td>
+      <a href="https://github.com/"></a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Anna Callahan</td>
+    <td>
+      <a href="https://github.com/jazztpt">jazztpt</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Anna Sidwell</td>
+    <td>
+      <a href="https://github.com/takkaria">takkaria</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Antonia Blair</td>
+    <td>
+      <a href="https://github.com/antoniablair">antoniablair</a>
+    </td>
+    <td>antoniablairart</td>
+  </tr>
+  <tr>
+    <td>Anuj Bansal</td>
+    <td>
+      <a href="https://github.com/ahhda">ahhda</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Arcuri Davide</td>
+    <td>
+      <a href="https://github.com/dadokkio">dadokkio</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Areski Belaid</td>
+    <td>
+      <a href="https://github.com/areski">areski</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>AsheKR</td>
+    <td>
+      <a href="https://github.com/ashekr">ashekr</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Ashley Camba</td>
+    <td>
+      <a href="https://github.com/"></a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Barclay Gauld</td>
+    <td>
+      <a href="https://github.com/yunti">yunti</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Bartek</td>
+    <td>
+      <a href="https://github.com/btknu">btknu</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Ben Lopatin</td>
+    <td>
+      <a href="https://github.com/"></a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Ben Warren</td>
+    <td>
+      <a href="https://github.com/bwarren2">bwarren2</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Benjamin Abel</td>
+    <td>
+      <a href="https://github.com/"></a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Bert de Miranda</td>
+    <td>
+      <a href="https://github.com/bertdemiranda">bertdemiranda</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Bo Lopker</td>
+    <td>
+      <a href="https://github.com/blopker">blopker</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Bo Peng</td>
+    <td>
+      <a href="https://github.com/BoPeng">BoPeng</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Bouke Haarsma</td>
+    <td>
+      <a href="https://github.com/"></a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Brent Payne</td>
+    <td>
+      <a href="https://github.com/brentpayne">brentpayne</a>
+    </td>
+    <td>brentpayne</td>
+  </tr>
+  <tr>
+    <td>Bruce Olivier</td>
+    <td>
+      <a href="https://github.com/bolivierjr">bolivierjr</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Caio Ariede</td>
+    <td>
+      <a href="https://github.com/caioariede">caioariede</a>
+    </td>
+    <td>caioariede</td>
+  </tr>
+  <tr>
+    <td>Carl Johnson</td>
+    <td>
+      <a href="https://github.com/carlmjohnson">carlmjohnson</a>
+    </td>
+    <td>carlmjohnson</td>
+  </tr>
+  <tr>
+    <td>Catherine Devlin</td>
+    <td>
+      <a href="https://github.com/catherinedevlin">catherinedevlin</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Charlie Smith</td>
+    <td>
+      <a href="https://github.com/chuckus">chuckus</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Chris Curvey</td>
+    <td>
+      <a href="https://github.com/ccurvey">ccurvey</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Chris Franklin</td>
+    <td>
+      <a href="https://github.com/"></a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Chris Franklin</td>
+    <td>
+      <a href="https://github.com/hairychris">hairychris</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Chris Pappalardo</td>
+    <td>
+      <a href="https://github.com/ChrisPappalardo">ChrisPappalardo</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Christopher Clarke</td>
+    <td>
+      <a href="https://github.com/chrisdev">chrisdev</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Cole Mackenzie</td>
+    <td>
+      <a href="https://github.com/cmackenzie1">cmackenzie1</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Cole Maclean</td>
+    <td>
+      <a href="https://github.com/cole">cole</a>
+    </td>
+    <td>cole</td>
+  </tr>
+  <tr>
+    <td>Collederas</td>
+    <td>
+      <a href="https://github.com/Collederas">Collederas</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Craig Margieson</td>
+    <td>
+      <a href="https://github.com/cmargieson">cmargieson</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Cristian Vargas</td>
+    <td>
+      <a href="https://github.com/cdvv7788">cdvv7788</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Cullen Rhodes</td>
+    <td>
+      <a href="https://github.com/c-rhodes">c-rhodes</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Curtis St Pierre</td>
+    <td>
+      <a href="https://github.com/curtisstpierre">curtisstpierre</a>
+    </td>
+    <td>cstpierre1388</td>
+  </tr>
+  <tr>
+    <td>Cédric Gaspoz</td>
+    <td>
+      <a href="https://github.com/cgaspoz">cgaspoz</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Dan Shultz</td>
+    <td>
+      <a href="https://github.com/shultz">shultz</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Dani Hodovic</td>
+    <td>
+      <a href="https://github.com/danihodovic">danihodovic</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Daniel Hepper</td>
+    <td>
+      <a href="https://github.com/dhepper">dhepper</a>
+    </td>
+    <td>danielhepper</td>
+  </tr>
+  <tr>
+    <td>Daniel Hillier</td>
+    <td>
+      <a href="https://github.com/danifus">danifus</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Daniel Sears</td>
+    <td>
+      <a href="https://github.com/highpost">highpost</a>
+    </td>
+    <td>highpost</td>
+  </tr>
+  <tr>
+    <td>Daniele Tricoli</td>
+    <td>
+      <a href="https://github.com/eriol">eriol</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>David Díaz</td>
+    <td>
+      <a href="https://github.com/ddiazpinto">ddiazpinto</a>
+    </td>
+    <td>DavidDiazPinto</td>
+  </tr>
+  <tr>
+    <td>Davit Tovmasyan</td>
+    <td>
+      <a href="https://github.com/davitovmasyan">davitovmasyan</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Davur Clementsen</td>
+    <td>
+      <a href="https://github.com/dsclementsen">dsclementsen</a>
+    </td>
+    <td>davur</td>
+  </tr>
+  <tr>
+    <td>Delio Castillo</td>
+    <td>
+      <a href="https://github.com/jangeador">jangeador</a>
+    </td>
+    <td>jangeador</td>
+  </tr>
+  <tr>
+    <td>Demetris Stavrou</td>
+    <td>
+      <a href="https://github.com/demestav">demestav</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Denis Bobrov</td>
+    <td>
+      <a href="https://github.com/delneg">delneg</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Denis Orehovsky</td>
+    <td>
+      <a href="https://github.com/apirobot">apirobot</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Denis Savran</td>
+    <td>
+      <a href="https://github.com/blaxpy">blaxpy</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Diane Chen</td>
+    <td>
+      <a href="https://github.com/purplediane">purplediane</a>
+    </td>
+    <td>purplediane88</td>
+  </tr>
+  <tr>
+    <td>Dong Huynh</td>
+    <td>
+      <a href="https://github.com/trungdong">trungdong</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Duda Nogueira</td>
+    <td>
+      <a href="https://github.com/dudanogueira">dudanogueira</a>
+    </td>
+    <td>dudanogueira</td>
+  </tr>
+  <tr>
+    <td>Dónal Adams</td>
+    <td>
+      <a href="https://github.com/epileptic-fish">epileptic-fish</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Emanuel Calso</td>
+    <td>
+      <a href="https://github.com/bloodpet">bloodpet</a>
+    </td>
+    <td>bloodpet</td>
+  </tr>
+  <tr>
+    <td>Eraldo Energy</td>
+    <td>
+      <a href="https://github.com/eraldo">eraldo</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Eric Groom</td>
+    <td>
+      <a href="https://github.com/ericgroom">ericgroom</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Ernesto Cedeno</td>
+    <td>
+      <a href="https://github.com/codnee">codnee</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Eyad Al Sibai</td>
+    <td>
+      <a href="https://github.com/eyadsibai">eyadsibai</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Felipe Arruda</td>
+    <td>
+      <a href="https://github.com/arruda">arruda</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Florian Idelberger</td>
+    <td>
+      <a href="https://github.com/step21">step21</a>
+    </td>
+    <td>windrush</td>
+  </tr>
+  <tr>
+    <td>Gabriel Mejia</td>
+    <td>
+      <a href="https://github.com/elgartoinf">elgartoinf</a>
+    </td>
+    <td>elgartoinf</td>
+  </tr>
+  <tr>
+    <td>Garry Cairns</td>
+    <td>
+      <a href="https://github.com/garry-cairns">garry-cairns</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Garry Polley</td>
+    <td>
+      <a href="https://github.com/garrypolley">garrypolley</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Gilbishkosma</td>
+    <td>
+      <a href="https://github.com/Gilbishkosma">Gilbishkosma</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Glenn Wiskur</td>
+    <td>
+      <a href="https://github.com/gwiskur">gwiskur</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Guilherme Guy</td>
+    <td>
+      <a href="https://github.com/guilherme1guy">guilherme1guy</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Hamish Durkin</td>
+    <td>
+      <a href="https://github.com/durkode">durkode</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Hana Quadara</td>
+    <td>
+      <a href="https://github.com/hanaquadara">hanaquadara</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Hannah Lazarus</td>
+    <td>
+      <a href="https://github.com/hanhanhan">hanhanhan</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Harry Moreno</td>
+    <td>
+      <a href="https://github.com/morenoh149">morenoh149</a>
+    </td>
+    <td>morenoh149</td>
+  </tr>
+  <tr>
+    <td>Harry Percival</td>
+    <td>
+      <a href="https://github.com/hjwp">hjwp</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Hendrik Schneider</td>
+    <td>
+      <a href="https://github.com/hendrikschneider">hendrikschneider</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Henrique G. G. Pereira</td>
+    <td>
+      <a href="https://github.com/ikkebr">ikkebr</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Howie Zhao</td>
+    <td>
+      <a href="https://github.com/howiezhao">howiezhao</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Ian Lee</td>
+    <td>
+      <a href="https://github.com/IanLee1521">IanLee1521</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Irfan Ahmad</td>
+    <td>
+      <a href="https://github.com/erfaan">erfaan</a>
+    </td>
+    <td>erfaan</td>
+  </tr>
+  <tr>
+    <td>Isaac12x</td>
+    <td>
+      <a href="https://github.com/Isaac12x">Isaac12x</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Ivan Khomutov</td>
+    <td>
+      <a href="https://github.com/ikhomutov">ikhomutov</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>James Williams</td>
+    <td>
+      <a href="https://github.com/jameswilliams1">jameswilliams1</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Jan Van Bruggen</td>
+    <td>
+      <a href="https://github.com/jvanbrug">jvanbrug</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Jelmer Draaijer</td>
+    <td>
+      <a href="https://github.com/foarsitter">foarsitter</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Jens Nilsson</td>
+    <td>
+      <a href="https://github.com/phiberjenz">phiberjenz</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Jerome Caisip</td>
+    <td>
+      <a href="https://github.com/jeromecaisip">jeromecaisip</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Jerome Leclanche</td>
+    <td>
+      <a href="https://github.com/jleclanche">jleclanche</a>
+    </td>
+    <td>Adys</td>
+  </tr>
+  <tr>
+    <td>Jimmy Gitonga</td>
+    <td>
+      <a href="https://github.com/afrowave">afrowave</a>
+    </td>
+    <td>afrowave</td>
+  </tr>
+  <tr>
+    <td>John Cass</td>
+    <td>
+      <a href="https://github.com/jcass77">jcass77</a>
+    </td>
+    <td>cass_john</td>
+  </tr>
+  <tr>
+    <td>Jonathan Thompson</td>
+    <td>
+      <a href="https://github.com/nojanath">nojanath</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Jules Cheron</td>
+    <td>
+      <a href="https://github.com/jules-ch">jules-ch</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Julien Almarcha</td>
+    <td>
+      <a href="https://github.com/sladinji">sladinji</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Julio Castillo</td>
+    <td>
+      <a href="https://github.com/juliocc">juliocc</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Kaido Kert</td>
+    <td>
+      <a href="https://github.com/kaidokert">kaidokert</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>kappataumu</td>
+    <td>
+      <a href="https://github.com/kappataumu">kappataumu</a>
+    </td>
+    <td>kappataumu</td>
+  </tr>
+  <tr>
+    <td>Kaveh</td>
+    <td>
+      <a href="https://github.com/ka7eh">ka7eh</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Keith Bailey</td>
+    <td>
+      <a href="https://github.com/keithjeb">keithjeb</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Keith Webber</td>
+    <td>
+      <a href="https://github.com/townie">townie</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Kevin A. Stone</td>
+    <td>
+      <a href="https://github.com/"></a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Kevin Ndung&#39;u</td>
+    <td>
+      <a href="https://github.com/kevgathuku">kevgathuku</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Keyvan Mosharraf</td>
+    <td>
+      <a href="https://github.com/keyvanm">keyvanm</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Krzysztof Szumny</td>
+    <td>
+      <a href="https://github.com/noisy">noisy</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Krzysztof Żuraw</td>
+    <td>
+      <a href="https://github.com/krzysztofzuraw">krzysztofzuraw</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Leo won</td>
+    <td>
+      <a href="https://github.com/leollon">leollon</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Leo Zhou</td>
+    <td>
+      <a href="https://github.com/glasslion">glasslion</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Leon Kim</td>
+    <td>
+      <a href="https://github.com/PilhwanKim">PilhwanKim</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Leonardo Jimenez</td>
+    <td>
+      <a href="https://github.com/xpostudio4">xpostudio4</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Lin Xianyi</td>
+    <td>
+      <a href="https://github.com/iynaix">iynaix</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Luis Nell</td>
+    <td>
+      <a href="https://github.com/originell">originell</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Lukas Klein</td>
+    <td>
+      <a href="https://github.com/"></a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Lyla Fischer</td>
+    <td>
+      <a href="https://github.com/"></a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Malik Sulaimanov</td>
+    <td>
+      <a href="https://github.com/flyudvik">flyudvik</a>
+    </td>
+    <td>flyudvik</td>
+  </tr>
+  <tr>
+    <td>Martin Blech</td>
+    <td>
+      <a href="https://github.com/"></a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Martin Saizar</td>
+    <td>
+      <a href="https://github.com/msaizar">msaizar</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Mateusz Ostaszewski</td>
+    <td>
+      <a href="https://github.com/mostaszewski">mostaszewski</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Mathijs Hoogland</td>
+    <td>
+      <a href="https://github.com/MathijsHoogland">MathijsHoogland</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Matt Braymer-Hayes</td>
+    <td>
+      <a href="https://github.com/mattayes">mattayes</a>
+    </td>
+    <td>mattayes</td>
+  </tr>
+  <tr>
+    <td>Matt Knapper</td>
+    <td>
+      <a href="https://github.com/mknapper1">mknapper1</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Matt Linares</td>
+    <td>
+      <a href="https://github.com/"></a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Matt Menzenski</td>
+    <td>
+      <a href="https://github.com/menzenski">menzenski</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Matt Warren</td>
+    <td>
+      <a href="https://github.com/mfwarren">mfwarren</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Matthew Sisley</td>
+    <td>
+      <a href="https://github.com/mjsisley">mjsisley</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Matthias Sieber</td>
+    <td>
+      <a href="https://github.com/manonthemat">manonthemat</a>
+    </td>
+    <td>MatzeOne</td>
+  </tr>
+  <tr>
+    <td>Meghan Heintz</td>
+    <td>
+      <a href="https://github.com/dot2dotseurat">dot2dotseurat</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Mesut Yılmaz</td>
+    <td>
+      <a href="https://github.com/myilmaz">myilmaz</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Michael Gecht</td>
+    <td>
+      <a href="https://github.com/mimischi">mimischi</a>
+    </td>
+    <td>_mischi</td>
+  </tr>
+  <tr>
+    <td>Michael Samoylov</td>
+    <td>
+      <a href="https://github.com/msamoylov">msamoylov</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Min ho Kim</td>
+    <td>
+      <a href="https://github.com/minho42">minho42</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>mozillazg</td>
+    <td>
+      <a href="https://github.com/mozillazg">mozillazg</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Nico Stefani</td>
+    <td>
+      <a href="https://github.com/nicolas471">nicolas471</a>
+    </td>
+    <td>moby_dick91</td>
+  </tr>
+  <tr>
+    <td>Oleg Russkin</td>
+    <td>
+      <a href="https://github.com/rolep">rolep</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Pablo</td>
+    <td>
+      <a href="https://github.com/oubiga">oubiga</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Parbhat Puri</td>
+    <td>
+      <a href="https://github.com/parbhat">parbhat</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Pawan Chaurasia</td>
+    <td>
+      <a href="https://github.com/rjsnh1522">rjsnh1522</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Peter Bittner</td>
+    <td>
+      <a href="https://github.com/bittner">bittner</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Peter Coles</td>
+    <td>
+      <a href="https://github.com/mrcoles">mrcoles</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Philipp Matthies</td>
+    <td>
+      <a href="https://github.com/canonnervio">canonnervio</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Pierre Chiquet</td>
+    <td>
+      <a href="https://github.com/pchiquet">pchiquet</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Raony Guimarães Corrêa</td>
+    <td>
+      <a href="https://github.com/raonyguimaraes">raonyguimaraes</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Raphael Pierzina</td>
+    <td>
+      <a href="https://github.com/hackebrot">hackebrot</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Reggie Riser</td>
+    <td>
+      <a href="https://github.com/reggieriser">reggieriser</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>René Muhl</td>
+    <td>
+      <a href="https://github.com/rm--">rm--</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Richard Hajdu</td>
+    <td>
+      <a href="https://github.com/Tusky">Tusky</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Roman Afanaskin</td>
+    <td>
+      <a href="https://github.com/siauPatrick">siauPatrick</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Roman Osipenko</td>
+    <td>
+      <a href="https://github.com/romanosipenko">romanosipenko</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Russell Davies</td>
+    <td>
+      <a href="https://github.com/"></a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Sam Collins</td>
+    <td>
+      <a href="https://github.com/MightySCollins">MightySCollins</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Sascha</td>
+    <td>
+      <a href="https://github.com/saschalalala">saschalalala</a>
+    </td>
+    <td>saschalalala</td>
+  </tr>
+  <tr>
+    <td>Sorasful</td>
+    <td>
+      <a href="https://github.com/sorasful">sorasful</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Srinivas Nyayapati</td>
+    <td>
+      <a href="https://github.com/shireenrao">shireenrao</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>stepmr</td>
+    <td>
+      <a href="https://github.com/stepmr">stepmr</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Steve Steiner</td>
+    <td>
+      <a href="https://github.com/ssteinerX">ssteinerX</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Sudarshan Wadkar</td>
+    <td>
+      <a href="https://github.com/wadkar">wadkar</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Sule Marshall</td>
+    <td>
+      <a href="https://github.com/suledev">suledev</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Sławek Ehlert</td>
+    <td>
+      <a href="https://github.com/slafs">slafs</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Tano Abeleyra</td>
+    <td>
+      <a href="https://github.com/tanoabeleyra">tanoabeleyra</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Taylor Baldwin</td>
+    <td>
+      <a href="https://github.com/"></a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Théo Segonds</td>
+    <td>
+      <a href="https://github.com/show0k">show0k</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Tim Claessens</td>
+    <td>
+      <a href="https://github.com/timclaessens">timclaessens</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Tim Freund</td>
+    <td>
+      <a href="https://github.com/timfreund">timfreund</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Tom Atkins</td>
+    <td>
+      <a href="https://github.com/knitatoms">knitatoms</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Tom Offermann</td>
+    <td>
+      <a href="https://github.com/"></a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Travis McNeill</td>
+    <td>
+      <a href="https://github.com/Travistock">Travistock</a>
+    </td>
+    <td>tavistock_esq</td>
+  </tr>
+  <tr>
+    <td>Tubo Shi</td>
+    <td>
+      <a href="https://github.com/Tubo">Tubo</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Umair Ashraf</td>
+    <td>
+      <a href="https://github.com/umrashrf">umrashrf</a>
+    </td>
+    <td>fabumair</td>
+  </tr>
+  <tr>
+    <td>Vadim Iskuchekov</td>
+    <td>
+      <a href="https://github.com/Egregors">Egregors</a>
+    </td>
+    <td>egregors</td>
+  </tr>
+  <tr>
+    <td>Vicente G. Reyes</td>
+    <td>
+      <a href="https://github.com/reyesvicente">reyesvicente</a>
+    </td>
+    <td>highcenburg</td>
+  </tr>
+  <tr>
+    <td>Vitaly Babiy</td>
+    <td>
+      <a href="https://github.com/"></a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Vivian Guillen</td>
+    <td>
+      <a href="https://github.com/viviangb">viviangb</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Vlad Doster</td>
+    <td>
+      <a href="https://github.com/vladdoster">vladdoster</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Will Farley</td>
+    <td>
+      <a href="https://github.com/goldhand">goldhand</a>
+    </td>
+    <td>g01dhand</td>
+  </tr>
+  <tr>
+    <td>William Archinal</td>
+    <td>
+      <a href="https://github.com/archinal">archinal</a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Xaver Y.R. Chen</td>
+    <td>
+      <a href="https://github.com/yrchen">yrchen</a>
+    </td>
+    <td>yrchen</td>
+  </tr>
+  <tr>
+    <td>Yaroslav Halchenko</td>
+    <td>
+      <a href="https://github.com/"></a>
+    </td>
+    <td></td>
+  </tr>
+  <tr>
+    <td>Yuchen Xie</td>
+    <td>
+      <a href="https://github.com/mapx">mapx</a>
+    </td>
+    <td></td>
+  </tr>
+</table>
+
+### Special Thanks
+
+The following haven't provided code directly, but have provided
+guidance and advice.
+
+-   Jannis Leidel
+-   Nate Aune
+-   Barry Morrison
\ No newline at end of file

From 0c8cfc65aa9c6a25cd15527b2c8ca4a5e9b15822 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 11 Aug 2020 01:42:06 -0700
Subject: [PATCH 0936/2840] Update flake8-isort from 3.0.1 to 4.0.0

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

diff --git a/requirements.txt b/requirements.txt
index 1fbc8d165..fd88434dc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ binaryornot==0.4.4
 black==19.10b0
 isort==4.3.21
 flake8==3.8.3
-flake8-isort==3.0.1
+flake8-isort==4.0.0
 
 # Testing
 # ------------------------------------------------------------------------------

From 85cfe02437fa094b779193260a87ee372f88fd06 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 11 Aug 2020 01:42:07 -0700
Subject: [PATCH 0937/2840] Update flake8-isort from 3.0.1 to 4.0.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 028b36a94..6b6f00e97 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -26,7 +26,7 @@ sphinx-autobuild==0.7.1 # https://github.com/GaretJax/sphinx-autobuild
 # Code quality
 # ------------------------------------------------------------------------------
 flake8==3.8.3  # https://github.com/PyCQA/flake8
-flake8-isort==3.0.1  # https://github.com/gforcada/flake8-isort
+flake8-isort==4.0.0  # https://github.com/gforcada/flake8-isort
 coverage==5.2.1  # https://github.com/nedbat/coveragepy
 black==19.10b0  # https://github.com/ambv/black
 pylint-django==2.3.0  # https://github.com/PyCQA/pylint-django

From 1cc6e6a05cddf7d3d703a7cf10fd3888c8006746 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 11 Aug 2020 02:42:42 -0700
Subject: [PATCH 0938/2840] Update isort from 4.3.21 to 5.3.2

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

diff --git a/requirements.txt b/requirements.txt
index fd88434dc..17cebc3cb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==19.10b0
-isort==4.3.21
+isort==5.3.2
 flake8==3.8.3
 flake8-isort==4.0.0
 

From 97e18889c68b55326fbf11685ebc7d239ac7ed72 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 11 Aug 2020 16:05:14 +0100
Subject: [PATCH 0939/2840] Revert "Added name to CONTRIBUTORS.txt"

This reverts commit 160ed6cb
---
 {{cookiecutter.project_slug}}/CONTRIBUTORS.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/CONTRIBUTORS.txt b/{{cookiecutter.project_slug}}/CONTRIBUTORS.txt
index e8450c4c3..82a80bfc1 100644
--- a/{{cookiecutter.project_slug}}/CONTRIBUTORS.txt
+++ b/{{cookiecutter.project_slug}}/CONTRIBUTORS.txt
@@ -1 +1 @@
-enchance
\ No newline at end of file
+{{ cookiecutter.author_name }}

From 1645b8826d49a8bd57c8843bc8e78df0708163d3 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 11 Aug 2020 16:20:10 +0100
Subject: [PATCH 0940/2840] Use the pip resolver to avoid broken deps

---
 tests/test_bare.sh | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/tests/test_bare.sh b/tests/test_bare.sh
index 7021a7e47..28f9b7bfb 100755
--- a/tests/test_bare.sh
+++ b/tests/test_bare.sh
@@ -5,6 +5,10 @@
 
 set -o errexit
 
+# Install modern pip to use new resolver:
+# https://blog.python.org/2020/07/upgrade-pip-20-2-changes-20-3.html
+pip install 'pip>=20.2'
+
 # install test requirements
 pip install -r requirements.txt
 
@@ -20,7 +24,7 @@ cd my_awesome_project
 sudo utility/install_os_dependencies.sh install
 
 # Install Python deps
-pip install -r requirements/local.txt
+pip install --use-feature=2020-resolver -r requirements/local.txt
 
 # run the project's tests
 pytest

From 85a5e46b9269f37172e7a04ad26a3ffcbd32dd69 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 11 Aug 2020 16:51:34 +0100
Subject: [PATCH 0941/2840] Find recent authors based on merged pull requests

---
 scripts/update_contributors.py | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py
index 206d7aab3..c73377643 100644
--- a/scripts/update_contributors.py
+++ b/scripts/update_contributors.py
@@ -1,5 +1,6 @@
 import json
 from pathlib import Path
+from urllib.parse import urlencode
 
 import requests
 from jinja2 import Template
@@ -50,10 +51,13 @@ class GitHub:
         return response.json()
 
     def iter_recent_authors(self):
-        commits = self.request("/repos/pydanny/cookiecutter-django/commits")
-        for commit in commits:
-            login = commit["author"]["login"]
-            if login not in BOT_LOGINS:
+        query_params = urlencode(
+            {"state": "closed", "sort": "updated", "direction": "desc"}
+        )
+        pulls = self.request(f"/repos/pydanny/cookiecutter-django/pulls?{query_params}")
+        for pull_request in pulls:
+            login = pull_request["user"]["login"]
+            if pull_request["merged_at"] and login not in BOT_LOGINS:
                 yield login
 
     def fetch_user_info(self, username):

From 34f93aaf10fde6f5e8b21fae75cc5863fd49b9d5 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 11 Aug 2020 16:59:41 +0100
Subject: [PATCH 0942/2840] Fix bugs when name or twitter username are null

---
 scripts/update_contributors.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py
index c73377643..06982bdce 100644
--- a/scripts/update_contributors.py
+++ b/scripts/update_contributors.py
@@ -81,9 +81,9 @@ class ContributorsJSONFile:
     def add_contributor(self, user_data):
         """Append the contributor data we care about at the end."""
         contributor_data = {
-            "name": user_data["name"],
+            "name": user_data.get("name", user_data["login"]),
             "github_login": user_data["login"],
-            "twitter_username": user_data["twitter_username"],
+            "twitter_username": user_data.get("twitter_username", ""),
         }
         self.content.append(contributor_data)
 

From 05d548b78f6dbf01d572dea486865b198e483e21 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 11 Aug 2020 17:17:12 +0100
Subject: [PATCH 0943/2840] Switch to PyGithub rather than custom API wrapper

---
 requirements.txt               |  2 +-
 scripts/update_contributors.py | 66 +++++++++++++---------------------
 2 files changed, 26 insertions(+), 42 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index b04e40126..4eb19f8a3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,5 +19,5 @@ pyyaml==5.3.1
 
 # Scripting
 # ------------------------------------------------------------------------------
-requests
+PyGithub
 jinja2
diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py
index 06982bdce..180e7e170 100644
--- a/scripts/update_contributors.py
+++ b/scripts/update_contributors.py
@@ -1,8 +1,7 @@
 import json
 from pathlib import Path
-from urllib.parse import urlencode
-
-import requests
+from github import Github
+from github.NamedUser import NamedUser
 from jinja2 import Template
 
 CURRENT_FILE = Path(__file__)
@@ -18,50 +17,35 @@ def main() -> None:
     2. Add missing ones to the JSON file
     3. Generate Markdown from JSON file
     """
-    # Use Github API to fetch recent authors rather than
-    # git CLI because we need to know their GH username
-    gh = GitHub()
-    recent_authors = set(gh.iter_recent_authors())
+    recent_authors = set(iter_recent_authors())
 
     # Add missing users to the JSON file
     contrib_file = ContributorsJSONFile()
-    for username in recent_authors:
-        print(f"Checking if {username} should be added")
-        if username not in contrib_file:
-            user_data = gh.fetch_user_info(username)
-            contrib_file.add_contributor(user_data)
-            print(f"Added {username} to contributors")
+    for author in recent_authors:
+        print(f"Checking if {author.login} should be added")
+        if author.login not in contrib_file:
+            contrib_file.add_contributor(author)
+            print(f"Added {author.login} to contributors")
     contrib_file.save()
 
     # Generate MD file from JSON file
     write_md_file(contrib_file.content)
 
 
-class GitHub:
-    """Small wrapper around Github REST API."""
+def iter_recent_authors():
+    """
+    Fetch users who opened recently merged pull requests.
 
-    base_url = "https://api.github.com"
-
-    def __init__(self) -> None:
-        self.session = requests.Session()
-
-    def request(self, endpoint):
-        response = self.session.get(f"{self.base_url}{endpoint}")
-        response.raise_for_status()
-        return response.json()
-
-    def iter_recent_authors(self):
-        query_params = urlencode(
-            {"state": "closed", "sort": "updated", "direction": "desc"}
-        )
-        pulls = self.request(f"/repos/pydanny/cookiecutter-django/pulls?{query_params}")
-        for pull_request in pulls:
-            login = pull_request["user"]["login"]
-            if pull_request["merged_at"] and login not in BOT_LOGINS:
-                yield login
-
-    def fetch_user_info(self, username):
-        return self.request(f"/users/{username}")
+    Use Github API to fetch recent authors rather than
+    git CLI to work with Github usernames.
+    """
+    repo = Github().get_repo("pydanny/cookiecutter-django")
+    recent_pulls = repo.get_pulls(
+        state="closed", sort="updated", direction="desc"
+    ).get_page(0)
+    for pull in recent_pulls:
+        if pull.merged and pull.user.login not in BOT_LOGINS:
+            yield pull.user
 
 
 class ContributorsJSONFile:
@@ -78,12 +62,12 @@ class ContributorsJSONFile:
         """Provide a nice API to do: `username in file`."""
         return any(github_login == contrib["github_login"] for contrib in self.content)
 
-    def add_contributor(self, user_data):
+    def add_contributor(self, user: NamedUser):
         """Append the contributor data we care about at the end."""
         contributor_data = {
-            "name": user_data.get("name", user_data["login"]),
-            "github_login": user_data["login"],
-            "twitter_username": user_data.get("twitter_username", ""),
+            "name": user.name or user.login,
+            "github_login": user.login,
+            "twitter_username": user.twitter_username or "",
         }
         self.content.append(contributor_data)
 

From 13c1182553bc666f7a642dc72947f8a5b80103e2 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 11 Aug 2020 16:20:28 +0000
Subject: [PATCH 0944/2840] 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 aeb0b61fd..e749ec14c 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1012,5 +1012,10 @@
     "name": "Yuchen Xie",
     "github_login": "mapx",
     "twitter_username": ""
+  },
+  {
+    "name": "enchance",
+    "github_login": "enchance",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index d033b1d98..f88512a33 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -607,6 +607,13 @@ Listed in alphabetical order.
     </td>
     <td>bloodpet</td>
   </tr>
+  <tr>
+    <td>enchance</td>
+    <td>
+      <a href="https://github.com/enchance">enchance</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Eraldo Energy</td>
     <td>

From 6ce39c7667e8df6908f1eccc810d36b79bd1f4d4 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 12 Aug 2020 11:30:01 +0000
Subject: [PATCH 0945/2840] 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 e749ec14c..febc1fb1f 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1017,5 +1017,10 @@
     "name": "enchance",
     "github_login": "enchance",
     "twitter_username": ""
+  },
+  {
+    "name": "Jan Fabry",
+    "github_login": "janfabry",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index f88512a33..b4f2bfcb0 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -789,6 +789,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Jan Fabry</td>
+    <td>
+      <a href="https://github.com/janfabry">janfabry</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Jan Van Bruggen</td>
     <td>

From 499af1b2034dddfab24646f8d3c8effd42827bef Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 12 Aug 2020 12:31:32 +0100
Subject: [PATCH 0946/2840] Update isort in pre-commit hook config

---
 {{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 734a0a715..1be2f6a45 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: 4.3.21
+    rev: 5.3.2
     hooks:
       - id: isort
 

From 3d1067fb56dea48e7b47f3b5b769035fcf847f5b Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 12 Aug 2020 12:52:58 +0100
Subject: [PATCH 0947/2840] Workflow to run pre-commit autoupdate

---
 .github/workflows/pre-commit-autoupdate.yml | 35 +++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 .github/workflows/pre-commit-autoupdate.yml

diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml
new file mode 100644
index 000000000..2ecb0032c
--- /dev/null
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -0,0 +1,35 @@
+# Run pre-commit autoupdate every day at midnight
+# and create a pull request if any changes
+
+
+name: Pre-commit auto-update
+
+on:
+  schedule:
+  - cron: "0 0 * * *"
+  workflow_dispatch: # to trigger manually
+
+jobs:
+  auto-update:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2.1.1
+      with:
+        python-version: 3.8
+
+    - name: Install pre-commit
+      run: pip install pre-commit
+    - name: Run pre-commit autoupdate
+      run: pre-commit autoupdate
+      working-directory: {{cookiecutter.project_slug}}
+
+    - name: Create Pull Request
+      uses: peter-evans/create-pull-request@v2
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+        branch: update/pre-commit-autoupdate
+        title: Auto-update pre-commit hooks
+        commit-message: Auto-update pre-commit hooks
+        body: Update versions of tools in pre-commit configs to latest version
+        labels: update

From 4db39b531919ec3782dd6b7a5af1c5fff894db1a Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 12 Aug 2020 12:55:37 +0100
Subject: [PATCH 0948/2840] Fix syntax

---
 .github/workflows/pre-commit-autoupdate.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml
index 2ecb0032c..4beaa578f 100644
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -20,9 +20,10 @@ jobs:
 
     - name: Install pre-commit
       run: pip install pre-commit
+
     - name: Run pre-commit autoupdate
+      working-directory: "{{cookiecutter.project_slug}}"
       run: pre-commit autoupdate
-      working-directory: {{cookiecutter.project_slug}}
 
     - name: Create Pull Request
       uses: peter-evans/create-pull-request@v2

From 5ae7d718bde5b25dbd93be5f36acba34fa88c416 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 12 Aug 2020 11:56:34 +0000
Subject: [PATCH 0949/2840] 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 1be2f6a45..921a87b7d 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -4,7 +4,7 @@ fail_fast: true
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: master
+    rev: v3.2.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer

From 266596f16b09dbc8d7f0551ab0dfacee9e6b32bb Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 12 Aug 2020 13:11:17 +0100
Subject: [PATCH 0950/2840] Only consider users of type 'User'

---
 scripts/update_contributors.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py
index 180e7e170..b77a35189 100644
--- a/scripts/update_contributors.py
+++ b/scripts/update_contributors.py
@@ -44,7 +44,11 @@ def iter_recent_authors():
         state="closed", sort="updated", direction="desc"
     ).get_page(0)
     for pull in recent_pulls:
-        if pull.merged and pull.user.login not in BOT_LOGINS:
+        if (
+            pull.merged
+            and pull.user.type == "User"
+            and pull.user.login not in BOT_LOGINS
+        ):
             yield pull.user
 
 

From 632bbd0a0892ead6b2fce183f0cee8dedb6587c6 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 12 Aug 2020 13:11:54 +0100
Subject: [PATCH 0951/2840] Only fetch 5 entries per page to limit GH API usage

---
 scripts/update_contributors.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py
index b77a35189..e00593ea4 100644
--- a/scripts/update_contributors.py
+++ b/scripts/update_contributors.py
@@ -39,7 +39,7 @@ def iter_recent_authors():
     Use Github API to fetch recent authors rather than
     git CLI to work with Github usernames.
     """
-    repo = Github().get_repo("pydanny/cookiecutter-django")
+    repo = Github(per_page=5).get_repo("pydanny/cookiecutter-django")
     recent_pulls = repo.get_pulls(
         state="closed", sort="updated", direction="desc"
     ).get_page(0)

From 6e17bd2e6bea21433544fbd8c94c5129264424fd Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 12 Aug 2020 23:55:18 -0700
Subject: [PATCH 0952/2840] Update isort from 5.3.2 to 5.4.0

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

diff --git a/requirements.txt b/requirements.txt
index 17cebc3cb..63eb9759e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==19.10b0
-isort==5.3.2
+isort==5.4.0
 flake8==3.8.3
 flake8-isort==4.0.0
 

From 2d410c5df99291f31ad5af9c262e5cd49a186e76 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 13 Aug 2020 01:34:47 -0700
Subject: [PATCH 0953/2840] Update factory-boy from 2.12.0 to 3.0.1

---
 {{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 789135938..e437ca565 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -37,7 +37,7 @@ pre-commit==2.6.0  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------
-factory-boy==2.12.0  # https://github.com/FactoryBoy/factory_boy
+factory-boy==3.0.1  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==2.2  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.0.5  # https://github.com/django-extensions/django-extensions

From 55d3d9533318db26b3ca0656ca78c6b352b97730 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Thu, 13 Aug 2020 10:08:53 -0400
Subject: [PATCH 0954/2840] Add STATICFILES_STORAGE with compressor support

---
 {{cookiecutter.project_slug}}/config/settings/production.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 3d4f324cd..ce381715c 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -236,10 +236,12 @@ ANYMAIL = {}
 # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_ENABLED
 COMPRESS_ENABLED = env.bool("COMPRESS_ENABLED", default=True)
 # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_STORAGE
-{%- if cookiecutter.cloud_provider == 'AWS' %}
+{%- if cookiecutter.cloud_provider == 'AWS' and cookiecutter.use_whitenoise == 'y' %}
 COMPRESS_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
-{%- elif cookiecutter.cloud_provider == 'GCP' %}
+{%- elif cookiecutter.cloud_provider == 'GCP' and cookiecutter.use_whitenoise == 'y' %}
 COMPRESS_STORAGE = "storages.backends.gcloud.GoogleCloudStorage"
+{%- elif cookiecutter.cloud_provider == 'AWS' or cookiecutter.cloud_provider == 'GCP' %}
+COMPRESS_STORAGE = STATICFILES_STORAGE
 {%- elif cookiecutter.cloud_provider == 'None' %}
 COMPRESS_STORAGE = "compressor.storage.GzipCompressorFileStorage"
 {%- endif %}

From 1cb2a0c98e3d54b4f2e89426e678f73713be94b6 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Thu, 13 Aug 2020 10:13:40 -0400
Subject: [PATCH 0955/2840] Set COMPRESS_ROOT to STATIC_ROOT for compressor

Django compressor also recommends the `COMPRESS_ROOT` be the STATIC_ROOT. This also makes sure the utils is set up properly so that the CACHE directory is actually publicly available (it'll be inside the static directory as a subdirectory).
---
 {{cookiecutter.project_slug}}/config/settings/production.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index ce381715c..f64ad1d27 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -242,6 +242,7 @@ COMPRESS_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
 COMPRESS_STORAGE = "storages.backends.gcloud.GoogleCloudStorage"
 {%- elif cookiecutter.cloud_provider == 'AWS' or cookiecutter.cloud_provider == 'GCP' %}
 COMPRESS_STORAGE = STATICFILES_STORAGE
+COMPRESS_ROOT = STATIC_ROOT
 {%- elif cookiecutter.cloud_provider == 'None' %}
 COMPRESS_STORAGE = "compressor.storage.GzipCompressorFileStorage"
 {%- endif %}

From 148d6c2e29e6095ad2ae451be043dece513836a2 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Thu, 13 Aug 2020 10:24:51 -0400
Subject: [PATCH 0956/2840] Added noqa F405 to undefined STATIC_ROOT - flake8

* This is in addition to the PR for compressor support with AWS S3 and Google Cloud buckets
---
 {{cookiecutter.project_slug}}/config/settings/production.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index f64ad1d27..7a8167229 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -242,7 +242,7 @@ COMPRESS_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
 COMPRESS_STORAGE = "storages.backends.gcloud.GoogleCloudStorage"
 {%- elif cookiecutter.cloud_provider == 'AWS' or cookiecutter.cloud_provider == 'GCP' %}
 COMPRESS_STORAGE = STATICFILES_STORAGE
-COMPRESS_ROOT = STATIC_ROOT
+COMPRESS_ROOT = STATIC_ROOT  # noqa F405 
 {%- elif cookiecutter.cloud_provider == 'None' %}
 COMPRESS_STORAGE = "compressor.storage.GzipCompressorFileStorage"
 {%- endif %}

From ebd43bbd3c29ff29cdf2617e661b857b89eb520c Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 13 Aug 2020 20:59:56 +0100
Subject: [PATCH 0957/2840] Update runtime.txt

---
 {{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 385705b56..43b47fb46 100644
--- a/{{cookiecutter.project_slug}}/runtime.txt
+++ b/{{cookiecutter.project_slug}}/runtime.txt
@@ -1 +1 @@
-python-3.8.3
+python-3.8.5

From 59d92d9eb4dc50b16443cb0f999408462bcabf60 Mon Sep 17 00:00:00 2001
From: Jimmy Gitonga <jimmygitts@gmail.com>
Date: Fri, 14 Aug 2020 01:00:17 +0300
Subject: [PATCH 0958/2840] Update docs/developing-locally-docker.rst

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 docs/developing-locally-docker.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index b5672e224..0bf52295b 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -280,7 +280,7 @@ Rebuild your ``docker`` application. ::
 
   $ docker-compose -f local.yml up -d --build
 
-Go to your browser and type in your usrl, ``
+Go to your browser and type in your URL bar ``https://my-dev-env.local``
 
 See `https with nginx`_ for more information on this configuration.
 

From ddcafff94fce980ac1e3ed21debe1d09e1f5c97d Mon Sep 17 00:00:00 2001
From: Jimmy Gitonga <jimmygitts@gmail.com>
Date: Fri, 14 Aug 2020 01:01:17 +0300
Subject: [PATCH 0959/2840] Update docs/developing-locally-docker.rst

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 docs/developing-locally-docker.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index 0bf52295b..17ea725bd 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -270,7 +270,7 @@ local.yml
    The services run behind the reverse proxy.
 
 config/settings/local.py
-~~~~~~~~~~~~~~~~~~~~~~~
+~~~~~~~~~~~~~~~~~~~~~~~~
 
 You should allow the new hostname. ::
 

From d411ed9b6a43e9fbf7e15eff2d2367f380887920 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Thu, 13 Aug 2020 18:45:37 -0400
Subject: [PATCH 0960/2840] Update compressor not check whitenoise condition

---
 .../config/settings/production.py                   | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 7a8167229..89049cad0 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -235,16 +235,11 @@ ANYMAIL = {}
 # ------------------------------------------------------------------------------
 # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_ENABLED
 COMPRESS_ENABLED = env.bool("COMPRESS_ENABLED", default=True)
-# https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_STORAGE
-{%- if cookiecutter.cloud_provider == 'AWS' and cookiecutter.use_whitenoise == 'y' %}
-COMPRESS_STORAGE = "storages.backends.s3boto3.S3Boto3Storage"
-{%- elif cookiecutter.cloud_provider == 'GCP' and cookiecutter.use_whitenoise == 'y' %}
-COMPRESS_STORAGE = "storages.backends.gcloud.GoogleCloudStorage"
-{%- elif cookiecutter.cloud_provider == 'AWS' or cookiecutter.cloud_provider == 'GCP' %}
-COMPRESS_STORAGE = STATICFILES_STORAGE
-COMPRESS_ROOT = STATIC_ROOT  # noqa F405 
-{%- elif cookiecutter.cloud_provider == 'None' %}
+{%- if cookiecutter.cloud_provider == 'None' %}
 COMPRESS_STORAGE = "compressor.storage.GzipCompressorFileStorage"
+{%- elif cookiecutter.cloud_provider in ('AWS', 'GCP') and cookiecutter.use_whitenoise == 'n' %}
+# https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_STORAGE
+COMPRESS_STORAGE = STATICFILES_STORAGE
 {%- endif %}
 # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_URL
 COMPRESS_URL = STATIC_URL{% if cookiecutter.use_whitenoise == 'y' or cookiecutter.cloud_provider == 'None' %}  # noqa F405{% endif %}

From aa261ddbb7908c098c7b9c3e36c81c3bda8ae71c Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 14 Aug 2020 00:20:41 +0000
Subject: [PATCH 0961/2840] 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 921a87b7d..5ff2d62b6 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.3.2
+    rev: 5.4.1
     hooks:
       - id: isort
 

From 363b6eed4ef32340cba3c43b4900c5dff98ebcdd Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 13 Aug 2020 23:55:15 -0700
Subject: [PATCH 0962/2840] Update isort from 5.4.0 to 5.4.1

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

diff --git a/requirements.txt b/requirements.txt
index 63eb9759e..a1cb16ee7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==19.10b0
-isort==5.4.0
+isort==5.4.1
 flake8==3.8.3
 flake8-isort==4.0.0
 

From 7e87a92596b66828575f71e6b2235dd030db1d34 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 14 Aug 2020 08:12:55 +0100
Subject: [PATCH 0963/2840] Add missing comment over settings

---
 {{cookiecutter.project_slug}}/config/settings/production.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 89049cad0..2f1b52e72 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -236,6 +236,7 @@ ANYMAIL = {}
 # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_ENABLED
 COMPRESS_ENABLED = env.bool("COMPRESS_ENABLED", default=True)
 {%- if cookiecutter.cloud_provider == 'None' %}
+# https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_STORAGE
 COMPRESS_STORAGE = "compressor.storage.GzipCompressorFileStorage"
 {%- elif cookiecutter.cloud_provider in ('AWS', 'GCP') and cookiecutter.use_whitenoise == 'n' %}
 # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_STORAGE

From dfdc3e729fbc577da1a204defc295cae4187a479 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 14 Aug 2020 07:17:53 +0000
Subject: [PATCH 0964/2840] 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 febc1fb1f..99121fdca 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1022,5 +1022,10 @@
     "name": "Jan Fabry",
     "github_login": "janfabry",
     "twitter_username": ""
+  },
+  {
+    "name": "Jimmy Gitonga",
+    "github_login": "Afrowave",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index b4f2bfcb0..dee97bef4 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -838,6 +838,13 @@ Listed in alphabetical order.
     </td>
     <td>afrowave</td>
   </tr>
+  <tr>
+    <td>Jimmy Gitonga</td>
+    <td>
+      <a href="https://github.com/Afrowave">Afrowave</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>John Cass</td>
     <td>

From be340d24d25cd96ae3549dae86f76cf60a3b5c38 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 14 Aug 2020 08:24:34 +0100
Subject: [PATCH 0965/2840] Remove duplicated contributor

---
 .github/contributors.json | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/.github/contributors.json b/.github/contributors.json
index 99121fdca..43e52913e 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -575,7 +575,7 @@
   },
   {
     "name": "Jimmy Gitonga",
-    "github_login": "afrowave",
+    "github_login": "Afrowave",
     "twitter_username": "afrowave"
   },
   {
@@ -1022,10 +1022,5 @@
     "name": "Jan Fabry",
     "github_login": "janfabry",
     "twitter_username": ""
-  },
-  {
-    "name": "Jimmy Gitonga",
-    "github_login": "Afrowave",
-    "twitter_username": ""
   }
-]
\ No newline at end of file
+]

From 3c1f2f0923f859939768a87c132d17483dde91b1 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 14 Aug 2020 07:25:26 +0000
Subject: [PATCH 0966/2840] Update Contributors

---
 .github/contributors.json | 2 +-
 CONTRIBUTORS.md           | 9 +--------
 2 files changed, 2 insertions(+), 9 deletions(-)

diff --git a/.github/contributors.json b/.github/contributors.json
index 43e52913e..e65ddcd38 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1023,4 +1023,4 @@
     "github_login": "janfabry",
     "twitter_username": ""
   }
-]
+]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index dee97bef4..752aa9e5e 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -831,19 +831,12 @@ Listed in alphabetical order.
     </td>
     <td>Adys</td>
   </tr>
-  <tr>
-    <td>Jimmy Gitonga</td>
-    <td>
-      <a href="https://github.com/afrowave">afrowave</a>
-    </td>
-    <td>afrowave</td>
-  </tr>
   <tr>
     <td>Jimmy Gitonga</td>
     <td>
       <a href="https://github.com/Afrowave">Afrowave</a>
     </td>
-    <td></td>
+    <td>afrowave</td>
   </tr>
   <tr>
     <td>John Cass</td>

From 6c63143f3bf4fdbc195fea83708b2514da6a5442 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 14 Aug 2020 08:27:57 +0100
Subject: [PATCH 0967/2840] Avoid duplicate contributors due to different case

---
 scripts/update_contributors.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py
index e00593ea4..8423ccd64 100644
--- a/scripts/update_contributors.py
+++ b/scripts/update_contributors.py
@@ -64,7 +64,11 @@ class ContributorsJSONFile:
 
     def __contains__(self, github_login: str):
         """Provide a nice API to do: `username in file`."""
-        return any(github_login == contrib["github_login"] for contrib in self.content)
+        return any(
+            # Github usernames are case insensitive
+            github_login.lower() == contrib["github_login"].lower()
+            for contrib in self.content
+        )
 
     def add_contributor(self, user: NamedUser):
         """Append the contributor data we care about at the end."""

From 0ebd35dd8369ea4faa5d3af75362cef15944cec0 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 14 Aug 2020 12:19:42 +0100
Subject: [PATCH 0968/2840] Update deprecated imports

---
 .../{{cookiecutter.project_slug}}/users/tests/factories.py     | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
index 8917c5aec..1a78f132d 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
@@ -1,7 +1,8 @@
 from typing import Any, Sequence
 
 from django.contrib.auth import get_user_model
-from factory import DjangoModelFactory, Faker, post_generation
+from factory import Faker, post_generation
+from factory.django import DjangoModelFactory
 
 
 class UserFactory(DjangoModelFactory):

From 5e3abf903f60a5a88d1f0c52af1f37ce86d54bad Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 14 Aug 2020 04:19:56 -0700
Subject: [PATCH 0969/2840] Update sphinx from 3.2.0 to 3.2.1

---
 {{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 789135938..f615195d2 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==3.2.0  # https://github.com/sphinx-doc/sphinx
+sphinx==3.2.1  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==0.7.1 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From 89420f2932a6a67512c23524631caa5b717308a8 Mon Sep 17 00:00:00 2001
From: Demetris Stavrou <1180929+demestav@users.noreply.github.com>
Date: Fri, 14 Aug 2020 15:09:36 +0300
Subject: [PATCH 0970/2840] Update linters.rst

Related to #2744 issue.
---
 docs/linters.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/linters.rst b/docs/linters.rst
index 2d6232181..a4f60cc8d 100644
--- a/docs/linters.rst
+++ b/docs/linters.rst
@@ -19,7 +19,7 @@ The config for flake8 is located in setup.cfg. It specifies:
 pylint
 ------
 
-This is included in flake8's checks, but you can also run it separately to see a more detailed report: ::
+To run pylint: ::
 
     $ pylint <python files that you wish to lint>
 

From 3752997562adfbb7769219ded50e1b6b5d83e24c Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 14 Aug 2020 15:49:18 -0700
Subject: [PATCH 0971/2840] Update sentry-sdk from 0.16.3 to 0.16.5

---
 {{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 385c7489f..309a6b6a5 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.16.3  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.16.5  # 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 727ad58d065dabbae619cce8766dc803bc1c7b2b Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 14 Aug 2020 23:10:21 -0700
Subject: [PATCH 0972/2840] Update isort from 5.4.1 to 5.4.2

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

diff --git a/requirements.txt b/requirements.txt
index a1cb16ee7..270d25351 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==19.10b0
-isort==5.4.1
+isort==5.4.2
 flake8==3.8.3
 flake8-isort==4.0.0
 

From ba5c1a760f9ab62a68321ae15a1607449c28b8fd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 16 Aug 2020 00:21:36 +0000
Subject: [PATCH 0973/2840] 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 5ff2d62b6..faca79081 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.4.1
+    rev: 5.4.2
     hooks:
       - id: isort
 

From 7d499e05aff036432fe1483529d52f4765ccabe2 Mon Sep 17 00:00:00 2001
From: Corey Garvey <cgarv16@gmail.com>
Date: Wed, 19 Aug 2020 15:38:59 +0100
Subject: [PATCH 0974/2840] Update CONTRIBUTORS.rst

---
 CONTRIBUTORS.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index eab2132fb..3faa87d5e 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -93,6 +93,7 @@ Listed in alphabetical order.
   Cole Mackenzie           `@cmackenzie1`_
   Cole Maclean             `@cole`_                      @cole
   Collederas               `@Collederas`_
+  Corey Garvey             `@coreygarvey`_
   Craig Margieson          `@cmargieson`_
   Cristian Vargas          `@cdvv7788`_
   Cullen Rhodes            `@c-rhodes`_

From 4f7204744667184bc2fc48a2e039bf44282a1a27 Mon Sep 17 00:00:00 2001
From: Corey Garvey <cgarv16@gmail.com>
Date: Wed, 19 Aug 2020 15:40:13 +0100
Subject: [PATCH 0975/2840] Updating production path to be hidden folder

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

diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index 17ea725bd..0d582d484 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -116,7 +116,7 @@ Consider the aforementioned ``.envs/.local/.postgres``: ::
 
 The three envs we are presented with here are ``POSTGRES_DB``, ``POSTGRES_USER``, and ``POSTGRES_PASSWORD`` (by the way, their values have also been generated for you). You might have figured out already where these definitions will end up; it's all the same with ``django`` service container envs.
 
-One final touch: should you ever need to merge ``.envs/production/*`` in a single ``.env`` run the ``merge_production_dotenvs_in_dotenv.py``: ::
+One final touch: should you ever need to merge ``.envs/.production/*`` in a single ``.env`` run the ``merge_production_dotenvs_in_dotenv.py``: ::
 
     $ python merge_production_dotenvs_in_dotenv.py
 

From 10d88c50f3f734d281e7d2bf128a2d8de6e53ba1 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 19 Aug 2020 19:19:20 +0000
Subject: [PATCH 0976/2840] 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 e65ddcd38..714880995 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1022,5 +1022,10 @@
     "name": "Jan Fabry",
     "github_login": "janfabry",
     "twitter_username": ""
+  },
+  {
+    "name": "Corey Garvey",
+    "github_login": "coreygarvey",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 752aa9e5e..0174628e5 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -439,6 +439,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Corey Garvey</td>
+    <td>
+      <a href="https://github.com/coreygarvey">coreygarvey</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Craig Margieson</td>
     <td>

From cc1d297ad6eaa9af8d6632eb46a15beb06154dc3 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 23 Aug 2020 12:35:31 -0700
Subject: [PATCH 0977/2840] Update pre-commit from 2.6.0 to 2.7.1

---
 {{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 5afe76938..01538655d 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -33,7 +33,7 @@ pylint-django==2.3.0  # 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.6.0  # https://github.com/pre-commit/pre-commit
+pre-commit==2.7.1  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From 32b81ba02e260f75dc00865f89ebcb112f1f4050 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 24 Aug 2020 09:54:47 -0700
Subject: [PATCH 0978/2840] Update sentry-sdk from 0.16.5 to 0.17.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 309a6b6a5..ce493a3cc 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.16.5  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.17.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 294d20d5e6fdd5aa4fc726ecad1ce8e69403e9a0 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 25 Aug 2020 05:08:22 -0700
Subject: [PATCH 0979/2840] Update django-cors-headers from 3.4.0 to 3.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 d24b50718..71f7cf5ab 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -41,5 +41,5 @@ django-redis==4.12.1  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == "y" %}
 # Django REST Framework
 djangorestframework==3.11.1  # https://github.com/encode/django-rest-framework
-django-cors-headers==3.4.0 # https://github.com/adamchainz/django-cors-headers
+django-cors-headers==3.5.0 # https://github.com/adamchainz/django-cors-headers
 {%- endif %}

From b8618430c96f552a97170d02626ca998d91036c3 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 26 Aug 2020 10:05:23 -0700
Subject: [PATCH 0980/2840] Update black from 19.10b0 to 20.8b1

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

diff --git a/requirements.txt b/requirements.txt
index 270d25351..9661a823b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-black==19.10b0
+black==20.8b1
 isort==5.4.2
 flake8==3.8.3
 flake8-isort==4.0.0

From 0dc3fe0b3d15faa394a6d2d2180c0fc976c0ac8c Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 26 Aug 2020 10:05:24 -0700
Subject: [PATCH 0981/2840] Update black from 19.10b0 to 20.8b1

---
 {{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 01538655d..1b3b7fa04 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -28,7 +28,7 @@ sphinx-autobuild==0.7.1 # https://github.com/GaretJax/sphinx-autobuild
 flake8==3.8.3  # https://github.com/PyCQA/flake8
 flake8-isort==4.0.0  # https://github.com/gforcada/flake8-isort
 coverage==5.2.1  # https://github.com/nedbat/coveragepy
-black==19.10b0  # https://github.com/ambv/black
+black==20.8b1  # https://github.com/ambv/black
 pylint-django==2.3.0  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery

From bc584203641497cba526a07cc44ec9ae36372e42 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 27 Aug 2020 00:22:07 +0000
Subject: [PATCH 0982/2840] 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 faca79081..297826013 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: 19.10b0
+    rev: 20.8b1
     hooks:
       - id: black
 

From e21869c1d4268c786451f45171b56b69abaca41c Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 27 Aug 2020 09:41:28 +0200
Subject: [PATCH 0983/2840] Fix black formatting issues

---
 tests/test_cookiecutter_generation.py                  | 10 ++++++++--
 .../{{cookiecutter.project_slug}}/users/models.py      |  3 +--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 89b9b856e..f9bfcd539 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -175,7 +175,10 @@ def test_black_passes(cookies, context_override):
 
 @pytest.mark.parametrize(
     ["use_docker", "expected_test_script"],
-    [("n", "pytest"), ("y", "docker-compose -f local.yml run django pytest"),],
+    [
+        ("n", "pytest"),
+        ("y", "docker-compose -f local.yml run django pytest"),
+    ],
 )
 def test_travis_invokes_pytest(cookies, context, use_docker, expected_test_script):
     context.update({"ci_tool": "Travis", "use_docker": use_docker})
@@ -197,7 +200,10 @@ def test_travis_invokes_pytest(cookies, context, use_docker, expected_test_scrip
 
 @pytest.mark.parametrize(
     ["use_docker", "expected_test_script"],
-    [("n", "pytest"), ("y", "docker-compose -f local.yml run django pytest"),],
+    [
+        ("n", "pytest"),
+        ("y", "docker-compose -f local.yml run django pytest"),
+    ],
 )
 def test_gitlab_invokes_flake8_and_pytest(
     cookies, context, use_docker, expected_test_script
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
index 70efdfdec..8391bc032 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
@@ -5,8 +5,7 @@ from django.utils.translation import gettext_lazy as _
 
 
 class User(AbstractUser):
-    """Default user for {{cookiecutter.project_name}}.
-    """
+    """Default user for {{cookiecutter.project_name}}."""
 
     #: First and last name do not cover name patterns around the globe
     name = CharField(_("Name of User"), blank=True, max_length=255)

From 8a5eae8f87c9d2610059e10aa334167cfa6aac3f Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 27 Aug 2020 10:33:47 +0200
Subject: [PATCH 0984/2840] Remove feature branch used for testing

---
 .github/workflows/update-contributors.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index f95532578..acae4729d 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -4,7 +4,6 @@ on:
   push:
     branches:
       - master
-      - auto-generate-contributors
 
 jobs:
   build:

From 18af7523fc7a20d52e4b684d6dd0bc0aa2fe7c85 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 27 Aug 2020 05:17:04 -0700
Subject: [PATCH 0985/2840] Pin pygithub to latest version 1.53

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

diff --git a/requirements.txt b/requirements.txt
index 96d5046ee..5f92a09e0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,5 +19,5 @@ pyyaml==5.3.1
 
 # Scripting
 # ------------------------------------------------------------------------------
-PyGithub
+PyGithub==1.53
 jinja2

From 814dfa26e45296130ce74521600082cf7b1146ad Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 27 Aug 2020 07:02:49 -0700
Subject: [PATCH 0986/2840] Pin jinja2 to latest version 2.11.2

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

diff --git a/requirements.txt b/requirements.txt
index 5f92a09e0..7444d12bd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -20,4 +20,4 @@ pyyaml==5.3.1
 # Scripting
 # ------------------------------------------------------------------------------
 PyGithub==1.53
-jinja2
+jinja2==2.11.2

From 688739cb3981b779beb8431ed6208ae5e595ff02 Mon Sep 17 00:00:00 2001
From: Jelmer Draaijer <info@jelmert.nl>
Date: Fri, 28 Aug 2020 10:17:34 +0200
Subject: [PATCH 0987/2840] Add environment and traces_sample_rate keyword to
 sentry_sdk.init

---
 docs/settings.rst                                    |  2 ++
 .../config/settings/production.py                    | 12 ++++++++----
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 949d5f35f..7563f50d2 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -49,6 +49,8 @@ DJANGO_AWS_S3_CUSTOM_DOMAIN             AWS_S3_CUSTOM_DOMAIN        n/a
 DJANGO_GCP_STORAGE_BUCKET_NAME          GS_BUCKET_NAME              n/a                                            raises error
 GOOGLE_APPLICATION_CREDENTIALS          n/a                         n/a                                            raises error
 SENTRY_DSN                              SENTRY_DSN                  n/a                                            raises error
+SENTRY_ENVIRONMENT                      n/a                         n/a                                            production
+SENTRY_TRACES_SAMPLE_RATE               n/a                         n/a                                            0.0
 DJANGO_SENTRY_LOG_LEVEL                 SENTRY_LOG_LEVEL            n/a                                            logging.INFO
 MAILGUN_API_KEY                         MAILGUN_API_KEY             n/a                                            raises error
 MAILGUN_DOMAIN                          MAILGUN_SENDER_DOMAIN       n/a                                            raises error
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 2f1b52e72..7b2776bf8 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -353,13 +353,17 @@ sentry_logging = LoggingIntegration(
 )
 
 {%- if cookiecutter.use_celery == 'y' %}
+integrations = [sentry_logging, DjangoIntegration(), CeleryIntegration()]
+{% else %}
+integrations = [sentry_logging, DjangoIntegration()]
+{% endif -%}
+
 sentry_sdk.init(
     dsn=SENTRY_DSN,
-    integrations=[sentry_logging, DjangoIntegration(), CeleryIntegration()],
+    integrations=integrations,
+    environment=env("SENTRY_ENVIRONMENT", default="production"),
+    traces_sample_rate=env.float("SENTRY_TRACES_SAMPLE_RATE", default=0.0),
 )
-{% else %}
-sentry_sdk.init(dsn=SENTRY_DSN, integrations=[sentry_logging, DjangoIntegration()])
-{% endif -%}
 {% endif %}
 # Your stuff...
 # ------------------------------------------------------------------------------

From d17321dfbe65846f3c0f552e9dad3b4c0fc8301b Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 28 Aug 2020 14:55:22 -0700
Subject: [PATCH 0988/2840] Update sentry-sdk from 0.17.0 to 0.17.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 ce493a3cc..16766cbc6 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.17.0  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.17.1  # 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 54e8f262193d2022e305896bd2a2d6e5a0f7ecca Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 28 Aug 2020 19:31:17 -0700
Subject: [PATCH 0989/2840] Update sh from 1.13.1 to 1.14.0

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

diff --git a/requirements.txt b/requirements.txt
index 7444d12bd..7f3f6e315 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 cookiecutter==1.7.2
-sh==1.13.1
+sh==1.14.0
 binaryornot==0.4.4
 
 # Code quality

From baf5e6e74ecb1695fd030a6af2eed47b43144670 Mon Sep 17 00:00:00 2001
From: Howie Zhao <howiezhaohr@hotmail.com>
Date: Sat, 29 Aug 2020 11:53:24 +0800
Subject: [PATCH 0990/2840] chore: exclude venv directory

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

diff --git a/{{cookiecutter.project_slug}}/setup.cfg b/{{cookiecutter.project_slug}}/setup.cfg
index 6520aff76..5bde75cff 100644
--- a/{{cookiecutter.project_slug}}/setup.cfg
+++ b/{{cookiecutter.project_slug}}/setup.cfg
@@ -1,10 +1,10 @@
 [flake8]
 max-line-length = 120
-exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules
+exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv
 
 [pycodestyle]
 max-line-length = 120
-exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules
+exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv
 
 [mypy]
 python_version = 3.8

From 2c82c4e1da6f2aa9454080b8b25ea56b3ad9de6a Mon Sep 17 00:00:00 2001
From: Howie Zhao <howiezhaohr@hotmail.com>
Date: Sat, 29 Aug 2020 11:59:29 +0800
Subject: [PATCH 0991/2840] chore: update document link

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

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 2f1b52e72..5528d166f 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -34,7 +34,7 @@ CACHES = {
         "OPTIONS": {
             "CLIENT_CLASS": "django_redis.client.DefaultClient",
             # Mimicing memcache behavior.
-            # http://jazzband.github.io/django-redis/latest/#_memcached_exceptions_behavior
+            # https://github.com/jazzband/django-redis#memcached-exceptions-behavior
             "IGNORE_EXCEPTIONS": True,
         },
     }

From aeefbc060fd7ed0ea7194725290d188df44fa207 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 31 Aug 2020 00:15:40 -0700
Subject: [PATCH 0992/2840] Update django-storages from 1.9.1 to 1.10

---
 {{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 ce493a3cc..ec0071d94 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -17,7 +17,7 @@ hiredis==1.1.0  # https://github.com/redis/hiredis-py
 # Django
 # ------------------------------------------------------------------------------
 {%- if cookiecutter.cloud_provider == 'AWS' %}
-django-storages[boto3]==1.9.1  # https://github.com/jschneier/django-storages
+django-storages[boto3]==1.10  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
 django-storages[google]==1.9.1  # https://github.com/jschneier/django-storages
 {%- endif %}

From 0c23267806f80dfb9fdd4dd053081c191744445d Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 31 Aug 2020 00:15:41 -0700
Subject: [PATCH 0993/2840] Update django-storages from 1.9.1 to 1.10

---
 {{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 ec0071d94..d988e107b 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -19,7 +19,7 @@ hiredis==1.1.0  # https://github.com/redis/hiredis-py
 {%- if cookiecutter.cloud_provider == 'AWS' %}
 django-storages[boto3]==1.10  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
-django-storages[google]==1.9.1  # https://github.com/jschneier/django-storages
+django-storages[google]==1.10  # https://github.com/jschneier/django-storages
 {%- endif %}
 {%- if cookiecutter.mail_service == 'Mailgun' %}
 django-anymail[mailgun]==7.2.1  # https://github.com/anymail/django-anymail

From 2f7a6c3013be3c7f78d7ec8987c2da6929414805 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 31 Aug 2020 05:45:27 -0700
Subject: [PATCH 0994/2840] Update sphinx-autobuild from 0.7.1 to 2020.9.1

---
 {{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 1b3b7fa04..f5f17a44f 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -21,7 +21,7 @@ pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 # Documentation
 # ------------------------------------------------------------------------------
 sphinx==3.2.1  # https://github.com/sphinx-doc/sphinx
-sphinx-autobuild==0.7.1 # https://github.com/GaretJax/sphinx-autobuild
+sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality
 # ------------------------------------------------------------------------------

From fe9c9b5e48c84a05fd2147314179ab70fba45062 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 31 Aug 2020 11:53:48 -0700
Subject: [PATCH 0995/2840] Update django-extensions from 3.0.5 to 3.0.6

---
 {{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 1b3b7fa04..89942cfe1 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -40,6 +40,6 @@ pre-commit==2.7.1  # https://github.com/pre-commit/pre-commit
 factory-boy==3.0.1  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==2.2  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==3.0.5  # https://github.com/django-extensions/django-extensions
+django-extensions==3.0.6  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.9.0  # https://github.com/pytest-dev/pytest-django

From 18c53d0a3b6deeeb26e0ceae93631f353cd4b3bd Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 1 Sep 2020 07:56:55 -0700
Subject: [PATCH 0996/2840] Update sentry-sdk from 0.17.1 to 0.17.2

---
 {{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 16766cbc6..bcde27ae8 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.17.1  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.17.2  # 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 007ab4aefd8484aed70499efc33d5414c38ba567 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 1 Sep 2020 07:56:59 -0700
Subject: [PATCH 0997/2840] Update django from 3.0.9 to 3.0.10

---
 {{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 71f7cf5ab..1c496a256 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,7 +29,7 @@ uvicorn==0.11.8  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.0.9  # pyup: < 3.1  # https://www.djangoproject.com/
+django==3.0.10  # pyup: < 3.1  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==4.0.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.42.0  # https://github.com/pennersr/django-allauth

From 72bd4d99b20271bbefc7b9301c2146588ec93c8e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 1 Sep 2020 13:04:19 -0700
Subject: [PATCH 0998/2840] Update tox from 3.19.0 to 3.20.0

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

diff --git a/requirements.txt b/requirements.txt
index 7f3f6e315..57938d744 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8-isort==4.0.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.19.0
+tox==3.20.0
 pytest==6.0.1
 pytest-cookies==0.5.1
 pytest-instafail==0.4.2

From dc1c89688c8062278b53a25f309bf828b6bffeab Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 1 Sep 2020 22:06:01 +0200
Subject: [PATCH 0999/2840] Update project version in setup.py

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

diff --git a/setup.py b/setup.py
index d12165463..8a5b0b8ce 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.0.9"
+version = "3.0.10"
 
 if sys.argv[-1] == "tag":
     os.system(f'git tag -a {version} -m "version {version}"')

From 53b4371c09c1304e0d684cdfc687ade2835e1181 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 1 Sep 2020 22:20:02 +0200
Subject: [PATCH 1000/2840] Remove deprecated setting from django-storages

---
 {{cookiecutter.project_slug}}/config/settings/production.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 2f1b52e72..85440adc6 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -86,8 +86,6 @@ _AWS_EXPIRY = 60 * 60 * 24 * 7
 AWS_S3_OBJECT_PARAMETERS = {
     "CacheControl": f"max-age={_AWS_EXPIRY}, s-maxage={_AWS_EXPIRY}, must-revalidate"
 }
-#  https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
-AWS_DEFAULT_ACL = None
 # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
 AWS_S3_REGION_NAME = env("DJANGO_AWS_S3_REGION_NAME", default=None)
 # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#cloudfront

From bd977e29afdb4008e5152578a11e8b4b9bce66b4 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 1 Sep 2020 17:08:30 -0700
Subject: [PATCH 1001/2840] Update django-extensions from 3.0.6 to 3.0.7

---
 {{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 62cb409dc..26eaf8e7f 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -40,6 +40,6 @@ pre-commit==2.7.1  # https://github.com/pre-commit/pre-commit
 factory-boy==3.0.1  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==2.2  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==3.0.6  # https://github.com/django-extensions/django-extensions
+django-extensions==3.0.7  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.9.0  # https://github.com/pytest-dev/pytest-django

From a115c13ced853e5c1fba283fb062ae556424c996 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 2 Sep 2020 09:57:55 +0200
Subject: [PATCH 1002/2840] Add issue manager workflow

---
 .github/workflows/issue-manager.yml | 59 +++++++++++++++++++++++++++++
 1 file changed, 59 insertions(+)
 create mode 100644 .github/workflows/issue-manager.yml

diff --git a/.github/workflows/issue-manager.yml b/.github/workflows/issue-manager.yml
new file mode 100644
index 000000000..3f7658178
--- /dev/null
+++ b/.github/workflows/issue-manager.yml
@@ -0,0 +1,59 @@
+# Automatically close issues that have a keyword mark (an HTML comment)
+# in the last comment in the issue, by a group of predefined users, after a custom delay.
+# https://github.com/tiangolo/issue-manager
+
+# Default config:
+# <!-- issue-manager: answered -->
+# Wait 10 days and comment: "Assuming the original issue was solved, it will be automatically closed now"
+
+# Extra config:
+# '<!-- issue-manager: waiting -->'
+# Wait 10 days and comment: "Automatically closing. To re-open, please provide the additional information requested"
+
+name: Issue Manager
+
+on:
+  schedule:
+  - cron: "0 0 * * *"
+
+jobs:
+  issue-manager:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: tiangolo/issue-manager@0.3.0
+      with:
+        token: ${{ secrets.GITHUB_TOKEN }}
+
+        config: >
+          {
+            "answered": {
+              "delay": 864000,
+              "message": "Assuming the original issue was solved, it will be automatically closed now.",
+              "users": [
+               "pydanny",
+               "audreyr",
+               "luzfcb",
+               "theskumar",
+               "jayfk",
+               "burhan",
+               "webyneter",
+               "browniebroke",
+               "sfdye",
+              ]
+            },
+            "waiting": {
+              "delay": 864000,
+              "message": "Automatically closing. To re-open, please provide the additional information requested.",
+              "users": [
+                "pydanny",
+                "audreyr",
+                "luzfcb",
+                "theskumar",
+                "jayfk",
+                "burhan",
+                "webyneter",
+                "browniebroke",
+                "sfdye",
+              ]
+            }
+          }

From a7c69639f2e3d87e989d4a7ca883fd368927d32d Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 2 Sep 2020 02:51:48 -0700
Subject: [PATCH 1003/2840] Update sentry-sdk from 0.17.2 to 0.17.3

---
 {{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 7340a8929..607faed3f 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.17.2  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.17.3  # 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 992837e274fc9f0b597221d32271f672eb197aa4 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 3 Sep 2020 08:36:06 +0100
Subject: [PATCH 1004/2840] Fix JSON formatting

---
 .github/workflows/issue-manager.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/issue-manager.yml b/.github/workflows/issue-manager.yml
index 3f7658178..f6b465276 100644
--- a/.github/workflows/issue-manager.yml
+++ b/.github/workflows/issue-manager.yml
@@ -13,8 +13,11 @@
 name: Issue Manager
 
 on:
+  # Every day at midnight
   schedule:
   - cron: "0 0 * * *"
+  # Manual trigger
+  workflow_dispatch:
 
 jobs:
   issue-manager:
@@ -38,7 +41,7 @@ jobs:
                "burhan",
                "webyneter",
                "browniebroke",
-               "sfdye",
+               "sfdye"
               ]
             },
             "waiting": {
@@ -53,7 +56,7 @@ jobs:
                 "burhan",
                 "webyneter",
                 "browniebroke",
-                "sfdye",
+                "sfdye"
               ]
             }
           }

From 865621c435e238987ea32f17274a2316c1c20db7 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 3 Sep 2020 06:41:36 -0700
Subject: [PATCH 1005/2840] Update isort from 5.4.2 to 5.5.0

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

diff --git a/requirements.txt b/requirements.txt
index 57938d744..3a896178a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==20.8b1
-isort==5.4.2
+isort==5.5.0
 flake8==3.8.3
 flake8-isort==4.0.0
 

From 84713cf72431a8b49cc3348a744922efaa22677b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 4 Sep 2020 00:24:21 +0000
Subject: [PATCH 1006/2840] 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 297826013..affb6929a 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.4.2
+    rev: 5.5.0
     hooks:
       - id: isort
 

From 9858c6a86612840dee15c1043d38ac117783e3a0 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 4 Sep 2020 06:28:21 -0700
Subject: [PATCH 1007/2840] Update isort from 5.5.0 to 5.5.1

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

diff --git a/requirements.txt b/requirements.txt
index 3a896178a..7ecdd4d0a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==20.8b1
-isort==5.5.0
+isort==5.5.1
 flake8==3.8.3
 flake8-isort==4.0.0
 

From c6c0bd9289fddc05533d8df9c78c5953471e5e13 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 4 Sep 2020 08:26:40 -0700
Subject: [PATCH 1008/2840] Update django-extensions from 3.0.7 to 3.0.8

---
 {{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 26eaf8e7f..144214104 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -40,6 +40,6 @@ pre-commit==2.7.1  # https://github.com/pre-commit/pre-commit
 factory-boy==3.0.1  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==2.2  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==3.0.7  # https://github.com/django-extensions/django-extensions
+django-extensions==3.0.8  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.9.0  # https://github.com/pytest-dev/pytest-django

From b78fbb1a25cef4d3d88cc27ceb4c08ee9807a468 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 4 Sep 2020 17:27:09 +0200
Subject: [PATCH 1009/2840] Fix typo in docstring

---
 scripts/update_contributors.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py
index 8423ccd64..0236daae3 100644
--- a/scripts/update_contributors.py
+++ b/scripts/update_contributors.py
@@ -13,7 +13,7 @@ def main() -> None:
     """
     Script entry point.
 
-    1. Fetch recent contribtors from the Github API
+    1. Fetch recent contributors from the Github API
     2. Add missing ones to the JSON file
     3. Generate Markdown from JSON file
     """

From df0d332207aad72663056c3de1c24a75edc40e61 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 4 Sep 2020 17:26:24 +0200
Subject: [PATCH 1010/2840] Automatically generate changelog

Fixes #1491
---
 .github/changelog-template.md          |  9 +++
 .github/workflows/update-changelog.yml | 34 +++++++++++
 CHANGELOG.md                           |  2 +
 scripts/update_changelog.py            | 78 ++++++++++++++++++++++++++
 4 files changed, 123 insertions(+)
 create mode 100644 .github/changelog-template.md
 create mode 100644 .github/workflows/update-changelog.yml
 create mode 100644 scripts/update_changelog.py

diff --git a/.github/changelog-template.md b/.github/changelog-template.md
new file mode 100644
index 000000000..49550ba12
--- /dev/null
+++ b/.github/changelog-template.md
@@ -0,0 +1,9 @@
+## [{{merge_date.strftime('%Y-%m-%d')}}]
+{%- for change_type, pulls in grouped_pulls.items() %}
+{%- if pulls %}
+### {{ change_type }}
+{%- for pull_request in pulls %}
+- {{ pull_request.title }} ([#{{ pull_request.number }}]({{ pull_request.url }}))
+{%- endfor -%}
+{% endif -%}
+{% endfor -%}
diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
new file mode 100644
index 000000000..562c37eb9
--- /dev/null
+++ b/.github/workflows/update-changelog.yml
@@ -0,0 +1,34 @@
+name: Update Changelog
+
+on:
+  # Every day at 2am
+  schedule:
+    - cron: "0 2 * * *"
+  # Manual trigger
+  workflow_dispatch:
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v2
+
+    - name: Set up Python
+      uses: actions/setup-python@v2
+      with:
+        python-version: "3.8"
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+    - name: Update list
+      run: python scripts/update_changelog.py
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+    - name: Commit changes
+      uses: stefanzweifel/git-auto-commit-action@v4
+      with:
+        commit_message: Update Changelog
+        file_pattern: CHANGELOG.md
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 27a8578a2..0019b35c1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,8 @@
 # Change Log
 All enhancements and patches to Cookiecutter Django will be documented in this file.
 
+<!-- GENERATOR_PLACEHOLDER -->
+
 ## [2020-04-13]
 ### Changed
 - Updated to Python 3.8 (@codnee)
diff --git a/scripts/update_changelog.py b/scripts/update_changelog.py
new file mode 100644
index 000000000..08ff5b095
--- /dev/null
+++ b/scripts/update_changelog.py
@@ -0,0 +1,78 @@
+import os
+from pathlib import Path
+from github import Github
+from jinja2 import Template
+import datetime as dt
+
+CURRENT_FILE = Path(__file__)
+ROOT = CURRENT_FILE.parents[1]
+GITHUB_TOKEN = os.getenv("GITHUB_TOKEN", None)
+
+# Generate changelog for PRs merged yesterday
+MERGED_DATE = dt.date.today() - dt.timedelta(days=1)
+
+
+def main() -> None:
+    """
+    Script entry point.
+    """
+    merged_pulls = list(iter_pulls())
+    if not merged_pulls:
+        print("Nothing was merged, existing.")
+        return
+
+    # Group pull requests by type of change
+    grouped_pulls = group_pulls_by_change_type(merged_pulls)
+
+    # Generate portion of markdown
+    rendered_content = generate_md(grouped_pulls)
+
+    # Update CHANGELOG.md file
+    file_path = ROOT / "CHANGELOG.md"
+    old_content = file_path.read_text()
+    updated_content = old_content.replace(
+        "<!-- GENERATOR_PLACEHOLDER -->",
+        f"<!-- GENERATOR_PLACEHOLDER -->\n\n{rendered_content}",
+    )
+    file_path.write_text(updated_content)
+
+
+def iter_pulls():
+    """Fetch merged pull requests at the date we're interested in."""
+    repo = Github(login_or_token=GITHUB_TOKEN).get_repo("pydanny/cookiecutter-django")
+    recent_pulls = repo.get_pulls(
+        state="closed", sort="updated", direction="desc"
+    ).get_page(0)
+    for pull in recent_pulls:
+        if pull.merged and pull.merged_at.date() == MERGED_DATE:
+            yield pull
+
+
+def group_pulls_by_change_type(pull_requests_list):
+    """Group pull request by change type."""
+    grouped_pulls = {
+        "Changed": [],
+        "Fixed": [],
+        "Updated": [],
+    }
+    for pull in pull_requests_list:
+        label_names = {l.name for l in pull.labels}
+        if "update" in label_names:
+            group_name = "Updated"
+        elif "bug" in label_names:
+            group_name = "Fixed"
+        else:
+            group_name = "Changed"
+        grouped_pulls[group_name].append(pull)
+    return grouped_pulls
+
+
+def generate_md(grouped_pulls):
+    """Generate markdown file from Jinja template."""
+    changelog_template = ROOT / ".github" / "changelog-template.md"
+    template = Template(changelog_template.read_text(), autoescape=True)
+    return template.render(merge_date=MERGED_DATE, grouped_pulls=grouped_pulls)
+
+
+if __name__ == "__main__":
+    main()

From dbb5a697f9fdcd40ca671d8936020b219bb2d05c Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 4 Sep 2020 17:54:28 +0200
Subject: [PATCH 1011/2840] Auto-generate changelog for the past week

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0019b35c1..f9fab8379 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,29 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2020-09-02]
+### Changed
+- Add environment and traces_sample_rate keyword to sentry_sdk.init ([#2777](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2777))
+### Updated
+- Update sentry-sdk to 0.17.3 ([#2788](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2788))
+- Update django-extensions to 3.0.7 ([#2787](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2787))
+
+## [2020-09-01]
+### Changed
+- Exclude venv directory and update document link ([#2780](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2780))
+### Updated
+- Update tox to 3.20.0 ([#2786](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2786))
+- Update django-storages to 1.10 ([#2781](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2781))
+- Update sentry-sdk to 0.17.2 ([#2784](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2784))
+- Update django to 3.0.10 ([#2785](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2785))
+- Update sphinx-autobuild to 2020.9.1 ([#2782](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2782))
+- Update django-extensions to 3.0.6 ([#2783](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2783))
+
+## [2020-08-31]
+### Updated
+- Update sh to 1.14.0 ([#2779](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2779))
+- Update sentry-sdk to 0.17.1 ([#2778](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2778))
+
 ## [2020-04-13]
 ### Changed
 - Updated to Python 3.8 (@codnee)

From 77a00376e8195b73fae5c3dd80efdf5d9b432e3f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 5 Sep 2020 00:40:41 +0000
Subject: [PATCH 1012/2840] 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 affb6929a..74839c2c0 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.5.0
+    rev: 5.5.1
     hooks:
       - id: isort
 

From e6d7b015583b2bebc14853b82753337c13d0f101 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 5 Sep 2020 02:43:34 +0000
Subject: [PATCH 1013/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9fab8379..93b4b9ef1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2020-09-04]
+### Updated
+- Update django-extensions to 3.0.8 ([#2792](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2792))
+- Update isort to 5.5.1 ([#2791](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2791))
+- Auto-update pre-commit hooks ([#2790](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2790))
+- Update isort to 5.5.0 ([#2789](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2789))
+
 ## [2020-09-02]
 ### Changed
 - Add environment and traces_sample_rate keyword to sentry_sdk.init ([#2777](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2777))

From 4659cb9baa82388436e7e2731359dde4bd58a433 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sun, 6 Sep 2020 02:16:23 +0000
Subject: [PATCH 1014/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93b4b9ef1..bc397c7ca 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 -->
 
+## [2020-09-05]
+### Updated
+- Auto-update pre-commit hooks ([#2793](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2793))
+
 ## [2020-09-04]
 ### Updated
 - Update django-extensions to 3.0.8 ([#2792](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2792))

From 9cdae535b3b56656e495d544d8f5de461f2c8321 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 6 Sep 2020 19:12:31 -0700
Subject: [PATCH 1015/2840] Update psycopg2-binary from 2.8.5 to 2.8.6

---
 {{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 144214104..dad44f822 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -5,7 +5,7 @@ ipdb==0.13.3  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}
-psycopg2-binary==2.8.5  # https://github.com/psycopg/psycopg2
+psycopg2-binary==2.8.6  # https://github.com/psycopg/psycopg2
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
 watchgod==0.6  # https://github.com/samuelcolvin/watchgod

From cbc46cb34f80235831f332168b895a707e4b12b9 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 7 Sep 2020 14:23:02 +0200
Subject: [PATCH 1016/2840] Update psycopg2 from 2.8.5 to 2.8.6

---
 {{cookiecutter.project_slug}}/requirements/local.txt      | 2 +-
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index dad44f822..998905a05 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -3,7 +3,7 @@
 Werkzeug==1.0.1 # https://github.com/pallets/werkzeug
 ipdb==0.13.3  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
-psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
+psycopg2==2.8.6 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}
 psycopg2-binary==2.8.6  # https://github.com/psycopg/psycopg2
 {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 607faed3f..31e576288 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -3,7 +3,7 @@
 -r base.txt
 
 gunicorn==20.0.4  # https://github.com/benoitc/gunicorn
-psycopg2==2.8.5 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
+psycopg2==2.8.6 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}

From 7fb71507d2f29049a9b446e4c20122fcaa849911 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13081994@users.noreply.github.com>
Date: Mon, 7 Sep 2020 17:58:49 +0530
Subject: [PATCH 1017/2840] Updated Gitlab CI to use Python 3.8 instead of
 Python 3.7 (#2794)

---
 CONTRIBUTORS.md                              | 2 +-
 {{cookiecutter.project_slug}}/.gitlab-ci.yml | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 0174628e5..2d17cddfe 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1463,4 +1463,4 @@ guidance and advice.
 
 -   Jannis Leidel
 -   Nate Aune
--   Barry Morrison
\ No newline at end of file
+-   Barry Morrison
diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
index 246c4c982..60925b811 100644
--- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml
+++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
@@ -13,7 +13,7 @@ variables:
 
 flake8:
   stage: lint
-  image: python:3.7-alpine
+  image: python:3.8-alpine
   before_script:
     - pip install -q flake8
   script:
@@ -21,7 +21,7 @@ flake8:
 
 pytest:
   stage: test
-  image: python:3.7
+  image: python:3.8
   {% if cookiecutter.use_docker == 'y' -%}
   image: docker/compose:latest
   tags:
@@ -39,7 +39,7 @@ pytest:
   tags:
     - python
   services:
-    - postgres:11
+    - postgres:{{ cookiecutter.postgresql_version }}
   variables:
     DATABASE_URL: pgsql://$POSTGRES_USER:$POSTGRES_PASSWORD@postgres/$POSTGRES_DB
 

From 17fbe5f4c6b37b45121779b9c5b17f192a338076 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Mon, 7 Sep 2020 12:29:24 +0000
Subject: [PATCH 1018/2840] Update Contributors

---
 .github/contributors.json | 5 +++++
 CONTRIBUTORS.md           | 9 ++++++++-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/contributors.json b/.github/contributors.json
index 714880995..8c2180bd1 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1027,5 +1027,10 @@
     "name": "Corey Garvey",
     "github_login": "coreygarvey",
     "twitter_username": ""
+  },
+  {
+    "name": "Arnav Choudhury",
+    "github_login": "arnav13081994",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 2d17cddfe..69ea53f3f 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -264,6 +264,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Arnav Choudhury</td>
+    <td>
+      <a href="https://github.com/arnav13081994">arnav13081994</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>AsheKR</td>
     <td>
@@ -1463,4 +1470,4 @@ guidance and advice.
 
 -   Jannis Leidel
 -   Nate Aune
--   Barry Morrison
+-   Barry Morrison
\ No newline at end of file

From 624dd94dd3738d50f91655d350ca9bf22b6af68f Mon Sep 17 00:00:00 2001
From: Wes Turner <50891+westurner@users.noreply.github.com>
Date: Mon, 7 Sep 2020 08:51:52 -0400
Subject: [PATCH 1019/2840] Add :z/:Z to mounted volumes in
 {local,production}.yml (#2663)

---
 {{cookiecutter.project_slug}}/local.yml      | 14 +++++++-------
 {{cookiecutter.project_slug}}/production.yml |  8 ++++----
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index 528e59b2c..a6cbe5430 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -17,7 +17,7 @@ services:
       - mailhog
       {%- endif %}
     volumes:
-      - .:/app
+      - .:/app:z
     env_file:
       - ./.envs/.local/.django
       - ./.envs/.local/.postgres
@@ -32,8 +32,8 @@ services:
     image: {{ cookiecutter.project_slug }}_production_postgres
     container_name: postgres
     volumes:
-      - local_postgres_data:/var/lib/postgresql/data
-      - local_postgres_data_backups:/backups
+      - local_postgres_data:/var/lib/postgresql/data:Z
+      - local_postgres_data_backups:/backups:z
     env_file:
       - ./.envs/.local/.postgres
 
@@ -46,9 +46,9 @@ services:
     env_file:
       - ./.envs/.local/.django
     volumes:
-      - ./docs:/docs
-      - ./config:/app/config
-      - ./{{ cookiecutter.project_slug }}:/app/{{ cookiecutter.project_slug }}
+      - ./docs:/docs:z
+      - ./config:/app/config:z
+      - ./{{ cookiecutter.project_slug }}:/app/{{ cookiecutter.project_slug }}:z
     ports:
       - "7000:7000"
     
@@ -113,7 +113,7 @@ services:
     depends_on:
       - django
     volumes:
-      - .:/app
+      - .:/app:z
       # http://jdlm.info/articles/2016/03/06/lessons-building-node-app-docker.html
       - /app/node_modules
     command: npm run dev
diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index 2cd2af132..93b61b134 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -25,8 +25,8 @@ services:
       dockerfile: ./compose/production/postgres/Dockerfile
     image: {{ cookiecutter.project_slug }}_production_postgres
     volumes:
-      - production_postgres_data:/var/lib/postgresql/data
-      - production_postgres_data_backups:/backups
+      - production_postgres_data:/var/lib/postgresql/data:Z
+      - production_postgres_data_backups:/backups:z
     env_file:
       - ./.envs/.production/.postgres
 
@@ -38,7 +38,7 @@ services:
     depends_on:
       - django
     volumes:
-      - production_traefik:/etc/traefik/acme
+      - production_traefik:/etc/traefik/acme:z
     ports:
       - "0.0.0.0:80:80"
       - "0.0.0.0:443:443"
@@ -75,5 +75,5 @@ services:
     env_file:
       - ./.envs/.production/.django
     volumes:
-      - production_postgres_data_backups:/backups
+      - production_postgres_data_backups:/backups:z
   {%- endif %}

From 756cf6c93545fa43e4330d52ec48bb49a9272925 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Mon, 7 Sep 2020 12:52:21 +0000
Subject: [PATCH 1020/2840] 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 8c2180bd1..4f2f96dfa 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1032,5 +1032,10 @@
     "name": "Arnav Choudhury",
     "github_login": "arnav13081994",
     "twitter_username": ""
+  },
+  {
+    "name": "Wes Turner",
+    "github_login": "westurner",
+    "twitter_username": "westurner"
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 69ea53f3f..e0fda25ed 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1426,6 +1426,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Wes Turner</td>
+    <td>
+      <a href="https://github.com/westurner">westurner</a>
+    </td>
+    <td>westurner</td>
+  </tr>
   <tr>
     <td>Will Farley</td>
     <td>

From 0b3dd776c624184cd89dde2b28d81625f1914112 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 7 Sep 2020 15:06:18 +0200
Subject: [PATCH 1021/2840] Fix options for sphinx-autobuild in docs Makefile
 (#2799)

Fix #2796
---
 {{cookiecutter.project_slug}}/docs/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/docs/Makefile b/{{cookiecutter.project_slug}}/docs/Makefile
index 90f61de32..4f772cade 100644
--- a/{{cookiecutter.project_slug}}/docs/Makefile
+++ b/{{cookiecutter.project_slug}}/docs/Makefile
@@ -22,9 +22,9 @@ help:
 # Build, watch and serve docs with live reload
 livehtml:
 	sphinx-autobuild -b html 
-	{%- if cookiecutter.use_docker == 'y' %} -H 0.0.0.0 
+	{%- if cookiecutter.use_docker == 'y' %} --host 0.0.0.0
 	{%- else %} --open-browser 
-	{%- endif %} -p 7000 --watch $(APP) -c . $(SOURCEDIR) $(BUILDDIR)/html
+	{%- endif %} --port 7000 --watch $(APP) -c . $(SOURCEDIR) $(BUILDDIR)/html
 
 # Outputs rst files from django application code
 apidocs:

From ffaec0008405dc528ba869a780c7ec61a36d0942 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 7 Sep 2020 15:10:57 +0200
Subject: [PATCH 1022/2840] Remove --no-binary option for psycopg2 (#2798)

It was required in 2.7, but it's now the default in 2.8
---
 {{cookiecutter.project_slug}}/requirements/local.txt      | 2 +-
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 998905a05..cc751326f 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -3,7 +3,7 @@
 Werkzeug==1.0.1 # https://github.com/pallets/werkzeug
 ipdb==0.13.3  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
-psycopg2==2.8.6 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
+psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 {%- else %}
 psycopg2-binary==2.8.6  # https://github.com/psycopg/psycopg2
 {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 31e576288..8016786cf 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -3,7 +3,7 @@
 -r base.txt
 
 gunicorn==20.0.4  # https://github.com/benoitc/gunicorn
-psycopg2==2.8.6 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
+psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}

From 2a0f40e7671fc1f21a18c369403ba6d1f7b13b65 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 7 Sep 2020 15:30:37 +0200
Subject: [PATCH 1023/2840] Clean up nested venv files from `.gitignore`

Fixes #2226
---
 .gitignore                               | 10 ----------
 {{cookiecutter.project_slug}}/.gitignore | 12 ------------
 2 files changed, 22 deletions(-)

diff --git a/.gitignore b/.gitignore
index 386b2651a..f753fec91 100644
--- a/.gitignore
+++ b/.gitignore
@@ -208,16 +208,6 @@ Session.vim
 tags
 
 
-### VirtualEnv template
-# Virtualenv
-# http://iamzed.com/2009/05/07/a-primer-on-virtualenv/
-[Ii]nclude
-[Ll]ib
-[Ll]ib64
-pyvenv.cfg
-pip-selfcheck.json
-
-
 # Even though the project might be opened and edited
 # in any of the JetBrains IDEs, it makes no sence whatsoever
 # to 'run' anything within it since any particular cookiecutter
diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore
index 9850b1273..311b43a57 100644
--- a/{{cookiecutter.project_slug}}/.gitignore
+++ b/{{cookiecutter.project_slug}}/.gitignore
@@ -321,18 +321,6 @@ Session.vim
 
 # Auto-generated tag files
 tags
-{% if cookiecutter.use_docker == 'n' %}
-
-### VirtualEnv template
-# Virtualenv
-[Ii]nclude
-[Ll]ib
-[Ll]ib64
-[Ss]cripts
-pyvenv.cfg
-pip-selfcheck.json
-.env
-{% endif %}
 
 ### Project template
 {% if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'n' %}

From 8eab7bbdb578f943f5cd5af02a7e68b29150f115 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 8 Sep 2020 02:16:41 +0000
Subject: [PATCH 1024/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc397c7ca..4c42b8695 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2020-09-07]
+### Changed
+- Add :z/:Z to mounted volumes in {local,production}.yml ([#2663](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2663))
+- Remove --no-binary option for psycopg2 ([#2798](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2798))
+- Updated Gitlab CI to use Python 3.8 instead of Python 3.7 ([#2794](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2794))
+### Fixed
+- Fix options for sphinx-autobuild in docs Makefile ([#2799](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2799))
+### Updated
+- Update psycopg2-binary to 2.8.6 ([#2797](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2797))
+
 ## [2020-09-05]
 ### Updated
 - Auto-update pre-commit hooks ([#2793](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2793))

From 536e86ecadb66a9f37315a73af4dd6255a5a2f39 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13081994@users.noreply.github.com>
Date: Tue, 8 Sep 2020 13:34:10 +0530
Subject: [PATCH 1025/2840] Traeffik and Django dockerfile changes (#2801)

---
 CONTRIBUTORS.md                                  |  2 +-
 .../compose/production/django/Dockerfile         | 16 ++++++++--------
 .../compose/production/traefik/Dockerfile        |  6 +++---
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index e0fda25ed..dd55e2af2 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1477,4 +1477,4 @@ guidance and advice.
 
 -   Jannis Leidel
 -   Nate Aune
--   Barry Morrison
\ No newline at end of file
+-   Barry Morrison
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index 72f71d6ec..2e6a195b7 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -32,26 +32,26 @@ COPY ./requirements /requirements
 RUN pip install --no-cache-dir -r /requirements/production.txt \
     && rm -rf /requirements
 
-COPY ./compose/production/django/entrypoint /entrypoint
+COPY --chown=django:django ./compose/production/django/entrypoint /entrypoint
 RUN sed -i 's/\r$//g' /entrypoint
 RUN chmod +x /entrypoint
-RUN chown django /entrypoint
 
-COPY ./compose/production/django/start /start
+
+COPY --chown=django:django ./compose/production/django/start /start
 RUN sed -i 's/\r$//g' /start
 RUN chmod +x /start
-RUN chown django /start
+
 
 {%- if cookiecutter.use_celery == "y" %}
-COPY ./compose/production/django/celery/worker/start /start-celeryworker
+COPY --chown=django:django ./compose/production/django/celery/worker/start /start-celeryworker
 RUN sed -i 's/\r$//g' /start-celeryworker
 RUN chmod +x /start-celeryworker
-RUN chown django /start-celeryworker
 
-COPY ./compose/production/django/celery/beat/start /start-celerybeat
+
+COPY --chown=django:django ./compose/production/django/celery/beat/start /start-celerybeat
 RUN sed -i 's/\r$//g' /start-celerybeat
 RUN chmod +x /start-celerybeat
-RUN chown django /start-celerybeat
+
 
 COPY ./compose/production/django/celery/flower/start /start-flower
 RUN sed -i 's/\r$//g' /start-flower
diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
index 746aa2b48..26a653d50 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
@@ -1,5 +1,5 @@
 FROM traefik:v2.0
-RUN mkdir -p /etc/traefik/acme
-RUN touch /etc/traefik/acme/acme.json
-RUN chmod 600 /etc/traefik/acme/acme.json
+RUN mkdir -p /etc/traefik/acme \
+  && touch /etc/traefik/acme/acme.json \
+  && chmod 600 /etc/traefik/acme/acme.json
 COPY ./compose/production/traefik/traefik.yml /etc/traefik

From 69209b6fa16147e0260d7e934910fdfa90e3780f Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 8 Sep 2020 08:04:49 +0000
Subject: [PATCH 1026/2840] Update Contributors

---
 CONTRIBUTORS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index dd55e2af2..e0fda25ed 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1477,4 +1477,4 @@ guidance and advice.
 
 -   Jannis Leidel
 -   Nate Aune
--   Barry Morrison
+-   Barry Morrison
\ No newline at end of file

From b3028d8299879916097f8f83c6d1f2093d2f0365 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 9 Sep 2020 02:17:01 +0000
Subject: [PATCH 1027/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4c42b8695..dd8b927d1 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 -->
 
+## [2020-09-08]
+### Changed
+- Traeffik and Django dockerfile changes ([#2801](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2801))
+
 ## [2020-09-07]
 ### Changed
 - Add :z/:Z to mounted volumes in {local,production}.yml ([#2663](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2663))

From d2e6b285d9fb84a4f622cc8170997b7ece26dc5e Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 9 Sep 2020 09:36:07 +0100
Subject: [PATCH 1028/2840] Update FUNDING.yml

---
 .github/FUNDING.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 5a5aefc78..c66e6bc7c 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,6 +1,6 @@
 # These are supported funding model platforms
 
-github: pydanny
+github: [pydanny, browniebroke]
 patreon: roygreenfeld
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username

From 949cd5acb7bbf2773496f19285efbc4c94271a3f Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 9 Sep 2020 14:07:30 +0200
Subject: [PATCH 1029/2840] Update issue and pull request templates

---
 .github/ISSUE_TEMPLATE.md              |  1 -
 .github/ISSUE_TEMPLATE/bug.md          | 32 ++++++++++++++++++--------
 .github/ISSUE_TEMPLATE/feature.md      | 18 ++++-----------
 .github/ISSUE_TEMPLATE/improvement.md  | 24 -------------------
 .github/ISSUE_TEMPLATE/paid-support.md |  8 ++++++-
 .github/ISSUE_TEMPLATE/question.md     | 10 ++++++--
 .github/ISSUE_TEMPLATE/regression.md   | 28 ----------------------
 .github/PULL_REQUEST_TEMPLATE.md       | 25 ++++++++------------
 cookiecutter.json                      |  1 -
 9 files changed, 51 insertions(+), 96 deletions(-)
 delete mode 100644 .github/ISSUE_TEMPLATE.md
 delete mode 100644 .github/ISSUE_TEMPLATE/improvement.md
 delete mode 100644 .github/ISSUE_TEMPLATE/regression.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
deleted file mode 100644
index b232b6e34..000000000
--- a/.github/ISSUE_TEMPLATE.md
+++ /dev/null
@@ -1 +0,0 @@
-## [Make sure to follow one of the issue templates we've got](https://github.com/pydanny/cookiecutter-django/issues/new/choose), otherwise the issue might be closed immeditely
diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index 2a48c0c32..b2b577f57 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -1,21 +1,33 @@
 ---
 name: Bug Report
 about: Report a bug
+title: '[bug]'
+labels: bug
 ---
 
 ## What happened?
 
-
-
-
 ## What should've happened instead?
 
+## Additional details
 
+<!-- To assist you best, please include commands that you've run, options you've selected and any relevant logs -->
 
-
-## Steps to reproduce
-
-[//]: # (Any or all of the following:)
-[//]: # (* Host system configuration: OS, Docker & friends' versions etc.)
-[//]: # (* Replay file https://cookiecutter.readthedocs.io/en/latest/advanced/replay.html)
-[//]: # (* Logs)
+* Host system configuration: 
+    * Version of cookiecutter CLI (get it with `cookiecutter --version`):
+    * OS:
+    * Python version:
+    * Docker versions (if using Docker):
+    * ...
+* Options selected and/or [replay file](https://cookiecutter.readthedocs.io/en/latest/advanced/replay.html):
+    ``` 
+    ```
+<summary>
+Logs:
+<details>
+<pre>
+$ cookiecutter https://github.com/pydanny/cookiecutter-django
+project_name [Project Name]: ...
+</pre>
+</details>
+</summary>
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
index b0d560d81..8cc8141aa 100644
--- a/.github/ISSUE_TEMPLATE/feature.md
+++ b/.github/ISSUE_TEMPLATE/feature.md
@@ -1,24 +1,14 @@
 ---
 name: New Feature Proposal
 about: Propose a new feature
+title: '[feature request]'
+labels: enhancement
 ---
 
 ## Description
 
-[//]: # (What's it you're proposing? How should it be implemented?)
-
-
-
+What are you proposing? How should it be implemented?
 
 ## Rationale
 
-[//]: # (Why should this feature be implemented?)
-
-
-
-
-## Use case(s) / visualization(s)
-
-[//]: # ("Better to see something once than to hear about it a thousand times.")
-
-
+Why should this feature be implemented?
diff --git a/.github/ISSUE_TEMPLATE/improvement.md b/.github/ISSUE_TEMPLATE/improvement.md
deleted file mode 100644
index 572652373..000000000
--- a/.github/ISSUE_TEMPLATE/improvement.md
+++ /dev/null
@@ -1,24 +0,0 @@
----
-name: Improvement Suggestion
-about: Let us know how we could improve
----
-
-## Description
-
-[//]: # (What's it you're proposing? How should it be implemented?)
-
-
-
-
-## Rationale
-
-[//]: # (Why should this feature be implemented?)
-
-
-
-
-## Use case(s) / visualization(s)
-
-[//]: # ("Better to see something once than to hear about it a thousand times.")
-
-
diff --git a/.github/ISSUE_TEMPLATE/paid-support.md b/.github/ISSUE_TEMPLATE/paid-support.md
index d565e564f..e553329f6 100644
--- a/.github/ISSUE_TEMPLATE/paid-support.md
+++ b/.github/ISSUE_TEMPLATE/paid-support.md
@@ -1,10 +1,16 @@
 ---
 name: Paid Support Request
 about: Ask Core Team members to help you out
+title: ''
+labels: ''
+assignees: ''
+
 ---
 
-Provided your question goes beyound [regular support](https://github.com/pydanny/cookiecutter-django/issues/new?template=question.md), and/or the task at hand is of timely/high priority nature use the below information to reach out for contributors directly.
+Provided your question goes beyond [regular support](https://github.com/pydanny/cookiecutter-django/issues/new?template=question.md), and/or the task at hand is of timely/high priority nature use the below information to reach out for contributors directly.
 
 * Daniel Roy Greenfeld, Project Lead ([GitHub](https://github.com/pydanny), [Patreon](https://www.patreon.com/danielroygreenfeld)): expertise in Django and AWS ELB.
 
 * Nikita Shupeyko, Core Developer ([GitHub](https://github.com/webyneter)): expertise in Python/Django, hands-on DevOps and frontend experience.
+
+* Bruno Alla, Core Developer ([GitHub](https://github.com/sponsors/browniebroke)).
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 0c0f3d891..f24e413f1 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -1,6 +1,12 @@
 ---
 name: Question
-about: Please, ask your question on StackOverflow or Gitter
+about: Please consider asking your question on StackOverflow or Slack
+title: '[question]'
+labels: question
 ---
 
-First, make sure to examine [the docs](https://cookiecutter-django.readthedocs.io/en/latest/). If that doesn't help post a question on [StackOverflow](https://stackoverflow.com/questions/tagged/cookiecutter-django) tagged with `cookiecutter-django`. Finally, feel free to join [Gitter](https://gitter.im/pydanny/cookiecutter-django) and ask around.
+First, make sure to examine [the docs](https://cookiecutter-django.readthedocs.io/en/latest/). 
+
+If that doesn't help, post a question on [StackOverflow](https://stackoverflow.com/questions/tagged/cookiecutter-django) tagged with `cookiecutter-django`, you might get more visibility there than on our issue tracker. 
+
+Finally, feel free to join [Slack](https://join.slack.com/t/cookie-cutter/shared_invite/enQtNzI0Mzg5NjE5Nzk5LTRlYWI2YTZhYmQ4YmU1Y2Q2NmE1ZjkwOGM0NDQyNTIwY2M4ZTgyNDVkNjMxMDdhZGI5ZGE5YmJjM2M3ODJlY2U) and ask around.
diff --git a/.github/ISSUE_TEMPLATE/regression.md b/.github/ISSUE_TEMPLATE/regression.md
deleted file mode 100644
index 80384004b..000000000
--- a/.github/ISSUE_TEMPLATE/regression.md
+++ /dev/null
@@ -1,28 +0,0 @@
----
-name: Regression Report
-about: Let us know if something that'd been working has broke
----
-
-## What happened before?
-
-
-
-
-## What happens now?
-
-
-
-
-## Last stable commit / Since when?
-
-
-
-
-## Steps to reproduce
-
-[//]: # (Any or all of the following:)
-[//]: # (* Host system configuration: OS, Docker & friends' versions etc.)
-[//]: # (* Project generation options)
-[//]: # (* Logs)
-
-
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 45e67c69b..5559e62ff 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,23 +1,18 @@
-[//]: # (Thank you for helping us out: your efforts mean great deal to the project and the community as a whole!)
-
-[//]: # (Before you proceed:)
-
-[//]: # (- Don't forget to update the `docs/` presuming others would benefit from a concise description of whatever that you're proposing)
-[//]: # (- If you're adding a new option, please make sure that tests/test_cookiecutter_generation.py is updated accordingly)
+<!-- Thank you for helping us out: your efforts mean a great deal to the project and the community as a whole! -->
 
 
 ## Description
 
-[//]: # (What's it you're proposing?)
+<!-- What's it you're proposing? -->
 
+Checklist:
+
+- [ ] I've made sure that `tests/test_cookiecutter_generation.py` is updated accordingly (especially if adding or updating a template option)
+- [ ] I've updated the documentation or confirm that my change doesn't require any updates
 
 ## Rationale
 
-[//]: # (Why does the project need that?)
-
-
-## Use case(s) / visualization(s)
-
-[//]: # ("Better to see something once than to hear about it a thousand times.")
-
-
+<!-- 
+Why does this project need the change you're proposing? 
+If this pull request fixes an open issue, don't forget to link it with `Fix #NNNN` 
+-->
diff --git a/cookiecutter.json b/cookiecutter.json
index ca11b3b47..682061476 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -59,6 +59,5 @@
     "Gitlab"
   ],
   "keep_local_envs_in_vcs": "y",
-
   "debug": "n"
 }

From 996b958feb319921de75210876ee30771b6b261b Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 9 Sep 2020 14:25:12 +0200
Subject: [PATCH 1030/2840] Configure Dependabot to update Github actions

---
 .github/dependabot.yml | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 .github/dependabot.yml

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
new file mode 100644
index 000000000..5ee5d0a04
--- /dev/null
+++ b/.github/dependabot.yml
@@ -0,0 +1,10 @@
+# Config for Dependabot updates. See Documentation here:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  # Update Github actions in workflows
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"

From 684218a90807d2997b1d25c677349cac72ac1079 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Sep 2020 12:25:44 +0000
Subject: [PATCH 1031/2840] Update actions/setup-python requirement to v2.1.2

Updates the requirements on [actions/setup-python](https://github.com/actions/setup-python) to permit the latest version.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/commits/24156c231c5e9d581bde27d0cdbb72715060ea51)

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/pre-commit-autoupdate.yml | 2 +-
 .github/workflows/update-changelog.yml      | 2 +-
 .github/workflows/update-contributors.yml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml
index 4beaa578f..f07d18033 100644
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2.1.1
+    - uses: actions/setup-python@v2.1.2
       with:
         python-version: 3.8
 
diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index 562c37eb9..ac8f749e5 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -15,7 +15,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v2.1.2
       with:
         python-version: "3.8"
     - name: Install dependencies
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index acae4729d..6dd2ac529 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -13,7 +13,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v2.1.2
       with:
         python-version: "3.8"
     - name: Install dependencies

From 8df38802f35afb2201b4db32c04b7c60e176e782 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 9 Sep 2020 15:41:47 -0700
Subject: [PATCH 1032/2840] Update sentry-sdk from 0.17.3 to 0.17.4

---
 {{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 8016786cf..4ed494349 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.17.3  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.17.4  # 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 a3ed42a28968f243ef42962b709414dae676ab3f Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 10 Sep 2020 02:16:26 +0000
Subject: [PATCH 1033/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd8b927d1..a3a25226a 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 -->
 
+## [2020-09-09]
+### Changed
+- Update actions/setup-python requirement to v2.1.2 ([#2804](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2804))
+- Clean up nested venv files from `.gitignore` ([#2800](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2800))
+
 ## [2020-09-08]
 ### Changed
 - Traeffik and Django dockerfile changes ([#2801](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2801))

From ca4bbd918d8c0249b2ba68aff17ac8038f924863 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 9 Sep 2020 23:58:50 -0700
Subject: [PATCH 1034/2840] Update isort from 5.5.1 to 5.5.2

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

diff --git a/requirements.txt b/requirements.txt
index 7ecdd4d0a..3f110e519 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==20.8b1
-isort==5.5.1
+isort==5.5.2
 flake8==3.8.3
 flake8-isort==4.0.0
 

From 806080e53eeb33ecd82cb7e890ecfb94fbc52f25 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 11 Sep 2020 00:24:40 +0000
Subject: [PATCH 1035/2840] 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 74839c2c0..398ccbf81 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.5.1
+    rev: 5.5.2
     hooks:
       - id: isort
 

From 625c7ceb7311a5acb173df82af3668ba834b034c Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 11 Sep 2020 10:55:38 +0100
Subject: [PATCH 1036/2840] Fix git-auto-commit-action

---
 .github/workflows/update-changelog.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index ac8f749e5..ef9263f31 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -28,7 +28,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Commit changes
-      uses: stefanzweifel/git-auto-commit-action@v4
+      uses: stefanzweifel/git-auto-commit-action@v4.5.1
       with:
         commit_message: Update Changelog
         file_pattern: CHANGELOG.md

From 7ef9f919e201a891040a1b6d788852020541b3b5 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 11 Sep 2020 10:56:03 +0100
Subject: [PATCH 1037/2840] Update update-contributors.yml

---
 .github/workflows/update-contributors.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 6dd2ac529..ba7fd74bc 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -24,7 +24,7 @@ jobs:
       run: python scripts/update_contributors.py
 
     - name: Commit changes
-      uses: stefanzweifel/git-auto-commit-action@v4
+      uses: stefanzweifel/git-auto-commit-action@v4.5.1
       with:
         commit_message: Update Contributors
         file_pattern: CONTRIBUTORS.md .github/contributors.json

From 4f631e148388d12d95ef567dcb56d529fee26c63 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 11 Sep 2020 09:58:15 +0000
Subject: [PATCH 1038/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3a25226a..7855d1676 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 -->
 
+## [2020-09-10]
+### Updated
+- Update isort to 5.5.2 ([#2807](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2807))
+- Update sentry-sdk to 0.17.4 ([#2805](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2805))
+
 ## [2020-09-09]
 ### Changed
 - Update actions/setup-python requirement to v2.1.2 ([#2804](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2804))

From e1922807aacd0dee853fdac389e5558b5cfa92d3 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Fri, 11 Sep 2020 21:47:00 +0530
Subject: [PATCH 1039/2840] Updating Traefik version from 2.0 to 2.2.11

---
 .../compose/production/traefik/Dockerfile                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
index 26a653d50..aa879052b 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
@@ -1,4 +1,4 @@
-FROM traefik:v2.0
+FROM traefik:v2.2.11
 RUN mkdir -p /etc/traefik/acme \
   && touch /etc/traefik/acme/acme.json \
   && chmod 600 /etc/traefik/acme/acme.json

From 53ffbbcf2ea9ec330e1ea68a9ccad7fd47b94059 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Fri, 11 Sep 2020 22:00:50 +0530
Subject: [PATCH 1040/2840] Multi stage Python build for Django

---
 .../compose/local/django/Dockerfile           | 61 ++++++++++++++-----
 .../compose/production/django/Dockerfile      | 58 ++++++++++++------
 2 files changed, 87 insertions(+), 32 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index 5473f114e..949235c04 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -1,23 +1,32 @@
+# Python build stage
+FROM python:3.8-slim-buster as python-build-stage
+ENV PYTHONDONTWRITEBYTECODE 1
+
+# Requirements are installed here to ensure they will be cached.
+COPY ./requirements /requirements
+
+RUN apt-get update && apt-get install --no-install-recommends -y \
+  # dependencies for building Python packages
+  build-essential \
+  # psycopg2 dependencies
+  libpq-dev \
+  # Translations dependencies
+  gettext \
+  # cleaning up unused files
+  && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+  && rm -rf /var/lib/apt/lists/* \
+  # create python dependency wheels
+  && pip wheel --no-cache-dir --no-deps --use-feature=2020-resolver --wheel-dir /usr/src/app/wheels -r /requirements/production.txt \
+  && rm -rf /requirements
+
+
+
+# Python 'run' stage
 FROM python:3.8-slim-buster
 
 ENV PYTHONUNBUFFERED 1
 ENV PYTHONDONTWRITEBYTECODE 1
 
-RUN apt-get update \
-  # dependencies for building Python packages
-  && apt-get install -y build-essential \
-  # psycopg2 dependencies
-  && apt-get install -y libpq-dev \
-  # Translations dependencies
-  && apt-get install -y gettext \
-  # cleaning up unused files
-  && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
-  && rm -rf /var/lib/apt/lists/*
-
-# Requirements are installed here to ensure they will be cached.
-COPY ./requirements /requirements
-RUN pip install -r /requirements/local.txt
-
 COPY ./compose/production/django/entrypoint /entrypoint
 RUN sed -i 's/\r$//g' /entrypoint
 RUN chmod +x /entrypoint
@@ -25,6 +34,7 @@ RUN chmod +x /entrypoint
 COPY ./compose/local/django/start /start
 RUN sed -i 's/\r$//g' /start
 RUN chmod +x /start
+
 {% if cookiecutter.use_celery == "y" %}
 COPY ./compose/local/django/celery/worker/start /start-celeryworker
 RUN sed -i 's/\r$//g' /start-celeryworker
@@ -38,6 +48,27 @@ COPY ./compose/local/django/celery/flower/start /start-flower
 RUN sed -i 's/\r$//g' /start-flower
 RUN chmod +x /start-flower
 {% endif %}
+
+
+# installing required system dependencies
+RUN apt-get update && apt-get install --no-install-recommends -y \
+  # psycopg2 dependencies
+  libpq-dev \
+  # Translations dependencies
+  gettext \
+  # cleaning up unused files
+  && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+  && rm -rf /var/lib/apt/lists/*
+
+
+# copy python dependency wheels from python-build-stage
+COPY --from=python-build-stage /usr/src/app/wheels /wheels
+
+# install python dependencies
+RUN pip install --no-cache /wheels/*
+
+
+
 WORKDIR /app
 
 ENTRYPOINT ["/entrypoint"]
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index 2e6a195b7..9fd75f7e9 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -7,31 +7,38 @@ RUN npm install && npm cache clean --force
 COPY . /app
 RUN npm run build
 
-# Python build stage
 {%- endif %}
+
+# Python build stage
+FROM python:3.8-slim-buster as python-build-stage
+
+
+# Requirements are installed here to ensure they will be cached.
+COPY ./requirements /requirements
+
+RUN apt-get update && apt-get install --no-install-recommends -y \
+  # dependencies for building Python packages
+  build-essential \
+  # psycopg2 dependencies
+  libpq-dev \
+  # Translations dependencies
+  gettext \
+  # cleaning up unused files
+  && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+  && rm -rf /var/lib/apt/lists/* \
+  # create python dependency wheels
+  && pip wheel --no-cache-dir --no-deps --use-feature=2020-resolver --wheel-dir /usr/src/app/wheels -r /requirements/production.txt \
+  && rm -rf /requirements
+
+
+# Python 'run' stage
 FROM python:3.8-slim-buster
 
 ENV PYTHONUNBUFFERED 1
 
-RUN apt-get update \
-  # dependencies for building Python packages
-  && apt-get install -y build-essential \
-  # psycopg2 dependencies
-  && apt-get install -y libpq-dev \
-  # Translations dependencies
-  && apt-get install -y gettext \
-  # cleaning up unused files
-  && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
-  && rm -rf /var/lib/apt/lists/*
-
 RUN addgroup --system django \
     && adduser --system --ingroup django django
 
-# Requirements are installed here to ensure they will be cached.
-COPY ./requirements /requirements
-RUN pip install --no-cache-dir -r /requirements/production.txt \
-    && rm -rf /requirements
-
 COPY --chown=django:django ./compose/production/django/entrypoint /entrypoint
 RUN sed -i 's/\r$//g' /entrypoint
 RUN chmod +x /entrypoint
@@ -58,6 +65,23 @@ RUN sed -i 's/\r$//g' /start-flower
 RUN chmod +x /start-flower
 {%- endif %}
 
+# installing required system dependencies
+RUN apt-get update && apt-get install --no-install-recommends -y \
+  # psycopg2 dependencies
+  libpq-dev \
+  # Translations dependencies
+  gettext \
+  # cleaning up unused files
+  && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+  && rm -rf /var/lib/apt/lists/*
+
+
+# copy python dependency wheels from python-build-stage
+COPY --from=python-build-stage /usr/src/app/wheels /wheels
+
+# install python dependencies
+RUN pip install --no-cache /wheels/*
+
 {%- if cookiecutter.js_task_runner == 'Gulp' %}
 COPY --from=client-builder --chown=django:django /app /app
 {% else %}

From 070d4556f9147979aa81a0300b36fb8c561bea81 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Fri, 11 Sep 2020 22:04:44 +0530
Subject: [PATCH 1041/2840] Multi stage Python build for Django

---
 .../compose/production/traefik/Dockerfile                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
index aa879052b..26a653d50 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
@@ -1,4 +1,4 @@
-FROM traefik:v2.2.11
+FROM traefik:v2.0
 RUN mkdir -p /etc/traefik/acme \
   && touch /etc/traefik/acme/acme.json \
   && chmod 600 /etc/traefik/acme/acme.json

From 13ca7bf4a4ea91afcc70021e94170091cd8bdcbc Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 11 Sep 2020 15:59:42 -0700
Subject: [PATCH 1042/2840] Update django-anymail from 7.2.1 to 8.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 4ed494349..047661cdb 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -22,7 +22,7 @@ django-storages[boto3]==1.10  # https://github.com/jschneier/django-storages
 django-storages[google]==1.10  # https://github.com/jschneier/django-storages
 {%- endif %}
 {%- if cookiecutter.mail_service == 'Mailgun' %}
-django-anymail[mailgun]==7.2.1  # https://github.com/anymail/django-anymail
+django-anymail[mailgun]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
 django-anymail[amazon_ses]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}

From 11d089c859d11798ee5657870faad417cf6e90ce Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 11 Sep 2020 15:59:43 -0700
Subject: [PATCH 1043/2840] Update django-anymail from 7.2.1 to 8.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 047661cdb..0c46da1d9 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -24,7 +24,7 @@ django-storages[google]==1.10  # https://github.com/jschneier/django-storages
 {%- if cookiecutter.mail_service == 'Mailgun' %}
 django-anymail[mailgun]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
-django-anymail[amazon_ses]==7.2.1  # https://github.com/anymail/django-anymail
+django-anymail[amazon_ses]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
 django-anymail[mailjet]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}

From 8cddc2f740812c1837b07ece95e21319f14c565b Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 11 Sep 2020 15:59:44 -0700
Subject: [PATCH 1044/2840] Update django-anymail from 7.2.1 to 8.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 0c46da1d9..e8e57d945 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -26,7 +26,7 @@ django-anymail[mailgun]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
 django-anymail[amazon_ses]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
-django-anymail[mailjet]==7.2.1  # https://github.com/anymail/django-anymail
+django-anymail[mailjet]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
 django-anymail[mandrill]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}

From e5c2f82949effe5719ebab00f42c7c13f9bf32db Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 11 Sep 2020 15:59:45 -0700
Subject: [PATCH 1045/2840] Update django-anymail from 7.2.1 to 8.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 e8e57d945..d507b1255 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -28,7 +28,7 @@ django-anymail[amazon_ses]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
 django-anymail[mailjet]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
-django-anymail[mandrill]==7.2.1  # https://github.com/anymail/django-anymail
+django-anymail[mandrill]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
 django-anymail[postmark]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}

From 99c9b043199c8cbc0d8de0829685170f6464403e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 11 Sep 2020 15:59:45 -0700
Subject: [PATCH 1046/2840] Update django-anymail from 7.2.1 to 8.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 d507b1255..2c92ad99b 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -30,7 +30,7 @@ django-anymail[mailjet]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
 django-anymail[mandrill]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
-django-anymail[postmark]==7.2.1  # https://github.com/anymail/django-anymail
+django-anymail[postmark]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
 django-anymail[sendgrid]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}

From e591022c6f3daa6207f36c95588bf1dd1bd6a8a5 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 11 Sep 2020 15:59:46 -0700
Subject: [PATCH 1047/2840] Update django-anymail from 7.2.1 to 8.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 2c92ad99b..cfdf7dff1 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -32,7 +32,7 @@ django-anymail[mandrill]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
 django-anymail[postmark]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
-django-anymail[sendgrid]==7.2.1  # https://github.com/anymail/django-anymail
+django-anymail[sendgrid]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
 django-anymail[sendinblue]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}

From 8241615edd35f09dd0b426f07964ffdc80c22001 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 11 Sep 2020 15:59:47 -0700
Subject: [PATCH 1048/2840] Update django-anymail from 7.2.1 to 8.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 cfdf7dff1..83f8fdf62 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -34,7 +34,7 @@ django-anymail[postmark]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
 django-anymail[sendgrid]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
-django-anymail[sendinblue]==7.2.1  # https://github.com/anymail/django-anymail
+django-anymail[sendinblue]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
 django-anymail[sparkpost]==7.2.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}

From bc0805549b540c0484b2a0731fbb1c1ba110da13 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 11 Sep 2020 15:59:48 -0700
Subject: [PATCH 1049/2840] Update django-anymail from 7.2.1 to 8.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 83f8fdf62..b5342b526 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -36,7 +36,7 @@ django-anymail[sendgrid]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
 django-anymail[sendinblue]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
-django-anymail[sparkpost]==7.2.1  # https://github.com/anymail/django-anymail
+django-anymail[sparkpost]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
 django-anymail==7.2.1  # https://github.com/anymail/django-anymail
 {%- endif %}

From 192ca300af8f052fa3a21dadcbb15761e351ec79 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 11 Sep 2020 15:59:49 -0700
Subject: [PATCH 1050/2840] Update django-anymail from 7.2.1 to 8.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 b5342b526..ced72c2f6 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -38,5 +38,5 @@ django-anymail[sendinblue]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
 django-anymail[sparkpost]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
-django-anymail==7.2.1  # https://github.com/anymail/django-anymail
+django-anymail==8.0  # https://github.com/anymail/django-anymail
 {%- endif %}

From 33eca9d121479db0e3ea4a8795e745f848be9c3e Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 12 Sep 2020 02:16:10 +0000
Subject: [PATCH 1051/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7855d1676..db5a2d9c1 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 -->
 
+## [2020-09-11]
+### Updated
+- Auto-update pre-commit hooks ([#2809](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2809))
+
 ## [2020-09-10]
 ### Updated
 - Update isort to 5.5.2 ([#2807](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2807))

From c7ee1e7c03ebb59a8833d9fd26ec0d97b5acccb7 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 11 Sep 2020 19:16:16 -0700
Subject: [PATCH 1052/2840] Update pytest from 6.0.1 to 6.0.2

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

diff --git a/requirements.txt b/requirements.txt
index 3f110e519..f645e14d6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ flake8-isort==4.0.0
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.20.0
-pytest==6.0.1
+pytest==6.0.2
 pytest-cookies==0.5.1
 pytest-instafail==0.4.2
 pyyaml==5.3.1

From 12cc96817de8208f8ad778428c1e05a577c7ed15 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 11 Sep 2020 19:16:17 -0700
Subject: [PATCH 1053/2840] Update pytest from 6.0.1 to 6.0.2

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

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index cc751326f..e5eb6c67c 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -15,7 +15,7 @@ watchgod==0.6  # https://github.com/samuelcolvin/watchgod
 # ------------------------------------------------------------------------------
 mypy==0.770  # https://github.com/python/mypy
 django-stubs==1.5.0  # https://github.com/typeddjango/django-stubs
-pytest==6.0.1  # https://github.com/pytest-dev/pytest
+pytest==6.0.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 
 # Documentation

From 07051bff33e489834f3d0b88954ddf3709cd74c7 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Sat, 12 Sep 2020 08:47:38 +0530
Subject: [PATCH 1054/2840] Fixed mistake of using production settings even for
 local/django image

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

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index 949235c04..5c3e3f1a8 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -16,7 +16,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
   && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
   && rm -rf /var/lib/apt/lists/* \
   # create python dependency wheels
-  && pip wheel --no-cache-dir --no-deps --use-feature=2020-resolver --wheel-dir /usr/src/app/wheels -r /requirements/production.txt \
+  && pip wheel --no-cache-dir --no-deps --use-feature=2020-resolver --wheel-dir /usr/src/app/wheels -r /requirements/local.txt \
   && rm -rf /requirements
 
 

From a795086b108c23d8e886762c3b9f06033e610352 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Sat, 12 Sep 2020 11:04:08 +0530
Subject: [PATCH 1055/2840] Removing using python wheels to build python
 dependecies due to issue resolving conflicts in package sub-dependencies.
 Ends up being much more trouble than it's worth.

---
 .../compose/local/django/Dockerfile               | 11 +++++------
 .../compose/production/django/Dockerfile          | 15 +++++++--------
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index 5c3e3f1a8..a7cf54aee 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -15,8 +15,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
   # cleaning up unused files
   && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
   && rm -rf /var/lib/apt/lists/* \
-  # create python dependency wheels
-  && pip wheel --no-cache-dir --no-deps --use-feature=2020-resolver --wheel-dir /usr/src/app/wheels -r /requirements/local.txt \
+  # install python dependencies
+  && pip install --no-cache-dir --use-feature=2020-resolver -r /requirements/local.txt \
   && rm -rf /requirements
 
 
@@ -61,11 +61,10 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
   && rm -rf /var/lib/apt/lists/*
 
 
-# copy python dependency wheels from python-build-stage
-COPY --from=python-build-stage /usr/src/app/wheels /wheels
 
-# install python dependencies
-RUN pip install --no-cache /wheels/*
+# copy python dependencies from python-build-stage
+COPY --from=build_stage /usr/local/lib/python3.8/site-packages/ /usr/local/lib/python3.8/site-packages/
+COPY --from=build_stage /usr/local/bin/ /usr/local/bin/
 
 
 
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index 9fd75f7e9..15708dcd8 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -11,7 +11,7 @@ RUN npm run build
 
 # Python build stage
 FROM python:3.8-slim-buster as python-build-stage
-
+ENV PYTHONDONTWRITEBYTECODE 1
 
 # Requirements are installed here to ensure they will be cached.
 COPY ./requirements /requirements
@@ -26,14 +26,15 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
   # cleaning up unused files
   && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
   && rm -rf /var/lib/apt/lists/* \
-  # create python dependency wheels
-  && pip wheel --no-cache-dir --no-deps --use-feature=2020-resolver --wheel-dir /usr/src/app/wheels -r /requirements/production.txt \
+  # install python dependencies
+  && pip install --no-cache-dir --use-feature=2020-resolver -r /requirements/production.txt \
   && rm -rf /requirements
 
 
 # Python 'run' stage
 FROM python:3.8-slim-buster
 
+ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
 
 RUN addgroup --system django \
@@ -76,11 +77,9 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
   && rm -rf /var/lib/apt/lists/*
 
 
-# copy python dependency wheels from python-build-stage
-COPY --from=python-build-stage /usr/src/app/wheels /wheels
-
-# install python dependencies
-RUN pip install --no-cache /wheels/*
+# copy python dependencies from python-build-stage
+COPY --from=build_stage /usr/local/lib/python3.8/site-packages/ /usr/local/lib/python3.8/site-packages/
+COPY --from=build_stage /usr/local/bin/ /usr/local/bin/
 
 {%- if cookiecutter.js_task_runner == 'Gulp' %}
 COPY --from=client-builder --chown=django:django /app /app

From 17e577c92478664627be6ded8501545a5d5b2115 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Sat, 12 Sep 2020 11:11:19 +0530
Subject: [PATCH 1056/2840] Fixed Typo with python build stage name that was
 references incorrectly in the run stage

---
 {{cookiecutter.project_slug}}/compose/local/django/Dockerfile | 4 ++--
 .../compose/production/django/Dockerfile                      | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index a7cf54aee..11cc99784 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -63,8 +63,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 
 
 # copy python dependencies from python-build-stage
-COPY --from=build_stage /usr/local/lib/python3.8/site-packages/ /usr/local/lib/python3.8/site-packages/
-COPY --from=build_stage /usr/local/bin/ /usr/local/bin/
+COPY --from=python-build-stage /usr/local/lib/python3.8/site-packages/ /usr/local/lib/python3.8/site-packages/
+COPY --from=python-build-stage /usr/local/bin/ /usr/local/bin/
 
 
 
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index 15708dcd8..722f709fb 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -78,8 +78,8 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 
 
 # copy python dependencies from python-build-stage
-COPY --from=build_stage /usr/local/lib/python3.8/site-packages/ /usr/local/lib/python3.8/site-packages/
-COPY --from=build_stage /usr/local/bin/ /usr/local/bin/
+COPY --from=python-build-stage /usr/local/lib/python3.8/site-packages/ /usr/local/lib/python3.8/site-packages/
+COPY --from=python-build-stage /usr/local/bin/ /usr/local/bin/
 
 {%- if cookiecutter.js_task_runner == 'Gulp' %}
 COPY --from=client-builder --chown=django:django /app /app

From 62c3f5fd5d8d97686dba27d5a8afe7e368f2d02e Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sun, 13 Sep 2020 02:16:38 +0000
Subject: [PATCH 1057/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db5a2d9c1..1b32d6d68 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 -->
 
+## [2020-09-12]
+### Updated
+- Updating Traefik version from 2.0 to 2.2.11 ([#2814](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2814))
+- Update pytest to 6.0.2 ([#2819](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2819))
+- Update django-anymail to 8.0 ([#2818](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2818))
+
 ## [2020-09-11]
 ### Updated
 - Auto-update pre-commit hooks ([#2809](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2809))

From 079db28661a5a30066dc67da57b728741a04b986 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Mon, 14 Sep 2020 01:41:33 +0530
Subject: [PATCH 1058/2840] Changed when Requirements are copied and installed
 to improve incremental image build times. The extra image layer is
 inconsequential since python-build-stage layers are discarded anyway.

---
 .../compose/local/django/Dockerfile             | 17 +++++++++--------
 .../compose/production/django/Dockerfile        | 16 ++++++++--------
 .../compose/production/traefik/Dockerfile       |  2 +-
 3 files changed, 18 insertions(+), 17 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index 11cc99784..645b04766 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -2,9 +2,6 @@
 FROM python:3.8-slim-buster as python-build-stage
 ENV PYTHONDONTWRITEBYTECODE 1
 
-# Requirements are installed here to ensure they will be cached.
-COPY ./requirements /requirements
-
 RUN apt-get update && apt-get install --no-install-recommends -y \
   # dependencies for building Python packages
   build-essential \
@@ -14,15 +11,19 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
   gettext \
   # cleaning up unused files
   && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
-  && rm -rf /var/lib/apt/lists/* \
-  # install python dependencies
-  && pip install --no-cache-dir --use-feature=2020-resolver -r /requirements/local.txt \
-  && rm -rf /requirements
+  && rm -rf /var/lib/apt/lists/*
+
+# Requirements are installed here to ensure they will be cached.
+COPY ./requirements /requirements
+
+# install python dependencies
+RUN pip install --no-cache-dir --use-feature=2020-resolver -r /requirements/local.txt \
+    && rm -rf /requirements
 
 
 
 # Python 'run' stage
-FROM python:3.8-slim-buster
+FROM python:3.8-slim-buster as python-run-stage
 
 ENV PYTHONUNBUFFERED 1
 ENV PYTHONDONTWRITEBYTECODE 1
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index 722f709fb..cc46464bb 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -13,9 +13,6 @@ RUN npm run build
 FROM python:3.8-slim-buster as python-build-stage
 ENV PYTHONDONTWRITEBYTECODE 1
 
-# Requirements are installed here to ensure they will be cached.
-COPY ./requirements /requirements
-
 RUN apt-get update && apt-get install --no-install-recommends -y \
   # dependencies for building Python packages
   build-essential \
@@ -25,14 +22,17 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
   gettext \
   # cleaning up unused files
   && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
-  && rm -rf /var/lib/apt/lists/* \
-  # install python dependencies
-  && pip install --no-cache-dir --use-feature=2020-resolver -r /requirements/production.txt \
-  && rm -rf /requirements
+  && rm -rf /var/lib/apt/lists/*
 
+# Requirements are installed here to ensure they will be cached.
+COPY ./requirements /requirements
+
+# install python dependencies
+Run pip install --no-cache-dir --use-feature=2020-resolver -r /requirements/production.txt \
+    && rm -rf /requirements
 
 # Python 'run' stage
-FROM python:3.8-slim-buster
+FROM python:3.8-slim-buster as python-run-stage
 
 ENV PYTHONDONTWRITEBYTECODE 1
 ENV PYTHONUNBUFFERED 1
diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
index 26a653d50..aa879052b 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
@@ -1,4 +1,4 @@
-FROM traefik:v2.0
+FROM traefik:v2.2.11
 RUN mkdir -p /etc/traefik/acme \
   && touch /etc/traefik/acme/acme.json \
   && chmod 600 /etc/traefik/acme/acme.json

From a6b88a9370a0707efb82a0e636f04e5c6f86c4a1 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 14 Sep 2020 01:40:32 -0700
Subject: [PATCH 1059/2840] Update django-storages from 1.10 to 1.10.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 ced72c2f6..3ee5e7619 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -17,7 +17,7 @@ hiredis==1.1.0  # https://github.com/redis/hiredis-py
 # Django
 # ------------------------------------------------------------------------------
 {%- if cookiecutter.cloud_provider == 'AWS' %}
-django-storages[boto3]==1.10  # https://github.com/jschneier/django-storages
+django-storages[boto3]==1.10.1  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
 django-storages[google]==1.10  # https://github.com/jschneier/django-storages
 {%- endif %}

From 8b4c87fd12cd2de4fdf5d5a4ae252eb3e6d1af2e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 14 Sep 2020 01:40:33 -0700
Subject: [PATCH 1060/2840] Update django-storages from 1.10 to 1.10.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 3ee5e7619..c6dc2e17c 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -19,7 +19,7 @@ hiredis==1.1.0  # https://github.com/redis/hiredis-py
 {%- if cookiecutter.cloud_provider == 'AWS' %}
 django-storages[boto3]==1.10.1  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
-django-storages[google]==1.10  # https://github.com/jschneier/django-storages
+django-storages[google]==1.10.1  # https://github.com/jschneier/django-storages
 {%- endif %}
 {%- if cookiecutter.mail_service == 'Mailgun' %}
 django-anymail[mailgun]==8.0  # https://github.com/anymail/django-anymail

From f1600ef17ba04523e82bf514b2e47cebed4a06ee Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 14 Sep 2020 01:40:37 -0700
Subject: [PATCH 1061/2840] Update coverage from 5.2.1 to 5.3

---
 {{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 e5eb6c67c..9a475e7f8 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -27,7 +27,7 @@ sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==3.8.3  # https://github.com/PyCQA/flake8
 flake8-isort==4.0.0  # https://github.com/gforcada/flake8-isort
-coverage==5.2.1  # https://github.com/nedbat/coveragepy
+coverage==5.3  # https://github.com/nedbat/coveragepy
 black==20.8b1  # https://github.com/ambv/black
 pylint-django==2.3.0  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 584267d8a4f1674acf8afbe01cd3ea8049f96082 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 14 Sep 2020 08:03:16 -0700
Subject: [PATCH 1062/2840] Update sentry-sdk from 0.17.4 to 0.17.5

---
 {{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 c6dc2e17c..855a8e290 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.17.4  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.17.5  # 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 b76d8d4f025590c1ddfb2a4506a932e92c5357f6 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 17 Aug 2020 14:20:00 +0100
Subject: [PATCH 1063/2840] Revert Celery to 4.4.6

It looks like 4.4.7 has some issues with Redis broker:

https://github.com/celery/celery/issues/6285
---
 {{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 1c496a256..c858b7339 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -17,7 +17,7 @@ redis==3.5.3  # https://github.com/andymccurdy/redis-py
 hiredis==1.1.0  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
-celery==4.4.7  # pyup: < 5.0  # https://github.com/celery/celery
+celery==4.4.6  # pyup: < 5.0,!=4.4.7  # https://github.com/celery/celery
 django-celery-beat==2.0.0  # https://github.com/celery/django-celery-beat
 {%- if cookiecutter.use_docker == 'y' %}
 flower==0.9.5  # https://github.com/mher/flower

From ec3922cfe6a4c58f98d3a547207d7993e5ab5ff2 Mon Sep 17 00:00:00 2001
From: Daniel Feldroy <pydanny@users.noreply.github.com>
Date: Mon, 14 Sep 2020 11:36:47 -0700
Subject: [PATCH 1064/2840] Give admin_forms the forms namespace

This will make extending various signup and registration forms easier.
---
 .../{{cookiecutter.project_slug}}/users/forms.py    | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
index ba848b858..d2170bb32 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
@@ -1,22 +1,23 @@
-from django.contrib.auth import forms, get_user_model
+from django.contrib.auth import get_user_model
+from django.contrib.auth import forms as admin_forms
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
 
 User = get_user_model()
 
 
-class UserChangeForm(forms.UserChangeForm):
-    class Meta(forms.UserChangeForm.Meta):
+class UserChangeForm(admin_forms.UserChangeForm):
+    class Meta(admin_forms.UserChangeForm.Meta):
         model = User
 
 
-class UserCreationForm(forms.UserCreationForm):
+class UserCreationForm(admin_forms.UserCreationForm):
 
-    error_message = forms.UserCreationForm.error_messages.update(
+    error_message = admin_forms.UserCreationForm.error_messages.update(
         {"duplicate_username": _("This username has already been taken.")}
     )
 
-    class Meta(forms.UserCreationForm.Meta):
+    class Meta(admin_forms.UserCreationForm.Meta):
         model = User
 
     def clean_username(self):

From 5950f4ebe21c119705974658817169fb44d7495e Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 15 Sep 2020 02:16:59 +0000
Subject: [PATCH 1065/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b32d6d68..460e463e4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2020-09-14]
+### Fixed
+- Downgrade Celery to 4.4.6 ([#2829](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2829))
+### Updated
+- Update sentry-sdk to 0.17.5 ([#2828](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2828))
+- Update coverage to 5.3 ([#2826](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2826))
+- Update django-storages to 1.10.1 ([#2825](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2825))
+
 ## [2020-09-12]
 ### Updated
 - Updating Traefik version from 2.0 to 2.2.11 ([#2814](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2814))

From a2c4453cf56adba84471875d1b08bb0cb77d7002 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 16 Sep 2020 09:39:02 +0100
Subject: [PATCH 1066/2840] Fix isort errors

---
 .../{{cookiecutter.project_slug}}/users/forms.py                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
index d2170bb32..7d3a296bc 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
@@ -1,5 +1,5 @@
-from django.contrib.auth import get_user_model
 from django.contrib.auth import forms as admin_forms
+from django.contrib.auth import get_user_model
 from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
 

From 4a52845a269584ade6c3198c84705a95f1e6ef78 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Wed, 16 Sep 2020 15:24:16 +0530
Subject: [PATCH 1067/2840] Replaced copying python package directories with
 wheel files which are then used to install all requirements. This way the
 generated images would be a lot more stable as well. Size increases by 2-3mb
 though

---
 .../compose/local/django/Dockerfile           | 20 ++++++++---------
 .../compose/production/django/Dockerfile      | 22 ++++++++++++-------
 2 files changed, 24 insertions(+), 18 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index 645b04766..c34f8ad40 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -7,19 +7,18 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
   build-essential \
   # psycopg2 dependencies
   libpq-dev \
-  # Translations dependencies
-  gettext \
   # cleaning up unused files
   && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
   && rm -rf /var/lib/apt/lists/*
 
+
 # Requirements are installed here to ensure they will be cached.
 COPY ./requirements /requirements
 
-# install python dependencies
-RUN pip install --no-cache-dir --use-feature=2020-resolver -r /requirements/local.txt \
-    && rm -rf /requirements
-
+# create python dependency wheels
+RUN pip wheel --no-cache-dir --no-deps --use-feature=2020-resolver --wheel-dir /usr/src/app/wheels  \
+  -r /requirements/local.txt \
+  && rm -rf /requirements
 
 
 # Python 'run' stage
@@ -62,11 +61,12 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
   && rm -rf /var/lib/apt/lists/*
 
 
+# copy python dependency wheels from python-build-stage
+COPY --from=python-build-stage /usr/src/app/wheels  /wheels
 
-# copy python dependencies from python-build-stage
-COPY --from=python-build-stage /usr/local/lib/python3.8/site-packages/ /usr/local/lib/python3.8/site-packages/
-COPY --from=python-build-stage /usr/local/bin/ /usr/local/bin/
-
+# use wheels to install python dependencies
+RUN pip install --no-cache /wheels/* \
+	&& rm -rf /wheels
 
 
 WORKDIR /app
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index cc46464bb..a2f432ccc 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -11,25 +11,28 @@ RUN npm run build
 
 # Python build stage
 FROM python:3.8-slim-buster as python-build-stage
+
 ENV PYTHONDONTWRITEBYTECODE 1
+ARG BUILD_ENVIRONMENT
+
 
 RUN apt-get update && apt-get install --no-install-recommends -y \
   # dependencies for building Python packages
   build-essential \
   # psycopg2 dependencies
   libpq-dev \
-  # Translations dependencies
-  gettext \
   # cleaning up unused files
   && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
   && rm -rf /var/lib/apt/lists/*
 
+
 # Requirements are installed here to ensure they will be cached.
 COPY ./requirements /requirements
 
-# install python dependencies
-Run pip install --no-cache-dir --use-feature=2020-resolver -r /requirements/production.txt \
-    && rm -rf /requirements
+# create python dependency wheels
+RUN pip wheel --no-cache-dir --no-deps --use-feature=2020-resolver --wheel-dir /usr/src/app/wheels  \
+  -r /requirements/production.txt \
+  && rm -rf /requirements
 
 # Python 'run' stage
 FROM python:3.8-slim-buster as python-run-stage
@@ -77,9 +80,12 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
   && rm -rf /var/lib/apt/lists/*
 
 
-# copy python dependencies from python-build-stage
-COPY --from=python-build-stage /usr/local/lib/python3.8/site-packages/ /usr/local/lib/python3.8/site-packages/
-COPY --from=python-build-stage /usr/local/bin/ /usr/local/bin/
+# copy python dependency wheels from python-build-stage
+COPY --from=python-build-stage /usr/src/app/wheels  /wheels
+
+# use wheels to install python dependencies
+RUN pip install --no-cache /wheels/* \
+	&& rm -rf /wheels
 
 {%- if cookiecutter.js_task_runner == 'Gulp' %}
 COPY --from=client-builder --chown=django:django /app /app

From fa85682910419511f28827747f872a18956d26c2 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 16 Sep 2020 04:28:56 -0700
Subject: [PATCH 1068/2840] Update pytest-django from 3.9.0 to 3.10.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 9a475e7f8..f2f87b381 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -42,4 +42,4 @@ factory-boy==3.0.1  # https://github.com/FactoryBoy/factory_boy
 django-debug-toolbar==2.2  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.0.8  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
-pytest-django==3.9.0  # https://github.com/pytest-dev/pytest-django
+pytest-django==3.10.0  # https://github.com/pytest-dev/pytest-django

From c06869367d8e935c9c38b420afa6cd064d45ef1f Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 16 Sep 2020 04:29:06 -0700
Subject: [PATCH 1069/2840] Update sentry-sdk from 0.17.5 to 0.17.6

---
 {{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 855a8e290..06731b0b2 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.17.5  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.17.6  # 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 d0ef737234b4c9427f71f88f399cf3c20d6a3c77 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 17 Sep 2020 02:16:54 +0000
Subject: [PATCH 1070/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 460e463e4..b2c3e1e4c 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 -->
 
+## [2020-09-16]
+### Updated
+- Update sentry-sdk to 0.17.6 ([#2833](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2833))
+- Update pytest-django to 3.10.0 ([#2832](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2832))
+
 ## [2020-09-14]
 ### Fixed
 - Downgrade Celery to 4.4.6 ([#2829](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2829))

From 35b89997ef7d6ab6642a346a924f23c6049f8ae6 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Thu, 17 Sep 2020 22:22:42 +0530
Subject: [PATCH 1071/2840] Made Traefik conf much easier to understand and
 improved redirect response to entrypoint as opposed to middleware layer that
 is hit after entrypoint and routing layers.

---
 .../compose/production/traefik/traefik.yml    | 23 ++++---------------
 1 file changed, 5 insertions(+), 18 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
index cfd566a8d..e18535736 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
@@ -5,6 +5,11 @@ entryPoints:
   web:
     # http
     address: ":80"
+    http:
+      redirections:
+        entryPoint:
+          to: web-secure
+          scheme: https
 
   web-secure:
     # https
@@ -27,19 +32,6 @@ certificatesResolvers:
 
 http:
   routers:
-    web-router:
-      {%- if cookiecutter.domain_name.count('.') == 1 %}
-      rule: "Host(`{{ cookiecutter.domain_name }}`) || Host(`www.{{ cookiecutter.domain_name }}`)"
-      {% else %}
-      rule: "Host(`{{ cookiecutter.domain_name }}`)"
-      {%- endif %}
-      entryPoints:
-        - web
-      middlewares:
-        - redirect
-        - csrf
-      service: django
-
     web-secure-router:
       {%- if cookiecutter.domain_name.count('.') == 1 %}
       rule: "Host(`{{ cookiecutter.domain_name }}`) || Host(`www.{{ cookiecutter.domain_name }}`)"
@@ -67,11 +59,6 @@ http:
     {%- endif %}
 
   middlewares:
-    redirect:
-      # https://docs.traefik.io/master/middlewares/redirectscheme/
-      redirectScheme:
-        scheme: https
-        permanent: true
     csrf:
       # https://docs.traefik.io/master/middlewares/headers/#hostsproxyheaders
       # https://docs.djangoproject.com/en/dev/ref/csrf/#ajax

From ade8aede4745c34d5650f833ba30d671c21972fa Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 17 Sep 2020 15:04:31 -0700
Subject: [PATCH 1072/2840] Update django-extensions from 3.0.8 to 3.0.9

---
 {{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 f2f87b381..6536f7f34 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -40,6 +40,6 @@ pre-commit==2.7.1  # https://github.com/pre-commit/pre-commit
 factory-boy==3.0.1  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==2.2  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==3.0.8  # https://github.com/django-extensions/django-extensions
+django-extensions==3.0.9  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.10.0  # https://github.com/pytest-dev/pytest-django

From 2408fc77566c7b87133fe247b8b8e4864bca69dc Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Fri, 18 Sep 2020 22:14:18 +0530
Subject: [PATCH 1073/2840] Added a comment to relevant part of documentation.
 Also removed the unnecessary scheme key as the default value for scheme is
 https anyway

---
 .../compose/production/traefik/traefik.yml                      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
index e18535736..7b56063f3 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
@@ -6,10 +6,10 @@ entryPoints:
     # http
     address: ":80"
     http:
+      # https://docs.traefik.io/routing/entrypoints/#entrypoint
       redirections:
         entryPoint:
           to: web-secure
-          scheme: https
 
   web-secure:
     # https

From 9851fbed6b955553b3e3b7c721de4dad8b0d729c Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 19 Sep 2020 02:16:52 +0000
Subject: [PATCH 1074/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2c3e1e4c..027408d68 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 -->
 
+## [2020-09-18]
+### Updated
+- Update django-extensions to 3.0.9 ([#2839](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2839))
+
 ## [2020-09-16]
 ### Updated
 - Update sentry-sdk to 0.17.6 ([#2833](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2833))

From 859766941d44b4d31332f3f4436d4d040adeb733 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 20 Sep 2020 12:27:04 -0700
Subject: [PATCH 1075/2840] Update django-debug-toolbar from 2.2 to 3.0

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

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 6536f7f34..0ac958899 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -39,7 +39,7 @@ pre-commit==2.7.1  # https://github.com/pre-commit/pre-commit
 # ------------------------------------------------------------------------------
 factory-boy==3.0.1  # https://github.com/FactoryBoy/factory_boy
 
-django-debug-toolbar==2.2  # https://github.com/jazzband/django-debug-toolbar
+django-debug-toolbar==3.0  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.0.9  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.10.0  # https://github.com/pytest-dev/pytest-django

From 561e9744bfd0ae00688a5a6a383dbb3e9ee37385 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 21 Sep 2020 00:26:05 +0000
Subject: [PATCH 1076/2840] 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 398ccbf81..d995d5aa3 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.5.2
+    rev: 5.5.3
     hooks:
       - id: isort
 

From 4f0363acfc86159b7abe9f3a7ad1ec3027d5ad34 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 20 Sep 2020 17:26:14 -0700
Subject: [PATCH 1077/2840] Update isort from 5.5.2 to 5.5.3

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

diff --git a/requirements.txt b/requirements.txt
index f645e14d6..717b98263 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==20.8b1
-isort==5.5.2
+isort==5.5.3
 flake8==3.8.3
 flake8-isort==4.0.0
 

From b064e09f12cf6b0bd3e54d560eb2eb0227aa86ff Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13081994@users.noreply.github.com>
Date: Mon, 21 Sep 2020 15:50:24 +0530
Subject: [PATCH 1078/2840] Adding GitHub-Action CI Option (#2837)

---
 cookiecutter.json                             |  3 +-
 docs/project-generation-options.rst           |  2 +
 hooks/post_gen_project.py                     |  7 ++
 tests/test_bare.sh                            |  2 +-
 tests/test_cookiecutter_generation.py         | 38 ++++++++
 .../.github/dependabot.yml                    |  7 ++
 .../.github/workflows/ci.yml                  | 95 +++++++++++++++++++
 7 files changed, 152 insertions(+), 2 deletions(-)
 create mode 100644 {{cookiecutter.project_slug}}/.github/dependabot.yml
 create mode 100644 {{cookiecutter.project_slug}}/.github/workflows/ci.yml

diff --git a/cookiecutter.json b/cookiecutter.json
index 682061476..4a580036d 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -56,7 +56,8 @@
   "ci_tool": [
     "None",
     "Travis",
-    "Gitlab"
+    "Gitlab",
+    "Github"
   ],
   "keep_local_envs_in_vcs": "y",
   "debug": "n"
diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index ec52e2183..8a81e19de 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -119,6 +119,7 @@ ci_tool:
     1. None
     2. `Travis CI`_
     3. `Gitlab CI`_
+    4. `Github Actions`_
 
 keep_local_envs_in_vcs:
     Indicates whether the project's ``.envs/.local/`` should be kept in VCS
@@ -176,3 +177,4 @@ debug:
 
 .. _GitLab CI: https://docs.gitlab.com/ee/ci/
 
+.. _Github Actions: https://docs.github.com/en/actions
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index fae73e110..ede14c324 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -123,6 +123,10 @@ def remove_dotgitlabciyml_file():
     os.remove(".gitlab-ci.yml")
 
 
+def remove_dotgithub_folder():
+    shutil.rmtree(".github")
+
+
 def append_to_project_gitignore(path):
     gitignore_file_path = ".gitignore"
     with open(gitignore_file_path, "a") as gitignore_file:
@@ -395,6 +399,9 @@ def main():
     if "{{ cookiecutter.ci_tool }}".lower() != "gitlab":
         remove_dotgitlabciyml_file()
 
+    if "{{ cookiecutter.ci_tool }}".lower() != "github":
+        remove_dotgithub_folder()
+
     if "{{ cookiecutter.use_drf }}".lower() == "n":
         remove_drf_starter_files()
 
diff --git a/tests/test_bare.sh b/tests/test_bare.sh
index 28f9b7bfb..cc1f1c36e 100755
--- a/tests/test_bare.sh
+++ b/tests/test_bare.sh
@@ -1,7 +1,7 @@
 #!/bin/sh
 # this is a very simple script that tests the docker configuration for cookiecutter-django
 # it is meant to be run from the root directory of the repository, eg:
-# sh tests/test_docker.sh
+# sh tests/test_bare.sh
 
 set -o errexit
 
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index f9bfcd539..af6e4588b 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -96,6 +96,7 @@ SUPPORTED_COMBINATIONS = [
     {"ci_tool": "None"},
     {"ci_tool": "Travis"},
     {"ci_tool": "Gitlab"},
+    {"ci_tool": "Github"},
     {"keep_local_envs_in_vcs": "y"},
     {"keep_local_envs_in_vcs": "n"},
     {"debug": "y"},
@@ -138,6 +139,7 @@ def check_paths(paths):
 @pytest.mark.parametrize("context_override", SUPPORTED_COMBINATIONS, ids=_fixture_id)
 def test_project_generation(cookies, context, context_override):
     """Test that project is generated and fully rendered."""
+
     result = cookies.bake(extra_context={**context, **context_override})
     assert result.exit_code == 0
     assert result.exception is None
@@ -225,6 +227,42 @@ def test_gitlab_invokes_flake8_and_pytest(
             pytest.fail(e)
 
 
+@pytest.mark.parametrize(
+    ["use_docker", "expected_test_script"],
+    [
+        ("n", "pytest"),
+        ("y", "docker-compose -f local.yml exec -T django pytest"),
+    ],
+)
+def test_github_invokes_flake8_and_pytest(
+    cookies, context, use_docker, expected_test_script
+):
+    context.update({"ci_tool": "Github", "use_docker": use_docker})
+    result = cookies.bake(extra_context=context)
+
+    assert result.exit_code == 0
+    assert result.exception is None
+    assert result.project.basename == context["project_slug"]
+    assert result.project.isdir()
+
+    with open(f"{result.project}/.github/workflows/ci.yml", "r") as github_yml:
+        try:
+            github_config = yaml.safe_load(github_yml)
+            flake8_present = False
+            for action_step in github_config["jobs"]["flake8"]["steps"]:
+                if action_step.get("run") == "flake8":
+                    flake8_present = True
+            assert flake8_present
+
+            expected_test_script_present = False
+            for action_step in github_config["jobs"]["pytest"]["steps"]:
+                if action_step.get("run") == expected_test_script:
+                    expected_test_script_present = True
+            assert expected_test_script_present
+        except yaml.YAMLError as e:
+            pytest.fail(e)
+
+
 @pytest.mark.parametrize("slug", ["project slug", "Project_Slug"])
 def test_invalid_slug(cookies, context, slug):
     """Invalid slug should failed pre-generation hook."""
diff --git a/{{cookiecutter.project_slug}}/.github/dependabot.yml b/{{cookiecutter.project_slug}}/.github/dependabot.yml
new file mode 100644
index 000000000..8e8ac8663
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/.github/dependabot.yml
@@ -0,0 +1,7 @@
+version: 2
+updates:
+  # Update Github actions in workflows
+  - package-ecosystem: "github-actions"
+    directory: "/"
+    schedule:
+      interval: "daily"
diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
new file mode 100644
index 000000000..52818e187
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -0,0 +1,95 @@
+name: CI
+
+# Enable Buildkit and let compose use it to speed up image building
+env:
+  DOCKER_BUILDKIT: 1
+  COMPOSE_DOCKER_CLI_BUILD: 1
+
+on:
+  pull_request:
+    branches: [ "master" ]
+    paths-ignore: [ "docs/**" ]
+
+  push:
+    branches: [ "master" ]
+    paths-ignore: [ "docs/**" ]
+
+
+jobs:
+  flake8:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout Code Repository
+        uses: actions/checkout@v2
+
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+
+      - name: Install flake8
+        run: |
+          python -m pip install --upgrade pip
+          pip install flake8
+
+      - name: Lint with flake8
+        run: flake8
+
+# With no caching at all the entire ci process takes 4m 30s to complete!
+  pytest:
+    runs-on: ubuntu-latest
+    steps:
+
+      - name: Checkout Code Repository
+        uses: actions/checkout@v2
+      {% if cookiecutter.use_docker == 'y' -%}
+
+      - name: Build the Stack
+        run:  docker-compose -f local.yml build
+
+      - name: Make DB Migrations
+        run:  docker-compose -f local.yml run --rm django python manage.py migrate
+
+      - name: Run the Stack
+        run:  docker-compose -f local.yml up -d
+
+      - name: Run Django Tests
+        run:  docker-compose -f local.yml exec -T django pytest
+
+      - name: Tear down the Stack
+        run:  docker-compose down
+
+      {%- else %}
+
+      - name: Set up Python 3.8
+        uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+
+      - name: Get pip cache dir
+        id: pip-cache-location
+        run: |
+          echo "::set-output name=dir::$(pip cache dir)"
+
+      {% raw %}
+      - name: Cache pip Project Dependencies
+        uses: actions/cache@v2
+        with:
+          # Get the location of pip cache dir
+          path: ${{ steps.pip-cache-location.outputs.dir }}
+          # Look to see if there is a cache hit for the corresponding requirements file
+          key: ${{ runner.os }}-pip-${{ hashFiles('**/local.txt') }}
+          restore-keys: |
+            ${{ runner.os }}-pip-
+      {% endraw %}
+
+      - name: Install Dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements/local.txt
+
+      - name: Test with pytest
+        run:  pytest
+
+      {%- endif %}

From e715b8f43dc6a1daef594bbdefeac48ca7f01c3e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 21 Sep 2020 14:13:08 -0700
Subject: [PATCH 1079/2840] Update django-debug-toolbar from 3.0 to 3.1

---
 {{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 0ac958899..423ac3742 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -39,7 +39,7 @@ pre-commit==2.7.1  # https://github.com/pre-commit/pre-commit
 # ------------------------------------------------------------------------------
 factory-boy==3.0.1  # https://github.com/FactoryBoy/factory_boy
 
-django-debug-toolbar==3.0  # https://github.com/jazzband/django-debug-toolbar
+django-debug-toolbar==3.1  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.0.9  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.10.0  # https://github.com/pytest-dev/pytest-django

From c567793453cc28f69ac3e07655ea2b4e2dfc080b Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 22 Sep 2020 02:17:28 +0000
Subject: [PATCH 1080/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 027408d68..9feac1399 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2020-09-21]
+### Changed
+- Adding GitHub-Action CI Option ([#2837](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2837))
+### Updated
+- Update django-debug-toolbar to 3.0 ([#2842](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2842))
+- Auto-update pre-commit hooks ([#2843](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2843))
+- Update isort to 5.5.3 ([#2844](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2844))
+
 ## [2020-09-18]
 ### Updated
 - Update django-extensions to 3.0.9 ([#2839](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2839))

From 762f3b3ae2526bfc8ad92413c4a14885ecf005d6 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 22 Sep 2020 02:49:28 -0700
Subject: [PATCH 1081/2840] Update sentry-sdk from 0.17.6 to 0.17.7

---
 {{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 06731b0b2..07ff0c523 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.17.6  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.17.7  # 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 1e924fac1696be524f3e1b3a11e9358199c8c543 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 24 Sep 2020 02:17:40 +0000
Subject: [PATCH 1082/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9feac1399..8efd5341a 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 -->
 
+## [2020-09-23]
+### Updated
+- Update sentry-sdk to 0.17.7 ([#2847](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2847))
+- Update django-debug-toolbar to 3.1 ([#2846](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2846))
+
 ## [2020-09-21]
 ### Changed
 - Adding GitHub-Action CI Option ([#2837](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2837))

From d5cb85ed9cb5416edc5b45fa1142d1369b8778b2 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 24 Sep 2020 10:22:21 -0700
Subject: [PATCH 1083/2840] Update django-debug-toolbar from 3.1 to 3.1.1

---
 {{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 423ac3742..04aef19d1 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -39,7 +39,7 @@ pre-commit==2.7.1  # https://github.com/pre-commit/pre-commit
 # ------------------------------------------------------------------------------
 factory-boy==3.0.1  # https://github.com/FactoryBoy/factory_boy
 
-django-debug-toolbar==3.1  # https://github.com/jazzband/django-debug-toolbar
+django-debug-toolbar==3.1.1  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.0.9  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==3.10.0  # https://github.com/pytest-dev/pytest-django

From 3a32c3b7ce2028c274b08d95a98e3599fbcdb733 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 27 Sep 2020 07:41:24 -0700
Subject: [PATCH 1084/2840] Update pytest from 6.0.2 to 6.1.0

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

diff --git a/requirements.txt b/requirements.txt
index 717b98263..4410bb3e3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ flake8-isort==4.0.0
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.20.0
-pytest==6.0.2
+pytest==6.1.0
 pytest-cookies==0.5.1
 pytest-instafail==0.4.2
 pyyaml==5.3.1

From 11afe7af59c3229e7e660791ceceb91f3eea51a1 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 27 Sep 2020 07:41:24 -0700
Subject: [PATCH 1085/2840] Update pytest from 6.0.2 to 6.1.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 423ac3742..2f4e84b61 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -15,7 +15,7 @@ watchgod==0.6  # https://github.com/samuelcolvin/watchgod
 # ------------------------------------------------------------------------------
 mypy==0.770  # https://github.com/python/mypy
 django-stubs==1.5.0  # https://github.com/typeddjango/django-stubs
-pytest==6.0.2  # https://github.com/pytest-dev/pytest
+pytest==6.1.0  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 
 # Documentation

From 6fb51ed49153725a80208f93e770f67089048985 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 28 Sep 2020 12:11:17 -0700
Subject: [PATCH 1086/2840] Update djangorestframework from 3.11.1 to 3.12.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 c858b7339..159a6bc64 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -40,6 +40,6 @@ django-compressor==2.4  # https://github.com/django-compressor/django-compressor
 django-redis==4.12.1  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == "y" %}
 # Django REST Framework
-djangorestframework==3.11.1  # https://github.com/encode/django-rest-framework
+djangorestframework==3.12.1  # https://github.com/encode/django-rest-framework
 django-cors-headers==3.5.0 # https://github.com/adamchainz/django-cors-headers
 {%- endif %}

From ae346d4a6f1c4520260c1c26443ac3e7a3989c9a Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 29 Sep 2020 10:50:08 -0700
Subject: [PATCH 1087/2840] Update sentry-sdk from 0.17.7 to 0.18.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 07ff0c523..34308c0b2 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.17.7  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.18.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 cf26e2d73cacbe03cf7f00b5ae94bb11037eae27 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 30 Sep 2020 00:32:38 -0700
Subject: [PATCH 1088/2840] Update isort from 5.5.3 to 5.5.4

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

diff --git a/requirements.txt b/requirements.txt
index 717b98263..c18e16faf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==20.8b1
-isort==5.5.3
+isort==5.5.4
 flake8==3.8.3
 flake8-isort==4.0.0
 

From 86e9a90d4ee11dd1756ad164da9de1b8c42d50a9 Mon Sep 17 00:00:00 2001
From: lcd1232 <8745863+lcd1232@users.noreply.github.com>
Date: Wed, 30 Sep 2020 11:14:21 +0300
Subject: [PATCH 1089/2840] Add node to INTERNAL_IPS

---
 {{cookiecutter.project_slug}}/config/settings/local.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py
index 21e6a8dfc..e7f8a2c1e 100644
--- a/{{cookiecutter.project_slug}}/config/settings/local.py
+++ b/{{cookiecutter.project_slug}}/config/settings/local.py
@@ -69,6 +69,8 @@ if env("USE_DOCKER") == "yes":
 
     hostname, _, ips = socket.gethostbyname_ex(socket.gethostname())
     INTERNAL_IPS += [".".join(ip.split(".")[:-1] + ["1"]) for ip in ips]
+    _, _, ips = socket.gethostbyname_ex("node")
+    INTERNAL_IPS.extend(ips)
 {%- endif %}
 
 # django-extensions

From 604325a1c6896f3767937919184d664f55ae3b3c Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 30 Sep 2020 06:31:39 -0700
Subject: [PATCH 1090/2840] Update uvicorn from 0.11.8 to 0.12.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 c858b7339..0fc28d81c 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -24,7 +24,7 @@ flower==0.9.5  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn==0.11.8  # https://github.com/encode/uvicorn
+uvicorn==0.12.1  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django

From aa6fd5381394e4d4aa4fa6a0c1e74617561cc457 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 1 Oct 2020 00:27:34 +0000
Subject: [PATCH 1091/2840] 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 d995d5aa3..b8e3601f9 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.5.3
+    rev: 5.5.4
     hooks:
       - id: isort
 

From da850d22170a67a67e570f9d63f654616e260c00 Mon Sep 17 00:00:00 2001
From: Daniel Feldroy <pydanny@users.noreply.github.com>
Date: Wed, 30 Sep 2020 17:52:33 -0700
Subject: [PATCH 1092/2840] Update README.rst

---
 README.rst | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/README.rst b/README.rst
index ec663d3e1..64fc521f5 100644
--- a/README.rst
+++ b/README.rst
@@ -110,14 +110,15 @@ This project is run by volunteers. Please support them in their efforts to maint
 
 Projects that provide financial support to the maintainers:
 
-Django Crash Course
+
+
 ~~~~~~~~~~~~~~~~~~~~~~~~~
 
-.. image:: https://cdn.shopify.com/s/files/1/0304/6901/files/Django-Crash-Course-300x436.jpg
-   :name: Django Crash Course: Covers Django 3.0 and Python 3.8
+.. image:: https://cdn.shopify.com/s/files/1/0304/6901/products/Two-Scoops-of-Django-3-Alpha-Cover_540x_26507b15-e489-470b-8a97-02773dd498d1_1080x.jpg
+   :name: Two Scoops of Django 3.x
    :align: center
-   :alt: Django Crash Course
-   :target: https://www.roygreenfeld.com/products/django-crash-course
+   :alt: Two Scoops of Django
+   :target: https://www.feldroy.com/products//two-scoops-of-django-3-x
 
 Django Crash Course for Django 3.0 and Python 3.8 is the best cheese-themed Django reference in the universe!
 

From 1a701ed70f3275b282d8fc3a1d98fde36e4e35f5 Mon Sep 17 00:00:00 2001
From: Daniel Feldroy <pydanny@users.noreply.github.com>
Date: Wed, 30 Sep 2020 17:53:04 -0700
Subject: [PATCH 1093/2840] Update README.rst

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 64fc521f5..f964635f9 100644
--- a/README.rst
+++ b/README.rst
@@ -120,7 +120,7 @@ Projects that provide financial support to the maintainers:
    :alt: Two Scoops of Django
    :target: https://www.feldroy.com/products//two-scoops-of-django-3-x
 
-Django Crash Course for Django 3.0 and Python 3.8 is the best cheese-themed Django reference in the universe!
+Two Scoops of Django 3.x is the best ice cream-themed Django reference in the universe!
 
 pyup
 ~~~~~~~~~~~~~~~~~~

From f98211ae4cb788a644de8211964add2e905099d2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 1 Oct 2020 06:24:35 +0000
Subject: [PATCH 1094/2840] Bump actions/setup-python from v2.1.2 to v2.1.3

Bumps [actions/setup-python](https://github.com/actions/setup-python) from v2.1.2 to v2.1.3.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v2.1.2...c181ffa198a1248f902bc2f7965d2f9a36c2d7f6)

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/pre-commit-autoupdate.yml | 2 +-
 .github/workflows/update-changelog.yml      | 2 +-
 .github/workflows/update-contributors.yml   | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml
index f07d18033..99881a78b 100644
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2.1.2
+    - uses: actions/setup-python@v2.1.3
       with:
         python-version: 3.8
 
diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index ef9263f31..ce9308555 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -15,7 +15,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Set up Python
-      uses: actions/setup-python@v2.1.2
+      uses: actions/setup-python@v2.1.3
       with:
         python-version: "3.8"
     - name: Install dependencies
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index ba7fd74bc..0bbc9e0ce 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -13,7 +13,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Set up Python
-      uses: actions/setup-python@v2.1.2
+      uses: actions/setup-python@v2.1.3
       with:
         python-version: "3.8"
     - name: Install dependencies

From 58c06e558fd6f455669d624c52bffd5ed16ff6f7 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 1 Oct 2020 08:58:53 -0700
Subject: [PATCH 1095/2840] Update ipdb from 0.13.3 to 0.13.4

---
 {{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 04aef19d1..ebc37fecb 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,7 +1,7 @@
 -r base.txt
 
 Werkzeug==1.0.1 # https://github.com/pallets/werkzeug
-ipdb==0.13.3  # https://github.com/gotcha/ipdb
+ipdb==0.13.4  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 {%- else %}

From 4225c1b1ab6c4b366e6870635140e8af044847ea Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 1 Oct 2020 17:07:17 +0100
Subject: [PATCH 1096/2840] Bump mypy and django-stubs versions

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

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 5a38a4380..0fea0b2d3 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -13,8 +13,8 @@ watchgod==0.6  # https://github.com/samuelcolvin/watchgod
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.770  # https://github.com/python/mypy
-django-stubs==1.5.0  # https://github.com/typeddjango/django-stubs
+mypy==0.782  # https://github.com/python/mypy
+django-stubs==1.6.0  # https://github.com/typeddjango/django-stubs
 pytest==6.1.0  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 

From a9482aec2c0a593a24c82daea04391a7e03a323f Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 1 Oct 2020 18:15:48 +0100
Subject: [PATCH 1097/2840] Remove placeholders title from issue templates

We had a few reports where the title was missing recently
---
 .github/ISSUE_TEMPLATE/bug.md          | 1 -
 .github/ISSUE_TEMPLATE/feature.md      | 1 -
 .github/ISSUE_TEMPLATE/paid-support.md | 4 ----
 .github/ISSUE_TEMPLATE/question.md     | 1 -
 4 files changed, 7 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index b2b577f57..757b5990f 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -1,7 +1,6 @@
 ---
 name: Bug Report
 about: Report a bug
-title: '[bug]'
 labels: bug
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
index 8cc8141aa..ab719770c 100644
--- a/.github/ISSUE_TEMPLATE/feature.md
+++ b/.github/ISSUE_TEMPLATE/feature.md
@@ -1,7 +1,6 @@
 ---
 name: New Feature Proposal
 about: Propose a new feature
-title: '[feature request]'
 labels: enhancement
 ---
 
diff --git a/.github/ISSUE_TEMPLATE/paid-support.md b/.github/ISSUE_TEMPLATE/paid-support.md
index e553329f6..7ebc06476 100644
--- a/.github/ISSUE_TEMPLATE/paid-support.md
+++ b/.github/ISSUE_TEMPLATE/paid-support.md
@@ -1,10 +1,6 @@
 ---
 name: Paid Support Request
 about: Ask Core Team members to help you out
-title: ''
-labels: ''
-assignees: ''
-
 ---
 
 Provided your question goes beyond [regular support](https://github.com/pydanny/cookiecutter-django/issues/new?template=question.md), and/or the task at hand is of timely/high priority nature use the below information to reach out for contributors directly.
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index f24e413f1..9d609eb98 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -1,7 +1,6 @@
 ---
 name: Question
 about: Please consider asking your question on StackOverflow or Slack
-title: '[question]'
 labels: question
 ---
 

From 6c22376f8eed454110f63b1f846bc29d2943bf86 Mon Sep 17 00:00:00 2001
From: Daniel Feldroy <pydanny@users.noreply.github.com>
Date: Thu, 1 Oct 2020 11:13:24 -0700
Subject: [PATCH 1098/2840] Update FUNDING.yml

---
 .github/FUNDING.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index c66e6bc7c..ced9c732b 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -1,7 +1,7 @@
 # These are supported funding model platforms
 
 github: [pydanny, browniebroke]
-patreon: roygreenfeld
+patreon: feldroy
 open_collective: # Replace with a single Open Collective username
 ko_fi: # Replace with a single Ko-fi username
 tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel

From 689c768abf890e54622c67566b31ab6650fb24d7 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 1 Oct 2020 19:16:22 +0100
Subject: [PATCH 1099/2840] Fix mypy error

users/tests/test_views.py:67: error: unused 'type: ignore' comment
---
 .../{{cookiecutter.project_slug}}/users/tests/test_views.py     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
index 18b8da7a6..3638c8f63 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
@@ -64,7 +64,7 @@ class TestUserDetailView:
 
     def test_not_authenticated(self, user: User, rf: RequestFactory):
         request = rf.get("/fake-url/")
-        request.user = AnonymousUser()  # type: ignore
+        request.user = AnonymousUser()
 
         response = user_detail_view(request, username=user.username)
 

From 26f2a3d7bab30b221780b941cbe0ca97d7ad1207 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 1 Oct 2020 20:01:26 +0100
Subject: [PATCH 1100/2840] Fix mypy error

my_awesome_project/users/admin.py:15: error: No overload variant of "__add__" of "tuple" matches argument type "List[Tuple[Optional[str], _FieldOpts]]"
my_awesome_project/users/admin.py:15: note: Possible overload variants:
my_awesome_project/users/admin.py:15: note:     def __add__(self, Tuple[Tuple[str, Dict[str, Tuple[str]]], ...]) -> Tuple[Tuple[str, Dict[str, Tuple[str]]], ...]
my_awesome_project/users/admin.py:15: note:     def __add__(self, Tuple[Any, ...]) -> Tuple[Any, ...]
my_awesome_project/users/admin.py:15: note: Right operand is of type "Union[Tuple[Tuple[Optional[str], _FieldOpts], ...], List[Tuple[Optional[str], _FieldOpts]]]"
---
 .../{{cookiecutter.project_slug}}/users/admin.py              | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py
index cc6efed5f..a68a94a95 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py
@@ -12,6 +12,8 @@ class UserAdmin(auth_admin.UserAdmin):
 
     form = UserChangeForm
     add_form = UserCreationForm
-    fieldsets = (("User", {"fields": ("name",)}),) + auth_admin.UserAdmin.fieldsets
+    fieldsets = (("User", {"fields": ("name",)}),) + tuple(
+        auth_admin.UserAdmin.fieldsets
+    )
     list_display = ["username", "name", "is_superuser"]
     search_fields = ["name"]

From 77b1d06e8741aebd1bca36a79c645910b6f05b05 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 2 Oct 2020 02:18:14 +0000
Subject: [PATCH 1101/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8efd5341a..8b25f9d9e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2020-10-01]
+### Changed
+- Bump actions/setup-python from v2.1.2 to v2.1.3 ([#2869](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2869))
+### Updated
+- Update ipdb to 0.13.4 ([#2873](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2873))
+- Auto-update pre-commit hooks ([#2867](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2867))
+- Update uvicorn to 0.12.1 ([#2866](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2866))
+- Update isort to 5.5.4 ([#2864](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2864))
+- Update sentry-sdk to 0.18.0 ([#2863](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2863))
+- Update djangorestframework to 3.12.1 ([#2862](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2862))
+- Update pytest to 6.1.0 ([#2859](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2859))
+- Update django-debug-toolbar to 3.1.1 ([#2855](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2855))
+
 ## [2020-09-23]
 ### Updated
 - Update sentry-sdk to 0.17.7 ([#2847](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2847))

From f1e87f264dca62e76f869dd29a70be6082252b3e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 3 Oct 2020 00:26:55 +0000
Subject: [PATCH 1102/2840] 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 b8e3601f9..d341c129a 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -21,7 +21,7 @@ repos:
       - id: isort
 
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.8.3
+    rev: 3.8.4
     hooks:
       - id: flake8
         args: ['--config=setup.cfg']

From 25f722d41814ab7409e604310d26c7a49bd13df9 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 2 Oct 2020 17:27:04 -0700
Subject: [PATCH 1103/2840] Update flake8 from 3.8.3 to 3.8.4

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

diff --git a/requirements.txt b/requirements.txt
index 22fabb175..34a7171d2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ binaryornot==0.4.4
 # ------------------------------------------------------------------------------
 black==20.8b1
 isort==5.5.4
-flake8==3.8.3
+flake8==3.8.4
 flake8-isort==4.0.0
 
 # Testing

From 42b41b7215dcb01cba301279c43bd32048640f02 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 2 Oct 2020 17:27:05 -0700
Subject: [PATCH 1104/2840] Update flake8 from 3.8.3 to 3.8.4

---
 {{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 0b6308ea4..d8f164dee 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -25,7 +25,7 @@ sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality
 # ------------------------------------------------------------------------------
-flake8==3.8.3  # https://github.com/PyCQA/flake8
+flake8==3.8.4  # https://github.com/PyCQA/flake8
 flake8-isort==4.0.0  # https://github.com/gforcada/flake8-isort
 coverage==5.3  # https://github.com/nedbat/coveragepy
 black==20.8b1  # https://github.com/ambv/black

From efeba02853449c8a1a4b6814abc1361d7d3e4ea9 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 4 Oct 2020 06:03:31 -0700
Subject: [PATCH 1105/2840] Update pytest from 6.1.0 to 6.1.1

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

diff --git a/requirements.txt b/requirements.txt
index 34a7171d2..4dd32a391 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ flake8-isort==4.0.0
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.20.0
-pytest==6.1.0
+pytest==6.1.1
 pytest-cookies==0.5.1
 pytest-instafail==0.4.2
 pyyaml==5.3.1

From 6e3f6acf075984cff09b31a690613c801700490c Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 4 Oct 2020 06:03:31 -0700
Subject: [PATCH 1106/2840] Update pytest from 6.1.0 to 6.1.1

---
 {{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 11ff8703e..1b5467e69 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -15,7 +15,7 @@ watchgod==0.6  # https://github.com/samuelcolvin/watchgod
 # ------------------------------------------------------------------------------
 mypy==0.782  # https://github.com/python/mypy
 django-stubs==1.6.0  # https://github.com/typeddjango/django-stubs
-pytest==6.1.0  # https://github.com/pytest-dev/pytest
+pytest==6.1.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 
 # Documentation

From d4d1f0c43dd89ecc295be75b078e093bf5bf2f92 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sun, 4 Oct 2020 15:48:52 +0100
Subject: [PATCH 1107/2840] Test extended Docker with Gulp

---
 .travis.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index 6039075a0..bfd008e77 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,7 +18,7 @@ matrix:
     - name: Basic Docker
       script: sh tests/test_docker.sh
     - name: Extended Docker
-      script: sh tests/test_docker.sh use_celery=y use_drf=y
+      script: sh tests/test_docker.sh use_celery=y use_drf=y js_task_runner=Gulp
     - name: Bare metal
       script: sh tests/test_bare.sh use_celery=y use_compressor=y
       services:

From f7bba4401538d8e2dfe67d33e8510dab5fb7b6f8 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sun, 4 Oct 2020 15:56:17 +0100
Subject: [PATCH 1108/2840] Print commands in bash script

---
 tests/test_bare.sh   | 1 +
 tests/test_docker.sh | 1 +
 2 files changed, 2 insertions(+)

diff --git a/tests/test_bare.sh b/tests/test_bare.sh
index cc1f1c36e..61a66239c 100755
--- a/tests/test_bare.sh
+++ b/tests/test_bare.sh
@@ -4,6 +4,7 @@
 # sh tests/test_bare.sh
 
 set -o errexit
+set -x
 
 # Install modern pip to use new resolver:
 # https://blog.python.org/2020/07/upgrade-pip-20-2-changes-20-3.html
diff --git a/tests/test_docker.sh b/tests/test_docker.sh
index 55771c14c..740f8fc22 100755
--- a/tests/test_docker.sh
+++ b/tests/test_docker.sh
@@ -4,6 +4,7 @@
 # sh tests/test_docker.sh
 
 set -o errexit
+set -x
 
 # install test requirements
 pip install -r requirements.txt

From f5bfa97f6ea0b79229c96fc28c740834e0c0f538 Mon Sep 17 00:00:00 2001
From: lcd1232 <8745863+lcd1232@users.noreply.github.com>
Date: Sun, 4 Oct 2020 19:31:09 +0300
Subject: [PATCH 1109/2840] Update
 {{cookiecutter.project_slug}}/config/settings/local.py

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/config/settings/local.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py
index e7f8a2c1e..c69042d53 100644
--- a/{{cookiecutter.project_slug}}/config/settings/local.py
+++ b/{{cookiecutter.project_slug}}/config/settings/local.py
@@ -69,8 +69,10 @@ if env("USE_DOCKER") == "yes":
 
     hostname, _, ips = socket.gethostbyname_ex(socket.gethostname())
     INTERNAL_IPS += [".".join(ip.split(".")[:-1] + ["1"]) for ip in ips]
+    {%- if cookiecutter.js_task_runner == 'Gulp' %}
     _, _, ips = socket.gethostbyname_ex("node")
     INTERNAL_IPS.extend(ips)
+    {%- endif %}
 {%- endif %}
 
 # django-extensions

From 88b841715623d94bb709aaf1a9722b8a135a2de2 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Mon, 5 Oct 2020 02:18:23 +0000
Subject: [PATCH 1110/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8b25f9d9e..f4b064ec4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2020-10-04]
+### Updated
+- Update pytest to 6.1.1 ([#2880](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2880))
+- Update mypy and django-stubs ([#2874](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2874))
+- Auto-update pre-commit hooks ([#2876](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2876))
+- Update flake8 to 3.8.4 ([#2877](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2877))
+
 ## [2020-10-01]
 ### Changed
 - Bump actions/setup-python from v2.1.2 to v2.1.3 ([#2869](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2869))

From 7be855975b65ef55671d3ed2fece6391917416d2 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Wed, 7 Oct 2020 12:33:00 -0400
Subject: [PATCH 1111/2840] Add dedicated websockets package

Ref: https://github.com/encode/uvicorn/issues/797

There used to be a package automatically installed; not anymore I guess. This came from a separate package and not cookiecutter-django, but the installation was similar.
---
 {{cookiecutter.project_slug}}/requirements/base.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 0ea589517..049d7b36d 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -25,6 +25,7 @@ flower==0.9.5  # https://github.com/mher/flower
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
 uvicorn==0.12.1  # https://github.com/encode/uvicorn
+wsproto==0.15.0  # https://github.com/python-hyper/wsproto/
 {%- endif %}
 
 # Django

From c1af517776c22bd7c5460e635d31e8b48467724b Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 8 Oct 2020 00:48:55 -0700
Subject: [PATCH 1112/2840] Update isort from 5.5.4 to 5.6.0

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

diff --git a/requirements.txt b/requirements.txt
index 4dd32a391..38913c322 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==20.8b1
-isort==5.5.4
+isort==5.6.0
 flake8==3.8.4
 flake8-isort==4.0.0
 

From dd0e03d2fbc8606108a4b569d4ece016a96efe55 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 8 Oct 2020 08:18:42 -0700
Subject: [PATCH 1113/2840] Update isort from 5.6.0 to 5.6.1

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

diff --git a/requirements.txt b/requirements.txt
index 38913c322..7ba0da23a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==20.8b1
-isort==5.6.0
+isort==5.6.1
 flake8==3.8.4
 flake8-isort==4.0.0
 

From 90a0b16ae4c318939aa13a971d0bd7dafce22eea Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 9 Oct 2020 00:27:59 +0000
Subject: [PATCH 1114/2840] 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 d341c129a..ea21f6a34 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.5.4
+    rev: 5.6.1
     hooks:
       - id: isort
 

From d8e62229b60f010a8a346b190c5a8ff7d3b5b3af Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 9 Oct 2020 02:18:57 +0000
Subject: [PATCH 1115/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f4b064ec4..5d868da2f 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 -->
 
+## [2020-10-08]
+### Changed
+- Add dedicated websockets package ([#2881](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2881))
+### Updated
+- Update isort to 5.6.0 ([#2882](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2882))
+
 ## [2020-10-04]
 ### Updated
 - Update pytest to 6.1.1 ([#2880](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2880))

From 7a29a427b4880bf8abab7d1f81a554e24ac9e9a1 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 9 Oct 2020 01:16:19 -0700
Subject: [PATCH 1116/2840] Update tox from 3.20.0 to 3.20.1

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

diff --git a/requirements.txt b/requirements.txt
index 7ba0da23a..70c4e049d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8-isort==4.0.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.20.0
+tox==3.20.1
 pytest==6.1.1
 pytest-cookies==0.5.1
 pytest-instafail==0.4.2

From 21c69c7d454f5ea4d7aaf218d7e7e27a7f626c51 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 9 Oct 2020 12:09:05 -0700
Subject: [PATCH 1117/2840] Update mypy from 0.782 to 0.790

---
 {{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 1b5467e69..27e0ea7a0 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -13,7 +13,7 @@ watchgod==0.6  # https://github.com/samuelcolvin/watchgod
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.782  # https://github.com/python/mypy
+mypy==0.790  # https://github.com/python/mypy
 django-stubs==1.6.0  # https://github.com/typeddjango/django-stubs
 pytest==6.1.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar

From 44689a8be620b48f16e49afcbd4a019102bb6785 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 9 Oct 2020 13:10:56 -0700
Subject: [PATCH 1118/2840] Update django-anymail from 8.0 to 8.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 34308c0b2..da5fbdb29 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -22,7 +22,7 @@ django-storages[boto3]==1.10.1  # https://github.com/jschneier/django-storages
 django-storages[google]==1.10.1  # https://github.com/jschneier/django-storages
 {%- endif %}
 {%- if cookiecutter.mail_service == 'Mailgun' %}
-django-anymail[mailgun]==8.0  # https://github.com/anymail/django-anymail
+django-anymail[mailgun]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
 django-anymail[amazon_ses]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}

From be74011ba58eeb54f9edaa8b800816b1f9a4c4f1 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 9 Oct 2020 13:10:57 -0700
Subject: [PATCH 1119/2840] Update django-anymail from 8.0 to 8.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 da5fbdb29..29fa37b85 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -24,7 +24,7 @@ django-storages[google]==1.10.1  # https://github.com/jschneier/django-storages
 {%- if cookiecutter.mail_service == 'Mailgun' %}
 django-anymail[mailgun]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
-django-anymail[amazon_ses]==8.0  # https://github.com/anymail/django-anymail
+django-anymail[amazon_ses]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
 django-anymail[mailjet]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}

From dee930cad5fbf01bb76255f049c3fc986d27154d Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 9 Oct 2020 13:10:58 -0700
Subject: [PATCH 1120/2840] Update django-anymail from 8.0 to 8.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 29fa37b85..93270d1a9 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -26,7 +26,7 @@ django-anymail[mailgun]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
 django-anymail[amazon_ses]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
-django-anymail[mailjet]==8.0  # https://github.com/anymail/django-anymail
+django-anymail[mailjet]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
 django-anymail[mandrill]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}

From d0d50fe800cc0bf01ed7738fc48a4eba3c554d1e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 9 Oct 2020 13:10:58 -0700
Subject: [PATCH 1121/2840] Update django-anymail from 8.0 to 8.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 93270d1a9..526f00734 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -28,7 +28,7 @@ django-anymail[amazon_ses]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
 django-anymail[mailjet]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
-django-anymail[mandrill]==8.0  # https://github.com/anymail/django-anymail
+django-anymail[mandrill]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
 django-anymail[postmark]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}

From fa2f09f27d37bc1791d8f26f74b533df615be3fd Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 9 Oct 2020 13:10:59 -0700
Subject: [PATCH 1122/2840] Update django-anymail from 8.0 to 8.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 526f00734..4a853240b 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -30,7 +30,7 @@ django-anymail[mailjet]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
 django-anymail[mandrill]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
-django-anymail[postmark]==8.0  # https://github.com/anymail/django-anymail
+django-anymail[postmark]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
 django-anymail[sendgrid]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}

From ae526ad8dfc9b8b7d883bcf0083c7805108d236e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 9 Oct 2020 13:11:00 -0700
Subject: [PATCH 1123/2840] Update django-anymail from 8.0 to 8.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 4a853240b..bd8508ac9 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -32,7 +32,7 @@ django-anymail[mandrill]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
 django-anymail[postmark]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
-django-anymail[sendgrid]==8.0  # https://github.com/anymail/django-anymail
+django-anymail[sendgrid]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
 django-anymail[sendinblue]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}

From edd29c3982c50d5c3556162ccf8c9fe9820fb6e6 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 9 Oct 2020 13:11:01 -0700
Subject: [PATCH 1124/2840] Update django-anymail from 8.0 to 8.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 bd8508ac9..50e17d8c5 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -34,7 +34,7 @@ django-anymail[postmark]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
 django-anymail[sendgrid]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
-django-anymail[sendinblue]==8.0  # https://github.com/anymail/django-anymail
+django-anymail[sendinblue]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
 django-anymail[sparkpost]==8.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}

From 55a6674d0c583b551ca8acc02d9d5dda97ccb1f9 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 9 Oct 2020 13:11:02 -0700
Subject: [PATCH 1125/2840] Update django-anymail from 8.0 to 8.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 50e17d8c5..4461d666c 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -36,7 +36,7 @@ django-anymail[sendgrid]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
 django-anymail[sendinblue]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
-django-anymail[sparkpost]==8.0  # https://github.com/anymail/django-anymail
+django-anymail[sparkpost]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
 django-anymail==8.0  # https://github.com/anymail/django-anymail
 {%- endif %}

From e043af811a4f3cb6f9d55518f28c001d404e3885 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 9 Oct 2020 13:11:03 -0700
Subject: [PATCH 1126/2840] Update django-anymail from 8.0 to 8.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 4461d666c..8ad3a42c5 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -38,5 +38,5 @@ django-anymail[sendinblue]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
 django-anymail[sparkpost]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
-django-anymail==8.0  # https://github.com/anymail/django-anymail
+django-anymail==8.1  # https://github.com/anymail/django-anymail
 {%- endif %}

From 53a112b6e40223a702841dc8bc7142c1a64e52be Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 10 Oct 2020 02:19:04 +0000
Subject: [PATCH 1127/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d868da2f..467503da5 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 -->
 
+## [2020-10-09]
+### Updated
+- Auto-update pre-commit hooks ([#2884](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2884))
+- Update isort to 5.6.1 ([#2883](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2883))
+
 ## [2020-10-08]
 ### Changed
 - Add dedicated websockets package ([#2881](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2881))

From 8faa1e478bebcde70b8ec062d67e7d5f98fcd60d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 11 Oct 2020 00:29:47 +0000
Subject: [PATCH 1128/2840] 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 ea21f6a34..8e1b7efb2 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.6.1
+    rev: 5.6.2
     hooks:
       - id: isort
 

From 5e03f51c5c9b03e48ddf25cc76727c4a30c183b6 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 11 Oct 2020 03:05:35 -0700
Subject: [PATCH 1129/2840] Update isort from 5.6.1 to 5.6.3

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

diff --git a/requirements.txt b/requirements.txt
index 7ba0da23a..2b2f16bb2 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==20.8b1
-isort==5.6.1
+isort==5.6.3
 flake8==3.8.4
 flake8-isort==4.0.0
 

From 62b20fd9068613775fe06a96bcb8a4832129d45e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 00:29:27 +0000
Subject: [PATCH 1130/2840] 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 8e1b7efb2..61534c5a1 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.6.2
+    rev: 5.6.3
     hooks:
       - id: isort
 

From ea0856f52f8d2e3165cb2810a584e86d1fda350a Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Mon, 12 Oct 2020 02:19:53 +0000
Subject: [PATCH 1131/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 467503da5..a04ec5eeb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2020-10-11]
+### Updated
+- Auto-update pre-commit hooks ([#2890](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2890))
+- Update isort to 5.6.3 ([#2891](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2891))
+- Update django-anymail to 8.1 ([#2887](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2887))
+- Update tox to 3.20.1 ([#2885](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2885))
+
 ## [2020-10-09]
 ### Updated
 - Auto-update pre-commit hooks ([#2884](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2884))

From 2b5b5a8fb6ca403af2f83eb6710b508dc10c18fe Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 12 Oct 2020 06:52:07 +0000
Subject: [PATCH 1132/2840] Bump stefanzweifel/git-auto-commit-action from
 v4.5.1 to v4.6.0

Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from v4.5.1 to v4.6.0.
- [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases)
- [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.5.1...5c9bfe7477fd67ca1ffc9fed4a69fb7a6a46dcfe)

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-changelog.yml    | 2 +-
 .github/workflows/update-contributors.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index ce9308555..eded07068 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -28,7 +28,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Commit changes
-      uses: stefanzweifel/git-auto-commit-action@v4.5.1
+      uses: stefanzweifel/git-auto-commit-action@v4.6.0
       with:
         commit_message: Update Changelog
         file_pattern: CHANGELOG.md
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 0bbc9e0ce..20a8c75c7 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -24,7 +24,7 @@ jobs:
       run: python scripts/update_contributors.py
 
     - name: Commit changes
-      uses: stefanzweifel/git-auto-commit-action@v4.5.1
+      uses: stefanzweifel/git-auto-commit-action@v4.6.0
       with:
         commit_message: Update Contributors
         file_pattern: CONTRIBUTORS.md .github/contributors.json

From 5cc1cb2039e5b51484df42cf04628f78d24d02d8 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 13 Oct 2020 02:19:53 +0000
Subject: [PATCH 1133/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a04ec5eeb..4e8480fc7 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 -->
 
+## [2020-10-12]
+### Changed
+- Bump stefanzweifel/git-auto-commit-action from v4.5.1 to v4.6.0 ([#2893](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2893))
+### Updated
+- Auto-update pre-commit hooks ([#2892](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2892))
+
 ## [2020-10-11]
 ### Updated
 - Auto-update pre-commit hooks ([#2890](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2890))

From 8141e29284a1ce9cb2bbe9520d4bcb918bf4bcb0 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 13 Oct 2020 02:35:34 -0700
Subject: [PATCH 1134/2840] Update isort from 5.6.3 to 5.6.4

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

diff --git a/requirements.txt b/requirements.txt
index 711c4e54c..6c04acb98 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==20.8b1
-isort==5.6.3
+isort==5.6.4
 flake8==3.8.4
 flake8-isort==4.0.0
 

From acaeb0d95073b0aa34a49582320e168da82c6a55 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 13 Oct 2020 05:31:37 -0700
Subject: [PATCH 1135/2840] Update sentry-sdk from 0.18.0 to 0.19.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 8ad3a42c5..bb516624f 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.18.0  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.19.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 a26d57a6e767f45d071a39890d922665e8aa24c5 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 14 Oct 2020 00:29:18 +0000
Subject: [PATCH 1136/2840] 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 61534c5a1..5dc5c1c45 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.6.3
+    rev: 5.6.4
     hooks:
       - id: isort
 

From fdce700634dff192656bf0516a596096f91f4815 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 14 Oct 2020 02:20:15 +0000
Subject: [PATCH 1137/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e8480fc7..1727ce13d 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 -->
 
+## [2020-10-13]
+### Updated
+- Update isort to 5.6.4 ([#2895](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2895))
+
 ## [2020-10-12]
 ### Changed
 - Bump stefanzweifel/git-auto-commit-action from v4.5.1 to v4.6.0 ([#2893](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2893))

From 4e6cc3ca6012ffeccf4895c2381e2a60976804ce Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 14 Oct 2020 15:58:12 -0700
Subject: [PATCH 1138/2840] Update pillow from 7.2.0 to 8.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 049d7b36d..e3fe6b541 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,6 +1,6 @@
 pytz==2020.1  # https://github.com/stub42/pytz
 python-slugify==4.0.1  # https://github.com/un33k/python-slugify
-Pillow==7.2.0  # https://github.com/python-pillow/Pillow
+Pillow==8.0.0  # 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 19ebbed30a4384b2d80932ceb9801ee5d973cf2d Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 15 Oct 2020 02:20:03 +0000
Subject: [PATCH 1139/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1727ce13d..6b7e3391a 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 -->
 
+## [2020-10-14]
+### Updated
+- Auto-update pre-commit hooks ([#2897](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2897))
+- Update sentry-sdk to 0.19.0 ([#2896](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2896))
+
 ## [2020-10-13]
 ### Updated
 - Update isort to 5.6.4 ([#2895](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2895))

From 7223ab50658024ec821c3c0f60c9bdf9b2fa66ad Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 15 Oct 2020 12:58:21 +0100
Subject: [PATCH 1140/2840] Pin official GH actions to the major digit

---
 .github/workflows/pre-commit-autoupdate.yml | 2 +-
 .github/workflows/update-changelog.yml      | 4 ++--
 .github/workflows/update-contributors.yml   | 4 ++--
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml
index 99881a78b..9937cdebc 100644
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2.1.3
+    - uses: actions/setup-python@v2
       with:
         python-version: 3.8
 
diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index eded07068..b6e2f4bee 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -15,9 +15,9 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Set up Python
-      uses: actions/setup-python@v2.1.3
+      uses: actions/setup-python@v2
       with:
-        python-version: "3.8"
+        python-version: 3.8
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 20a8c75c7..f3999157d 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -13,9 +13,9 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Set up Python
-      uses: actions/setup-python@v2.1.3
+      uses: actions/setup-python@v2
       with:
-        python-version: "3.8"
+        python-version: 3.8
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

From 4ecc00ea6cdd90b55b49b3d77ad6866c36d070d5 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 15 Oct 2020 12:30:53 -0700
Subject: [PATCH 1141/2840] Update django-allauth from 0.42.0 to 0.43.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 e3fe6b541..e0045f418 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -33,7 +33,7 @@ wsproto==0.15.0  # https://github.com/python-hyper/wsproto/
 django==3.0.10  # pyup: < 3.1  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==4.0.0  # https://github.com/jazzband/django-model-utils
-django-allauth==0.42.0  # https://github.com/pennersr/django-allauth
+django-allauth==0.43.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.9.2  # https://github.com/django-crispy-forms/django-crispy-forms
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==2.4  # https://github.com/django-compressor/django-compressor

From 520dcfef36f855071d4082c66a19876fb45ae0b0 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 16 Oct 2020 02:19:55 +0000
Subject: [PATCH 1142/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6b7e3391a..5a7774072 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 -->
 
+## [2020-10-15]
+### Updated
+- Update pillow to 8.0.0 ([#2898](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2898))
+
 ## [2020-10-14]
 ### Updated
 - Auto-update pre-commit hooks ([#2897](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2897))

From 58b0359af6458a6b2b4ddf6c16b23cb952bf6630 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 16 Oct 2020 10:36:51 -0700
Subject: [PATCH 1143/2840] Update pytest-django from 3.10.0 to 4.0.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 1b5467e69..5aaf740b5 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -42,4 +42,4 @@ factory-boy==3.0.1  # https://github.com/FactoryBoy/factory_boy
 django-debug-toolbar==3.1.1  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.0.9  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
-pytest-django==3.10.0  # https://github.com/pytest-dev/pytest-django
+pytest-django==4.0.0  # https://github.com/pytest-dev/pytest-django

From 27b005202ddd3480d9d50c3f05dce79190a8ca50 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sun, 18 Oct 2020 02:19:43 +0000
Subject: [PATCH 1144/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a7774072..700f3c691 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 -->
 
+## [2020-10-17]
+### Updated
+- Update django-allauth to 0.43.0 ([#2901](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2901))
+- Update pytest-django to 4.0.0 ([#2903](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2903))
+
 ## [2020-10-15]
 ### Updated
 - Update pillow to 8.0.0 ([#2898](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2898))

From 3d87a420550f75370db3699f209addd890a04cb5 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 19 Oct 2020 03:32:37 -0700
Subject: [PATCH 1145/2840] Update sentry-sdk from 0.19.0 to 0.19.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 bb516624f..58714e5ca 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.19.0  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.19.1  # 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 81c9a4a76ac2c201fa81393d89f70726bad76e88 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 19 Oct 2020 09:13:14 -0700
Subject: [PATCH 1146/2840] Update uvicorn from 0.12.1 to 0.12.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 e0045f418..08f8894c2 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -24,7 +24,7 @@ flower==0.9.5  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn==0.12.1  # https://github.com/encode/uvicorn
+uvicorn==0.12.2  # https://github.com/encode/uvicorn
 wsproto==0.15.0  # https://github.com/python-hyper/wsproto/
 {%- endif %}
 

From 4b97071cfe83c6ef48b5c383b14b8bbbe15c0cb4 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 20 Oct 2020 02:19:25 +0000
Subject: [PATCH 1147/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 700f3c691..ccb84bd81 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 -->
 
+## [2020-10-19]
+### Updated
+- Update sentry-sdk to 0.19.1 ([#2905](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2905))
+
 ## [2020-10-17]
 ### Updated
 - Update django-allauth to 0.43.0 ([#2901](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2901))

From 8e229ce0e02f7c15fb1fb9760a38adb2b82b6dc7 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 19 Oct 2020 23:39:07 -0700
Subject: [PATCH 1148/2840] Update django-celery-beat from 2.0.0 to 2.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 e0045f418..90661fd83 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -18,7 +18,7 @@ hiredis==1.1.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.0.0  # https://github.com/celery/django-celery-beat
+django-celery-beat==2.1.0  # https://github.com/celery/django-celery-beat
 {%- if cookiecutter.use_docker == 'y' %}
 flower==0.9.5  # https://github.com/mher/flower
 {%- endif %}

From eb400e498034ec1fcb3d8eb8167851588d9cc1ec Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 22 Oct 2020 15:52:32 -0700
Subject: [PATCH 1149/2840] Update pillow from 8.0.0 to 8.0.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 e0045f418..a0dc1aa98 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,6 +1,6 @@
 pytz==2020.1  # https://github.com/stub42/pytz
 python-slugify==4.0.1  # https://github.com/un33k/python-slugify
-Pillow==8.0.0  # https://github.com/python-pillow/Pillow
+Pillow==8.0.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 edbc4d3a8c248ab802a34774ddc1c356a5687c35 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 22 Oct 2020 15:52:35 -0700
Subject: [PATCH 1150/2840] Update pytest-django from 4.0.0 to 4.1.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 5aaf740b5..e5d579325 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -42,4 +42,4 @@ factory-boy==3.0.1  # https://github.com/FactoryBoy/factory_boy
 django-debug-toolbar==3.1.1  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.0.9  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
-pytest-django==4.0.0  # https://github.com/pytest-dev/pytest-django
+pytest-django==4.1.0  # https://github.com/pytest-dev/pytest-django

From f2d289588ba1bbe1caf9edfe0e9a7349240dd557 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 24 Oct 2020 11:04:52 -0700
Subject: [PATCH 1151/2840] Update sh from 1.14.0 to 1.14.1

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

diff --git a/requirements.txt b/requirements.txt
index 6c04acb98..b53316a3b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 cookiecutter==1.7.2
-sh==1.14.0
+sh==1.14.1
 binaryornot==0.4.4
 
 # Code quality

From 2b3cd5178935a0534e5e6a8c82d8c5385b1e7b66 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Oct 2020 07:10:28 +0000
Subject: [PATCH 1152/2840] Bump stefanzweifel/git-auto-commit-action from
 v4.6.0 to v4.7.2

Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from v4.6.0 to v4.7.2.
- [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases)
- [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.6.0...bbd291750d2526367d915d5197485331dc2d8dc7)

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-changelog.yml    | 2 +-
 .github/workflows/update-contributors.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index b6e2f4bee..0c72c7819 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -28,7 +28,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Commit changes
-      uses: stefanzweifel/git-auto-commit-action@v4.6.0
+      uses: stefanzweifel/git-auto-commit-action@v4.7.2
       with:
         commit_message: Update Changelog
         file_pattern: CHANGELOG.md
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index f3999157d..4ce1c76f1 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -24,7 +24,7 @@ jobs:
       run: python scripts/update_contributors.py
 
     - name: Commit changes
-      uses: stefanzweifel/git-auto-commit-action@v4.6.0
+      uses: stefanzweifel/git-auto-commit-action@v4.7.2
       with:
         commit_message: Update Contributors
         file_pattern: CONTRIBUTORS.md .github/contributors.json

From 9c0f056817bf51b975e3264dbbed12e3af36324c Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 28 Oct 2020 02:10:16 -0700
Subject: [PATCH 1153/2840] Update django-stubs from 1.6.0 to 1.7.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 5aaf740b5..5ca2dcdc6 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -14,7 +14,7 @@ watchgod==0.6  # https://github.com/samuelcolvin/watchgod
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.782  # https://github.com/python/mypy
-django-stubs==1.6.0  # https://github.com/typeddjango/django-stubs
+django-stubs==1.7.0  # https://github.com/typeddjango/django-stubs
 pytest==6.1.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 

From 21d8bf5fc3b39a4cd723c526b197e123244581fe Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 28 Oct 2020 23:59:02 -0700
Subject: [PATCH 1154/2840] Update pytest from 6.1.1 to 6.1.2

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

diff --git a/requirements.txt b/requirements.txt
index 6c04acb98..beb028244 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ flake8-isort==4.0.0
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.20.1
-pytest==6.1.1
+pytest==6.1.2
 pytest-cookies==0.5.1
 pytest-instafail==0.4.2
 pyyaml==5.3.1

From 5224641a16797cfb469416f5e96c82612a11239c Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 28 Oct 2020 23:59:03 -0700
Subject: [PATCH 1155/2840] Update pytest from 6.1.1 to 6.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 5aaf740b5..be0063ee8 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -15,7 +15,7 @@ watchgod==0.6  # https://github.com/samuelcolvin/watchgod
 # ------------------------------------------------------------------------------
 mypy==0.782  # https://github.com/python/mypy
 django-stubs==1.6.0  # https://github.com/typeddjango/django-stubs
-pytest==6.1.1  # https://github.com/pytest-dev/pytest
+pytest==6.1.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 
 # Documentation

From b14a033c8b295dd15085025beebb91a5710ff31f Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 30 Oct 2020 15:44:46 -0700
Subject: [PATCH 1156/2840] Update pre-commit from 2.7.1 to 2.8.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 5aaf740b5..17d28c4dc 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -33,7 +33,7 @@ pylint-django==2.3.0  # 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.7.1  # https://github.com/pre-commit/pre-commit
+pre-commit==2.8.2  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From b86ede6079abeb7adf228b5191526dd38807ae96 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 2 Nov 2020 06:37:16 -0800
Subject: [PATCH 1157/2840] Update pytz from 2020.1 to 2020.4

---
 {{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 e0045f418..8dcf820fb 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,4 +1,4 @@
-pytz==2020.1  # https://github.com/stub42/pytz
+pytz==2020.4  # https://github.com/stub42/pytz
 python-slugify==4.0.1  # https://github.com/un33k/python-slugify
 Pillow==8.0.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}

From 510ba4ca8a0e2e0537689d9260e61b98afa0abf5 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 2 Nov 2020 06:37:19 -0800
Subject: [PATCH 1158/2840] Update django from 3.0.10 to 3.0.11

---
 {{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 e0045f418..39b3fc2a7 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -30,7 +30,7 @@ wsproto==0.15.0  # https://github.com/python-hyper/wsproto/
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.0.10  # pyup: < 3.1  # https://www.djangoproject.com/
+django==3.0.11  # pyup: < 3.1  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==4.0.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.43.0  # https://github.com/pennersr/django-allauth

From 2bd2e4a8fccb6265be6978e4d27831beeab52009 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 2 Nov 2020 06:37:22 -0800
Subject: [PATCH 1159/2840] Update sphinx from 3.2.1 to 3.3.0

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

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 5aaf740b5..7cce652cc 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==3.2.1  # https://github.com/sphinx-doc/sphinx
+sphinx==3.3.0  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From 4a5717c831db7e5731a9b7dda938b25b775df660 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 2 Nov 2020 15:47:08 -0800
Subject: [PATCH 1160/2840] Update sentry-sdk from 0.19.1 to 0.19.2

---
 {{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 58714e5ca..157ac92a3 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.19.1  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.19.2  # 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 b40a76eb13c88ebfb064db0352cd98ed099889a4 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 3 Nov 2020 23:35:24 +0000
Subject: [PATCH 1161/2840] Bump template version

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

diff --git a/setup.py b/setup.py
index 8a5b0b8ce..c72ba1c9d 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.0.10"
+version = "3.0.11"
 
 if sys.argv[-1] == "tag":
     os.system(f'git tag -a {version} -m "version {version}"')

From 63ea6bca763a2fc272a58e75bea3d07f5c188eba Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 4 Nov 2020 00:19:56 +0000
Subject: [PATCH 1162/2840] 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 5dc5c1c45..55368bb73 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -4,7 +4,7 @@ fail_fast: true
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.2.0
+    rev: v3.3.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer

From f99a0af4c0618d774cd7d83e7498a5f8cba11a4d Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 4 Nov 2020 02:14:42 +0000
Subject: [PATCH 1163/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ccb84bd81..2e802de11 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,20 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2020-11-03]
+### Updated
+- Update sentry-sdk to 0.19.2 ([#2926](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2926))
+- Update sphinx to 3.3.0 ([#2925](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2925))
+- Update django to 3.0.11 ([#2924](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2924))
+- Update pytz to 2020.4 ([#2923](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2923))
+- Update pre-commit to 2.8.2 ([#2919](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2919))
+- Update pytest to 6.1.2 ([#2917](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2917))
+- Update sh to 1.14.1 ([#2912](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2912))
+- Update pytest-django to 4.1.0 ([#2911](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2911))
+- Update pillow to 8.0.1 ([#2910](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2910))
+- Update django-celery-beat to 2.1.0 ([#2907](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2907))
+- Update uvicorn to 0.12.2 ([#2906](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2906))
+
 ## [2020-10-19]
 ### Updated
 - Update sentry-sdk to 0.19.1 ([#2905](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2905))

From 607c9676f52a3554747c51c8b9c243315ddbc99d Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwangpython@gmail.com>
Date: Wed, 4 Nov 2020 11:54:21 -0500
Subject: [PATCH 1164/2840] Use defer for script tags (Fix #2922) * This way,
 scripts from external URLs are loaded asynchronously. By putting it at the
 top of the file, the browser parses it first, downloads it while continuing
 to parse the HTML, and then executes on parsing finish * Additionally,
 developers will not need to use $(window).ready() or the like in their files
 anymore. * Added inline_javascript tag in case anyone wants to use the bottom
 of the HTML page to execute some Javascript. Using defer here has no effect
 as inline scripts defer by default

Signed-off-by: Andrew-Chen-Wang <acwangpython@gmail.com>
---
 .../templates/account/email.html              |  2 +-
 .../templates/base.html                       | 51 ++++++++++---------
 2 files changed, 28 insertions(+), 25 deletions(-)

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 78d997365..8b4669bb6 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html
@@ -59,7 +59,7 @@
 {% endblock %}
 
 
-{% block javascript %}
+{% block inline_javascript %}
 {{ block.super }}
 <script type="text/javascript">
 (function() {
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
index 99fe27ab0..127068878 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -31,6 +31,30 @@
     {% endraw %}{% endif %}{% raw %}
     {% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %}
     {% endblock %}
+    <!-- Le javascript
+    ================================================== -->
+    {# Placed at the top of the document so pages load faster with defer #}
+    {% block javascript %}
+      {% endraw %}{% if cookiecutter.custom_bootstrap_compilation == "y" and cookiecutter.js_task_runner == "Gulp" %}{% raw %}
+      <!-- Vendor dependencies bundled as one file-->
+      {% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% compress js %}{% endraw %}{% endif %}{% raw %}
+      <script defer src="{% static 'js/vendors.js' %}"></script>
+      {% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %}
+      {% endraw %}{% else %}{% raw %}
+      <!-- Bootstrap JS and its dependencies-->
+      <script defer src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
+      <script defer src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
+      <script defer src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
+
+      <!-- Your stuff: Third-party javascript libraries go here -->
+      {% endraw %}{% endif %}{% raw %}
+
+      <!-- place project specific Javascript in this file -->
+      {% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% compress js %}{% endraw %}{% endif %}{% raw %}
+      <script defer src="{% static 'js/project.js' %}"></script>
+      {% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %}
+
+    {% endblock javascript %}
 
   </head>
 
@@ -92,30 +116,9 @@
 
     {% block modal %}{% endblock modal %}
 
-    <!-- Le javascript
-    ================================================== -->
-    <!-- Placed at the end of the document so the pages load faster -->
-    {% block javascript %}
-      {% endraw %}{% if cookiecutter.custom_bootstrap_compilation == "y" and cookiecutter.js_task_runner == "Gulp" %}{% raw %}
-      <!-- Vendor dependencies bundled as one file-->
-      {% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% compress js %}{% endraw %}{% endif %}{% raw %}
-      <script src="{% static 'js/vendors.js' %}"></script>
-      {% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %}
-      {% endraw %}{% else %}{% raw %}
-      <!-- Bootstrap JS and its dependencies-->
-      <script src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-      <script src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
-      <script src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
-
-      <!-- Your stuff: Third-party javascript libraries go here -->
-      {% endraw %}{% endif %}{% raw %}
-
-      <!-- place project specific Javascript in this file -->
-      {% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% compress js %}{% endraw %}{% endif %}{% raw %}
-      <script src="{% static 'js/project.js' %}"></script>
-      {% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %}
-
-    {% endblock javascript %}
+    {% block inline_javascript %}
+    {# Script tags with only code, no src (defer by default) #}
+    {% endblock inline_javascript %}
   </body>
 </html>
  {% endraw %}

From 72da0bfa9cb7897b03a5ebaef3f2ece3d31247db Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Wed, 4 Nov 2020 12:17:02 -0500
Subject: [PATCH 1165/2840] Fix docs service and add RTD support (#2920)

Co-authored-by: Andrew-Chen-Wang <Andrew-Chen-Wang@users.noreply.github.com>
Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 docs/document.rst                             |  19 ++++++++++++++++--
 .../.readthedocs.yml                          |   9 +++++++++
 .../compose/local/docs/Dockerfile             |   6 ++++--
 .../compose/local/docs/start                  |   7 +++++++
 {{cookiecutter.project_slug}}/docs/Makefile   |   2 +-
 {{cookiecutter.project_slug}}/docs/conf.py    |  18 ++++++++++++-----
 .../docs/{_source => }/howto.rst              |   0
 .../docs/{_source => }/index.rst              |   0
 .../{_source => }/pycharm/configuration.rst   |   0
 .../docs/{_source => }/pycharm/images/1.png   | Bin
 .../docs/{_source => }/pycharm/images/2.png   | Bin
 .../docs/{_source => }/pycharm/images/3.png   | Bin
 .../docs/{_source => }/pycharm/images/4.png   | Bin
 .../docs/{_source => }/pycharm/images/7.png   | Bin
 .../docs/{_source => }/pycharm/images/8.png   | Bin
 .../docs/{_source => }/pycharm/images/f1.png  | Bin
 .../docs/{_source => }/pycharm/images/f2.png  | Bin
 .../docs/{_source => }/pycharm/images/f3.png  | Bin
 .../docs/{_source => }/pycharm/images/f4.png  | Bin
 .../{_source => }/pycharm/images/issue1.png   | Bin
 .../{_source => }/pycharm/images/issue2.png   | Bin
 .../docs/{_source => }/users.rst              |   0
 {{cookiecutter.project_slug}}/local.yml       |   3 ++-
 23 files changed, 53 insertions(+), 11 deletions(-)
 create mode 100644 {{cookiecutter.project_slug}}/.readthedocs.yml
 create mode 100644 {{cookiecutter.project_slug}}/compose/local/docs/start
 rename {{cookiecutter.project_slug}}/docs/{_source => }/howto.rst (100%)
 rename {{cookiecutter.project_slug}}/docs/{_source => }/index.rst (100%)
 rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/configuration.rst (100%)
 rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/1.png (100%)
 rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/2.png (100%)
 rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/3.png (100%)
 rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/4.png (100%)
 rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/7.png (100%)
 rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/8.png (100%)
 rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/f1.png (100%)
 rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/f2.png (100%)
 rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/f3.png (100%)
 rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/f4.png (100%)
 rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/issue1.png (100%)
 rename {{cookiecutter.project_slug}}/docs/{_source => }/pycharm/images/issue2.png (100%)
 rename {{cookiecutter.project_slug}}/docs/{_source => }/users.rst (100%)

diff --git a/docs/document.rst b/docs/document.rst
index 15a5396e1..a30979094 100644
--- a/docs/document.rst
+++ b/docs/document.rst
@@ -15,15 +15,30 @@ If you set up your project to `develop locally with docker`_, run the following
 
 Navigate to port 7000 on your host to see the documentation. This will be opened automatically at `localhost`_ for local, non-docker development.
 
+Note: using Docker for documentation sets up a temporary SQLite file by setting the environment variable ``DATABASE_URL=sqlite:///readthedocs.db`` in ``docs/conf.py`` to avoid a dependency on PostgreSQL.
+
 Generate API documentation
 ----------------------------
 
-Edit the ``docs/_source`` files and project application docstrings to create your documentation.
+Edit the ``docs`` files and project application docstrings to create your documentation.
 
-Sphinx can automatically include class and function signatures and docstrings in generated documentation. 
+Sphinx can automatically include class and function signatures and docstrings in generated documentation.
 See the generated project documentation for more examples.
 
+Setting up ReadTheDocs
+----------------------
+
+To setup your documentation on `ReadTheDocs`_, you must
+
+1. Go to `ReadTheDocs`_ and login/create an account
+2. Add your GitHub repository
+3. Trigger a build
+
+Additionally, you can auto-build Pull Request previews, but `you must enable it`_.
+
 .. _localhost: http://localhost:7000/
 .. _Sphinx: https://www.sphinx-doc.org/en/master/index.html
 .. _develop locally: ./developing-locally.html
 .. _develop locally with docker: ./developing-locally-docker.html
+.. _ReadTheDocs: https://readthedocs.org/
+.. _you must enable it: https://docs.readthedocs.io/en/latest/guides/autobuild-docs-for-pull-requests.html#autobuild-documentation-for-pull-requests
diff --git a/{{cookiecutter.project_slug}}/.readthedocs.yml b/{{cookiecutter.project_slug}}/.readthedocs.yml
new file mode 100644
index 000000000..b193a85e0
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/.readthedocs.yml
@@ -0,0 +1,9 @@
+version: 2
+
+sphinx:
+  configuration: docs/conf.py
+
+python:
+  version: 3.8
+  install:
+    - requirements: requirements/local.txt
diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
index 7736777b3..315fdd405 100644
--- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
@@ -24,6 +24,8 @@ COPY ./requirements /requirements
 # All imports needed for autodoc.
 RUN pip install -r /requirements/local.txt -r /requirements/production.txt
 
-WORKDIR /docs
+COPY ./compose/local/docs/start /start-docs
+RUN sed -i 's/\r$//g' /start-docs
+RUN chmod +x /start-docs
 
-CMD make livehtml
+WORKDIR /docs
diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/start b/{{cookiecutter.project_slug}}/compose/local/docs/start
new file mode 100644
index 000000000..fd2e0de6a
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/compose/local/docs/start
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+set -o errexit
+set -o pipefail
+set -o nounset
+
+make livehtml
diff --git a/{{cookiecutter.project_slug}}/docs/Makefile b/{{cookiecutter.project_slug}}/docs/Makefile
index 4f772cade..0b56e1f86 100644
--- a/{{cookiecutter.project_slug}}/docs/Makefile
+++ b/{{cookiecutter.project_slug}}/docs/Makefile
@@ -5,7 +5,7 @@
 # from the environment for the first two.
 SPHINXOPTS    ?= 
 SPHINXBUILD   ?= sphinx-build -c .
-SOURCEDIR     = ./_source
+SOURCEDIR     = .
 BUILDDIR      = ./_build
 {%- if cookiecutter.use_docker == 'y' %}
 APP = /app
diff --git a/{{cookiecutter.project_slug}}/docs/conf.py b/{{cookiecutter.project_slug}}/docs/conf.py
index 691f351e5..c640e1c63 100644
--- a/{{cookiecutter.project_slug}}/docs/conf.py
+++ b/{{cookiecutter.project_slug}}/docs/conf.py
@@ -14,11 +14,19 @@ import os
 import sys
 import django
 
-{% if cookiecutter.use_docker == 'y' %}
-sys.path.insert(0, os.path.abspath("/app"))
-os.environ.setdefault("DATABASE_URL", "")
-{% else %}
-sys.path.insert(0, os.path.abspath(".."))
+if os.getenv("READTHEDOCS", default=False) == "True":
+    sys.path.insert(0, os.path.abspath(".."))
+    os.environ["DJANGO_READ_DOT_ENV_FILE"] = "True"
+    os.environ["USE_DOCKER"] = "no"
+else:
+{%- if cookiecutter.use_docker == 'y' %}
+    sys.path.insert(0, os.path.abspath("/app"))
+{%- else %}
+    sys.path.insert(0, os.path.abspath(".."))
+{%- endif %}
+os.environ["DATABASE_URL"] = "sqlite:///readthedocs.db"
+{%- if cookiecutter.use_celery == 'y' %}
+os.environ["CELERY_BROKER_URL"] = os.getenv("REDIS_URL", "redis://redis:6379")
 {%- endif %}
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local")
 django.setup()
diff --git a/{{cookiecutter.project_slug}}/docs/_source/howto.rst b/{{cookiecutter.project_slug}}/docs/howto.rst
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/howto.rst
rename to {{cookiecutter.project_slug}}/docs/howto.rst
diff --git a/{{cookiecutter.project_slug}}/docs/_source/index.rst b/{{cookiecutter.project_slug}}/docs/index.rst
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/index.rst
rename to {{cookiecutter.project_slug}}/docs/index.rst
diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/configuration.rst b/{{cookiecutter.project_slug}}/docs/pycharm/configuration.rst
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/configuration.rst
rename to {{cookiecutter.project_slug}}/docs/pycharm/configuration.rst
diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/1.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/1.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/1.png
rename to {{cookiecutter.project_slug}}/docs/pycharm/images/1.png
diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/2.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/2.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/2.png
rename to {{cookiecutter.project_slug}}/docs/pycharm/images/2.png
diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/3.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/3.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/3.png
rename to {{cookiecutter.project_slug}}/docs/pycharm/images/3.png
diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/4.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/4.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/4.png
rename to {{cookiecutter.project_slug}}/docs/pycharm/images/4.png
diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/7.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/7.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/7.png
rename to {{cookiecutter.project_slug}}/docs/pycharm/images/7.png
diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/8.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/8.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/8.png
rename to {{cookiecutter.project_slug}}/docs/pycharm/images/8.png
diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/f1.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/f1.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/f1.png
rename to {{cookiecutter.project_slug}}/docs/pycharm/images/f1.png
diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/f2.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/f2.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/f2.png
rename to {{cookiecutter.project_slug}}/docs/pycharm/images/f2.png
diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/f3.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/f3.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/f3.png
rename to {{cookiecutter.project_slug}}/docs/pycharm/images/f3.png
diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/f4.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/f4.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/f4.png
rename to {{cookiecutter.project_slug}}/docs/pycharm/images/f4.png
diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/issue1.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/issue1.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/issue1.png
rename to {{cookiecutter.project_slug}}/docs/pycharm/images/issue1.png
diff --git a/{{cookiecutter.project_slug}}/docs/_source/pycharm/images/issue2.png b/{{cookiecutter.project_slug}}/docs/pycharm/images/issue2.png
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/pycharm/images/issue2.png
rename to {{cookiecutter.project_slug}}/docs/pycharm/images/issue2.png
diff --git a/{{cookiecutter.project_slug}}/docs/_source/users.rst b/{{cookiecutter.project_slug}}/docs/users.rst
similarity index 100%
rename from {{cookiecutter.project_slug}}/docs/_source/users.rst
rename to {{cookiecutter.project_slug}}/docs/users.rst
diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index a6cbe5430..e285f3498 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -51,7 +51,8 @@ services:
       - ./{{ cookiecutter.project_slug }}:/app/{{ cookiecutter.project_slug }}:z
     ports:
       - "7000:7000"
-    
+    command: /start-docs
+
   {%- if cookiecutter.use_mailhog == 'y' %}
 
   mailhog:

From f8a239d4f9844031792993c085be2e13b67dbb10 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 5 Nov 2020 02:15:30 +0000
Subject: [PATCH 1166/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e802de11..3748e8c18 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2020-11-04]
+### Changed
+- Fix docs service and add RTD support ([#2920](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2920))
+- Bump stefanzweifel/git-auto-commit-action from v4.6.0 to v4.7.2 ([#2914](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2914))
+### Updated
+- Auto-update pre-commit hooks ([#2908](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2908))
+- Update mypy to 0.790 ([#2886](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2886))
+- Update django-stubs to 1.7.0 ([#2916](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2916))
+
 ## [2020-11-03]
 ### Updated
 - Update sentry-sdk to 0.19.2 ([#2926](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2926))

From 3750aff3949eb2b77cf41dfd37978623863bd619 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 5 Nov 2020 17:50:07 -0800
Subject: [PATCH 1167/2840] Update djangorestframework from 3.12.1 to 3.12.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 8b9af7a28..ca92f81a6 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -41,6 +41,6 @@ django-compressor==2.4  # https://github.com/django-compressor/django-compressor
 django-redis==4.12.1  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == "y" %}
 # Django REST Framework
-djangorestframework==3.12.1  # https://github.com/encode/django-rest-framework
+djangorestframework==3.12.2  # https://github.com/encode/django-rest-framework
 django-cors-headers==3.5.0 # https://github.com/adamchainz/django-cors-headers
 {%- endif %}

From 041ecb0fc648378fd4570e6cb02f9800efb6845f Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 7 Nov 2020 02:15:42 +0000
Subject: [PATCH 1168/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3748e8c18..ffc571c7b 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 -->
 
+## [2020-11-06]
+### Updated
+- Update djangorestframework to 3.12.2 ([#2930](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2930))
+
 ## [2020-11-04]
 ### Changed
 - Fix docs service and add RTD support ([#2920](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2920))

From 1abfd539e398516130944891660eb8959c22e7b7 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 9 Nov 2020 18:46:19 +0000
Subject: [PATCH 1169/2840] Basic CI workflow using github actions

---
 .github/workflows/ci.yml | 33 +++++++++++++++++++++++++++++++++
 .travis.yml              | 36 ------------------------------------
 2 files changed, 33 insertions(+), 36 deletions(-)
 create mode 100644 .github/workflows/ci.yml
 delete mode 100644 .travis.yml

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
new file mode 100644
index 000000000..eb1aeec45
--- /dev/null
+++ b/.github/workflows/ci.yml
@@ -0,0 +1,33 @@
+name: CI
+
+on: [push, pull_request]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        script:
+          - name: Test results
+            run: tox -e py38
+          - name: Black template
+            run: tox -e black-template
+          - name: Basic Docker
+            run: sh tests/test_docker.sh
+          - name: Extended Docker
+            run: sh tests/test_docker.sh use_celery=y use_drf=y js_task_runner=Gulp
+          - name: Bare metal
+            run: sh tests/test_bare.sh use_celery=y use_compressor=y
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+      - name: Install dependencies
+        run: |
+          python -m pip install -U pip
+          python -m pip install -U tox
+      - name: ${{ matrix.script.name }}
+        run: ${{ matrix.script.run }}
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index bfd008e77..000000000
--- a/.travis.yml
+++ /dev/null
@@ -1,36 +0,0 @@
-services:
-  - docker
-
-language: python
-
-python: 3.8
-
-before_install:
-  - docker-compose -v
-  - docker -v
-
-matrix:
-  include:
-    - name: Test results
-      script: tox -e py38
-    - name: Black template
-      script: tox -e black-template
-    - name: Basic Docker
-      script: sh tests/test_docker.sh
-    - name: Extended Docker
-      script: sh tests/test_docker.sh use_celery=y use_drf=y js_task_runner=Gulp
-    - name: Bare metal
-      script: sh tests/test_bare.sh use_celery=y use_compressor=y
-      services:
-        - postgresql
-        - redis-server
-      env:
-        - CELERY_BROKER_URL=redis://localhost:6379/0
-
-install:
-  - pip install tox
-
-notifications:
-  email:
-    on_success: change
-    on_failure: always

From 0a56c9c9b9157db28dbe2427dd7a85acebe8e260 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 9 Nov 2020 19:01:29 +0000
Subject: [PATCH 1170/2840] Split out workflow to add services for bare metal
 tests

---
 .github/workflows/ci.yml | 69 ++++++++++++++++++++++++++++++++--------
 1 file changed, 55 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index eb1aeec45..3785ec7ce 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -3,22 +3,14 @@ name: CI
 on: [push, pull_request]
 
 jobs:
-  test:
+  tox:
     runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
-        script:
-          - name: Test results
-            run: tox -e py38
-          - name: Black template
-            run: tox -e black-template
-          - name: Basic Docker
-            run: sh tests/test_docker.sh
-          - name: Extended Docker
-            run: sh tests/test_docker.sh use_celery=y use_drf=y js_task_runner=Gulp
-          - name: Bare metal
-            run: sh tests/test_bare.sh use_celery=y use_compressor=y
+        tox-env:
+          - py38
+          - black-template
 
     steps:
       - uses: actions/checkout@v2
@@ -29,5 +21,54 @@ jobs:
         run: |
           python -m pip install -U pip
           python -m pip install -U tox
-      - name: ${{ matrix.script.name }}
-        run: ${{ matrix.script.run }}
+      - name: Tox ${{ matrix.tox-env }}
+        run: tox -e ${{ matrix.tox-env }}
+
+  docker:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        script:
+          - name: Basic
+            args: ""
+          - name: Extended
+            args: "use_celery=y use_drf=y js_task_runner=Gulp"
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+      - name: Docker ${{ matrix.script.name }}
+        run: sh tests/test_docker.sh ${{ matrix.script.args }}
+
+  bare:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        script:
+          - name: With Celery
+            args: "use_celery=y use_compressor=y"
+
+    services:
+      redis:
+        image: redis
+        ports:
+          - 6379:6379
+      postgres:
+        image: postgres
+        env:
+          POSTGRES_PASSWORD: postgres
+
+    env:
+      CELERY_BROKER_URL: "redis://localhost:6379/0"
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: 3.8
+      - name: Bare Metal ${{ matrix.script.name }}
+        run: sh tests/test_bare.sh ${{ matrix.script.args }}

From 56268ec82c4b8969cefd2a87511fbfb15483ec4d Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 9 Nov 2020 19:06:49 +0000
Subject: [PATCH 1171/2840] Pin service images, expose DB ports and don't set
 PG password

---
 .github/workflows/ci.yml | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3785ec7ce..32eaa054f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -54,13 +54,13 @@ jobs:
 
     services:
       redis:
-        image: redis
+        image: redis:5.0
         ports:
           - 6379:6379
       postgres:
-        image: postgres
-        env:
-          POSTGRES_PASSWORD: postgres
+        image: postgres:12
+        ports:
+          - 5432:5432
 
     env:
       CELERY_BROKER_URL: "redis://localhost:6379/0"

From a625327226e77839b39865e484c8b2ce5a02f55e Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 9 Nov 2020 19:18:38 +0000
Subject: [PATCH 1172/2840] Set some environment variables

---
 .github/workflows/ci.yml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 32eaa054f..6bc0966b0 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -35,6 +35,10 @@ jobs:
           - name: Extended
             args: "use_celery=y use_drf=y js_task_runner=Gulp"
 
+    env:
+      DOCKER_BUILDKIT: 1
+      COMPOSE_DOCKER_CLI_BUILD: 1
+
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
@@ -64,6 +68,7 @@ jobs:
 
     env:
       CELERY_BROKER_URL: "redis://localhost:6379/0"
+      DATABASE_URL: "postgres://postgres"
 
     steps:
       - uses: actions/checkout@v2

From c3d644083052025d05f27f8e786296349990dbc5 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 9 Nov 2020 19:23:48 +0000
Subject: [PATCH 1173/2840] Explicit DATABASE_URL

---
 .github/workflows/ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 6bc0966b0..a943bfba8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -65,10 +65,13 @@ jobs:
         image: postgres:12
         ports:
           - 5432:5432
+        env:
+          POSTGRES_PASSWORD: postgres
 
     env:
       CELERY_BROKER_URL: "redis://localhost:6379/0"
-      DATABASE_URL: "postgres://postgres"
+      # postgres://user:password@host:port/database
+      DATABASE_URL: "postgres://postgres:postgres@postgres:5432/postgres"
 
     steps:
       - uses: actions/checkout@v2

From 2233de8566830bbca8d02a5fe20a183831801823 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 9 Nov 2020 19:28:09 +0000
Subject: [PATCH 1174/2840] Connect to PG on localhost

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

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a943bfba8..fb26dd8e1 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -71,7 +71,7 @@ jobs:
     env:
       CELERY_BROKER_URL: "redis://localhost:6379/0"
       # postgres://user:password@host:port/database
-      DATABASE_URL: "postgres://postgres:postgres@postgres:5432/postgres"
+      DATABASE_URL: "postgres://postgres:postgres@localhost:5432/postgres"
 
     steps:
       - uses: actions/checkout@v2

From 1e6104ce723809ff758a4b24967bb20dca75f762 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 9 Nov 2020 19:31:40 +0000
Subject: [PATCH 1175/2840] Update badge

---
 README.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.rst b/README.rst
index f964635f9..dbc510a47 100644
--- a/README.rst
+++ b/README.rst
@@ -1,8 +1,8 @@
 Cookiecutter Django
-=======================
+===================
 
-.. image:: https://travis-ci.org/pydanny/cookiecutter-django.svg?branch=master
-    :target: https://travis-ci.org/pydanny/cookiecutter-django?branch=master
+.. image:: https://img.shields.io/github/workflow/status/pydanny/cookiecutter-django/CI/master
+    :target: https://github.com/pydanny/cookiecutter-django/actions?query=workflow%3ACI
     :alt: Build Status
 
 .. image:: https://readthedocs.org/projects/cookiecutter-django/badge/?version=latest

From 46a0b60a29d34d3b8654382408541a0c52b890e6 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 9 Nov 2020 19:38:16 +0000
Subject: [PATCH 1176/2840] Ignore pushes to non-master branch to avoid double
 builds

---
 .github/workflows/ci.yml | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fb26dd8e1..fd9668459 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -1,6 +1,9 @@
 name: CI
 
-on: [push, pull_request]
+on:
+  push:
+    branches: [ master ]
+  pull_request:
 
 jobs:
   tox:

From 9f3117c61579a6413fc272ddd450a02d79467e2a Mon Sep 17 00:00:00 2001
From: umgelurgel <umgelurgel@gmail.com>
Date: Thu, 12 Nov 2020 18:53:29 +0100
Subject: [PATCH 1177/2840] Upgrade factory-boy to 3.1.0

---
 {{cookiecutter.project_slug}}/requirements/local.txt            | 2 +-
 .../{{cookiecutter.project_slug}}/users/tests/factories.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index b57268c7c..ccde790ad 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -37,7 +37,7 @@ pre-commit==2.8.2  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------
-factory-boy==3.0.1  # https://github.com/FactoryBoy/factory_boy
+factory-boy==3.1.0  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==3.1.1  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.0.9  # https://github.com/django-extensions/django-extensions
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
index 1a78f132d..05b3ae0b5 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
@@ -23,7 +23,7 @@ class UserFactory(DjangoModelFactory):
                 digits=True,
                 upper_case=True,
                 lower_case=True,
-            ).generate(extra_kwargs={})
+            ).generate(params={"locale": None})
         )
         self.set_password(password)
 

From aaaa26494a0ed546d6a8e87e86b3e75f1177eab9 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 12 Nov 2020 13:10:42 -0800
Subject: [PATCH 1178/2840] Update sentry-sdk from 0.19.2 to 0.19.3

---
 {{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 157ac92a3..12e4bd855 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.19.2  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.19.3  # 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 eca1f45564cc58cdc19cb813b551776fa765e0f2 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 12 Nov 2020 13:10:45 -0800
Subject: [PATCH 1179/2840] Update sphinx from 3.3.0 to 3.3.1

---
 {{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 b57268c7c..cf505bb43 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==3.3.0  # https://github.com/sphinx-doc/sphinx
+sphinx==3.3.1  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From 22ad82b24e29fc3cbcbdca20168b6fecde246313 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 13 Nov 2020 02:15:12 +0000
Subject: [PATCH 1180/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ffc571c7b..51a6149a3 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 -->
 
+## [2020-11-12]
+### Changed
+- Migrate CI to Github Actions ([#2931](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2931))
+
 ## [2020-11-06]
 ### Updated
 - Update djangorestframework to 3.12.2 ([#2930](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2930))

From 94130f9c56a5eea22a5d0f7653cb88a64fb50eeb Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 13 Nov 2020 10:00:15 +0000
Subject: [PATCH 1181/2840] 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 4f2f96dfa..3ecf0223b 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1037,5 +1037,10 @@
     "name": "Wes Turner",
     "github_login": "westurner",
     "twitter_username": "westurner"
+  },
+  {
+    "name": "Jakub Musko",
+    "github_login": "umgelurgel",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index e0fda25ed..642a6ba9b 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -796,6 +796,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Jakub Musko</td>
+    <td>
+      <a href="https://github.com/umgelurgel">umgelurgel</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>James Williams</td>
     <td>

From 23b6c0d61f3417688b8a8dc278d2a2f339d20901 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 14 Nov 2020 02:15:20 +0000
Subject: [PATCH 1182/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51a6149a3..da70c8c62 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2020-11-13]
+### Changed
+- Upgrade factory-boy to 3.1.0 ([#2932](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2932))
+### Updated
+- Update sentry-sdk to 0.19.3 ([#2933](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2933))
+- Update sphinx to 3.3.1 ([#2934](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2934))
+
 ## [2020-11-12]
 ### Changed
 - Migrate CI to Github Actions ([#2931](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2931))

From 1fa5d798134fcb6a230f0a2cb8bb8f4e6517925b Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Sat, 14 Nov 2020 10:27:14 -0500
Subject: [PATCH 1183/2840] Add "defer" for inline Javascript

* Also utilize ECMAScript 6, 2015 syntax
---
 .../templates/account/email.html                       | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

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 8b4669bb6..2b7e12789 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html
@@ -62,17 +62,17 @@
 {% block inline_javascript %}
 {{ block.super }}
 <script type="text/javascript">
-(function() {
-  var message = "{% trans 'Do you really want to remove the selected e-mail address?' %}";
-  var actions = document.getElementsByName('action_remove');
+window.addEventListener('DOMContentLoaded',function() {
+  const message = "{% trans 'Do you really want to remove the selected e-mail address?' %}";
+  const actions = document.getElementsByName('action_remove');
   if (actions.length) {
     actions[0].addEventListener("click", function(e) {
-      if (! confirm(message)) {
+      if (!confirm(message)) {
         e.preventDefault();
       }
     });
   }
-})();
+});
 
 $('.form-group').removeClass('row');
 </script>

From 4b9002d7db8d278f455b1b7915febf0bdfd6dc9b Mon Sep 17 00:00:00 2001
From: Fabian Affolter <mail@fabian-affolter.ch>
Date: Sat, 14 Nov 2020 22:10:36 +0100
Subject: [PATCH 1184/2840] Fix formatting

---
 docs/developing-locally.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index 0da265484..2b7806ce4 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -34,10 +34,10 @@ First things first.
     $ git init # A git repo is required for pre-commit to install
     $ pre-commit install
 
-     .. note::
+   .. note::
 
-        the `pre-commit` exists in the generated project as default.
-        for the details of `pre-commit`, follow the [site of pre-commit](https://pre-commit.com/).
+       the `pre-commit` exists in the generated project as default.
+       for the details of `pre-commit`, follow the [site of pre-commit](https://pre-commit.com/).
 
 #. Create a new PostgreSQL database using createdb_: ::
 

From 4ffa344592c4c76fc959d0de69b307a8dfcf3fc5 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sun, 15 Nov 2020 00:30:23 +0000
Subject: [PATCH 1185/2840] 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 3ecf0223b..38ab437e2 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1042,5 +1042,10 @@
     "name": "Jakub Musko",
     "github_login": "umgelurgel",
     "twitter_username": ""
+  },
+  {
+    "name": "Fabian Affolter",
+    "github_login": "fabaff",
+    "twitter_username": "fabaff"
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 642a6ba9b..8ccbf18e3 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -656,6 +656,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Fabian Affolter</td>
+    <td>
+      <a href="https://github.com/fabaff">fabaff</a>
+    </td>
+    <td>fabaff</td>
+  </tr>
   <tr>
     <td>Felipe Arruda</td>
     <td>

From ecc46a36c43b475801d421821feb5b725c9c2697 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Mon, 16 Nov 2020 02:15:38 +0000
Subject: [PATCH 1186/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da70c8c62..668768972 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 -->
 
+## [2020-11-15]
+### Changed
+- Fix formatting in docs ([#2935](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2935))
+
 ## [2020-11-13]
 ### Changed
 - Upgrade factory-boy to 3.1.0 ([#2932](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2932))

From 1ab82a0e33d591cf23855984cd3253f0b756a07a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 17 Nov 2020 06:16:21 +0000
Subject: [PATCH 1187/2840] Bump peter-evans/create-pull-request from v2 to
 v3.5.0

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from v2 to v3.5.0.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v2...ff0beed1b2103611f5bdb7dfb1b23956763bf79a)

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 9937cdebc..c81a25a7e 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@v2
+      uses: peter-evans/create-pull-request@v3.5.0
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         branch: update/pre-commit-autoupdate

From 9439c82e60f178b4bafb3f6b920ad9be8c0f9168 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 18 Nov 2020 02:16:09 +0000
Subject: [PATCH 1188/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 668768972..2e6d7c378 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 -->
 
+## [2020-11-17]
+### Changed
+- Bump peter-evans/create-pull-request from v2 to v3.5.0 ([#2936](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2936))
+
 ## [2020-11-15]
 ### Changed
 - Fix formatting in docs ([#2935](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2935))

From e649b76ec9d045f288e08ac751b501e72c856c77 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 18 Nov 2020 13:53:32 -0800
Subject: [PATCH 1189/2840] Update django-crispy-forms from 1.9.2 to 1.10.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 ca92f81a6..a65825f2c 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -34,7 +34,7 @@ django==3.0.11  # pyup: < 3.1  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==4.0.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.43.0  # https://github.com/pennersr/django-allauth
-django-crispy-forms==1.9.2  # https://github.com/django-crispy-forms/django-crispy-forms
+django-crispy-forms==1.10.0  # https://github.com/django-crispy-forms/django-crispy-forms
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==2.4  # https://github.com/django-compressor/django-compressor
 {%- endif %}

From a02aba44e7683a0852f03e28b01aeeb1ce8d7207 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 19 Nov 2020 10:39:39 -0800
Subject: [PATCH 1190/2840] Update sentry-sdk from 0.19.3 to 0.19.4

---
 {{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 12e4bd855..38e5ec869 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.19.3  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.19.4  # 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 88f6150c5d1a40c0a119f3909339bc9f3d9481df Mon Sep 17 00:00:00 2001
From: Simon Rey <51708585+eqqe@users.noreply.github.com>
Date: Thu, 19 Nov 2020 20:16:56 +0100
Subject: [PATCH 1191/2840] Fix after uvicorn 0.12.0 - Ship extra dependencies

Uvicorn no longer ships extra dependencies uvloop, websockets and httptools as default. To install these dependencies use uvicorn[standard].
cf https://github.com/encode/uvicorn/blob/master/CHANGELOG.md
---
 {{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 a65825f2c..d0630a6da 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -24,7 +24,7 @@ flower==0.9.5  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn==0.12.2  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.12.2  # https://github.com/encode/uvicorn
 wsproto==0.15.0  # https://github.com/python-hyper/wsproto/
 {%- endif %}
 

From a6b637841665daff0d00e384febbf14210c9c2c1 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 20 Nov 2020 02:16:46 +0000
Subject: [PATCH 1192/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e6d7c378..c0636762f 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 -->
 
+## [2020-11-19]
+### Updated
+- Update django-crispy-forms to 1.10.0 ([#2937](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2937))
+
 ## [2020-11-17]
 ### Changed
 - Bump peter-evans/create-pull-request from v2 to v3.5.0 ([#2936](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2936))

From a30b604a25b9fc32976b31473faeaa764c8342f5 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 21 Nov 2020 02:16:33 +0000
Subject: [PATCH 1193/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c0636762f..3dbb31b17 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 -->
 
+## [2020-11-20]
+### Updated
+- Update sentry-sdk to 0.19.4 ([#2938](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2938))
+
 ## [2020-11-19]
 ### Updated
 - Update django-crispy-forms to 1.10.0 ([#2937](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2937))

From f02c57bf3ebba0647c7fe8ca35aaf54867c7f402 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 21 Nov 2020 11:44:46 +0000
Subject: [PATCH 1194/2840] Remove wsproto

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

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index d0630a6da..64cb3e0f3 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -25,7 +25,6 @@ flower==0.9.5  # https://github.com/mher/flower
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
 uvicorn[standard]==0.12.2  # https://github.com/encode/uvicorn
-wsproto==0.15.0  # https://github.com/python-hyper/wsproto/
 {%- endif %}
 
 # Django

From 6e932a48b82c34cd7bbf0d40074bc5bc6286d5d8 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 21 Nov 2020 11:49:57 +0000
Subject: [PATCH 1195/2840] 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 38ab437e2..25a33ed51 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1047,5 +1047,10 @@
     "name": "Fabian Affolter",
     "github_login": "fabaff",
     "twitter_username": "fabaff"
+  },
+  {
+    "name": "Simon Rey",
+    "github_login": "eqqe",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 8ccbf18e3..6649f3fd7 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1286,6 +1286,13 @@ Listed in alphabetical order.
     </td>
     <td>saschalalala</td>
   </tr>
+  <tr>
+    <td>Simon Rey</td>
+    <td>
+      <a href="https://github.com/eqqe">eqqe</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Sorasful</td>
     <td>

From 132a6f0be2a8b66677809bef25e550531d011ec7 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 21 Nov 2020 15:37:47 -0800
Subject: [PATCH 1196/2840] Update pre-commit from 2.8.2 to 2.9.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 0847e6b23..368dc5bd8 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -33,7 +33,7 @@ pylint-django==2.3.0  # 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.8.2  # https://github.com/pre-commit/pre-commit
+pre-commit==2.9.0  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From 4d6a2b9a1746b4cab0fd20c4cb40f07561858945 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sun, 22 Nov 2020 02:16:48 +0000
Subject: [PATCH 1197/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3dbb31b17..800de5fd0 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 -->
 
+## [2020-11-21]
+### Changed
+- Fix after uvicorn 0.12.0 - Ship extra dependencies ([#2939](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2939))
+
 ## [2020-11-20]
 ### Updated
 - Update sentry-sdk to 0.19.4 ([#2938](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2938))

From 90d71f424d0333c2847d21b1bff8b59bbdf0ea13 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 22 Nov 2020 02:00:45 -0800
Subject: [PATCH 1198/2840] Update uvicorn from 0.12.2 to 0.12.3

---
 {{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 64cb3e0f3..eea7fe657 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -24,7 +24,7 @@ flower==0.9.5  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn[standard]==0.12.2  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.12.3  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django

From 48011f7422d26e1561e59156960c87a0806f0227 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 24 Nov 2020 02:17:31 +0000
Subject: [PATCH 1199/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 800de5fd0..faa102b0f 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 -->
 
+## [2020-11-23]
+### Updated
+- Update uvicorn to 0.12.3 ([#2943](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2943))
+- Update pre-commit to 2.9.0 ([#2942](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2942))
+
 ## [2020-11-21]
 ### Changed
 - Fix after uvicorn 0.12.0 - Ship extra dependencies ([#2939](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2939))

From b47678a2e84774d9834c103dab49278888ffb568 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 25 Nov 2020 05:47:41 +0000
Subject: [PATCH 1200/2840] Bump peter-evans/create-pull-request from v3.5.0 to
 v3.5.1

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from v3.5.0 to v3.5.1.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v3.5.0...ce699aa2d108e9d04fde047a71e44b2bf444b6dc)

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 c81a25a7e..f471eacf1 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.5.0
+      uses: peter-evans/create-pull-request@v3.5.1
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         branch: update/pre-commit-autoupdate

From 4e978361097c652e8089b3c45e0bb8f88be4f106 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 25 Nov 2020 11:27:41 -0800
Subject: [PATCH 1201/2840] Update django-allauth from 0.43.0 to 0.44.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 eea7fe657..502928f67 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -32,7 +32,7 @@ uvicorn[standard]==0.12.3  # https://github.com/encode/uvicorn
 django==3.0.11  # pyup: < 3.1  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==4.0.0  # https://github.com/jazzband/django-model-utils
-django-allauth==0.43.0  # https://github.com/pennersr/django-allauth
+django-allauth==0.44.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.10.0  # https://github.com/django-crispy-forms/django-crispy-forms
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==2.4  # https://github.com/django-compressor/django-compressor

From c33d0f278c0bcd8271927184e5fe0a7e2aa4c4ed Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 25 Nov 2020 15:33:56 -0800
Subject: [PATCH 1202/2840] Update django-extensions from 3.0.9 to 3.1.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 368dc5bd8..5df8e4aeb 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -40,6 +40,6 @@ pre-commit==2.9.0  # https://github.com/pre-commit/pre-commit
 factory-boy==3.1.0  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==3.1.1  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==3.0.9  # https://github.com/django-extensions/django-extensions
+django-extensions==3.1.0  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.1.0  # https://github.com/pytest-dev/pytest-django

From 3335ee70b451d968ca487cf4707740619bc6574b Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 26 Nov 2020 02:17:43 +0000
Subject: [PATCH 1203/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index faa102b0f..fc617aa73 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 -->
 
+## [2020-11-25]
+### Changed
+- Bump peter-evans/create-pull-request from v3.5.0 to v3.5.1 ([#2944](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2944))
+
 ## [2020-11-23]
 ### Updated
 - Update uvicorn to 0.12.3 ([#2943](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2943))

From f63a434d727627af7bfdc622ce538cb12d810891 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 25 Nov 2020 20:33:51 -0800
Subject: [PATCH 1204/2840] Update pre-commit from 2.9.0 to 2.9.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 368dc5bd8..464dc80e3 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -33,7 +33,7 @@ pylint-django==2.3.0  # 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.9.0  # https://github.com/pre-commit/pre-commit
+pre-commit==2.9.2  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From d2ec1eca12ee2f6356a96009e65f60b1975f9ecd Mon Sep 17 00:00:00 2001
From: Thorrak <thorrak@excelinspace.com>
Date: Thu, 26 Nov 2020 10:15:04 -0500
Subject: [PATCH 1205/2840] Fix typo in message

---
 .../{{cookiecutter.project_slug}}/users/views.py                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
index 520b1e52c..fe41938d7 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
@@ -31,7 +31,7 @@ class UserUpdateView(LoginRequiredMixin, UpdateView):
 
     def form_valid(self, form):
         messages.add_message(
-            self.request, messages.INFO, _("Infos successfully updated")
+            self.request, messages.INFO, _("Information successfully updated")
         )
         return super().form_valid(form)
 

From 894dbce6459d5aa63f83f71bffaca12708b739c3 Mon Sep 17 00:00:00 2001
From: Thorrak <thorrak@excelinspace.com>
Date: Thu, 26 Nov 2020 10:17:20 -0500
Subject: [PATCH 1206/2840] Add test for users.form_valid Ensures that the
 message is added to the request when a form is submitted

---
 .../users/tests/test_views.py                 | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
index 3638c8f63..23d4ab3c8 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
@@ -1,8 +1,12 @@
 import pytest
+from django.contrib import messages
 from django.contrib.auth.models import AnonymousUser
+from django.contrib.messages.middleware import MessageMiddleware
+from django.contrib.sessions.middleware import SessionMiddleware
 from django.http.response import Http404
 from django.test import RequestFactory
 
+from {{ cookiecutter.project_slug }}.users.forms import UserChangeForm
 from {{ cookiecutter.project_slug }}.users.models import User
 from {{ cookiecutter.project_slug }}.users.tests.factories import UserFactory
 from {{ cookiecutter.project_slug }}.users.views import (
@@ -41,6 +45,24 @@ class TestUserUpdateView:
 
         assert view.get_object() == user
 
+    def test_form_valid(self, user: User, rf: RequestFactory):
+        view = UserUpdateView()
+        request = rf.get("/fake-url/")
+
+        # Add the session/message middleware to the request
+        SessionMiddleware().process_request(request)
+        MessageMiddleware().process_request(request)
+        request.user = user
+
+        view.request = request
+
+        # Initialize the form
+        form = UserChangeForm()
+        form.cleaned_data = []
+        view.form_valid(form)
+
+        assert messages.get_messages(request)._queued_messages[0].message == "Information successfully updated"
+
 
 class TestUserRedirectView:
     def test_get_redirect_url(self, user: User, rf: RequestFactory):

From ed69df44032c5b9911640e25ec3b30f238d3b46e Mon Sep 17 00:00:00 2001
From: Thorrak <thorrak@excelinspace.com>
Date: Thu, 26 Nov 2020 11:23:46 -0500
Subject: [PATCH 1207/2840] Change test to iterate through messages instead of
 accessing _queued_messages directly

---
 .../{{cookiecutter.project_slug}}/users/tests/test_views.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
index 23d4ab3c8..52d146065 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
@@ -61,7 +61,11 @@ class TestUserUpdateView:
         form.cleaned_data = []
         view.form_valid(form)
 
-        assert messages.get_messages(request)._queued_messages[0].message == "Information successfully updated"
+        found_message = False
+        for message in messages.get_messages(request):
+            assert message.message == "Information successfully updated"
+            found_message = True
+        assert found_message
 
 
 class TestUserRedirectView:

From bb0c68317cb71bf0ce8095452d815c04fbd1db34 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 27 Nov 2020 02:17:48 +0000
Subject: [PATCH 1208/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fc617aa73..c203da3bc 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 -->
 
+## [2020-11-26]
+### Updated
+- Update django-extensions to 3.1.0 ([#2947](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2947))
+- Update pre-commit to 2.9.2 ([#2948](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2948))
+- Update django-allauth to 0.44.0 ([#2945](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2945))
+
 ## [2020-11-25]
 ### Changed
 - Bump peter-evans/create-pull-request from v3.5.0 to v3.5.1 ([#2944](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2944))

From 5ad419e3223fb0b2b4c8e14d80297d521ff92dea Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 2 Dec 2020 13:58:05 +0000
Subject: [PATCH 1209/2840] Fixes for pip 20.3

---
 requirements.txt   | 2 +-
 tests/test_bare.sh | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 9f5d03653..f65d45630 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ flake8-isort==4.0.0
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.20.1
-pytest==6.1.2
+pytest==5.4.3
 pytest-cookies==0.5.1
 pytest-instafail==0.4.2
 pyyaml==5.3.1
diff --git a/tests/test_bare.sh b/tests/test_bare.sh
index 61a66239c..eae09dc78 100755
--- a/tests/test_bare.sh
+++ b/tests/test_bare.sh
@@ -6,9 +6,9 @@
 set -o errexit
 set -x
 
-# Install modern pip to use new resolver:
-# https://blog.python.org/2020/07/upgrade-pip-20-2-changes-20-3.html
-pip install 'pip>=20.2'
+# Install modern pip with new resolver:
+# https://blog.python.org/2020/11/pip-20-3-release-new-resolver.html
+pip install 'pip>=20.3'
 
 # install test requirements
 pip install -r requirements.txt
@@ -25,7 +25,7 @@ cd my_awesome_project
 sudo utility/install_os_dependencies.sh install
 
 # Install Python deps
-pip install --use-feature=2020-resolver -r requirements/local.txt
+pip install -r requirements/local.txt
 
 # run the project's tests
 pytest

From 092416147ca3c6c9f3e3a3e924a1a44867cde076 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 2 Dec 2020 14:02:54 +0000
Subject: [PATCH 1210/2840] Pin django-timezone-field==4.0

refs #2950
---
 {{cookiecutter.project_slug}}/requirements/base.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 502928f67..8e8701842 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -19,6 +19,7 @@ hiredis==1.1.0  # https://github.com/redis/hiredis-py
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.4.6  # pyup: < 5.0,!=4.4.7  # https://github.com/celery/celery
 django-celery-beat==2.1.0  # https://github.com/celery/django-celery-beat
+django-timezone-field==4.0  # https://github.com/celery/django-celery-beat/pull/378
 {%- if cookiecutter.use_docker == 'y' %}
 flower==0.9.5  # https://github.com/mher/flower
 {%- endif %}

From 549274d699dca42125a3f9538fd99378cb30e0b5 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 2 Dec 2020 06:09:49 -0800
Subject: [PATCH 1211/2840] Update django-model-utils from 4.0.0 to 4.1.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 8e8701842..9b0900696 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -32,7 +32,7 @@ uvicorn[standard]==0.12.3  # https://github.com/encode/uvicorn
 # ------------------------------------------------------------------------------
 django==3.0.11  # pyup: < 3.1  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
-django-model-utils==4.0.0  # https://github.com/jazzband/django-model-utils
+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-crispy-forms==1.10.0  # https://github.com/django-crispy-forms/django-crispy-forms
 {%- if cookiecutter.use_compressor == "y" %}

From 1b02e8c90ddcf766b937172fac613ce5e380a150 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 2 Dec 2020 14:14:34 +0000
Subject: [PATCH 1212/2840] PyUP filter for pytest <6 in template

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

diff --git a/requirements.txt b/requirements.txt
index f65d45630..02842d2da 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ flake8-isort==4.0.0
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.20.1
-pytest==5.4.3
+pytest==5.4.3  # pyup: <6  # https://github.com/hackebrot/pytest-cookies/issues/51
 pytest-cookies==0.5.1
 pytest-instafail==0.4.2
 pyyaml==5.3.1

From b2a34f57cdc9e42d68620dd29e2fc177e73a367d Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 2 Dec 2020 06:17:15 -0800
Subject: [PATCH 1213/2840] Update pygithub from 1.53 to 1.54

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

diff --git a/requirements.txt b/requirements.txt
index 02842d2da..482b00768 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,5 +19,5 @@ pyyaml==5.3.1
 
 # Scripting
 # ------------------------------------------------------------------------------
-PyGithub==1.53
+PyGithub==1.54
 jinja2==2.11.2

From 1164d9cbcb5960046d1dce4331912f58c9b6d3d6 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 3 Dec 2020 02:18:33 +0000
Subject: [PATCH 1214/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c203da3bc..ed7005754 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 -->
 
+## [2020-12-02]
+### Updated
+- Update django-model-utils to 4.1.1 ([#2957](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2957))
+- Update pygithub to 1.54 ([#2958](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2958))
+
 ## [2020-11-26]
 ### Updated
 - Update django-extensions to 3.1.0 ([#2947](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2947))

From 9d6f661d4042b3f3c355f7c559f45bb7c62fa2d1 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 3 Dec 2020 03:59:51 -0800
Subject: [PATCH 1215/2840] Update django-debug-toolbar from 3.1.1 to 3.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 466bef14d..8eea2149b 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -39,7 +39,7 @@ pre-commit==2.9.2  # https://github.com/pre-commit/pre-commit
 # ------------------------------------------------------------------------------
 factory-boy==3.1.0  # https://github.com/FactoryBoy/factory_boy
 
-django-debug-toolbar==3.1.1  # https://github.com/jazzband/django-debug-toolbar
+django-debug-toolbar==3.2  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.1.0  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.1.0  # https://github.com/pytest-dev/pytest-django

From 3d9b9dc3047a663ceba1eda66bdf1092114b904b Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 5 Dec 2020 02:18:58 +0000
Subject: [PATCH 1216/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ed7005754..056feb7e8 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 -->
 
+## [2020-12-04]
+### Updated
+- Update django-debug-toolbar to 3.2 ([#2959](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2959))
+
 ## [2020-12-02]
 ### Updated
 - Update django-model-utils to 4.1.1 ([#2957](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2957))

From a72e597338f601a22b7d11937cca5b2f86040f47 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 7 Dec 2020 17:14:50 -0800
Subject: [PATCH 1217/2840] Update pre-commit from 2.9.2 to 2.9.3

---
 {{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 8eea2149b..ea8f38c35 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -33,7 +33,7 @@ pylint-django==2.3.0  # 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.9.2  # https://github.com/pre-commit/pre-commit
+pre-commit==2.9.3  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From f727c21d087792fb77daea8cd324e4d5bac6eed4 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 8 Dec 2020 08:38:13 -0800
Subject: [PATCH 1218/2840] Update uvicorn from 0.12.3 to 0.13.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 9b0900696..ec1a7b906 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -25,7 +25,7 @@ flower==0.9.5  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn[standard]==0.12.3  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.13.0  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django

From 41d760ddd8a49d31340d3f8af487a3a05d8a7f5a Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 9 Dec 2020 02:23:26 +0000
Subject: [PATCH 1219/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 056feb7e8..13725c12a 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 -->
 
+## [2020-12-08]
+### Updated
+- Update pre-commit to 2.9.3 ([#2961](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2961))
+
 ## [2020-12-04]
 ### Updated
 - Update django-debug-toolbar to 3.2 ([#2959](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2959))

From c1b9c2acc5d7f8f94238284df4533c7e304973b9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 9 Dec 2020 06:18:22 +0000
Subject: [PATCH 1220/2840] Bump peter-evans/create-pull-request from v3.5.1 to
 v3.5.2

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from v3.5.1 to v3.5.2.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v3.5.1...8c603dbb04b917a9fc2dd991dc54fef54b640b43)

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 f471eacf1..2b5bb09b5 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.5.1
+      uses: peter-evans/create-pull-request@v3.5.2
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         branch: update/pre-commit-autoupdate

From dde36972acc994dab08162b941a67fe38381fe12 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 10 Dec 2020 02:25:51 +0000
Subject: [PATCH 1221/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13725c12a..68f29a1f2 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 -->
 
+## [2020-12-09]
+### Changed
+- Bump peter-evans/create-pull-request from v3.5.1 to v3.5.2 ([#2964](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2964))
+
 ## [2020-12-08]
 ### Updated
 - Update pre-commit to 2.9.3 ([#2961](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2961))

From 633739d19d87a083fe275a482d6fc158edbe6b26 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 10 Dec 2020 05:17:51 -0800
Subject: [PATCH 1222/2840] Update sentry-sdk from 0.19.4 to 0.19.5

---
 {{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 38e5ec869..eed4477e3 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.19.4  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.19.5  # 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 f058c53aa76e0de2a6f5861e4bd9cc08791dd1a6 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 10 Dec 2020 19:54:31 +0000
Subject: [PATCH 1223/2840] 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 25a33ed51..99fd084f0 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1052,5 +1052,10 @@
     "name": "Simon Rey",
     "github_login": "eqqe",
     "twitter_username": ""
+  },
+  {
+    "name": "Yotam Tal",
+    "github_login": "yotamtal",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 6649f3fd7..75f0efd2d 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1482,6 +1482,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Yotam Tal</td>
+    <td>
+      <a href="https://github.com/yotamtal">yotamtal</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Yuchen Xie</td>
     <td>

From 9ea6ec46bd711661a9d8732d2b1f81baa784b5e7 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 11 Dec 2020 02:26:26 +0000
Subject: [PATCH 1224/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68f29a1f2..ace310929 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2020-12-10]
+### Changed
+- Hot-reload support to celery ([#2554](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2554))
+### Updated
+- Update uvicorn to 0.13.0 ([#2962](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2962))
+- Update sentry-sdk to 0.19.5 ([#2965](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2965))
+
 ## [2020-12-09]
 ### Changed
 - Bump peter-evans/create-pull-request from v3.5.1 to v3.5.2 ([#2964](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2964))

From 5d8908673d4d0844513c5e95c2dea10984a147d1 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 12 Dec 2020 04:22:50 -0800
Subject: [PATCH 1225/2840] Update uvicorn from 0.13.0 to 0.13.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 ec1a7b906..5085f9d5d 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -25,7 +25,7 @@ flower==0.9.5  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn[standard]==0.13.0  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.13.1  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django

From 56a3b3d8a5007b80046f163cdd1fd2f19f9e9b26 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 13 Dec 2020 03:32:59 -0800
Subject: [PATCH 1226/2840] Update django-cors-headers from 3.5.0 to 3.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 ec1a7b906..1aa4a296a 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -42,5 +42,5 @@ django-redis==4.12.1  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == "y" %}
 # Django REST Framework
 djangorestframework==3.12.2  # https://github.com/encode/django-rest-framework
-django-cors-headers==3.5.0 # https://github.com/adamchainz/django-cors-headers
+django-cors-headers==3.6.0 # https://github.com/adamchainz/django-cors-headers
 {%- endif %}

From 0d96660e9451bc29f573cfa54041339b4f7df393 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 13 Dec 2020 03:33:02 -0800
Subject: [PATCH 1227/2840] Update pytest from 6.1.2 to 6.2.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 70e9090f4..fe7001c69 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -15,7 +15,7 @@ watchgod==0.6  # https://github.com/samuelcolvin/watchgod
 # ------------------------------------------------------------------------------
 mypy==0.790  # https://github.com/python/mypy
 django-stubs==1.7.0  # https://github.com/typeddjango/django-stubs
-pytest==6.1.2  # https://github.com/pytest-dev/pytest
+pytest==6.2.0  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 
 # Documentation

From 840530ae7df15ab4c725af4297d6bbf34f33397c Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 15 Dec 2020 02:29:03 +0000
Subject: [PATCH 1228/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ace310929..d98a0b91c 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 -->
 
+## [2020-12-14]
+### Updated
+- Update pytest to 6.2.0 ([#2968](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2968))
+- Update django-cors-headers to 3.6.0 ([#2967](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2967))
+- Update uvicorn to 0.13.1 ([#2966](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2966))
+
 ## [2020-12-10]
 ### Changed
 - Hot-reload support to celery ([#2554](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2554))

From 1caced19c7284aa0529aa76416c2e6f2b01c2e3b Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 16 Dec 2020 00:27:10 +0000
Subject: [PATCH 1229/2840] 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 55368bb73..3fd2b622a 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -4,7 +4,7 @@ fail_fast: true
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.3.0
+    rev: v3.4.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer

From 2b023d186db737ff97dae26df401faafe1d60149 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 15 Dec 2020 16:27:21 -0800
Subject: [PATCH 1230/2840] Update pytest from 6.2.0 to 6.2.1

---
 {{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 fe7001c69..bd61be56b 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -15,7 +15,7 @@ watchgod==0.6  # https://github.com/samuelcolvin/watchgod
 # ------------------------------------------------------------------------------
 mypy==0.790  # https://github.com/python/mypy
 django-stubs==1.7.0  # https://github.com/typeddjango/django-stubs
-pytest==6.2.0  # https://github.com/pytest-dev/pytest
+pytest==6.2.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 
 # Documentation

From 20fb67cc0bb450dfdcc1ea103f54654a365de87b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 16 Dec 2020 06:14:37 +0000
Subject: [PATCH 1231/2840] Bump stefanzweifel/git-auto-commit-action from
 v4.7.2 to v4.8.0

Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from v4.7.2 to v4.8.0.
- [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases)
- [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.7.2...75802d269e7721b5146d08f6063ba3097c55ad2b)

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-changelog.yml    | 2 +-
 .github/workflows/update-contributors.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index 0c72c7819..ea4ddf613 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -28,7 +28,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Commit changes
-      uses: stefanzweifel/git-auto-commit-action@v4.7.2
+      uses: stefanzweifel/git-auto-commit-action@v4.8.0
       with:
         commit_message: Update Changelog
         file_pattern: CHANGELOG.md
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 4ce1c76f1..f849484fc 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -24,7 +24,7 @@ jobs:
       run: python scripts/update_contributors.py
 
     - name: Commit changes
-      uses: stefanzweifel/git-auto-commit-action@v4.7.2
+      uses: stefanzweifel/git-auto-commit-action@v4.8.0
       with:
         commit_message: Update Contributors
         file_pattern: CONTRIBUTORS.md .github/contributors.json

From 73c10348e49ef4a8a5f758d524e11cedc99e8bf9 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 16 Dec 2020 18:22:57 -0800
Subject: [PATCH 1232/2840] Update django-storages from 1.10.1 to 1.11

---
 {{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 eed4477e3..7f8c9eaea 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -17,7 +17,7 @@ hiredis==1.1.0  # https://github.com/redis/hiredis-py
 # Django
 # ------------------------------------------------------------------------------
 {%- if cookiecutter.cloud_provider == 'AWS' %}
-django-storages[boto3]==1.10.1  # https://github.com/jschneier/django-storages
+django-storages[boto3]==1.11  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
 django-storages[google]==1.10.1  # https://github.com/jschneier/django-storages
 {%- endif %}

From 6110904fc20a38a8ea70989098260a3af7a88846 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 16 Dec 2020 18:22:57 -0800
Subject: [PATCH 1233/2840] Update django-storages from 1.10.1 to 1.11

---
 {{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 7f8c9eaea..cfb5ec68b 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -19,7 +19,7 @@ hiredis==1.1.0  # https://github.com/redis/hiredis-py
 {%- if cookiecutter.cloud_provider == 'AWS' %}
 django-storages[boto3]==1.11  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
-django-storages[google]==1.10.1  # https://github.com/jschneier/django-storages
+django-storages[google]==1.11  # https://github.com/jschneier/django-storages
 {%- endif %}
 {%- if cookiecutter.mail_service == 'Mailgun' %}
 django-anymail[mailgun]==8.1  # https://github.com/anymail/django-anymail

From bdd1345a9785a648585b7b55132f191aab6b1f90 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 19 Dec 2020 02:33:21 +0000
Subject: [PATCH 1234/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d98a0b91c..a7ba2e997 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2020-12-18]
+### Changed
+- Bump stefanzweifel/git-auto-commit-action from v4.7.2 to v4.8.0 ([#2972](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2972))
+### Updated
+- Update django-storages to 1.11 ([#2973](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2973))
+- Update pytest to 6.2.1 ([#2971](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2971))
+- Auto-update pre-commit hooks ([#2970](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2970))
+
 ## [2020-12-14]
 ### Updated
 - Update pytest to 6.2.0 ([#2968](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2968))

From cf6935b0a28f1df7510540eaee6305f4deea20cb Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 20 Dec 2020 01:02:40 -0800
Subject: [PATCH 1235/2840] Update uvicorn from 0.13.1 to 0.13.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 6ebbdb470..e6f8c808c 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -25,7 +25,7 @@ flower==0.9.5  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn[standard]==0.13.1  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.13.2  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django

From 1532af099f34672b545c36f1b74aea484be040d1 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 20 Dec 2020 01:02:43 -0800
Subject: [PATCH 1236/2840] Update coverage from 5.3 to 5.3.1

---
 {{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 bd61be56b..1fa22dc23 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -27,7 +27,7 @@ sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==3.8.4  # https://github.com/PyCQA/flake8
 flake8-isort==4.0.0  # https://github.com/gforcada/flake8-isort
-coverage==5.3  # https://github.com/nedbat/coveragepy
+coverage==5.3.1  # https://github.com/nedbat/coveragepy
 black==20.8b1  # https://github.com/ambv/black
 pylint-django==2.3.0  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 0b0d713d4f1a0d4bc682ca50a124647aef97b854 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 20 Dec 2020 09:49:47 -0800
Subject: [PATCH 1237/2840] Update sphinx from 3.3.1 to 3.4.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 bd61be56b..45147dc38 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==3.3.1  # https://github.com/sphinx-doc/sphinx
+sphinx==3.4.0  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From 6a948603596ffadc7d2424f2a7f9fdb4ac17cc0f Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 21 Dec 2020 10:32:44 -0800
Subject: [PATCH 1238/2840] Update flower from 0.9.5 to 0.9.7

---
 {{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 6ebbdb470..b994c30ea 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -21,7 +21,7 @@ celery==4.4.6  # pyup: < 5.0,!=4.4.7  # https://github.com/celery/celery
 django-celery-beat==2.1.0  # https://github.com/celery/django-celery-beat
 django-timezone-field==4.0  # https://github.com/celery/django-celery-beat/pull/378
 {%- if cookiecutter.use_docker == 'y' %}
-flower==0.9.5  # https://github.com/mher/flower
+flower==0.9.7  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}

From 5e41838b391d3cb1cb99bc31bf2ca9b50042c48c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Dec 2020 06:12:42 +0000
Subject: [PATCH 1239/2840] Bump peter-evans/create-pull-request from v3.5.2 to
 v3.6.0

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from v3.5.2 to v3.6.0.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v3.5.2...45c510e1f68ba052e3cd911f661a799cfb9ba3a3)

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 2b5bb09b5..c76a501bf 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.5.2
+      uses: peter-evans/create-pull-request@v3.6.0
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         branch: update/pre-commit-autoupdate

From 53bbbb8e177eb0f502f82f064e48ea36f32eb423 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 24 Dec 2020 02:42:38 +0000
Subject: [PATCH 1240/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a7ba2e997..5a53d671e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2020-12-23]
+### Changed
+- Bump peter-evans/create-pull-request from v3.5.2 to v3.6.0 ([#2980](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2980))
+### Updated
+- Update flower to 0.9.7 ([#2979](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2979))
+- Update sphinx to 3.4.0 ([#2978](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2978))
+- Update coverage to 5.3.1 ([#2977](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2977))
+- Update uvicorn to 0.13.2 ([#2976](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2976))
+
 ## [2020-12-18]
 ### Changed
 - Bump stefanzweifel/git-auto-commit-action from v4.7.2 to v4.8.0 ([#2972](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2972))

From 5061f2a69f2f731be7e7ec3c70deffbdfee4abee Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 23 Dec 2020 18:42:45 -0800
Subject: [PATCH 1241/2840] Update django-storages from 1.11 to 1.11.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 cfb5ec68b..02dfe19fc 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -17,7 +17,7 @@ hiredis==1.1.0  # https://github.com/redis/hiredis-py
 # Django
 # ------------------------------------------------------------------------------
 {%- if cookiecutter.cloud_provider == 'AWS' %}
-django-storages[boto3]==1.11  # https://github.com/jschneier/django-storages
+django-storages[boto3]==1.11.1  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
 django-storages[google]==1.11  # https://github.com/jschneier/django-storages
 {%- endif %}

From 3827d742f3b9caeea6eeb137623e25adfa4002cc Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 23 Dec 2020 18:42:46 -0800
Subject: [PATCH 1242/2840] Update django-storages from 1.11 to 1.11.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 02dfe19fc..4a610d0c4 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -19,7 +19,7 @@ hiredis==1.1.0  # https://github.com/redis/hiredis-py
 {%- if cookiecutter.cloud_provider == 'AWS' %}
 django-storages[boto3]==1.11.1  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
-django-storages[google]==1.11  # https://github.com/jschneier/django-storages
+django-storages[google]==1.11.1  # https://github.com/jschneier/django-storages
 {%- endif %}
 {%- if cookiecutter.mail_service == 'Mailgun' %}
 django-anymail[mailgun]==8.1  # https://github.com/anymail/django-anymail

From af30966400f95dc9e95dfe07ad2c40da097a78ba Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 23 Dec 2020 22:19:17 -0800
Subject: [PATCH 1243/2840] Update pygithub from 1.54 to 1.54.1

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

diff --git a/requirements.txt b/requirements.txt
index 482b00768..900031883 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -19,5 +19,5 @@ pyyaml==5.3.1
 
 # Scripting
 # ------------------------------------------------------------------------------
-PyGithub==1.54
+PyGithub==1.54.1
 jinja2==2.11.2

From c122de1068fceba94b72d48c035e0ae072c4b775 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 24 Dec 2020 20:52:28 -0800
Subject: [PATCH 1244/2840] Update pytz from 2020.4 to 2020.5

---
 {{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 cbad7d14e..fb3479737 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,4 +1,4 @@
-pytz==2020.4  # https://github.com/stub42/pytz
+pytz==2020.5  # https://github.com/stub42/pytz
 python-slugify==4.0.1  # https://github.com/un33k/python-slugify
 Pillow==8.0.1  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}

From f3dc0dbc6df032ec69a77a3998bb8051c9fa49cc Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 24 Dec 2020 20:52:31 -0800
Subject: [PATCH 1245/2840] Update sphinx from 3.4.0 to 3.4.1

---
 {{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 7ce64023a..718242b8c 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==3.4.0  # https://github.com/sphinx-doc/sphinx
+sphinx==3.4.1  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From eeae7e5f24467316b5df9d2ec45faef50340a450 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sun, 27 Dec 2020 02:40:39 +0000
Subject: [PATCH 1246/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a53d671e..6527d6c20 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 -->
 
+## [2020-12-26]
+### Updated
+- Update sphinx to 3.4.1 ([#2985](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2985))
+- Update pytz to 2020.5 ([#2984](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2984))
+
 ## [2020-12-23]
 ### Changed
 - Bump peter-evans/create-pull-request from v3.5.2 to v3.6.0 ([#2980](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2980))

From c077028310ec8196a070fc7e05816493173d28c4 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 28 Dec 2020 02:41:37 -0800
Subject: [PATCH 1247/2840] Update factory-boy from 3.1.0 to 3.2.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 718242b8c..b831b46a8 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -37,7 +37,7 @@ pre-commit==2.9.3  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------
-factory-boy==3.1.0  # https://github.com/FactoryBoy/factory_boy
+factory-boy==3.2.0  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==3.2  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.1.0  # https://github.com/django-extensions/django-extensions

From 3950f2e504c14c23cb70eda36805a865c9f3d97e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 29 Dec 2020 09:14:44 -0800
Subject: [PATCH 1248/2840] Update uvicorn from 0.13.2 to 0.13.3

---
 {{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 fb3479737..eae4ac895 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -25,7 +25,7 @@ flower==0.9.7  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn[standard]==0.13.2  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.13.3  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django

From 86a388b7a4bf3196cb9f2c44667ee095a5d08106 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 30 Dec 2020 02:43:05 +0000
Subject: [PATCH 1249/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6527d6c20..7a643436f 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 -->
 
+## [2020-12-29]
+### Updated
+- Update pygithub to 1.54.1 ([#2982](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2982))
+- Update django-storages to 1.11.1 ([#2981](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2981))
+
 ## [2020-12-26]
 ### Updated
 - Update sphinx to 3.4.1 ([#2985](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2985))

From a511e3dd94821832dcb1f8282e49d8451e356d30 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 30 Dec 2020 20:16:52 -0800
Subject: [PATCH 1250/2840] Update isort from 5.6.4 to 5.7.0

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

diff --git a/requirements.txt b/requirements.txt
index 900031883..b41349464 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==20.8b1
-isort==5.6.4
+isort==5.7.0
 flake8==3.8.4
 flake8-isort==4.0.0
 

From fcbe4f5f86dc4015440fcf2fd9fb1847fdd44e6a Mon Sep 17 00:00:00 2001
From: vascop <vascogpinho@gmail.com>
Date: Thu, 31 Dec 2020 14:02:53 +0100
Subject: [PATCH 1251/2840] Sentry Redis integration enabled by default in
 production.

---
 {{cookiecutter.project_slug}}/config/settings/production.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 340046f98..bd0acfbd4 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -7,6 +7,7 @@ from sentry_sdk.integrations.logging import LoggingIntegration
 {%- if cookiecutter.use_celery == 'y' %}
 from sentry_sdk.integrations.celery import CeleryIntegration
 {% endif %}
+from sentry_sdk.integrations.redis import RedisIntegration
 
 {% endif -%}
 from .base import *  # noqa
@@ -351,9 +352,9 @@ sentry_logging = LoggingIntegration(
 )
 
 {%- if cookiecutter.use_celery == 'y' %}
-integrations = [sentry_logging, DjangoIntegration(), CeleryIntegration()]
+integrations = [sentry_logging, DjangoIntegration(), CeleryIntegration(), RedisIntegration()]
 {% else %}
-integrations = [sentry_logging, DjangoIntegration()]
+integrations = [sentry_logging, DjangoIntegration(), RedisIntegration()]
 {% endif -%}
 
 sentry_sdk.init(

From 06bd13a191b3415465fdb3891e61b4b0d1883720 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 1 Jan 2021 00:39:49 +0000
Subject: [PATCH 1252/2840] 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 3fd2b622a..5a5b58a63 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.6.4
+    rev: 5.7.0
     hooks:
       - id: isort
 

From 3a1e94f41cb2c94e9455a2eb247c5d7085ac5255 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Fri, 1 Jan 2021 22:40:30 -0500
Subject: [PATCH 1253/2840] Use exception var in 403.html if available

---
 .../{{cookiecutter.project_slug}}/templates/403.html            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/403.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/403.html
index c02bd4e9e..49c82a9d7 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/403.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/403.html
@@ -5,5 +5,5 @@
 {% block content %}
 <h1>Forbidden (403)</h1>
 
-<p>CSRF verification failed. Request aborted.</p>
+<p>{% if exception %}{{ exception }}{% else %}CSRF verification failed. Request aborted.{% endif %}</p>
 {% endblock content %}{% endraw %}

From ac0af4c178029adb2ab08ad94f79994233179e2c Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Fri, 1 Jan 2021 22:44:02 -0500
Subject: [PATCH 1254/2840] Use exception var in 404.html if available

---
 .../{{cookiecutter.project_slug}}/templates/404.html            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/404.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/404.html
index 1687ef311..187c1fc9d 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/404.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/404.html
@@ -5,5 +5,5 @@
 {% block content %}
 <h1>Page not found</h1>
 
-<p>This is not the page you were looking for.</p>
+<p>{% if exception %}{{ exception }}{% else %}This is not the page you were looking for.{% endif %}</p>
 {% endblock content %}{% endraw %}

From 64a1c46cf4c3dacffdc95d9d10243538112e3f8f Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 2 Jan 2021 16:48:49 -0800
Subject: [PATCH 1255/2840] Update pillow from 8.0.1 to 8.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 fb3479737..bf152e077 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,6 +1,6 @@
 pytz==2020.5  # https://github.com/stub42/pytz
 python-slugify==4.0.1  # https://github.com/un33k/python-slugify
-Pillow==8.0.1  # https://github.com/python-pillow/Pillow
+Pillow==8.1.0  # 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 91b543228648376d8d20ea6fdb9b3644e7d8be5f Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 4 Jan 2021 08:45:17 -0800
Subject: [PATCH 1256/2840] Update sphinx from 3.4.1 to 3.4.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 718242b8c..3917c86c8 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==3.4.1  # https://github.com/sphinx-doc/sphinx
+sphinx==3.4.2  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From e071a6d66b2728d4eefb5395ac4ee7ddca49caf2 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 5 Jan 2021 02:51:26 +0000
Subject: [PATCH 1257/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a643436f..9d2b4ba44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-01-04]
+### Updated
+- Update isort to 5.7.0 ([#2988](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2988))
+- Update uvicorn to 0.13.3 ([#2987](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2987))
+- Auto-update pre-commit hooks ([#2990](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2990))
+- Update sphinx to 3.4.2 ([#2995](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2995))
+- Update pillow to 8.1.0 ([#2993](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2993))
+
 ## [2020-12-29]
 ### Updated
 - Update pygithub to 1.54.1 ([#2982](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2982))

From a395383256018ce56b5f77fa346cf2a5d15f5563 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 6 Jan 2021 02:17:12 -0800
Subject: [PATCH 1258/2840] Update pylint-django from 2.3.0 to 2.4.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 3917c86c8..f6f1f0196 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -29,7 +29,7 @@ flake8==3.8.4  # https://github.com/PyCQA/flake8
 flake8-isort==4.0.0  # https://github.com/gforcada/flake8-isort
 coverage==5.3.1  # https://github.com/nedbat/coveragepy
 black==20.8b1  # https://github.com/ambv/black
-pylint-django==2.3.0  # https://github.com/PyCQA/pylint-django
+pylint-django==2.4.0  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}

From dce3144b3989f5634a38e1c9d2b5cd128d1266c1 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Thu, 7 Jan 2021 22:27:50 -0500
Subject: [PATCH 1259/2840] Omit first_name and last_name in User model

---
 .../{{cookiecutter.project_slug}}/users/models.py               | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
index 8391bc032..712a355b6 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
@@ -9,6 +9,8 @@ class User(AbstractUser):
 
     #: First and last name do not cover name patterns around the globe
     name = CharField(_("Name of User"), blank=True, max_length=255)
+    first_name = None
+    last_name = None
 
     def get_absolute_url(self):
         """Get url for user's detail view.

From 2f416f90574fbfc60e1e7c5db0e2cb22dfd42b7a Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Thu, 7 Jan 2021 22:30:27 -0500
Subject: [PATCH 1260/2840] Remove first_name and last_name from migrations

---
 .../users/migrations/0001_initial.py                 | 12 ------------
 1 file changed, 12 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py
index c9d890568..ef2c2d941 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py
@@ -53,18 +53,6 @@ class Migration(migrations.Migration):
                         verbose_name="username",
                     ),
                 ),
-                (
-                    "first_name",
-                    models.CharField(
-                        blank=True, max_length=30, verbose_name="first name"
-                    ),
-                ),
-                (
-                    "last_name",
-                    models.CharField(
-                        blank=True, max_length=150, verbose_name="last name"
-                    ),
-                ),
                 (
                     "email",
                     models.EmailField(

From e83933ae7a251938001497da5da37bf229a99ee8 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Thu, 7 Jan 2021 22:34:39 -0500
Subject: [PATCH 1261/2840] Upgrade Travis to Focal

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

diff --git a/{{cookiecutter.project_slug}}/.travis.yml b/{{cookiecutter.project_slug}}/.travis.yml
index 24f9f24ac..f478685eb 100644
--- a/{{cookiecutter.project_slug}}/.travis.yml
+++ b/{{cookiecutter.project_slug}}/.travis.yml
@@ -1,4 +1,4 @@
-dist: xenial
+dist: focal
 
 language: python
 python:

From 5809eabb31543e518eb7eaffca08e793b65b7a78 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Thu, 7 Jan 2021 22:39:18 -0500
Subject: [PATCH 1262/2840] Ignore typing override in name removals

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

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
index 712a355b6..935eee9a2 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
@@ -9,8 +9,8 @@ class User(AbstractUser):
 
     #: First and last name do not cover name patterns around the globe
     name = CharField(_("Name of User"), blank=True, max_length=255)
-    first_name = None
-    last_name = None
+    first_name = None  # type: ignore
+    last_name = None  # type: ignore
 
     def get_absolute_url(self):
         """Get url for user's detail view.

From 305347e7c7ad157a418c4ca64db65644592c08a7 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 7 Jan 2021 22:04:13 -0800
Subject: [PATCH 1263/2840] Update sphinx from 3.4.2 to 3.4.3

---
 {{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 3917c86c8..20ffbc5dd 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==3.4.2  # https://github.com/sphinx-doc/sphinx
+sphinx==3.4.3  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From 42f6b1c3a5b86fe52dbc20c5212b372a93bd4083 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 8 Jan 2021 02:34:59 -0800
Subject: [PATCH 1264/2840] Update pylint-django from 2.4.0 to 2.4.1

---
 {{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 c5cdb64e1..4c957fd54 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -29,7 +29,7 @@ flake8==3.8.4  # https://github.com/PyCQA/flake8
 flake8-isort==4.0.0  # https://github.com/gforcada/flake8-isort
 coverage==5.3.1  # https://github.com/nedbat/coveragepy
 black==20.8b1  # https://github.com/ambv/black
-pylint-django==2.4.0  # https://github.com/PyCQA/pylint-django
+pylint-django==2.4.1  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}

From 85e846a2c6d1a2b90db8e15f092e71f95f47421a Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 9 Jan 2021 02:57:06 +0000
Subject: [PATCH 1265/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d2b4ba44..e4bf44c07 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-01-08]
+### Changed
+- Upgrade Travis to Focal ([#2999](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2999))
+### Updated
+- Update pylint-django to 2.4.1 ([#3001](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3001))
+- Update sphinx to 3.4.3 ([#3000](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3000))
+- Update pylint-django to 2.4.0 ([#2996](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2996))
+
 ## [2021-01-04]
 ### Updated
 - Update isort to 5.7.0 ([#2988](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2988))

From d25dcfe1931dfb72f559d135ed0767fc4d9ebb90 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 8 Jan 2021 18:57:23 -0800
Subject: [PATCH 1266/2840] Update tox from 3.20.1 to 3.21.0

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

diff --git a/requirements.txt b/requirements.txt
index b41349464..ded1ebc46 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8-isort==4.0.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.20.1
+tox==3.21.0
 pytest==5.4.3  # pyup: <6  # https://github.com/hackebrot/pytest-cookies/issues/51
 pytest-cookies==0.5.1
 pytest-instafail==0.4.2

From a99833e8c673987fd3a215b530de715266a0c37f Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 10 Jan 2021 05:14:01 -0800
Subject: [PATCH 1267/2840] Update pylint-django from 2.4.1 to 2.4.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 4c957fd54..349442ac1 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -29,7 +29,7 @@ flake8==3.8.4  # https://github.com/PyCQA/flake8
 flake8-isort==4.0.0  # https://github.com/gforcada/flake8-isort
 coverage==5.3.1  # https://github.com/nedbat/coveragepy
 black==20.8b1  # https://github.com/ambv/black
-pylint-django==2.4.1  # https://github.com/PyCQA/pylint-django
+pylint-django==2.4.2  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}

From 4958941810400b878145fd3fdfa41e32de8cb482 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Mon, 11 Jan 2021 03:01:51 +0000
Subject: [PATCH 1268/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4bf44c07..476dd4ad8 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-01-10]
+### Updated
+- Update pylint-django to 2.4.2 ([#3003](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3003))
+- Update tox to 3.21.0 ([#3002](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3002))
+
 ## [2021-01-08]
 ### Changed
 - Upgrade Travis to Focal ([#2999](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2999))

From 1872bc65f4b144e036a3f4ee188f42035d161c64 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 13 Jan 2021 12:05:30 -0800
Subject: [PATCH 1269/2840] Update tox from 3.21.0 to 3.21.1

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

diff --git a/requirements.txt b/requirements.txt
index ded1ebc46..375d6345f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8-isort==4.0.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.21.0
+tox==3.21.1
 pytest==5.4.3  # pyup: <6  # https://github.com/hackebrot/pytest-cookies/issues/51
 pytest-cookies==0.5.1
 pytest-instafail==0.4.2

From adb8abe040d0d93396324036c9ba1b69437b50fd Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 15 Jan 2021 03:12:42 +0000
Subject: [PATCH 1270/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 476dd4ad8..13531da57 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-01-14]
+### Updated
+- Update tox to 3.21.1 ([#3006](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3006))
+
 ## [2021-01-10]
 ### Updated
 - Update pylint-django to 2.4.2 ([#3003](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3003))

From 2d84fe89dd44cf5abf85ce6285fa130ad5e951e2 Mon Sep 17 00:00:00 2001
From: "Fabio C. Barrionuevo da Luz" <bnafta@gmail.com>
Date: Mon, 18 Jan 2021 16:06:31 -0300
Subject: [PATCH 1271/2840] Move sentry-sdk requirement to base.txt

---
 {{cookiecutter.project_slug}}/requirements/base.txt       | 3 +++
 {{cookiecutter.project_slug}}/requirements/production.txt | 3 ---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 41ba12b79..36c18edf3 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -27,6 +27,9 @@ flower==0.9.7  # https://github.com/mher/flower
 {%- if cookiecutter.use_async == 'y' %}
 uvicorn[standard]==0.13.3  # https://github.com/encode/uvicorn
 {%- endif %}
+{%- if cookiecutter.use_sentry == "y" %}
+sentry-sdk==0.19.5  # https://github.com/getsentry/sentry-python
+{%- endif %}
 
 # Django
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 4a610d0c4..fed43ceb7 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -7,9 +7,6 @@ psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
-{%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.19.5  # 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
 {%- endif %}

From 1858fc2be83a54110d287df7d983f18aa03dbc70 Mon Sep 17 00:00:00 2001
From: "Fabio C. Barrionuevo da Luz" <bnafta@gmail.com>
Date: Mon, 18 Jan 2021 17:58:00 -0300
Subject: [PATCH 1272/2840] Revert "Move sentry-sdk requirement to base.txt"

This reverts commit 2d84fe89dd44cf5abf85ce6285fa130ad5e951e2.
---
 {{cookiecutter.project_slug}}/requirements/base.txt       | 3 ---
 {{cookiecutter.project_slug}}/requirements/production.txt | 3 +++
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 36c18edf3..41ba12b79 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -27,9 +27,6 @@ flower==0.9.7  # https://github.com/mher/flower
 {%- if cookiecutter.use_async == 'y' %}
 uvicorn[standard]==0.13.3  # https://github.com/encode/uvicorn
 {%- endif %}
-{%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.19.5  # https://github.com/getsentry/sentry-python
-{%- endif %}
 
 # Django
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index fed43ceb7..4a610d0c4 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -7,6 +7,9 @@ psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
+{%- if cookiecutter.use_sentry == "y" %}
+sentry-sdk==0.19.5  # 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
 {%- endif %}

From af1cfc82c6aff6a71efc4bdc3a3ec75a7525144f Mon Sep 17 00:00:00 2001
From: "Fabio C. Barrionuevo da Luz" <bnafta@gmail.com>
Date: Mon, 18 Jan 2021 18:05:22 -0300
Subject: [PATCH 1273/2840] Fix docker container stop command on github action

---
 {{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 52818e187..57add2c04 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -58,7 +58,7 @@ jobs:
         run:  docker-compose -f local.yml exec -T django pytest
 
       - name: Tear down the Stack
-        run:  docker-compose down
+        run:  docker-compose -f local.yml down
 
       {%- else %}
 

From ea57990b06903de589f5bbba7c19b4bbe4d37469 Mon Sep 17 00:00:00 2001
From: "Fabio C. Barrionuevo da Luz" <bnafta@gmail.com>
Date: Mon, 18 Jan 2021 19:38:53 -0300
Subject: [PATCH 1274/2840] Update Heroku runtime to python3.8.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 43b47fb46..3e4835ce2 100644
--- a/{{cookiecutter.project_slug}}/runtime.txt
+++ b/{{cookiecutter.project_slug}}/runtime.txt
@@ -1 +1 @@
-python-3.8.5
+python-3.8.7

From 3e0c40f5b6cd0e975b21e333e605fc71368f9849 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 19 Jan 2021 20:45:44 -0800
Subject: [PATCH 1275/2840] Update django-celery-beat from 2.1.0 to 2.2.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 41ba12b79..d8904d695 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -18,7 +18,7 @@ hiredis==1.1.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.1.0  # https://github.com/celery/django-celery-beat
+django-celery-beat==2.2.0  # https://github.com/celery/django-celery-beat
 django-timezone-field==4.0  # https://github.com/celery/django-celery-beat/pull/378
 {%- if cookiecutter.use_docker == 'y' %}
 flower==0.9.7  # https://github.com/mher/flower

From 30d8498a79d3e02fecbb8cb03ee92208c2d7a72d Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 20 Jan 2021 13:31:41 -0800
Subject: [PATCH 1276/2840] Update tox from 3.21.1 to 3.21.2

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

diff --git a/requirements.txt b/requirements.txt
index 375d6345f..55182fa3f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8-isort==4.0.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.21.1
+tox==3.21.2
 pytest==5.4.3  # pyup: <6  # https://github.com/hackebrot/pytest-cookies/issues/51
 pytest-cookies==0.5.1
 pytest-instafail==0.4.2

From d72c311e9b3c92942075135cbf51b9300e6413d1 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 20 Jan 2021 14:54:34 -0800
Subject: [PATCH 1277/2840] Update pyyaml from 5.3.1 to 5.4.1

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

diff --git a/requirements.txt b/requirements.txt
index 375d6345f..88f09127d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,7 +15,7 @@ tox==3.21.1
 pytest==5.4.3  # pyup: <6  # https://github.com/hackebrot/pytest-cookies/issues/51
 pytest-cookies==0.5.1
 pytest-instafail==0.4.2
-pyyaml==5.3.1
+pyyaml==5.4.1
 
 # Scripting
 # ------------------------------------------------------------------------------

From 3cbd840a96628282e8ab99c2dc2cf4e7e711fa82 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Thu, 21 Jan 2021 19:02:01 -0500
Subject: [PATCH 1278/2840] Use self.request.user instead of second query

---
 .../{{cookiecutter.project_slug}}/users/views.py                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
index 520b1e52c..f3a240d81 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
@@ -27,7 +27,7 @@ class UserUpdateView(LoginRequiredMixin, UpdateView):
         return reverse("users:detail", kwargs={"username": self.request.user.username})
 
     def get_object(self):
-        return User.objects.get(username=self.request.user.username)
+        return self.request.user
 
     def form_valid(self, form):
         messages.add_message(

From 4f52366a9149aa4d752295d40d4c609ebc1bb97a Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 22 Jan 2021 13:28:28 -0800
Subject: [PATCH 1279/2840] Update mypy from 0.790 to 0.800

---
 {{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 349442ac1..ca677877b 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -13,7 +13,7 @@ watchgod==0.6  # https://github.com/samuelcolvin/watchgod
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.790  # https://github.com/python/mypy
+mypy==0.800  # https://github.com/python/mypy
 django-stubs==1.7.0  # https://github.com/typeddjango/django-stubs
 pytest==6.2.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar

From 5a8a86ec44ba5c018e5630370fc23d3c69f72d39 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 23 Jan 2021 03:15:12 +0000
Subject: [PATCH 1280/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13531da57..1b47539fb 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-01-22]
+### Changed
+- Use self.request.user instead of second query ([#3012](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3012))
+
 ## [2021-01-14]
 ### Updated
 - Update tox to 3.21.1 ([#3006](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3006))

From b7c95f6eed786000278f5719fbf4ac037af20e50 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sun, 24 Jan 2021 14:20:39 +0000
Subject: [PATCH 1281/2840] Update factory-boy's .generate to evaluate

Co-Authored-By: Timo Halbesma <timo@halbesma.com>
---
 .../{{cookiecutter.project_slug}}/users/tests/factories.py      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
index 05b3ae0b5..edd306cb8 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
@@ -23,7 +23,7 @@ class UserFactory(DjangoModelFactory):
                 digits=True,
                 upper_case=True,
                 lower_case=True,
-            ).generate(params={"locale": None})
+            ).evaluate(None, None, extra={"locale": None})
         )
         self.set_password(password)
 

From 99f6cf35bb9cf3f5f4dad0db4d077ff3bea78fb1 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sun, 24 Jan 2021 15:08:56 +0000
Subject: [PATCH 1282/2840] 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 99fd084f0..7976ce1d6 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1057,5 +1057,10 @@
     "name": "Yotam Tal",
     "github_login": "yotamtal",
     "twitter_username": ""
+  },
+  {
+    "name": "John",
+    "github_login": "thorrak",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 75f0efd2d..dd66bd95f 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -866,6 +866,13 @@ Listed in alphabetical order.
     </td>
     <td>afrowave</td>
   </tr>
+  <tr>
+    <td>John</td>
+    <td>
+      <a href="https://github.com/thorrak">thorrak</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>John Cass</td>
     <td>

From 42f33527c51effce8ad39e8b7d7f94a6a642d736 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sun, 24 Jan 2021 15:11:15 +0000
Subject: [PATCH 1283/2840] Refactor test

---
 .../users/tests/test_views.py                              | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
index 52d146065..c2fe8b519 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
@@ -61,11 +61,8 @@ class TestUserUpdateView:
         form.cleaned_data = []
         view.form_valid(form)
 
-        found_message = False
-        for message in messages.get_messages(request):
-            assert message.message == "Information successfully updated"
-            found_message = True
-        assert found_message
+        messages_sent = [m.message for m in messages.get_messages(request)]
+        assert messages_sent == ["Information successfully updated"]
 
 
 class TestUserRedirectView:

From eb6fad5f3299c9dadf0fc7e844c651bf37541631 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sun, 24 Jan 2021 15:23:56 +0000
Subject: [PATCH 1284/2840] Remove pinning of django-timezone-field

fixes #2950
---
 {{cookiecutter.project_slug}}/requirements/base.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index d8904d695..475ac1866 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -19,7 +19,6 @@ hiredis==1.1.0  # https://github.com/redis/hiredis-py
 {%- 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
-django-timezone-field==4.0  # https://github.com/celery/django-celery-beat/pull/378
 {%- if cookiecutter.use_docker == 'y' %}
 flower==0.9.7  # https://github.com/mher/flower
 {%- endif %}

From abc2e969a77a1982e1759189192bff3c43dfc7de Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sun, 24 Jan 2021 16:50:45 +0000
Subject: [PATCH 1285/2840] 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 7976ce1d6..8853e76e7 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1062,5 +1062,10 @@
     "name": "John",
     "github_login": "thorrak",
     "twitter_username": ""
+  },
+  {
+    "name": "vascop",
+    "github_login": "vascop",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index dd66bd95f..818b6cdd7 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1426,6 +1426,13 @@ Listed in alphabetical order.
     </td>
     <td>egregors</td>
   </tr>
+  <tr>
+    <td>vascop</td>
+    <td>
+      <a href="https://github.com/vascop">vascop</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Vicente G. Reyes</td>
     <td>

From c2060bf34a22a213e8801d6d9a9dab08780ff27e Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sun, 24 Jan 2021 23:16:45 +0000
Subject: [PATCH 1286/2840] Add logo to badge

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

diff --git a/{{cookiecutter.project_slug}}/README.rst b/{{cookiecutter.project_slug}}/README.rst
index 1deeafbec..2aae422ce 100644
--- a/{{cookiecutter.project_slug}}/README.rst
+++ b/{{cookiecutter.project_slug}}/README.rst
@@ -3,7 +3,7 @@
 
 {{cookiecutter.description}}
 
-.. image:: https://img.shields.io/badge/built%20with-Cookiecutter%20Django-ff69b4.svg
+.. image:: https://img.shields.io/badge/built%20with-Cookiecutter%20Django-ff69b4.svg?logo=cookiecutter
      :target: https://github.com/pydanny/cookiecutter-django/
      :alt: Built with Cookiecutter Django
 .. image:: https://img.shields.io/badge/code%20style-black-000000.svg

From 9903cb9fcde468246e4f6bb7b1067a957c1afdf9 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Mon, 25 Jan 2021 03:17:23 +0000
Subject: [PATCH 1287/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b47539fb..8c5999159 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,21 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-01-24]
+### Changed
+- Use defer for script tags (Fix #2922) ([#2927](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2927))
+- Made Traefik conf much easier to understand and improved redirect res… ([#2838](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2838))
+- Sentry Redis integration enabled by default in production. ([#2989](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2989))
+- Add test for UserUpdateView.form_valid() ([#2949](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2949))
+### Fixed
+- Omit first_name and last_name in User model ([#2998](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2998))
+### Updated
+- Update django-celery-beat to 2.2.0 ([#3009](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3009))
+- Update pyyaml to 5.4.1 ([#3011](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3011))
+- Update mypy to 0.800 ([#3013](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3013))
+- Update factory-boy to 3.2.0 ([#2986](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2986))
+- Update tox to 3.21.2 ([#3010](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3010))
+
 ## [2021-01-22]
 ### Changed
 - Use self.request.user instead of second query ([#3012](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3012))

From cbb3cdb2b1320aae296b638564546084f0cb49a9 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Mon, 25 Jan 2021 11:20:34 -0500
Subject: [PATCH 1288/2840] Update admin to ignore *_name User attributes

Fixes #3016
---
 .../users/admin.py                             | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py
index a68a94a95..700311482 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py
@@ -12,8 +12,22 @@ class UserAdmin(auth_admin.UserAdmin):
 
     form = UserChangeForm
     add_form = UserCreationForm
-    fieldsets = (("User", {"fields": ("name",)}),) + tuple(
-        auth_admin.UserAdmin.fieldsets
+    fieldsets = (
+        (None, {"fields": ("username", "password")}),
+        (_("Personal info"), {"fields": ("name", "email")}),
+        (
+            _("Permissions"),
+            {
+                "fields": (
+                    "is_active",
+                    "is_staff",
+                    "is_superuser",
+                    "groups",
+                    "user_permissions",
+                ),
+            },
+        ),
+        (_("Important dates"), {"fields": ("last_login", "date_joined")}),
     )
     list_display = ["username", "name", "is_superuser"]
     search_fields = ["name"]

From d1409e2fb3962c66f8c7829f6b2456b50aca40e5 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 25 Jan 2021 21:08:33 +0000
Subject: [PATCH 1289/2840] Missing import

---
 .../{{cookiecutter.project_slug}}/users/admin.py                 | 1 +
 1 file changed, 1 insertion(+)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py
index 700311482..8e8e3eb2f 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py
@@ -1,6 +1,7 @@
 from django.contrib import admin
 from django.contrib.auth import admin as auth_admin
 from django.contrib.auth import get_user_model
+from django.utils.translation import gettext_lazy as _
 
 from {{ cookiecutter.project_slug }}.users.forms import UserChangeForm, UserCreationForm
 

From 37e0d6ae04da6b127e214afba1d8d1adabfa707e Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 25 Jan 2021 21:55:14 +0000
Subject: [PATCH 1290/2840] Add test for the UserAdmin

---
 .../users/tests/test_admin.py                 | 40 +++++++++++++++++++
 1 file changed, 40 insertions(+)
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py
new file mode 100644
index 000000000..ee9f70ed5
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py
@@ -0,0 +1,40 @@
+import pytest
+from django.urls import reverse
+
+from {{ cookiecutter.project_slug }}.users.models import User
+
+pytestmark = pytest.mark.django_db
+
+
+class TestUserAdmin:
+    def test_changelist(self, admin_client):
+        url = reverse("admin:users_user_changelist")
+        response = admin_client.get(url)
+        assert response.status_code == 200
+
+    def test_search(self, admin_client):
+        url = reverse("admin:users_user_changelist")
+        response = admin_client.get(url, data={"q": "test"})
+        assert response.status_code == 200
+
+    def test_add(self, admin_client):
+        url = reverse("admin:users_user_add")
+        response = admin_client.get(url)
+        assert response.status_code == 200
+
+        response = admin_client.post(
+            url,
+            data={
+                "username": "test",
+                "password1": "My_R@ndom-P@ssw0rd",
+                "password2": "My_R@ndom-P@ssw0rd",
+            },
+        )
+        assert response.status_code == 302
+        assert User.objects.filter(username="test").exists()
+
+    def test_view_user(self, admin_client):
+        user = User.objects.first()
+        url = reverse("admin:users_user_change", kwargs={"object_id": user.pk})
+        response = admin_client.get(url)
+        assert response.status_code == 200

From d12d01d325e662d565fb358575aa0f8caede1642 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 25 Jan 2021 22:13:19 +0000
Subject: [PATCH 1291/2840] Fix mypy error

---
 .../{{cookiecutter.project_slug}}/users/tests/test_admin.py     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py
index ee9f70ed5..c50a4be4c 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py
@@ -34,7 +34,7 @@ class TestUserAdmin:
         assert User.objects.filter(username="test").exists()
 
     def test_view_user(self, admin_client):
-        user = User.objects.first()
+        user = User.objects.get(username="admin")
         url = reverse("admin:users_user_change", kwargs={"object_id": user.pk})
         response = admin_client.get(url)
         assert response.status_code == 200

From 1b7b003f1539e86bb47d461ad018ee2d498b4cf8 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 25 Jan 2021 17:42:39 -0800
Subject: [PATCH 1292/2840] Update django-cors-headers from 3.6.0 to 3.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 475ac1866..a035aeed3 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -41,5 +41,5 @@ django-redis==4.12.1  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == "y" %}
 # Django REST Framework
 djangorestframework==3.12.2  # https://github.com/encode/django-rest-framework
-django-cors-headers==3.6.0 # https://github.com/adamchainz/django-cors-headers
+django-cors-headers==3.7.0 # https://github.com/adamchainz/django-cors-headers
 {%- endif %}

From 880cdeb2df72f5a80840dd9c31d277b1a99f1a06 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 25 Jan 2021 17:42:43 -0800
Subject: [PATCH 1293/2840] Update pytest from 6.2.1 to 6.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 9e26f6f00..c34862a9a 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -15,7 +15,7 @@ watchgod==0.6  # https://github.com/samuelcolvin/watchgod
 # ------------------------------------------------------------------------------
 mypy==0.800  # https://github.com/python/mypy
 django-stubs==1.7.0  # https://github.com/typeddjango/django-stubs
-pytest==6.2.1  # https://github.com/pytest-dev/pytest
+pytest==6.2.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 
 # Documentation

From d358fc948d6bd9c8524740cd6e5093b5232eef33 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Tue, 26 Jan 2021 09:56:24 +0530
Subject: [PATCH 1294/2840] Using SuccessMessageMixin to pass the message to
 django template instead of overriding form_valid

---
 .../{{cookiecutter.project_slug}}/users/views.py  | 15 +++++----------
 1 file changed, 5 insertions(+), 10 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
index 011ea4106..803769fa1 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
@@ -1,6 +1,6 @@
-from django.contrib import messages
 from django.contrib.auth import get_user_model
 from django.contrib.auth.mixins import LoginRequiredMixin
+from django.contrib.messages.views import SuccessMessageMixin
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
 from django.views.generic import DetailView, RedirectView, UpdateView
@@ -18,23 +18,18 @@ class UserDetailView(LoginRequiredMixin, DetailView):
 user_detail_view = UserDetailView.as_view()
 
 
-class UserUpdateView(LoginRequiredMixin, UpdateView):
+class UserUpdateView(LoginRequiredMixin, SuccessMessageMixin, UpdateView):
 
     model = User
     fields = ["name"]
+    success_message = _("Information successfully updated")
 
     def get_success_url(self):
         return reverse("users:detail", kwargs={"username": self.request.user.username})
 
     def get_object(self):
         return self.request.user
-
-    def form_valid(self, form):
-        messages.add_message(
-            self.request, messages.INFO, _("Information successfully updated")
-        )
-        return super().form_valid(form)
-
+        
 
 user_update_view = UserUpdateView.as_view()
 
@@ -47,4 +42,4 @@ class UserRedirectView(LoginRequiredMixin, RedirectView):
         return reverse("users:detail", kwargs={"username": self.request.user.username})
 
 
-user_redirect_view = UserRedirectView.as_view()
+user_redirect_view = UserRedirectView.as_view()
\ No newline at end of file

From 125f1a8afe56950f012e40ee9109628526c85f99 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Tue, 26 Jan 2021 10:34:18 +0530
Subject: [PATCH 1295/2840] Fixing Formatting issues

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

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
index 803769fa1..2b077d424 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
@@ -29,7 +29,7 @@ class UserUpdateView(LoginRequiredMixin, SuccessMessageMixin, UpdateView):
 
     def get_object(self):
         return self.request.user
-        
+
 
 user_update_view = UserUpdateView.as_view()
 
@@ -42,4 +42,4 @@ class UserRedirectView(LoginRequiredMixin, RedirectView):
         return reverse("users:detail", kwargs={"username": self.request.user.username})
 
 
-user_redirect_view = UserRedirectView.as_view()
\ No newline at end of file
+user_redirect_view = UserRedirectView.as_view()

From 602832cde30bfb231c31dd68c99f2b74b024a35c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 26 Jan 2021 06:07:57 +0000
Subject: [PATCH 1296/2840] Bump peter-evans/create-pull-request from v3.6.0 to
 v3.7.0

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from v3.6.0 to v3.7.0.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v3.6.0...2455e1596942c2902952003bbb574afbbe2ab2e6)

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 c76a501bf..a0ad17ab0 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.6.0
+      uses: peter-evans/create-pull-request@v3.7.0
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         branch: update/pre-commit-autoupdate

From a1d551d0679b54b2f57bf9ba17e07c854171566a Mon Sep 17 00:00:00 2001
From: areski <areski@gmail.com>
Date: Tue, 26 Jan 2021 16:13:27 +0100
Subject: [PATCH 1297/2840] Update from Python3.8 to Python3.9

---
 .github/workflows/ci.yml                                  | 8 ++++----
 .github/workflows/pre-commit-autoupdate.yml               | 2 +-
 .github/workflows/update-changelog.yml                    | 2 +-
 .github/workflows/update-contributors.yml                 | 2 +-
 CONTRIBUTING.rst                                          | 4 ++--
 README.rst                                                | 2 +-
 docs/deployment-on-pythonanywhere.rst                     | 2 +-
 docs/developing-locally.rst                               | 4 ++--
 hooks/pre_gen_project.py                                  | 2 +-
 setup.py                                                  | 2 +-
 tox.ini                                                   | 2 +-
 {{cookiecutter.project_slug}}/.github/workflows/ci.yml    | 8 ++++----
 {{cookiecutter.project_slug}}/.gitlab-ci.yml              | 4 ++--
 {{cookiecutter.project_slug}}/.readthedocs.yml            | 2 +-
 {{cookiecutter.project_slug}}/.travis.yml                 | 4 ++--
 .../compose/local/django/Dockerfile                       | 2 +-
 .../compose/local/docs/Dockerfile                         | 2 +-
 .../compose/production/django/Dockerfile                  | 2 +-
 {{cookiecutter.project_slug}}/runtime.txt                 | 2 +-
 {{cookiecutter.project_slug}}/setup.cfg                   | 2 +-
 20 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index fd9668459..cd1389c0d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,14 +12,14 @@ jobs:
       fail-fast: false
       matrix:
         tox-env:
-          - py38
+          - py39
           - black-template
 
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.9
       - name: Install dependencies
         run: |
           python -m pip install -U pip
@@ -46,7 +46,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.9
       - name: Docker ${{ matrix.script.name }}
         run: sh tests/test_docker.sh ${{ matrix.script.args }}
 
@@ -80,6 +80,6 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.9
       - name: Bare Metal ${{ matrix.script.name }}
         run: sh tests/test_bare.sh ${{ matrix.script.args }}
diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml
index a0ad17ab0..71738d629 100644
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -16,7 +16,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: 3.9
 
     - name: Install pre-commit
       run: pip install pre-commit
diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index ea4ddf613..f05f99d61 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -17,7 +17,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: 3.9
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index f849484fc..835000b29 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: 3.8
+        python-version: 3.9
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index 5d88bf5bf..d4412b7f0 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -38,9 +38,9 @@ To run all tests using various versions of python in virtualenvs defined in tox.
 It is possible to test with a specific version of python. To do this, the command
 is::
 
-    $ tox -e py38
+    $ tox -e py39
 
-This will run py.test with the python3.8 interpreter, for example.
+This will run py.test with the python3.9 interpreter, for example.
 
 To run a particular test with tox for against your current Python version::
 
diff --git a/README.rst b/README.rst
index dbc510a47..105497c47 100644
--- a/README.rst
+++ b/README.rst
@@ -41,7 +41,7 @@ Features
 ---------
 
 * For Django 3.0
-* Works with Python 3.8
+* Works with Python 3.9
 * Renders Django projects with 100% starting test coverage
 * Twitter Bootstrap_ v4 (`maintained Foundation fork`_ also available)
 * 12-Factor_ based settings via django-environ_
diff --git a/docs/deployment-on-pythonanywhere.rst b/docs/deployment-on-pythonanywhere.rst
index 16dba5a29..67da158ba 100644
--- a/docs/deployment-on-pythonanywhere.rst
+++ b/docs/deployment-on-pythonanywhere.rst
@@ -35,7 +35,7 @@ Make sure your project is fully committed and pushed up to Bitbucket or Github o
 
     git clone <my-repo-url>  # you can also use hg
     cd my-project-name
-    mkvirtualenv --python=/usr/bin/python3.8 my-project-name
+    mkvirtualenv --python=/usr/bin/python3.9 my-project-name
     pip install -r requirements/production.txt  # may take a few minutes
 
 
diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index 2b7806ce4..c8b54ea53 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -9,7 +9,7 @@ Setting Up Development Environment
 
 Make sure to have the following on your host:
 
-* Python 3.8
+* Python 3.9
 * PostgreSQL_.
 * Redis_, if using Celery
 * Cookiecutter_
@@ -18,7 +18,7 @@ First things first.
 
 #. Create a virtualenv: ::
 
-    $ python3.8 -m venv <virtual env path>
+    $ python3.9 -m venv <virtual env path>
 
 #. Activate the virtualenv you have just created: ::
 
diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py
index 8eaf4983d..70c29557c 100644
--- a/hooks/pre_gen_project.py
+++ b/hooks/pre_gen_project.py
@@ -35,7 +35,7 @@ if "{{ cookiecutter.use_docker }}".lower() == "n":
     if python_major_version == 2:
         print(
             WARNING + "You're running cookiecutter under Python 2, but the generated "
-            "project requires Python 3.8+. Do you want to proceed (y/n)? " + TERMINATOR
+            "project requires Python 3.9+. Do you want to proceed (y/n)? " + TERMINATOR
         )
         yes_options, no_options = frozenset(["y"]), frozenset(["n"])
         while True:
diff --git a/setup.py b/setup.py
index c72ba1c9d..44ffae967 100644
--- a/setup.py
+++ b/setup.py
@@ -40,7 +40,7 @@ setup(
         "License :: OSI Approved :: BSD License",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.8",
+        "Programming Language :: Python :: 3.9",
         "Programming Language :: Python :: Implementation :: CPython",
         "Topic :: Software Development",
     ],
diff --git a/tox.ini b/tox.ini
index cecc7435f..0afe3931d 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 skipsdist = true
-envlist = py38,black-template
+envlist = py39,black-template
 
 [testenv]
 deps = -rrequirements.txt
diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
index 57add2c04..15eb3daa4 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -23,10 +23,10 @@ jobs:
       - name: Checkout Code Repository
         uses: actions/checkout@v2
 
-      - name: Set up Python 3.8
+      - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.9
 
       - name: Install flake8
         run: |
@@ -62,10 +62,10 @@ jobs:
 
       {%- else %}
 
-      - name: Set up Python 3.8
+      - name: Set up Python 3.9
         uses: actions/setup-python@v2
         with:
-          python-version: 3.8
+          python-version: 3.9
 
       - name: Get pip cache dir
         id: pip-cache-location
diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
index 60925b811..314aacb6e 100644
--- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml
+++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
@@ -13,7 +13,7 @@ variables:
 
 flake8:
   stage: lint
-  image: python:3.8-alpine
+  image: python:3.9-alpine
   before_script:
     - pip install -q flake8
   script:
@@ -21,7 +21,7 @@ flake8:
 
 pytest:
   stage: test
-  image: python:3.8
+  image: python:3.9
   {% if cookiecutter.use_docker == 'y' -%}
   image: docker/compose:latest
   tags:
diff --git a/{{cookiecutter.project_slug}}/.readthedocs.yml b/{{cookiecutter.project_slug}}/.readthedocs.yml
index b193a85e0..1b6020f3a 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.8
+  version: 3.9
   install:
     - requirements: requirements/local.txt
diff --git a/{{cookiecutter.project_slug}}/.travis.yml b/{{cookiecutter.project_slug}}/.travis.yml
index f478685eb..a684da225 100644
--- a/{{cookiecutter.project_slug}}/.travis.yml
+++ b/{{cookiecutter.project_slug}}/.travis.yml
@@ -2,7 +2,7 @@ dist: focal
 
 language: python
 python:
-  - "3.8"
+  - "3.9"
 
 services:
   - {% if cookiecutter.use_docker == 'y' %}docker{% else %}postgresql{% endif %}
@@ -37,7 +37,7 @@ jobs:
         - sudo apt-get install -qq libsqlite3-dev libxml2 libxml2-dev libssl-dev libbz2-dev wget curl llvm
       language: python
       python:
-        - "3.8"
+        - "3.9"
       install:
         - pip install -r requirements/local.txt
       script:
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index 5473f114e..210d14fa8 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.8-slim-buster
+FROM python:3.9-slim-buster
 
 ENV PYTHONUNBUFFERED 1
 ENV PYTHONDONTWRITEBYTECODE 1
diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
index 315fdd405..fbb5ce9d0 100644
--- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.8-slim-buster
+FROM python:3.9-slim-buster
 
 ENV PYTHONUNBUFFERED 1
 ENV PYTHONDONTWRITEBYTECODE 1
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index 2e6a195b7..45faa17e9 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -9,7 +9,7 @@ RUN npm run build
 
 # Python build stage
 {%- endif %}
-FROM python:3.8-slim-buster
+FROM python:3.9-slim-buster
 
 ENV PYTHONUNBUFFERED 1
 
diff --git a/{{cookiecutter.project_slug}}/runtime.txt b/{{cookiecutter.project_slug}}/runtime.txt
index 3e4835ce2..1a1817944 100644
--- a/{{cookiecutter.project_slug}}/runtime.txt
+++ b/{{cookiecutter.project_slug}}/runtime.txt
@@ -1 +1 @@
-python-3.8.7
+python-3.9.1
diff --git a/{{cookiecutter.project_slug}}/setup.cfg b/{{cookiecutter.project_slug}}/setup.cfg
index 5bde75cff..c3ce2a0ef 100644
--- a/{{cookiecutter.project_slug}}/setup.cfg
+++ b/{{cookiecutter.project_slug}}/setup.cfg
@@ -7,7 +7,7 @@ max-line-length = 120
 exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv
 
 [mypy]
-python_version = 3.8
+python_version = 3.9
 check_untyped_defs = True
 ignore_missing_imports = True
 warn_unused_ignores = True

From d5d42b179726b00660ab284ce7819b688bb520bb Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 26 Jan 2021 10:51:06 -0800
Subject: [PATCH 1298/2840] Update coverage from 5.3.1 to 5.4

---
 {{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 c34862a9a..e5919ee37 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -27,7 +27,7 @@ sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==3.8.4  # https://github.com/PyCQA/flake8
 flake8-isort==4.0.0  # https://github.com/gforcada/flake8-isort
-coverage==5.3.1  # https://github.com/nedbat/coveragepy
+coverage==5.4  # https://github.com/nedbat/coveragepy
 black==20.8b1  # https://github.com/ambv/black
 pylint-django==2.4.2  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 8e031e760ff8b391fcc4dbb6a7d209aa36937666 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 27 Jan 2021 02:35:54 +0000
Subject: [PATCH 1299/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8c5999159..1a246a3eb 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-01-26]
+### Changed
+- Bump peter-evans/create-pull-request from v3.6.0 to v3.7.0 ([#3022](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3022))
+- Using SuccessMessageMixin to send success message to django template ([#3021](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3021))
+### Fixed
+- Update admin to ignore *_name User attributes ([#3018](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3018))
+### Updated
+- Update coverage to 5.4 ([#3024](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3024))
+- Update pytest to 6.2.2 ([#3020](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3020))
+- Update django-cors-headers to 3.7.0 ([#3019](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3019))
+
 ## [2021-01-24]
 ### Changed
 - Use defer for script tags (Fix #2922) ([#2927](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2927))

From 9969f8fa0da67de61f7583d319bf8a741a3e281f Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 28 Jan 2021 09:19:14 +0000
Subject: [PATCH 1300/2840] Handle error if node hasn't started yet

---
 {{cookiecutter.project_slug}}/config/settings/local.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py
index c69042d53..3ce150e1c 100644
--- a/{{cookiecutter.project_slug}}/config/settings/local.py
+++ b/{{cookiecutter.project_slug}}/config/settings/local.py
@@ -70,8 +70,12 @@ if env("USE_DOCKER") == "yes":
     hostname, _, ips = socket.gethostbyname_ex(socket.gethostname())
     INTERNAL_IPS += [".".join(ip.split(".")[:-1] + ["1"]) for ip in ips]
     {%- if cookiecutter.js_task_runner == 'Gulp' %}
-    _, _, ips = socket.gethostbyname_ex("node")
-    INTERNAL_IPS.extend(ips)
+    try:
+        _, _, ips = socket.gethostbyname_ex("node")
+        INTERNAL_IPS.extend(ips)
+    except socket.gaierror:
+        # The node container isn't started (yet?)
+        pass
     {%- endif %}
 {%- endif %}
 

From 7b92bc388d3150c7f810a901a93888cb4b471a86 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 28 Jan 2021 10:46:03 +0000
Subject: [PATCH 1301/2840] Update deprecated `scale` command to `up --scale`

The scale command is deprecated: Use the up command with the `--scale` flag instead.
---
 docs/deployment-with-docker.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/deployment-with-docker.rst b/docs/deployment-with-docker.rst
index 01df2e44d..fcce7e6f5 100644
--- a/docs/deployment-with-docker.rst
+++ b/docs/deployment-with-docker.rst
@@ -124,8 +124,8 @@ To check the logs out, run::
 
 If you want to scale your application, run::
 
-   docker-compose -f production.yml scale django=4
-   docker-compose -f production.yml scale celeryworker=2
+   docker-compose -f production.yml up --scale django=4
+   docker-compose -f production.yml up --scale celeryworker=2
 
 .. warning:: don't try to scale ``postgres``, ``celerybeat``, or ``traefik``.
 

From f0ae5ebfe75e9452cec96962d0426aea491c0bbf Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 28 Jan 2021 02:46:12 -0800
Subject: [PATCH 1302/2840] Update tox from 3.21.2 to 3.21.3

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

diff --git a/requirements.txt b/requirements.txt
index 87161a2e1..6f389476f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8-isort==4.0.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.21.2
+tox==3.21.3
 pytest==5.4.3  # pyup: <6  # https://github.com/hackebrot/pytest-cookies/issues/51
 pytest-cookies==0.5.1
 pytest-instafail==0.4.2

From 7bfac19625f9c53e23372e9b6e46b8c50c5aa1ae Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 28 Jan 2021 09:24:34 -0800
Subject: [PATCH 1303/2840] Update django-anymail from 8.1 to 8.2

---
 {{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 4a610d0c4..f5bf3ca99 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -22,7 +22,7 @@ django-storages[boto3]==1.11.1  # https://github.com/jschneier/django-storages
 django-storages[google]==1.11.1  # https://github.com/jschneier/django-storages
 {%- endif %}
 {%- if cookiecutter.mail_service == 'Mailgun' %}
-django-anymail[mailgun]==8.1  # https://github.com/anymail/django-anymail
+django-anymail[mailgun]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
 django-anymail[amazon_ses]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}

From f9b0b5a4222f0fe233528df17ec2e082c9fd15ec Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 28 Jan 2021 09:24:35 -0800
Subject: [PATCH 1304/2840] Update django-anymail from 8.1 to 8.2

---
 {{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 f5bf3ca99..004375dcb 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -24,7 +24,7 @@ django-storages[google]==1.11.1  # https://github.com/jschneier/django-storages
 {%- if cookiecutter.mail_service == 'Mailgun' %}
 django-anymail[mailgun]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
-django-anymail[amazon_ses]==8.1  # https://github.com/anymail/django-anymail
+django-anymail[amazon_ses]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
 django-anymail[mailjet]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}

From 346c91c7613c910c1a00fa3c3010fc56c6d0ceba Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 28 Jan 2021 09:24:35 -0800
Subject: [PATCH 1305/2840] Update django-anymail from 8.1 to 8.2

---
 {{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 004375dcb..c1b8a9642 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -26,7 +26,7 @@ django-anymail[mailgun]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
 django-anymail[amazon_ses]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
-django-anymail[mailjet]==8.1  # https://github.com/anymail/django-anymail
+django-anymail[mailjet]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
 django-anymail[mandrill]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}

From 70adb225292c901b24ecd03d4d52cd059a2eb4d8 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 28 Jan 2021 09:24:36 -0800
Subject: [PATCH 1306/2840] Update django-anymail from 8.1 to 8.2

---
 {{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 c1b8a9642..b5766bc14 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -28,7 +28,7 @@ django-anymail[amazon_ses]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
 django-anymail[mailjet]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
-django-anymail[mandrill]==8.1  # https://github.com/anymail/django-anymail
+django-anymail[mandrill]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
 django-anymail[postmark]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}

From dceee9bb5ca3b124a0bf8efe75ec1aabb2262b38 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 28 Jan 2021 09:24:37 -0800
Subject: [PATCH 1307/2840] Update django-anymail from 8.1 to 8.2

---
 {{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 b5766bc14..dc6a0a42e 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -30,7 +30,7 @@ django-anymail[mailjet]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
 django-anymail[mandrill]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
-django-anymail[postmark]==8.1  # https://github.com/anymail/django-anymail
+django-anymail[postmark]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
 django-anymail[sendgrid]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}

From f4a5b106a7bf8c0126636a637c175c9c8215c482 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 28 Jan 2021 09:24:38 -0800
Subject: [PATCH 1308/2840] Update django-anymail from 8.1 to 8.2

---
 {{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 dc6a0a42e..148d20e48 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -32,7 +32,7 @@ django-anymail[mandrill]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
 django-anymail[postmark]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
-django-anymail[sendgrid]==8.1  # https://github.com/anymail/django-anymail
+django-anymail[sendgrid]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
 django-anymail[sendinblue]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}

From 0059a87a85f585a2e105d4140ccebe294df79e89 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 28 Jan 2021 09:24:39 -0800
Subject: [PATCH 1309/2840] Update django-anymail from 8.1 to 8.2

---
 {{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 148d20e48..c3dd39f25 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -34,7 +34,7 @@ django-anymail[postmark]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
 django-anymail[sendgrid]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
-django-anymail[sendinblue]==8.1  # https://github.com/anymail/django-anymail
+django-anymail[sendinblue]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
 django-anymail[sparkpost]==8.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}

From b2613405b00fd8b34be6bafec09a86a9824409ac Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 28 Jan 2021 09:24:40 -0800
Subject: [PATCH 1310/2840] Update django-anymail from 8.1 to 8.2

---
 {{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 c3dd39f25..d9be12802 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -36,7 +36,7 @@ django-anymail[sendgrid]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
 django-anymail[sendinblue]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
-django-anymail[sparkpost]==8.1  # https://github.com/anymail/django-anymail
+django-anymail[sparkpost]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
 django-anymail==8.1  # https://github.com/anymail/django-anymail
 {%- endif %}

From f12fdbafafe229cfb14252794664873dd6c5beec Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 28 Jan 2021 09:24:41 -0800
Subject: [PATCH 1311/2840] Update django-anymail from 8.1 to 8.2

---
 {{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 d9be12802..ef7f99644 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -38,5 +38,5 @@ django-anymail[sendinblue]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
 django-anymail[sparkpost]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
-django-anymail==8.1  # https://github.com/anymail/django-anymail
+django-anymail==8.2  # https://github.com/anymail/django-anymail
 {%- endif %}

From e546500bd0d3ea92a629695a2c95addc74e49d57 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 28 Jan 2021 09:24:44 -0800
Subject: [PATCH 1312/2840] Update pre-commit from 2.9.3 to 2.10.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 e5919ee37..163a83d76 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -33,7 +33,7 @@ pylint-django==2.4.2  # 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.9.3  # https://github.com/pre-commit/pre-commit
+pre-commit==2.10.0  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From 518f179b13545b061ee235a88687303a75bc406e Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 29 Jan 2021 02:36:43 +0000
Subject: [PATCH 1313/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a246a3eb..96d9b79e1 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-01-28]
+### Updated
+- Update pre-commit to 2.10.0 ([#3028](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3028))
+- Update django-anymail to 8.2 ([#3027](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3027))
+- Update tox to 3.21.3 ([#3026](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3026))
+
 ## [2021-01-26]
 ### Changed
 - Bump peter-evans/create-pull-request from v3.6.0 to v3.7.0 ([#3022](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3022))

From e0cf956fe2b63fff19710bc0c12a47e795598b2d Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Fri, 29 Jan 2021 17:55:10 +0530
Subject: [PATCH 1314/2840] Refactored users.forms to make the code more
 readeable

---
 .../users/forms.py                             | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
index 7d3a296bc..80cd97aed 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
@@ -1,6 +1,5 @@
 from django.contrib.auth import forms as admin_forms
 from django.contrib.auth import get_user_model
-from django.core.exceptions import ValidationError
 from django.utils.translation import gettext_lazy as _
 
 User = get_user_model()
@@ -12,20 +11,9 @@ class UserChangeForm(admin_forms.UserChangeForm):
 
 
 class UserCreationForm(admin_forms.UserCreationForm):
-
-    error_message = admin_forms.UserCreationForm.error_messages.update(
-        {"duplicate_username": _("This username has already been taken.")}
-    )
-
     class Meta(admin_forms.UserCreationForm.Meta):
         model = User
 
-    def clean_username(self):
-        username = self.cleaned_data["username"]
-
-        try:
-            User.objects.get(username=username)
-        except User.DoesNotExist:
-            return username
-
-        raise ValidationError(self.error_messages["duplicate_username"])
+        error_messages = {
+            "username": {"unique": _("This username has already been taken.")}
+        }

From 0a241a8f75dfee56c0af5b7d8c7eea2f071b8ff3 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Fri, 29 Jan 2021 22:16:11 +0530
Subject: [PATCH 1315/2840] Updated test_forms.py to not check whether
 UserCreationForm has a clean_username() method

---
 .../{{cookiecutter.project_slug}}/users/tests/test_forms.py      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
index dfa5da52e..3b4a1210c 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
@@ -20,7 +20,6 @@ class TestUserCreationForm:
         )
 
         assert form.is_valid()
-        assert form.clean_username() == proto_user.username
 
         # Creating a user.
         form.save()

From e8996ef281ada2dab4188f2eff1435d2a694f50c Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Sat, 30 Jan 2021 11:41:16 +0530
Subject: [PATCH 1316/2840] Updated the test_clean_username test to also test
 for the custom validation message raised in case username already exists in
 the db

---
 .../{{cookiecutter.project_slug}}/users/tests/test_forms.py     | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
index 3b4a1210c..437829b25 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
@@ -1,4 +1,5 @@
 import pytest
+from django.utils.translation import ugettext_lazy as _
 
 from {{ cookiecutter.project_slug }}.users.forms import UserCreationForm
 from {{ cookiecutter.project_slug }}.users.tests.factories import UserFactory
@@ -37,3 +38,4 @@ class TestUserCreationForm:
         assert not form.is_valid()
         assert len(form.errors) == 1
         assert "username" in form.errors
+        assert form.errors["username"][0] == _("This username has already been taken.")

From b980db9f6252ba8a1d6727512d3cd1a40a3ef3cb Mon Sep 17 00:00:00 2001
From: PJ Hoberman <pj.hoberman@gmail.com>
Date: Sat, 30 Jan 2021 13:55:06 -0700
Subject: [PATCH 1317/2840] Adding local celery instructions to
 developing-locally

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

diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index 2b7806ce4..264fd849d 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -143,6 +143,10 @@ when developing locally. If you have the appropriate setup on your local machine
 in ``config/settings/local.py``::
 
     CELERY_TASK_ALWAYS_EAGER = False
+    
+To run Celery locally, make sure redis-server is installed (instructions are available at https://redis.io/topics/quickstart), run the server in one terminal with `redis-server`, and then start celery in another terminal with the following command::
+    
+    celery -A config.celery_app worker --loglevel=info
 
 
 Sass Compilation & Live Reloading

From ba97025971b5f7ecd3b8b094b307f0bbea234efe Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 31 Jan 2021 05:43:22 -0800
Subject: [PATCH 1318/2840] Update django-crispy-forms from 1.10.0 to 1.11.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 a035aeed3..76efc0e9e 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -33,7 +33,7 @@ django==3.0.11  # pyup: < 3.1  # 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-crispy-forms==1.10.0  # https://github.com/django-crispy-forms/django-crispy-forms
+django-crispy-forms==1.11.0  # https://github.com/django-crispy-forms/django-crispy-forms
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==2.4  # https://github.com/django-compressor/django-compressor
 {%- endif %}

From ae63c708093696de322353cb497917b34be17399 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sun, 31 Jan 2021 18:04:27 +0000
Subject: [PATCH 1319/2840] 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 8853e76e7..7a684f38f 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1067,5 +1067,10 @@
     "name": "vascop",
     "github_login": "vascop",
     "twitter_username": ""
+  },
+  {
+    "name": "PJ Hoberman",
+    "github_login": "pjhoberman",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 818b6cdd7..ca43cd64c 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1223,6 +1223,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>PJ Hoberman</td>
+    <td>
+      <a href="https://github.com/pjhoberman">pjhoberman</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Raony Guimarães Corrêa</td>
     <td>

From 958de4814eb6e2478a6a9464bcdcdf56055d15e3 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sun, 31 Jan 2021 18:11:23 +0000
Subject: [PATCH 1320/2840] Update dependabot.yml

---
 .github/dependabot.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 5ee5d0a04..f0b70dd0e 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -8,3 +8,5 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+    labels:
+      - "update"

From 7c68e12bcae78b9ea03724dda4e5afb987d9dd23 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Mon, 1 Feb 2021 02:37:18 +0000
Subject: [PATCH 1321/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 96d9b79e1..3fa3ae633 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-01-31]
+### Changed
+- Adding local celery instructions to developing-locally ([#3031](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3031))
+### Updated
+- Update django-crispy-forms to 1.11.0 ([#3032](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3032))
+
 ## [2021-01-28]
 ### Updated
 - Update pre-commit to 2.10.0 ([#3028](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3028))

From ffffd6d14881f79a6dcc8c6e2d41141a88a6771f Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 31 Jan 2021 18:37:25 -0800
Subject: [PATCH 1322/2840] Update jinja2 from 2.11.2 to 2.11.3

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

diff --git a/requirements.txt b/requirements.txt
index 6f389476f..80b930c8f 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -20,4 +20,4 @@ pyyaml==5.4.1
 # Scripting
 # ------------------------------------------------------------------------------
 PyGithub==1.54.1
-jinja2==2.11.2
+jinja2==2.11.3

From 086dae7ecaf4077ff81b8162f2843ccfa6791aa1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 1 Feb 2021 07:19:27 +0000
Subject: [PATCH 1323/2840] Bump peter-evans/create-pull-request from v3.7.0 to
 v3.8.0

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from v3.7.0 to v3.8.0.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v3.7.0...5e9d0ee9ea5ccf865a52a571cba827e4b52a1aff)

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 a0ad17ab0..ca2ecdd59 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.7.0
+      uses: peter-evans/create-pull-request@v3.8.0
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         branch: update/pre-commit-autoupdate

From d442074ce33d7164b8563bb3c32b7df8b8b06129 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 1 Feb 2021 01:49:28 -0800
Subject: [PATCH 1324/2840] Update pytz from 2020.5 to 2021.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 76efc0e9e..b2eaa48ea 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,4 +1,4 @@
-pytz==2020.5  # https://github.com/stub42/pytz
+pytz==2021.1  # https://github.com/stub42/pytz
 python-slugify==4.0.1  # https://github.com/un33k/python-slugify
 Pillow==8.1.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}

From fc01e870bd53d1ab903f99b7fd842054910a8090 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 2 Feb 2021 02:38:04 +0000
Subject: [PATCH 1325/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3fa3ae633..a0abb1a45 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-02-01]
+### Updated
+- Update pytz to 2021.1 ([#3035](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3035))
+- Update jinja2 to 2.11.3 ([#3033](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3033))
+- Bump peter-evans/create-pull-request from v3.7.0 to v3.8.0 ([#3034](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3034))
+
 ## [2021-01-31]
 ### Changed
 - Adding local celery instructions to developing-locally ([#3031](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3031))

From c5750920164e11b840ef55db9f6720f4ee663a39 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 1 Feb 2021 18:38:12 -0800
Subject: [PATCH 1326/2840] Update django from 3.0.11 to 3.0.12

---
 {{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 b2eaa48ea..a0e98dab1 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,7 +29,7 @@ uvicorn[standard]==0.13.3  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.0.11  # pyup: < 3.1  # https://www.djangoproject.com/
+django==3.0.12  # pyup: < 3.1  # 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

From 08334ba9795e38917b6aaa07d519f14b93cdc830 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Tue, 2 Feb 2021 13:19:27 +0530
Subject: [PATCH 1327/2840] Fixed the Middleware deprecation warnings by
 creating a dummy response function.

---
 .../users/tests/test_views.py                             | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
index c2fe8b519..36ad6e1fa 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
@@ -3,6 +3,7 @@ from django.contrib import messages
 from django.contrib.auth.models import AnonymousUser
 from django.contrib.messages.middleware import MessageMiddleware
 from django.contrib.sessions.middleware import SessionMiddleware
+from django.http import HttpRequest
 from django.http.response import Http404
 from django.test import RequestFactory
 
@@ -27,6 +28,9 @@ class TestUserUpdateView:
         https://github.com/pytest-dev/pytest-django/pull/258
     """
 
+    def dummy_get_response(self, request: HttpRequest):
+        return None
+
     def test_get_success_url(self, user: User, rf: RequestFactory):
         view = UserUpdateView()
         request = rf.get("/fake-url/")
@@ -50,8 +54,8 @@ class TestUserUpdateView:
         request = rf.get("/fake-url/")
 
         # Add the session/message middleware to the request
-        SessionMiddleware().process_request(request)
-        MessageMiddleware().process_request(request)
+        SessionMiddleware(self.dummy_get_response).process_request(request)
+        MessageMiddleware(self.dummy_get_response).process_request(request)
         request.user = user
 
         view.request = request

From fc8e2ea8a237b5a4badc2b1226194481cbca39ac Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Thu, 4 Feb 2021 15:28:08 +0530
Subject: [PATCH 1328/2840] Removed unnecessary test for username case
 sensitivity since django usernames are case sensitive by default. Also made
 the redirecting to the login url more dynamic by fetching the defined
 login_url from settings

---
 .../users/tests/test_views.py                        | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
index c2fe8b519..9e6bbcbfc 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
@@ -1,10 +1,12 @@
 import pytest
+from django.conf import settings
 from django.contrib import messages
 from django.contrib.auth.models import AnonymousUser
 from django.contrib.messages.middleware import MessageMiddleware
 from django.contrib.sessions.middleware import SessionMiddleware
 from django.http.response import Http404
 from django.test import RequestFactory
+from django.urls import reverse
 
 from {{ cookiecutter.project_slug }}.users.forms import UserChangeForm
 from {{ cookiecutter.project_slug }}.users.models import User
@@ -90,13 +92,7 @@ class TestUserDetailView:
         request.user = AnonymousUser()
 
         response = user_detail_view(request, username=user.username)
+        login_url = reverse(settings.LOGIN_URL)
 
         assert response.status_code == 302
-        assert response.url == "/accounts/login/?next=/fake-url/"
-
-    def test_case_sensitivity(self, rf: RequestFactory):
-        request = rf.get("/fake-url/")
-        request.user = UserFactory(username="UserName")
-
-        with pytest.raises(Http404):
-            user_detail_view(request, username="username")
+        assert response.url == f"{login_url}?next=/fake-url/"

From 3cf7e74a7781f31314aa5f16a6be614057845f09 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Thu, 4 Feb 2021 15:54:26 +0530
Subject: [PATCH 1329/2840] Removed unused Http404 import.

---
 .../{{cookiecutter.project_slug}}/users/tests/test_views.py      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
index 9e6bbcbfc..a9349bf3a 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
@@ -4,7 +4,6 @@ from django.contrib import messages
 from django.contrib.auth.models import AnonymousUser
 from django.contrib.messages.middleware import MessageMiddleware
 from django.contrib.sessions.middleware import SessionMiddleware
-from django.http.response import Http404
 from django.test import RequestFactory
 from django.urls import reverse
 

From 002b3eaf4100c02d9045f5953157754699e60777 Mon Sep 17 00:00:00 2001
From: areski <areski@gmail.com>
Date: Thu, 4 Feb 2021 16:52:45 +0100
Subject: [PATCH 1330/2840] Update Django 3.0.11 to 3.1.6

---
 tests/test_docker.sh                            |  2 +-
 .../requirements/base.txt                       |  2 +-
 .../0004_alter_options_ordering_domain.py       | 17 +++++++++++++++++
 3 files changed, 19 insertions(+), 2 deletions(-)
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0004_alter_options_ordering_domain.py

diff --git a/tests/test_docker.sh b/tests/test_docker.sh
index 740f8fc22..f6df6b8ab 100755
--- a/tests/test_docker.sh
+++ b/tests/test_docker.sh
@@ -30,4 +30,4 @@ docker-compose -f local.yml run django pytest
 docker-compose -f local.yml run django python manage.py makemigrations --dry-run --check || { echo "ERROR: there were changes in the models, but migration listed above have not been created and are not saved in version control"; exit 1; }
 
 # Test support for translations
-docker-compose -f local.yml run django python manage.py makemessages
+docker-compose -f local.yml run django python manage.py makemessages --all
diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index b2eaa48ea..1bb928178 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,7 +29,7 @@ uvicorn[standard]==0.13.3  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.0.11  # pyup: < 3.1  # https://www.djangoproject.com/
+django==3.1.6  # pyup: < 3.1  # 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
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0004_alter_options_ordering_domain.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0004_alter_options_ordering_domain.py
new file mode 100644
index 000000000..ffc88bf5c
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0004_alter_options_ordering_domain.py
@@ -0,0 +1,17 @@
+# Generated by Django 3.1.6 on 2021-02-04 14:49
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('sites', '0003_set_site_domain_and_name'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='site',
+            options={'ordering': ['domain'], 'verbose_name': 'site', 'verbose_name_plural': 'sites'},
+        ),
+    ]

From b2fa8b1b182f6b456e10870739652ec6b3045a45 Mon Sep 17 00:00:00 2001
From: areski <areski@gmail.com>
Date: Thu, 4 Feb 2021 19:07:31 +0100
Subject: [PATCH 1331/2840] Update Readme for support Django 3.1

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index dbc510a47..ae8699503 100644
--- a/README.rst
+++ b/README.rst
@@ -40,7 +40,7 @@ production-ready Django projects quickly.
 Features
 ---------
 
-* For Django 3.0
+* For Django 3.1
 * Works with Python 3.8
 * Renders Django projects with 100% starting test coverage
 * Twitter Bootstrap_ v4 (`maintained Foundation fork`_ also available)

From 39033fa8abb1c9cbb5895c498c5c829f35e82850 Mon Sep 17 00:00:00 2001
From: areski <areski@gmail.com>
Date: Thu, 4 Feb 2021 19:09:09 +0100
Subject: [PATCH 1332/2840] Fix pyup for Django 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 1bb928178..3efa6170d 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,7 +29,7 @@ uvicorn[standard]==0.13.3  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.1.6  # pyup: < 3.1  # https://www.djangoproject.com/
+django==3.1.6  # 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

From 47768d495f928196da015cd22c4c9c0cdfd1c429 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Fri, 5 Feb 2021 09:47:06 +0530
Subject: [PATCH 1333/2840] Refactored test_views to test only the required
 characteristics of the UserCreationForm.

---
 .../users/tests/test_forms.py                 | 38 +++++++++----------
 1 file changed, 17 insertions(+), 21 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
index 437829b25..617f2cbe5 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
@@ -1,37 +1,33 @@
+"""
+Module for all Form Tests.
+"""
 import pytest
 from django.utils.translation import ugettext_lazy as _
 
 from {{ cookiecutter.project_slug }}.users.forms import UserCreationForm
-from {{ cookiecutter.project_slug }}.users.tests.factories import UserFactory
+from {{ cookiecutter.project_slug }}.users.models import User
 
 pytestmark = pytest.mark.django_db
 
 
 class TestUserCreationForm:
-    def test_clean_username(self):
-        # A user with proto_user params does not exist yet.
-        proto_user = UserFactory.build()
+    """
+    Test class for all tests related to the UserCreationForm
+    """
+    def test_username_validation_error_msg(self, user: User):
+        """
+        Tests UserCreation Form's unique validator functions correctly by testing:
+            1) Only 1 error is raised by the UserCreation Form
+            2) The desired error message is raised
+        """
 
-        form = UserCreationForm(
-            {
-                "username": proto_user.username,
-                "password1": proto_user._password,
-                "password2": proto_user._password,
-            }
-        )
-
-        assert form.is_valid()
-
-        # Creating a user.
-        form.save()
-
-        # The user with proto_user params already exists,
+        # The user already exists,
         # hence cannot be created.
         form = UserCreationForm(
             {
-                "username": proto_user.username,
-                "password1": proto_user._password,
-                "password2": proto_user._password,
+                "username": user.username,
+                "password1": user.password,
+                "password2": user.password,
             }
         )
 

From 352232f61706c22a1184094fe79798eef174baa3 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Fri, 5 Feb 2021 09:55:30 +0530
Subject: [PATCH 1334/2840] Fixed Formatting Issues.

---
 .../{{cookiecutter.project_slug}}/users/tests/test_forms.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
index 617f2cbe5..66118f493 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
@@ -14,11 +14,13 @@ class TestUserCreationForm:
     """
     Test class for all tests related to the UserCreationForm
     """
+
     def test_username_validation_error_msg(self, user: User):
         """
         Tests UserCreation Form's unique validator functions correctly by testing:
-            1) Only 1 error is raised by the UserCreation Form
-            2) The desired error message is raised
+            1) A new user with an existing username cannot be added.
+            2) Only 1 error is raised by the UserCreation Form
+            3) The desired error message is raised
         """
 
         # The user already exists,

From 9d3d423221914da193f8a3f43cbc9f0d1a6c3ddc Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 6 Feb 2021 16:56:50 +0000
Subject: [PATCH 1335/2840] Bump template version

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

diff --git a/setup.py b/setup.py
index c72ba1c9d..e6e863850 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.0.11"
+version = "3.0.12"
 
 if sys.argv[-1] == "tag":
     os.system(f'git tag -a {version} -m "version {version}"')

From 06c54c9312b270c3cc88fd87da03351260dad053 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 6 Feb 2021 08:59:33 -0800
Subject: [PATCH 1336/2840] Update tox from 3.21.3 to 3.21.4

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

diff --git a/requirements.txt b/requirements.txt
index 80b930c8f..d7e3c5b95 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8-isort==4.0.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.21.3
+tox==3.21.4
 pytest==5.4.3  # pyup: <6  # https://github.com/hackebrot/pytest-cookies/issues/51
 pytest-cookies==0.5.1
 pytest-instafail==0.4.2

From e853e50fb727a344fb7768c6bcd0433cbd7a76fb Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sun, 7 Feb 2021 02:22:26 +0000
Subject: [PATCH 1337/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0abb1a45..86d0cfd5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-02-06]
+### Changed
+- Removed Redundant test_case_sensitivity() and made test_not_authenticated() get the LOGIN_URL dynamically. ([#3041](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3041))
+- Refactored users.forms to make the code more readeable ([#3029](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3029))
+- Update django to 3.0.12 ([#3037](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3037))
+### Updated
+- Update tox to 3.21.4 ([#3044](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3044))
+
 ## [2021-02-01]
 ### Updated
 - Update pytz to 2021.1 ([#3035](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3035))

From 416e052de22dcdee225b55669dc61d8a3ed1e2fb Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 6 Feb 2021 20:36:09 -0800
Subject: [PATCH 1338/2840] Update pre-commit from 2.10.0 to 2.10.1

---
 {{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 163a83d76..62aa17ec0 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -33,7 +33,7 @@ pylint-django==2.4.2  # 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.10.0  # https://github.com/pre-commit/pre-commit
+pre-commit==2.10.1  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From 10a4f4e4b8276aeffcf47f71705cc0f3b0934f02 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 8 Feb 2021 06:30:51 +0000
Subject: [PATCH 1339/2840] Bump peter-evans/create-pull-request from v3.8.0 to
 v3.8.1

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from v3.8.0 to v3.8.1.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v3.8.0...34371f09e5a05dadd212d0bc451d4c1fa456c646)

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 ca2ecdd59..188e96ac6 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.8.0
+      uses: peter-evans/create-pull-request@v3.8.1
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         branch: update/pre-commit-autoupdate

From 073625445bdab864f0dadeeedb1e2fb233396bc9 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 8 Feb 2021 07:23:24 -0800
Subject: [PATCH 1340/2840] Update django-extensions from 3.1.0 to 3.1.1

---
 {{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 163a83d76..88d7419f8 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -40,6 +40,6 @@ pre-commit==2.10.0  # https://github.com/pre-commit/pre-commit
 factory-boy==3.2.0  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==3.2  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==3.1.0  # https://github.com/django-extensions/django-extensions
+django-extensions==3.1.1  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.1.0  # https://github.com/pytest-dev/pytest-django

From 8473717a910d3e1bf82e463d21962c12bac07a60 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 9 Feb 2021 02:21:45 +0000
Subject: [PATCH 1341/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86d0cfd5c..6c1c32237 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-02-08]
+### Updated
+- Update django-extensions to 3.1.1 ([#3047](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3047))
+- Bump peter-evans/create-pull-request from v3.8.0 to v3.8.1 ([#3046](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3046))
+
 ## [2021-02-06]
 ### Changed
 - Removed Redundant test_case_sensitivity() and made test_not_authenticated() get the LOGIN_URL dynamically. ([#3041](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3041))

From 9efa93a7e0b406ed56a19f6856fb5fea81fffe38 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 10 Feb 2021 05:51:17 +0000
Subject: [PATCH 1342/2840] Bump peter-evans/create-pull-request from v3.8.1 to
 v3.8.2

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from v3.8.1 to v3.8.2.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v3.8.1...052fc72b4198ba9fbc81b818c6e1859f747d49a8)

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 188e96ac6..1c0c0b769 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.8.1
+      uses: peter-evans/create-pull-request@v3.8.2
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         branch: update/pre-commit-autoupdate

From 84a6de2d75b265263b5610cf4d66348dc68041da Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 11 Feb 2021 02:21:56 +0000
Subject: [PATCH 1343/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c1c32237..dd79da4bb 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-02-10]
+### Updated
+- Bump peter-evans/create-pull-request from v3.8.1 to v3.8.2 ([#3049](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3049))
+
 ## [2021-02-08]
 ### Updated
 - Update django-extensions to 3.1.1 ([#3047](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3047))

From ae151f04a2b9db0791b077b48d42baaf6f318c01 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 11 Feb 2021 23:54:12 -0800
Subject: [PATCH 1344/2840] Update sentry-sdk from 0.19.5 to 0.20.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 ef7f99644..9f1ea9691 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.19.5  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.20.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 8d87b194fc4b6fabcbd4c119174dd43c5793c8a3 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 13 Feb 2021 02:21:49 +0000
Subject: [PATCH 1345/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd79da4bb..182ce5eb6 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-02-12]
+### Updated
+- Update pre-commit to 2.10.1 ([#3045](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3045))
+- Update sentry-sdk to 0.20.0 ([#3051](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3051))
+
 ## [2021-02-10]
 ### Updated
 - Bump peter-evans/create-pull-request from v3.8.1 to v3.8.2 ([#3049](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3049))

From 179ba90299592f0437fe3b4a356f391248a57595 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 13 Feb 2021 00:19:41 -0800
Subject: [PATCH 1346/2840] Update sentry-sdk from 0.20.0 to 0.20.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 9f1ea9691..83f3ef9f7 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.20.0  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.20.1  # 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 027c18fb87610d9064e96ce8f619543cf0229bfb Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sun, 14 Feb 2021 02:22:50 +0000
Subject: [PATCH 1347/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 182ce5eb6..6cba732c6 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-02-13]
+### Updated
+- Update sentry-sdk to 0.20.1 ([#3052](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3052))
+
 ## [2021-02-12]
 ### Updated
 - Update pre-commit to 2.10.1 ([#3045](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3045))

From 583f8c668807e1f88bae57173bad839af87d488d Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 14 Feb 2021 15:08:48 -0800
Subject: [PATCH 1348/2840] Update sphinx from 3.4.3 to 3.5.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 7ef1d5097..39d6a9fda 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==3.4.3  # https://github.com/sphinx-doc/sphinx
+sphinx==3.5.0  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From 3795bc04d039eb5e3e251c3be2bc190f2f4f697f Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 16 Feb 2021 06:27:45 -0800
Subject: [PATCH 1349/2840] Update sentry-sdk from 0.20.1 to 0.20.2

---
 {{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 83f3ef9f7..66d7fca42 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.20.1  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.20.2  # 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 17499a12c9216d1db907305ef30f58970cd0932e Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Tue, 16 Feb 2021 18:33:27 -0500
Subject: [PATCH 1350/2840] Remove email from User API

---
 .../{{cookiecutter.project_slug}}/users/api/serializers.py      | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py
index 8bd39d30e..b5ccabba1 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py
@@ -7,7 +7,7 @@ User = get_user_model()
 class UserSerializer(serializers.ModelSerializer):
     class Meta:
         model = User
-        fields = ["username", "email", "name", "url"]
+        fields = ["username", "name", "url"]
 
         extra_kwargs = {
             "url": {"view_name": "api:user-detail", "lookup_field": "username"}

From 8aeee881bb32935718e767114256179f9c9bf216 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Tue, 16 Feb 2021 18:35:47 -0500
Subject: [PATCH 1351/2840] Remove email from User API Test

---
 .../{{cookiecutter.project_slug}}/users/tests/test_drf_views.py  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
index 60944ad3b..924573089 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
@@ -28,7 +28,6 @@ class TestUserViewSet:
 
         assert response.data == {
             "username": user.username,
-            "email": user.email,
             "name": user.name,
             "url": f"http://testserver/api/users/{user.username}/",
         }

From 55003e21a62c761910f64a4899842a986d5fdfba Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 17 Feb 2021 02:20:58 +0000
Subject: [PATCH 1352/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6cba732c6..c3a819341 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-02-16]
+### Updated
+- Update sentry-sdk to 0.20.2 ([#3054](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3054))
+- Update sphinx to 3.5.0 ([#3053](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3053))
+
 ## [2021-02-13]
 ### Updated
 - Update sentry-sdk to 0.20.1 ([#3052](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3052))

From 119a4d066010a3edb05e0a9e6a4ad927fa692c10 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 16 Feb 2021 18:21:04 -0800
Subject: [PATCH 1353/2840] Update sphinx from 3.5.0 to 3.5.1

---
 {{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 39d6a9fda..02ff06aad 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==3.5.0  # https://github.com/sphinx-doc/sphinx
+sphinx==3.5.1  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From c2db5077bb5620203008453791f3bb02c9becd4a Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 17 Feb 2021 04:27:17 -0800
Subject: [PATCH 1354/2840] Update tox from 3.21.4 to 3.22.0

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

diff --git a/requirements.txt b/requirements.txt
index d7e3c5b95..cce198bf4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8-isort==4.0.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.21.4
+tox==3.22.0
 pytest==5.4.3  # pyup: <6  # https://github.com/hackebrot/pytest-cookies/issues/51
 pytest-cookies==0.5.1
 pytest-instafail==0.4.2

From 81812fd8c297fb0164df3edcec519991a7f2c9cd Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 19 Feb 2021 06:29:09 -0800
Subject: [PATCH 1355/2840] Update sentry-sdk from 0.20.2 to 0.20.3

---
 {{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 66d7fca42..0ce6fc10e 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.20.2  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.20.3  # 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 d67dbf9d362d1b00ab6a050444d4f9e6a68ff052 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 20 Feb 2021 00:58:50 -0800
Subject: [PATCH 1356/2840] Update django from 3.0.12 to 3.0.13

---
 {{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 a0e98dab1..085972df1 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,7 +29,7 @@ uvicorn[standard]==0.13.3  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.0.12  # pyup: < 3.1  # https://www.djangoproject.com/
+django==3.0.13  # pyup: < 3.1  # 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

From 5d138cc0f50a5d827a553fd4c2413e9e3923bcbe Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 20 Feb 2021 08:00:22 -0800
Subject: [PATCH 1357/2840] Update mypy from 0.800 to 0.812

---
 {{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 39d6a9fda..c6293bde1 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -13,7 +13,7 @@ watchgod==0.6  # https://github.com/samuelcolvin/watchgod
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.800  # https://github.com/python/mypy
+mypy==0.812  # https://github.com/python/mypy
 django-stubs==1.7.0  # https://github.com/typeddjango/django-stubs
 pytest==6.2.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar

From bf4d502941e7ec626892d18ef2777e6d46ab653e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 21 Feb 2021 06:12:15 -0800
Subject: [PATCH 1358/2840] Update uvicorn from 0.13.3 to 0.13.4

---
 {{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 a0e98dab1..132cd7cf7 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.13.3  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.13.4  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django

From f97513d0ca601b4d1401da7f95c2dba867fd1e98 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 21 Feb 2021 06:12:17 -0800
Subject: [PATCH 1359/2840] Update django-crispy-forms from 1.11.0 to 1.11.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 a0e98dab1..34115932c 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -33,7 +33,7 @@ django==3.0.12  # pyup: < 3.1  # 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-crispy-forms==1.11.0  # https://github.com/django-crispy-forms/django-crispy-forms
+django-crispy-forms==1.11.1  # https://github.com/django-crispy-forms/django-crispy-forms
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==2.4  # https://github.com/django-compressor/django-compressor
 {%- endif %}

From 86f79e08b2153c79b423d78247f3a0988b5a993b Mon Sep 17 00:00:00 2001
From: areski <areski@gmail.com>
Date: Sun, 21 Feb 2021 17:55:05 +0100
Subject: [PATCH 1360/2840] Update Django to 3.1.7

---
 {{cookiecutter.project_slug}}/requirements/base.txt             | 2 +-
 .../sites/migrations/0004_alter_options_ordering_domain.py      | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 3efa6170d..7ded74df9 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,7 +29,7 @@ uvicorn[standard]==0.13.3  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.1.6  # pyup: < 3.2  # https://www.djangoproject.com/
+django==3.1.7  # 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
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0004_alter_options_ordering_domain.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0004_alter_options_ordering_domain.py
index ffc88bf5c..00c9a74d3 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0004_alter_options_ordering_domain.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0004_alter_options_ordering_domain.py
@@ -1,4 +1,4 @@
-# Generated by Django 3.1.6 on 2021-02-04 14:49
+# Generated by Django 3.1.7 on 2021-02-04 14:49
 
 from django.db import migrations
 

From 977e0333520af940fc7531559ce6af5c46d704c1 Mon Sep 17 00:00:00 2001
From: Dani Hodovic <dani.hodovic@gmail.com>
Date: Sun, 21 Feb 2021 19:25:32 +0200
Subject: [PATCH 1361/2840] refactor: remove default cache settings in test.py

It's LocMemCache by default, there is no need to specify this in test.py
```python
django.core.cache.backends.locmem.LocMemCache
```

https://docs.djangoproject.com/en/dev/ref/settings/#caches
---
 {{cookiecutter.project_slug}}/config/settings/test.py | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/test.py b/{{cookiecutter.project_slug}}/config/settings/test.py
index 667bb20d8..222597ad9 100644
--- a/{{cookiecutter.project_slug}}/config/settings/test.py
+++ b/{{cookiecutter.project_slug}}/config/settings/test.py
@@ -15,16 +15,6 @@ SECRET_KEY = env(
 # https://docs.djangoproject.com/en/dev/ref/settings/#test-runner
 TEST_RUNNER = "django.test.runner.DiscoverRunner"
 
-# CACHES
-# ------------------------------------------------------------------------------
-# https://docs.djangoproject.com/en/dev/ref/settings/#caches
-CACHES = {
-    "default": {
-        "BACKEND": "django.core.cache.backends.locmem.LocMemCache",
-        "LOCATION": "",
-    }
-}
-
 # PASSWORDS
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#password-hashers

From 4434df4d7b6dd5a4b22285d39b17b81a570e24f7 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 22 Feb 2021 06:43:11 +0000
Subject: [PATCH 1362/2840] Bump stefanzweifel/git-auto-commit-action from
 v4.8.0 to v4.9.0

Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from v4.8.0 to v4.9.0.
- [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases)
- [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.8.0...268ec0c24022281e267b095789643cf0db356bc6)

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-changelog.yml    | 2 +-
 .github/workflows/update-contributors.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index ea4ddf613..7cb2a1b80 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -28,7 +28,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Commit changes
-      uses: stefanzweifel/git-auto-commit-action@v4.8.0
+      uses: stefanzweifel/git-auto-commit-action@v4.9.0
       with:
         commit_message: Update Changelog
         file_pattern: CHANGELOG.md
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index f849484fc..4d9026b9f 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -24,7 +24,7 @@ jobs:
       run: python scripts/update_contributors.py
 
     - name: Commit changes
-      uses: stefanzweifel/git-auto-commit-action@v4.8.0
+      uses: stefanzweifel/git-auto-commit-action@v4.9.0
       with:
         commit_message: Update Contributors
         file_pattern: CONTRIBUTORS.md .github/contributors.json

From c8a4de1a385953a933efb757f70f5708aed6933b Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 22 Feb 2021 19:49:08 +0000
Subject: [PATCH 1363/2840] Bump template version

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

diff --git a/setup.py b/setup.py
index e6e863850..fb3a7cae7 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.0.12"
+version = "3.0.13"
 
 if sys.argv[-1] == "tag":
     os.system(f'git tag -a {version} -m "version {version}"')

From 748179bedc862f3967f359565ccbbc2c2233cf71 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Mon, 22 Feb 2021 20:26:42 +0000
Subject: [PATCH 1364/2840] 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 7a684f38f..5b5c575cf 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1072,5 +1072,10 @@
     "name": "PJ Hoberman",
     "github_login": "pjhoberman",
     "twitter_username": ""
+  },
+  {
+    "name": "lcd1232",
+    "github_login": "lcd1232",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index ca43cd64c..9a8e30190 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -978,6 +978,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>lcd1232</td>
+    <td>
+      <a href="https://github.com/lcd1232">lcd1232</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Leo won</td>
     <td>

From 1aa4c31b87d3a32fd791ee1a7053c4d08f845200 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Mon, 22 Feb 2021 15:45:05 -0500
Subject: [PATCH 1365/2840] Change confusing CSRF 403 message

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 .../{{cookiecutter.project_slug}}/templates/403.html            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/403.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/403.html
index 49c82a9d7..31da98826 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/403.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/403.html
@@ -5,5 +5,5 @@
 {% block content %}
 <h1>Forbidden (403)</h1>
 
-<p>{% if exception %}{{ exception }}{% else %}CSRF verification failed. Request aborted.{% endif %}</p>
+<p>{% if exception %}{{ exception }}{% else %}You're not allowed to access this page.{% endif %}</p>
 {% endblock content %}{% endraw %}

From 499b60ce7fb7ee38988ceca9db23bc1a93c9e76c Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 23 Feb 2021 02:24:37 +0000
Subject: [PATCH 1366/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c3a819341..5838e06eb 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-02-22]
+### Changed
+- refactor: remove default cache settings in test.py ([#3064](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3064))
+- Update django to 3.0.13 ([#3060](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3060))
+### Fixed
+- Fix missing Django Debug toolbar with node container ([#2865](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2865))
+- Remove Email from User API ([#3055](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3055))
+### Updated
+- Bump stefanzweifel/git-auto-commit-action from v4.8.0 to v4.9.0 ([#3065](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3065))
+- Update django-crispy-forms to 1.11.1 ([#3063](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3063))
+- Update uvicorn to 0.13.4 ([#3062](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3062))
+- Update mypy to 0.812 ([#3061](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3061))
+- Update sentry-sdk to 0.20.3 ([#3059](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3059))
+- Update tox to 3.22.0 ([#3057](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3057))
+- Update sphinx to 3.5.1 ([#3056](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3056))
+
 ## [2021-02-16]
 ### Updated
 - Update sentry-sdk to 0.20.2 ([#3054](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3054))

From a4f1acf17e952cb058676d75b3e0054ffee57643 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Tue, 23 Feb 2021 10:59:30 +0530
Subject: [PATCH 1367/2840] Updated the github action to run all pre-commit
 hooks on all files in the linter stage so that there is only 1 place that is
 used to maange all code quality tools.

---
 {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
index 57add2c04..3a6b0284c 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -16,7 +16,7 @@ on:
 
 
 jobs:
-  flake8:
+  linter:
     runs-on: ubuntu-latest
     steps:
 
@@ -28,13 +28,13 @@ jobs:
         with:
           python-version: 3.8
 
-      - name: Install flake8
+      - name: Install flake8, flake8-isort, and black
         run: |
           python -m pip install --upgrade pip
-          pip install flake8
+          pip install flake8 flake8-isort black
 
-      - name: Lint with flake8
-        run: flake8
+      - name: Install and Run Pre-commit 
+        uses: pre-commit/action@v2.0.0
 
 # With no caching at all the entire ci process takes 4m 30s to complete!
   pytest:

From db636c8e3675132106ddc8ea99024a84ee594659 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Tue, 23 Feb 2021 11:11:03 +0530
Subject: [PATCH 1368/2840] Updated tests with the updated github stage names.

---
 tests/test_cookiecutter_generation.py                | 12 ++++++------
 .../.github/workflows/ci.yml                         |  3 +++
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index af6e4588b..a1dcf796d 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -234,7 +234,7 @@ def test_gitlab_invokes_flake8_and_pytest(
         ("y", "docker-compose -f local.yml exec -T django pytest"),
     ],
 )
-def test_github_invokes_flake8_and_pytest(
+def test_github_invokes_linter_and_pytest(
     cookies, context, use_docker, expected_test_script
 ):
     context.update({"ci_tool": "Github", "use_docker": use_docker})
@@ -248,11 +248,11 @@ def test_github_invokes_flake8_and_pytest(
     with open(f"{result.project}/.github/workflows/ci.yml", "r") as github_yml:
         try:
             github_config = yaml.safe_load(github_yml)
-            flake8_present = False
-            for action_step in github_config["jobs"]["flake8"]["steps"]:
-                if action_step.get("run") == "flake8":
-                    flake8_present = True
-            assert flake8_present
+            linter_present = False
+            for action_step in github_config["jobs"]["linter"]["steps"]:
+                if action_step.get("run") == "linter":
+                    linter_present = True
+            assert linter_present
 
             expected_test_script_present = False
             for action_step in github_config["jobs"]["pytest"]["steps"]:
diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
index 3a6b0284c..a69b2c924 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -33,6 +33,9 @@ jobs:
           python -m pip install --upgrade pip
           pip install flake8 flake8-isort black
 
+      # Run all pre-commit hooks on all the files.
+      # Getting only staged files can be tricky in case a new PR is opened
+      # since the action is run on a branch in detached head state
       - name: Install and Run Pre-commit 
         uses: pre-commit/action@v2.0.0
 

From fbc9b89e0d37d70b0e65db0f7b1d77f311989b50 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Tue, 23 Feb 2021 11:28:37 +0530
Subject: [PATCH 1369/2840] Updated tests with the updated github stage names.

---
 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 a1dcf796d..c8514493f 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -250,7 +250,7 @@ def test_github_invokes_linter_and_pytest(
             github_config = yaml.safe_load(github_yml)
             linter_present = False
             for action_step in github_config["jobs"]["linter"]["steps"]:
-                if action_step.get("run") == "linter":
+                if action_step.get("uses", "NA").startswith("pre-commit"):
                     linter_present = True
             assert linter_present
 

From c988a6fbdc02eae7343749439ca01d81279dc7f2 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Tue, 23 Feb 2021 19:20:17 +0530
Subject: [PATCH 1370/2840] Removed the step for installing dependencies

---
 {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
index a69b2c924..378ee30b3 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -28,11 +28,6 @@ jobs:
         with:
           python-version: 3.8
 
-      - name: Install flake8, flake8-isort, and black
-        run: |
-          python -m pip install --upgrade pip
-          pip install flake8 flake8-isort black
-
       # Run all pre-commit hooks on all the files.
       # Getting only staged files can be tricky in case a new PR is opened
       # since the action is run on a branch in detached head state

From 7a289de3e526565687e72e8d4e0b3bb3b50d9e81 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 23 Feb 2021 19:44:29 +0000
Subject: [PATCH 1371/2840] Bump version 3.0.13 -> 3.1.7

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

diff --git a/setup.py b/setup.py
index fb3a7cae7..bc31d84a1 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.0.13"
+version = "3.1.7"
 
 if sys.argv[-1] == "tag":
     os.system(f'git tag -a {version} -m "version {version}"')

From ff98d8f517526f9211fcafb4eaf86d8f23ac7e1d Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 23 Feb 2021 20:34:41 +0000
Subject: [PATCH 1372/2840] Remove --use-feature=2020-resolver in pip commands

They are now the default and cause a warning:

WARNING: --use-feature=2020-resolver no longer has any effect, since it is now the default dependency resolver in pip. This will become an error in pip 21.0.
---
 {{cookiecutter.project_slug}}/compose/local/django/Dockerfile   | 2 +-
 .../compose/production/django/Dockerfile                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index c34f8ad40..25d70bf51 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -16,7 +16,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 COPY ./requirements /requirements
 
 # create python dependency wheels
-RUN pip wheel --no-cache-dir --no-deps --use-feature=2020-resolver --wheel-dir /usr/src/app/wheels  \
+RUN pip wheel --no-cache-dir --no-deps --wheel-dir /usr/src/app/wheels  \
   -r /requirements/local.txt \
   && rm -rf /requirements
 
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index a2f432ccc..f4e2b458b 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -30,7 +30,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 COPY ./requirements /requirements
 
 # create python dependency wheels
-RUN pip wheel --no-cache-dir --no-deps --use-feature=2020-resolver --wheel-dir /usr/src/app/wheels  \
+RUN pip wheel --no-cache-dir --no-deps --wheel-dir /usr/src/app/wheels  \
   -r /requirements/production.txt \
   && rm -rf /requirements
 

From 483b636fcb74353baed3009be25ce7724bc5e644 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 23 Feb 2021 20:36:52 +0000
Subject: [PATCH 1373/2840] Only indent with spaces in django Dockerfile

---
 {{cookiecutter.project_slug}}/compose/local/django/Dockerfile   | 2 +-
 .../compose/production/django/Dockerfile                        | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index 25d70bf51..0fc7b9c16 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -66,7 +66,7 @@ COPY --from=python-build-stage /usr/src/app/wheels  /wheels
 
 # use wheels to install python dependencies
 RUN pip install --no-cache /wheels/* \
-	&& rm -rf /wheels
+  && rm -rf /wheels
 
 
 WORKDIR /app
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index f4e2b458b..69b80aa00 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -85,7 +85,7 @@ COPY --from=python-build-stage /usr/src/app/wheels  /wheels
 
 # use wheels to install python dependencies
 RUN pip install --no-cache /wheels/* \
-	&& rm -rf /wheels
+  && rm -rf /wheels
 
 {%- if cookiecutter.js_task_runner == 'Gulp' %}
 COPY --from=client-builder --chown=django:django /app /app

From 4caad4a1297a555343e12a6e887b0cfe9b6e370d Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 24 Feb 2021 02:25:29 +0000
Subject: [PATCH 1374/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5838e06eb..d0a4c8f2d 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-02-23]
+### Changed
+- Update to Django 3.1 ([#3043](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3043))
+- Lint with pre-commit on CI with Github actions ([#3066](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3066))
+- Use exception var in status code pages if available ([#2992](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2992))
+
 ## [2021-02-22]
 ### Changed
 - refactor: remove default cache settings in test.py ([#3064](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3064))

From 15453df8245ffd31b9aceaecb9970342b26f814a Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Wed, 24 Feb 2021 10:58:28 +0530
Subject: [PATCH 1375/2840] Updated the local and production dockerfiles with
 more repeatability and easier to update in mind.

---
 .../compose/local/django/Dockerfile           |  85 ++++++++-------
 .../compose/production/django/Dockerfile      | 101 ++++++++++--------
 2 files changed, 103 insertions(+), 83 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index 0fc7b9c16..bdcd87ba7 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -1,31 +1,57 @@
-# Python build stage
-FROM python:3.8-slim-buster as python-build-stage
-ENV PYTHONDONTWRITEBYTECODE 1
+ARG PYTHON_VERSION=3.8-slim-buster
 
+# define an alias for the specfic python version used in this file.
+FROM python:${PYTHON_VERSION} as python
+
+# Python build stage
+FROM python as python-build-stage
+
+ARG BUILD_ENVIRONMENT=local
+
+# Install apt packages
 RUN apt-get update && apt-get install --no-install-recommends -y \
   # dependencies for building Python packages
   build-essential \
+  # psycopg2 dependencies
+  libpq-dev
+
+# Requirements are installed here to ensure they will be cached.
+COPY ./requirements .
+
+# Create Python Dependency and Sub-Dependency Wheels.
+RUN pip wheel --wheel-dir /usr/src/app/wheels  \
+  -r ${BUILD_ENVIRONMENT}.txt
+
+
+# Python 'run' stage
+FROM python as python-run-stage
+
+ARG BUILD_ENVIRONMENT=local
+ARG APP_HOME=/app
+
+ENV PYTHONUNBUFFERED 1
+ENV PYTHONDONTWRITEBYTECODE 1
+ENV BUILD_ENV ${BUILD_ENVIRONMENT}
+
+WORKDIR ${APP_HOME}
+
+# Install required system dependencies
+RUN apt-get update && apt-get install --no-install-recommends -y \
   # psycopg2 dependencies
   libpq-dev \
+  # Translations dependencies
+  gettext \
   # cleaning up unused files
   && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
   && rm -rf /var/lib/apt/lists/*
 
+# All absolute dir copies ignore workdir instruction. All relative dir copies are wrt to the workdir instruction
+# copy python dependency wheels from python-build-stage
+COPY --from=python-build-stage /usr/src/app/wheels  /wheels/
 
-# Requirements are installed here to ensure they will be cached.
-COPY ./requirements /requirements
-
-# create python dependency wheels
-RUN pip wheel --no-cache-dir --no-deps --wheel-dir /usr/src/app/wheels  \
-  -r /requirements/local.txt \
-  && rm -rf /requirements
-
-
-# Python 'run' stage
-FROM python:3.8-slim-buster as python-run-stage
-
-ENV PYTHONUNBUFFERED 1
-ENV PYTHONDONTWRITEBYTECODE 1
+# use wheels to install python dependencies
+RUN pip install --no-cache-dir --no-index --find-links=/wheels/ /wheels/* \
+	&& rm -rf /wheels/
 
 COPY ./compose/production/django/entrypoint /entrypoint
 RUN sed -i 's/\r$//g' /entrypoint
@@ -49,26 +75,7 @@ RUN sed -i 's/\r$//g' /start-flower
 RUN chmod +x /start-flower
 {% endif %}
 
+# copy application code to WORKDIR
+COPY . ${APP_HOME}
 
-# installing required system dependencies
-RUN apt-get update && apt-get install --no-install-recommends -y \
-  # psycopg2 dependencies
-  libpq-dev \
-  # Translations dependencies
-  gettext \
-  # cleaning up unused files
-  && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
-  && rm -rf /var/lib/apt/lists/*
-
-
-# copy python dependency wheels from python-build-stage
-COPY --from=python-build-stage /usr/src/app/wheels  /wheels
-
-# use wheels to install python dependencies
-RUN pip install --no-cache /wheels/* \
-  && rm -rf /wheels
-
-
-WORKDIR /app
-
-ENTRYPOINT ["/entrypoint"]
+ENTRYPOINT ["/entrypoint"]
\ No newline at end of file
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index 69b80aa00..8fa6e202c 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -1,47 +1,75 @@
 {% if cookiecutter.js_task_runner == 'Gulp' -%}
 FROM node:10-stretch-slim as client-builder
 
-WORKDIR /app
-COPY ./package.json /app
+ARG APP_HOME=/app
+WORKDIR ${APP_HOME}
+
+COPY ./package.json ${APP_HOME}
 RUN npm install && npm cache clean --force
-COPY . /app
+COPY . ${APP_HOME}
 RUN npm run build
 
 {%- endif %}
 
+ARG PYTHON_VERSION=3.8-slim-buster
+
+# define an alias for the specfic python version used in this file.
+FROM python:${PYTHON_VERSION} as python
+
 # Python build stage
-FROM python:3.8-slim-buster as python-build-stage
-
-ENV PYTHONDONTWRITEBYTECODE 1
-ARG BUILD_ENVIRONMENT
+FROM python as python-build-stage
 
+ARG BUILD_ENVIRONMENT=production
 
+# Install apt packages
 RUN apt-get update && apt-get install --no-install-recommends -y \
   # dependencies for building Python packages
   build-essential \
+  # psycopg2 dependencies
+  libpq-dev
+
+# Requirements are installed here to ensure they will be cached.
+COPY ./requirements .
+
+# Create Python Dependency and Sub-Dependency Wheels.
+RUN pip wheel --wheel-dir /usr/src/app/wheels  \
+  -r ${BUILD_ENVIRONMENT}.txt
+
+
+# Python 'run' stage
+FROM python as python-run-stage
+
+ARG BUILD_ENVIRONMENT=production
+ARG APP_HOME=/app
+
+ENV PYTHONUNBUFFERED 1
+ENV PYTHONDONTWRITEBYTECODE 1
+ENV BUILD_ENV ${BUILD_ENVIRONMENT}
+
+WORKDIR ${APP_HOME}
+
+RUN addgroup --system django \
+    && adduser --system --ingroup django django
+
+
+# Install required system dependencies
+RUN apt-get update && apt-get install --no-install-recommends -y \
   # psycopg2 dependencies
   libpq-dev \
+  # Translations dependencies
+  gettext \
   # cleaning up unused files
   && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
   && rm -rf /var/lib/apt/lists/*
 
+# All absolute dir copies ignore workdir instruction. All relative dir copies are wrt to the workdir instruction
+# copy python dependency wheels from python-build-stage
+COPY --from=python-build-stage /usr/src/app/wheels  /wheels/
 
-# Requirements are installed here to ensure they will be cached.
-COPY ./requirements /requirements
+# use wheels to install python dependencies
+RUN pip install --no-cache-dir --no-index --find-links=/wheels/ /wheels/* \
+	&& rm -rf /wheels/
 
-# create python dependency wheels
-RUN pip wheel --no-cache-dir --no-deps --wheel-dir /usr/src/app/wheels  \
-  -r /requirements/production.txt \
-  && rm -rf /requirements
-
-# Python 'run' stage
-FROM python:3.8-slim-buster as python-run-stage
-
-ENV PYTHONDONTWRITEBYTECODE 1
-ENV PYTHONUNBUFFERED 1
-
-RUN addgroup --system django \
-    && adduser --system --ingroup django django
 
 COPY --chown=django:django ./compose/production/django/entrypoint /entrypoint
 RUN sed -i 's/\r$//g' /entrypoint
@@ -69,32 +97,17 @@ RUN sed -i 's/\r$//g' /start-flower
 RUN chmod +x /start-flower
 {%- endif %}
 
-# installing required system dependencies
-RUN apt-get update && apt-get install --no-install-recommends -y \
-  # psycopg2 dependencies
-  libpq-dev \
-  # Translations dependencies
-  gettext \
-  # cleaning up unused files
-  && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
-  && rm -rf /var/lib/apt/lists/*
-
-
-# copy python dependency wheels from python-build-stage
-COPY --from=python-build-stage /usr/src/app/wheels  /wheels
-
-# use wheels to install python dependencies
-RUN pip install --no-cache /wheels/* \
-  && rm -rf /wheels
 
+# copy application code to WORKDIR
 {%- if cookiecutter.js_task_runner == 'Gulp' %}
-COPY --from=client-builder --chown=django:django /app /app
+COPY --from=client-builder --chown=django:django ${APP_HOME} ${APP_HOME}
 {% else %}
-COPY --chown=django:django . /app
+COPY --chown=django:django . ${APP_HOME}
 {%- endif %}
 
+# make django owner of the WORKDIR directory as well.
+RUN chown django:django ${APP_HOME}
+
 USER django
 
-WORKDIR /app
-
-ENTRYPOINT ["/entrypoint"]
+ENTRYPOINT ["/entrypoint"]
\ No newline at end of file

From d396264efaad39fcb17409f7b56db4c3d1947e6b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 24 Feb 2021 07:19:28 +0000
Subject: [PATCH 1376/2840] Bump stefanzweifel/git-auto-commit-action from
 v4.9.0 to v4.9.1

Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from v4.9.0 to v4.9.1.
- [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases)
- [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.9.0...296e083b4c312cf3438feb21957a85fa9677f61d)

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-changelog.yml    | 2 +-
 .github/workflows/update-contributors.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index 7cb2a1b80..5c63532b3 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -28,7 +28,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Commit changes
-      uses: stefanzweifel/git-auto-commit-action@v4.9.0
+      uses: stefanzweifel/git-auto-commit-action@v4.9.1
       with:
         commit_message: Update Changelog
         file_pattern: CHANGELOG.md
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 4d9026b9f..64a899e44 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -24,7 +24,7 @@ jobs:
       run: python scripts/update_contributors.py
 
     - name: Commit changes
-      uses: stefanzweifel/git-auto-commit-action@v4.9.0
+      uses: stefanzweifel/git-auto-commit-action@v4.9.1
       with:
         commit_message: Update Contributors
         file_pattern: CONTRIBUTORS.md .github/contributors.json

From 2345c2c92d21b8274f0581864f0b656b9b147cca Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13081994@users.noreply.github.com>
Date: Wed, 24 Feb 2021 16:26:58 +0530
Subject: [PATCH 1377/2840] Update
 {{cookiecutter.project_slug}}/compose/production/django/Dockerfile

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 .../compose/production/django/Dockerfile                      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index 8fa6e202c..4da817df3 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -68,7 +68,7 @@ COPY --from=python-build-stage /usr/src/app/wheels  /wheels/
 
 # use wheels to install python dependencies
 RUN pip install --no-cache-dir --no-index --find-links=/wheels/ /wheels/* \
-	&& rm -rf /wheels/
+  && rm -rf /wheels/
 
 
 COPY --chown=django:django ./compose/production/django/entrypoint /entrypoint
@@ -110,4 +110,4 @@ RUN chown django:django ${APP_HOME}
 
 USER django
 
-ENTRYPOINT ["/entrypoint"]
\ No newline at end of file
+ENTRYPOINT ["/entrypoint"]

From e0566e5b1eeb9c8e17ff66b9fd9a0529bcdf768c Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 25 Feb 2021 02:23:46 +0000
Subject: [PATCH 1378/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d0a4c8f2d..f3ca47755 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-02-24]
+### Updated
+- Bump stefanzweifel/git-auto-commit-action from v4.9.0 to v4.9.1 ([#3069](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3069))
+
 ## [2021-02-23]
 ### Changed
 - Update to Django 3.1 ([#3043](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3043))

From fa0b278225b8b444cf2d40c85d3939d3806e5c75 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Fri, 26 Feb 2021 12:04:48 +0530
Subject: [PATCH 1379/2840] Updated test_urls and views to re-use
 User.get_absolute_url method instead of using reverse on the user:detail view

---
 .../{{cookiecutter.project_slug}}/users/tests/test_urls.py   | 5 +----
 .../{{cookiecutter.project_slug}}/users/views.py             | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
index aab6d0a87..2623f4e39 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
@@ -7,10 +7,7 @@ pytestmark = pytest.mark.django_db
 
 
 def test_detail(user: User):
-    assert (
-        reverse("users:detail", kwargs={"username": user.username})
-        == f"/users/{user.username}/"
-    )
+    assert user.get_absolute_url() == f"/users/{user.username}/"
     assert resolve(f"/users/{user.username}/").view_name == "users:detail"
 
 
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
index 2b077d424..c7b846c08 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
@@ -25,7 +25,7 @@ class UserUpdateView(LoginRequiredMixin, SuccessMessageMixin, UpdateView):
     success_message = _("Information successfully updated")
 
     def get_success_url(self):
-        return reverse("users:detail", kwargs={"username": self.request.user.username})
+        return self.request.user.get_absolute_url()  # type: ignore [union-attr]
 
     def get_object(self):
         return self.request.user

From 691229b979ef9695658f3c29f236d181ac97c32c Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 1 Mar 2021 12:00:56 -0800
Subject: [PATCH 1380/2840] Update coverage from 5.4 to 5.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 6960b1d79..47bba1361 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -27,7 +27,7 @@ sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==3.8.4  # https://github.com/PyCQA/flake8
 flake8-isort==4.0.0  # https://github.com/gforcada/flake8-isort
-coverage==5.4  # https://github.com/nedbat/coveragepy
+coverage==5.5  # https://github.com/nedbat/coveragepy
 black==20.8b1  # https://github.com/ambv/black
 pylint-django==2.4.2  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 51b92b935f25976847a198b1018f24000583e53e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 1 Mar 2021 21:07:12 -0800
Subject: [PATCH 1381/2840] Update pillow from 8.1.0 to 8.1.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 71317e818..d5382a6d5 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==4.0.1  # https://github.com/un33k/python-slugify
-Pillow==8.1.0  # https://github.com/python-pillow/Pillow
+Pillow==8.1.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 97935112664cb5c267f3099a395f004ff8c7e873 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 2 Mar 2021 19:48:26 +0000
Subject: [PATCH 1382/2840] Support both master and main branches

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

diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
index 378ee30b3..c8bda2174 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -7,11 +7,11 @@ env:
 
 on:
   pull_request:
-    branches: [ "master" ]
+    branches: [ "master", "main" ]
     paths-ignore: [ "docs/**" ]
 
   push:
-    branches: [ "master" ]
+    branches: [ "master", "main" ]
     paths-ignore: [ "docs/**" ]
 
 

From c1ec7e3cd1fe6d4fc578430cf013b098611d5557 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 2 Mar 2021 20:03:14 +0000
Subject: [PATCH 1383/2840] Add necessary services for GH actions without
 Docker

---
 .../.github/workflows/ci.yml                  | 24 +++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
index c8bda2174..c84d3eebd 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -37,6 +37,30 @@ jobs:
 # With no caching at all the entire ci process takes 4m 30s to complete!
   pytest:
     runs-on: ubuntu-latest
+    {%- if cookiecutter.use_docker == 'n' %}
+
+    services:
+      {%- if cookiecutter.use_celery == 'y' %}
+      redis:
+        image: redis:5.0
+        ports:
+          - 6379:6379
+      {%- endif %}
+      postgres:
+        image: postgres:12
+        ports:
+          - 5432:5432
+        env:
+          POSTGRES_PASSWORD: postgres
+
+    env:
+      {%- if cookiecutter.use_celery == 'y' %}
+      CELERY_BROKER_URL: "redis://localhost:6379/0"
+      {%- endif %}
+      # postgres://user:password@host:port/database
+      DATABASE_URL: "postgres://postgres:postgres@localhost:5432/postgres"
+    {%- endif %}
+
     steps:
 
       - name: Checkout Code Repository

From c3ee08fbb2be2688af155e3eb36a14be438f5d3d Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 2 Mar 2021 20:03:27 +0000
Subject: [PATCH 1384/2840] Tweak formatting of workflow file

---
 {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
index c84d3eebd..7799cf415 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -34,7 +34,7 @@ jobs:
       - name: Install and Run Pre-commit 
         uses: pre-commit/action@v2.0.0
 
-# With no caching at all the entire ci process takes 4m 30s to complete!
+  # With no caching at all the entire ci process takes 4m 30s to complete!
   pytest:
     runs-on: ubuntu-latest
     {%- if cookiecutter.use_docker == 'n' %}
@@ -65,7 +65,7 @@ jobs:
 
       - name: Checkout Code Repository
         uses: actions/checkout@v2
-      {% if cookiecutter.use_docker == 'y' -%}
+      {%- if cookiecutter.use_docker == 'y' %}
 
       - name: Build the Stack
         run:  docker-compose -f local.yml build
@@ -81,7 +81,6 @@ jobs:
 
       - name: Tear down the Stack
         run:  docker-compose -f local.yml down
-
       {%- else %}
 
       - name: Set up Python 3.8
@@ -93,8 +92,8 @@ jobs:
         id: pip-cache-location
         run: |
           echo "::set-output name=dir::$(pip cache dir)"
+      {%- raw %}
 
-      {% raw %}
       - name: Cache pip Project Dependencies
         uses: actions/cache@v2
         with:
@@ -104,7 +103,7 @@ jobs:
           key: ${{ runner.os }}-pip-${{ hashFiles('**/local.txt') }}
           restore-keys: |
             ${{ runner.os }}-pip-
-      {% endraw %}
+      {%- endraw %}
 
       - name: Install Dependencies
         run: |
@@ -113,5 +112,4 @@ jobs:
 
       - name: Test with pytest
         run:  pytest
-
       {%- endif %}

From d999846ca27693dfa0efb0813e477a03f968d704 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 2 Mar 2021 20:11:15 +0000
Subject: [PATCH 1385/2840] Fix Github CI with Docker

---
 {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
index 7799cf415..9798e6c8d 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -70,14 +70,11 @@ jobs:
       - name: Build the Stack
         run:  docker-compose -f local.yml build
 
-      - name: Make DB Migrations
+      - name: Run DB Migrations
         run:  docker-compose -f local.yml run --rm django python manage.py migrate
 
-      - name: Run the Stack
-        run:  docker-compose -f local.yml up -d
-
       - name: Run Django Tests
-        run:  docker-compose -f local.yml exec -T django pytest
+        run:  docker-compose -f local.yml run django pytest
 
       - name: Tear down the Stack
         run:  docker-compose -f local.yml down

From a6e45554500fa7b2c2883710d1085833d635bb9d Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 2 Mar 2021 21:20:20 +0000
Subject: [PATCH 1386/2840] Update tests

---
 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 c8514493f..7e585ea40 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -231,7 +231,7 @@ def test_gitlab_invokes_flake8_and_pytest(
     ["use_docker", "expected_test_script"],
     [
         ("n", "pytest"),
-        ("y", "docker-compose -f local.yml exec -T django pytest"),
+        ("y", "docker-compose -f local.yml run django pytest"),
     ],
 )
 def test_github_invokes_linter_and_pytest(

From d47052388fa8cfdb7cd17410334a32c274ad3dbc Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 2 Mar 2021 17:00:27 -0800
Subject: [PATCH 1387/2840] Update ipdb from 0.13.4 to 0.13.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 47bba1361..ec239bb46 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,7 +1,7 @@
 -r base.txt
 
 Werkzeug==1.0.1 # https://github.com/pallets/werkzeug
-ipdb==0.13.4  # https://github.com/gotcha/ipdb
+ipdb==0.13.5  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 {%- else %}

From a87d131a2a0bf771b75b6b8a9859d9011fce0ec7 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 3 Mar 2021 02:27:47 +0000
Subject: [PATCH 1388/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f3ca47755..0b2a08777 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-03-02]
+### Fixed
+- Fixes for pytest job in Github CI workflow ([#3076](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3076))
+### Updated
+- Update pillow to 8.1.1 ([#3075](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3075))
+- Update coverage to 5.5 ([#3074](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3074))
+
 ## [2021-02-24]
 ### Updated
 - Bump stefanzweifel/git-auto-commit-action from v4.9.0 to v4.9.1 ([#3069](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3069))

From 15b7b97722647b4500e0db7995f46b43d7ec987f Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 3 Mar 2021 11:54:07 -0800
Subject: [PATCH 1389/2840] Update tox from 3.22.0 to 3.23.0

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

diff --git a/requirements.txt b/requirements.txt
index cce198bf4..a410f3132 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ flake8-isort==4.0.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.22.0
+tox==3.23.0
 pytest==5.4.3  # pyup: <6  # https://github.com/hackebrot/pytest-cookies/issues/51
 pytest-cookies==0.5.1
 pytest-instafail==0.4.2

From 899faa766b23cf307b359d8d65cf6aed73a68d83 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 4 Mar 2021 02:28:43 +0000
Subject: [PATCH 1390/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b2a08777..1a0e1b749 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-03-03]
+### Updated
+- Update tox to 3.23.0 ([#3079](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3079))
+- Update ipdb to 0.13.5 ([#3078](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3078))
+
 ## [2021-03-02]
 ### Fixed
 - Fixes for pytest job in Github CI workflow ([#3076](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3076))

From 1371d6a3e60efa097b3464a784e8587219c64509 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Thu, 4 Mar 2021 19:34:58 +0530
Subject: [PATCH 1391/2840] Reverting the use of get_absolute_url method in
 getting the detail view url. Purpose was to test if the url could be created
 correctly and not if the view was working correctly.

---
 .../{{cookiecutter.project_slug}}/users/tests/test_urls.py   | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
index 2623f4e39..aab6d0a87 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
@@ -7,7 +7,10 @@ pytestmark = pytest.mark.django_db
 
 
 def test_detail(user: User):
-    assert user.get_absolute_url() == f"/users/{user.username}/"
+    assert (
+        reverse("users:detail", kwargs={"username": user.username})
+        == f"/users/{user.username}/"
+    )
     assert resolve(f"/users/{user.username}/").view_name == "users:detail"
 
 

From b593c9884470274f38c6f17d7be33a87cd3cb577 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 5 Mar 2021 05:53:28 +0000
Subject: [PATCH 1392/2840] Bump stefanzweifel/git-auto-commit-action from
 v4.9.1 to v4.9.2

Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from v4.9.1 to v4.9.2.
- [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases)
- [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.9.1...be7095c202abcf573b09f20541e0ee2f6a3a9d9b)

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-changelog.yml    | 2 +-
 .github/workflows/update-contributors.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index 5c63532b3..fa70824c0 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -28,7 +28,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Commit changes
-      uses: stefanzweifel/git-auto-commit-action@v4.9.1
+      uses: stefanzweifel/git-auto-commit-action@v4.9.2
       with:
         commit_message: Update Changelog
         file_pattern: CHANGELOG.md
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 64a899e44..5d5dd0eaa 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -24,7 +24,7 @@ jobs:
       run: python scripts/update_contributors.py
 
     - name: Commit changes
-      uses: stefanzweifel/git-auto-commit-action@v4.9.1
+      uses: stefanzweifel/git-auto-commit-action@v4.9.2
       with:
         commit_message: Update Contributors
         file_pattern: CONTRIBUTORS.md .github/contributors.json

From 3d67dc267193986b88df05b163738e2dabd0ec75 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 6 Mar 2021 02:29:15 +0000
Subject: [PATCH 1393/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a0e1b749..150dd3909 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-03-05]
+### Changed
+- Updated test_urls.py and views.py to re-use User.get_absolute_url() ([#3070](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3070))
+### Updated
+- Bump stefanzweifel/git-auto-commit-action from v4.9.1 to v4.9.2 ([#3082](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3082))
+
 ## [2021-03-03]
 ### Updated
 - Update tox to 3.23.0 ([#3079](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3079))

From fb6cb0f51eedb1e801dc57be71363af8102a0b0d Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 6 Mar 2021 23:08:35 -0800
Subject: [PATCH 1394/2840] Update pillow from 8.1.1 to 8.1.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 d5382a6d5..377f2d05f 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==4.0.1  # https://github.com/un33k/python-slugify
-Pillow==8.1.1  # https://github.com/python-pillow/Pillow
+Pillow==8.1.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 569ab9af4a204ca71e407b6ca45a9d8887036350 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 10 Mar 2021 08:50:25 -0800
Subject: [PATCH 1395/2840] Update pre-commit from 2.10.1 to 2.11.1

---
 {{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 ec239bb46..ed3479fce 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -33,7 +33,7 @@ pylint-django==2.4.2  # 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.10.1  # https://github.com/pre-commit/pre-commit
+pre-commit==2.11.1  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From 078ae92e01ae9d6c59762e94664e66527e222593 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 15 Mar 2021 14:27:21 -0700
Subject: [PATCH 1396/2840] Update flake8 from 3.8.4 to 3.9.0

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

diff --git a/requirements.txt b/requirements.txt
index a410f3132..54dbc229d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ binaryornot==0.4.4
 # ------------------------------------------------------------------------------
 black==20.8b1
 isort==5.7.0
-flake8==3.8.4
+flake8==3.9.0
 flake8-isort==4.0.0
 
 # Testing

From b6c6d682ff649414fed8258bafb0d84159724666 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 15 Mar 2021 14:27:22 -0700
Subject: [PATCH 1397/2840] Update flake8 from 3.8.4 to 3.9.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 ec239bb46..9b49a0b46 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -25,7 +25,7 @@ sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality
 # ------------------------------------------------------------------------------
-flake8==3.8.4  # https://github.com/PyCQA/flake8
+flake8==3.9.0  # 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==20.8b1  # https://github.com/ambv/black

From d36f7e8617e9e107eb97cd14a8ef3f7bd2256df6 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Mon, 22 Mar 2021 00:27:06 +0000
Subject: [PATCH 1398/2840] 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 5a5b58a63..fd4572f79 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -16,12 +16,12 @@ repos:
       - id: black
 
   - repo: https://github.com/timothycrosley/isort
-    rev: 5.7.0
+    rev: 5.8.0
     hooks:
       - id: isort
 
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.8.4
+    rev: 3.9.0
     hooks:
       - id: flake8
         args: ['--config=setup.cfg']

From b9eaa50ff565a33d65c56b8848ce7c4cc588fa11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?=
 <bnafta@gmail.com>
Date: Sun, 21 Mar 2021 22:48:36 -0300
Subject: [PATCH 1399/2840] Add non-python requirements file for Ubuntu 20.04

---
 .../utility/requirements-focal.apt            | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 {{cookiecutter.project_slug}}/utility/requirements-focal.apt

diff --git a/{{cookiecutter.project_slug}}/utility/requirements-focal.apt b/{{cookiecutter.project_slug}}/utility/requirements-focal.apt
new file mode 100644
index 000000000..fe6f21e46
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/utility/requirements-focal.apt
@@ -0,0 +1,23 @@
+##basic build dependencies of various Django apps for Ubuntu Focal 20.04
+#build-essential metapackage install: make, gcc, g++,
+build-essential
+#required to translate
+gettext
+python3-dev
+
+##shared dependencies of:
+##Pillow, pylibmc
+zlib1g-dev
+
+##Postgresql and psycopg2 dependencies
+libpq-dev
+
+##Pillow dependencies
+libtiff5-dev
+libjpeg8-dev
+libfreetype6-dev
+liblcms2-dev
+libwebp-dev
+
+##django-extensions
+graphviz-dev

From 2ea090a0de268cddccd3defcb6ade4f77bfa1ca7 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 22 Mar 2021 03:47:05 -0700
Subject: [PATCH 1400/2840] Update isort from 5.7.0 to 5.8.0

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

diff --git a/requirements.txt b/requirements.txt
index 54dbc229d..3b16db8d8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==20.8b1
-isort==5.7.0
+isort==5.8.0
 flake8==3.9.0
 flake8-isort==4.0.0
 

From 779270832223d243d5f416c48547090c4e776cc5 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 22 Mar 2021 03:51:35 -0700
Subject: [PATCH 1401/2840] Update sphinx-autobuild from 2020.9.1 to 2021.3.14

---
 {{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 49640cb26..a1e39ca50 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -21,7 +21,7 @@ pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 # Documentation
 # ------------------------------------------------------------------------------
 sphinx==3.5.1  # https://github.com/sphinx-doc/sphinx
-sphinx-autobuild==2020.9.1 # https://github.com/GaretJax/sphinx-autobuild
+sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality
 # ------------------------------------------------------------------------------

From be4e70bbd907565b4cc9c59ea6c114ca7109f1f1 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 22 Mar 2021 03:52:19 -0700
Subject: [PATCH 1402/2840] Update ipdb from 0.13.5 to 0.13.7

---
 {{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 49640cb26..6fafe86de 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,7 +1,7 @@
 -r base.txt
 
 Werkzeug==1.0.1 # https://github.com/pallets/werkzeug
-ipdb==0.13.5  # https://github.com/gotcha/ipdb
+ipdb==0.13.7  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 {%- else %}

From 34877810799668e1b6e1ab75f5c8e5abef618602 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 22 Mar 2021 04:18:19 -0700
Subject: [PATCH 1403/2840] Update sphinx from 3.5.1 to 3.5.3

---
 {{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 9b8535574..b6a7e5439 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==3.5.1  # https://github.com/sphinx-doc/sphinx
+sphinx==3.5.3  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From b07c5d5d906beac2b435b8560bd8595e4649e9f9 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 22 Mar 2021 07:21:59 -0700
Subject: [PATCH 1404/2840] Update django-crispy-forms from 1.11.1 to 1.11.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 377f2d05f..75479fdb3 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -33,7 +33,7 @@ django==3.1.7  # 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-crispy-forms==1.11.1  # https://github.com/django-crispy-forms/django-crispy-forms
+django-crispy-forms==1.11.2  # https://github.com/django-crispy-forms/django-crispy-forms
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==2.4  # https://github.com/django-compressor/django-compressor
 {%- endif %}

From b6bd76d4287b2bcb35bbd8a1c85ba05140edc5bd Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 23 Mar 2021 02:37:18 +0000
Subject: [PATCH 1405/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 150dd3909..db8f052f3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,18 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-03-22]
+### Updated
+- Update django-crispy-forms to 1.11.2 ([#3104](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3104))
+- Update sphinx to 3.5.3 ([#3103](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3103))
+- Update ipdb to 0.13.7 ([#3102](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3102))
+- Update sphinx-autobuild to 2021.3.14 ([#3101](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3101))
+- Update isort to 5.8.0 ([#3100](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3100))
+- Update pre-commit to 2.11.1 ([#3089](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3089))
+- Update flake8 to 3.9.0 ([#3096](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3096))
+- Update pillow to 8.1.2 ([#3084](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3084))
+- Auto-update pre-commit hooks ([#3095](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3095))
+
 ## [2021-03-05]
 ### Changed
 - Updated test_urls.py and views.py to re-use User.get_absolute_url() ([#3070](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3070))

From a7847ec2ccc2ff58eb8335658770833fa38a335e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 25 Mar 2021 09:30:30 -0700
Subject: [PATCH 1406/2840] Update djangorestframework from 3.12.2 to 3.12.3

---
 {{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 75479fdb3..69b11ce71 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -40,6 +40,6 @@ django-compressor==2.4  # https://github.com/django-compressor/django-compressor
 django-redis==4.12.1  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == "y" %}
 # Django REST Framework
-djangorestframework==3.12.2  # https://github.com/encode/django-rest-framework
+djangorestframework==3.12.3  # https://github.com/encode/django-rest-framework
 django-cors-headers==3.7.0 # https://github.com/adamchainz/django-cors-headers
 {%- endif %}

From ebc2f0446ac1cd22f5817f8bb63b0bda1d22ea51 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 26 Mar 2021 02:15:58 +0000
Subject: [PATCH 1407/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db8f052f3..15c176dbb 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-03-25]
+### Updated
+- Update djangorestframework to 3.12.3 ([#3105](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3105))
+
 ## [2021-03-22]
 ### Updated
 - Update django-crispy-forms to 1.11.2 ([#3104](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3104))

From 140c3a961caa6862c57112f7d068161bbed24e58 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 26 Mar 2021 09:30:46 -0700
Subject: [PATCH 1408/2840] Update djangorestframework from 3.12.3 to 3.12.4

---
 {{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 69b11ce71..1946b0750 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -40,6 +40,6 @@ django-compressor==2.4  # https://github.com/django-compressor/django-compressor
 django-redis==4.12.1  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == "y" %}
 # Django REST Framework
-djangorestframework==3.12.3  # https://github.com/encode/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
 {%- endif %}

From a18ccd35238745c588281b1436807c65ccd3c5d6 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 27 Mar 2021 02:23:07 +0000
Subject: [PATCH 1409/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 15c176dbb..d1479a28e 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-03-26]
+### Updated
+- Update djangorestframework to 3.12.4 ([#3107](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3107))
+
 ## [2021-03-25]
 ### Updated
 - Update djangorestframework to 3.12.3 ([#3105](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3105))

From 0073683c7056ef69686c6f7c3f8f251a23731909 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 27 Mar 2021 02:04:38 -0700
Subject: [PATCH 1410/2840] Update gunicorn from 20.0.4 to 20.1.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 0ce6fc10e..743cb3f9e 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -2,7 +2,7 @@
 
 -r base.txt
 
-gunicorn==20.0.4  # https://github.com/benoitc/gunicorn
+gunicorn==20.1.0  # https://github.com/benoitc/gunicorn
 psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast

From 5314faaf8adaf2fcd5cd3b369bca2fc8ebdbc51a Mon Sep 17 00:00:00 2001
From: Tames McTigue <tames@northwestern.edu>
Date: Tue, 30 Mar 2021 13:09:29 +0300
Subject: [PATCH 1411/2840] Fixed placement of image key value for non-Docker
 run.

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

diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
index 60925b811..fcdfb7dd7 100644
--- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml
+++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
@@ -21,7 +21,6 @@ flake8:
 
 pytest:
   stage: test
-  image: python:3.8
   {% if cookiecutter.use_docker == 'y' -%}
   image: docker/compose:latest
   tags:
@@ -36,6 +35,7 @@ pytest:
   script:
     - docker-compose -f local.yml run django pytest
   {%- else %}
+  image: python:3.8
   tags:
     - python
   services:

From 49bf68aa006986e427665400f9fd99b09b34fda1 Mon Sep 17 00:00:00 2001
From: Tames McTigue <tames@northwestern.edu>
Date: Tue, 30 Mar 2021 13:26:12 +0300
Subject: [PATCH 1412/2840] Fixed blank space

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

diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
index fcdfb7dd7..c599f6b62 100644
--- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml
+++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
@@ -34,7 +34,7 @@ pytest:
     - docker-compose -f local.yml up -d
   script:
     - docker-compose -f local.yml run django pytest
-  {%- else %}
+  {%- else -%}
   image: python:3.8
   tags:
     - python

From 0ef98a118b110fff72caf5b8dbac4efd97330a3b Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 2 Apr 2021 11:19:19 -0700
Subject: [PATCH 1413/2840] Update pillow from 8.1.2 to 8.2.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 1946b0750..96619498f 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==4.0.1  # https://github.com/un33k/python-slugify
-Pillow==8.1.2  # https://github.com/python-pillow/Pillow
+Pillow==8.2.0  # 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 9e62ff99d5d1c4b035eea44b6d2d053c31d26061 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 4 Apr 2021 12:36:50 -0700
Subject: [PATCH 1414/2840] Update pytest from 6.2.2 to 6.2.3

---
 {{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 b6a7e5439..fdce88d72 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -15,7 +15,7 @@ watchgod==0.6  # https://github.com/samuelcolvin/watchgod
 # ------------------------------------------------------------------------------
 mypy==0.812  # https://github.com/python/mypy
 django-stubs==1.7.0  # https://github.com/typeddjango/django-stubs
-pytest==6.2.2  # https://github.com/pytest-dev/pytest
+pytest==6.2.3  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 
 # Documentation

From a5727efc5555974ada6aac02d6ec9887140b8678 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 5 Apr 2021 08:36:26 -0700
Subject: [PATCH 1415/2840] Update django-extensions from 3.1.1 to 3.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 b6a7e5439..fbe62a58f 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -40,6 +40,6 @@ pre-commit==2.11.1  # https://github.com/pre-commit/pre-commit
 factory-boy==3.2.0  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==3.2  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==3.1.1  # https://github.com/django-extensions/django-extensions
+django-extensions==3.1.2  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.1.0  # https://github.com/pytest-dev/pytest-django

From 289a14aef102c4e93e311a679cfb778a8f05c0f1 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 6 Apr 2021 17:56:14 -0700
Subject: [PATCH 1416/2840] Update django from 3.1.7 to 3.1.8

---
 {{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 1946b0750..25d1802da 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,7 +29,7 @@ uvicorn[standard]==0.13.4  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.1.7  # pyup: < 3.2  # https://www.djangoproject.com/
+django==3.1.8  # 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

From a567c85fb5018125b2bb06bd3d5d86d53a2b1ebe Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 6 Apr 2021 21:03:28 -0700
Subject: [PATCH 1417/2840] Update pre-commit from 2.11.1 to 2.12.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 b6a7e5439..dcbd76b93 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -33,7 +33,7 @@ pylint-django==2.4.2  # 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.11.1  # https://github.com/pre-commit/pre-commit
+pre-commit==2.12.0  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From 3a23b5f45e385aeaac2e754989648ccb7403d58c Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 4 Mar 2021 07:47:26 -0800
Subject: [PATCH 1418/2840] Update sentry-sdk from 0.20.3 to 1.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 743cb3f9e..6e566eccf 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.20.3  # https://github.com/getsentry/sentry-python
+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

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 1419/2840] 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 6e566eccf..d4ed6f83a 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 1420/2840] 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 a4ab01b00..fd7daccbd 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 fa143aa60a2711fd36c7624f21278aa726c35697 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 7 Apr 2021 20:47:03 +0100
Subject: [PATCH 1421/2840] Bump version to 3.1.8

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

diff --git a/setup.py b/setup.py
index bc31d84a1..f8cfe29cd 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.7"
+version = "3.1.8"
 
 if sys.argv[-1] == "tag":
     os.system(f'git tag -a {version} -m "version {version}"')

From 3f3148f88fdd015acf61cd731eaa944ab260a3cc Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 7 Apr 2021 19:50:12 +0000
Subject: [PATCH 1422/2840] 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 5b5c575cf..846375687 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1077,5 +1077,10 @@
     "name": "lcd1232",
     "github_login": "lcd1232",
     "twitter_username": ""
+  },
+  {
+    "name": "Tames McTigue",
+    "github_login": "Tamerz",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 9a8e30190..ea8701879 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1363,6 +1363,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Tames McTigue</td>
+    <td>
+      <a href="https://github.com/Tamerz">Tamerz</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Tano Abeleyra</td>
     <td>

From 095a2a56af953d2d1fd8f3c78e2585e8300b90cd Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 2 Mar 2021 21:50:57 +0000
Subject: [PATCH 1423/2840] Run linting via pre-commit on CI

---
 tests/test_bare.sh | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/tests/test_bare.sh b/tests/test_bare.sh
index eae09dc78..c7938ecf6 100755
--- a/tests/test_bare.sh
+++ b/tests/test_bare.sh
@@ -27,5 +27,10 @@ sudo utility/install_os_dependencies.sh install
 # Install Python deps
 pip install -r requirements/local.txt
 
+# Lint by running pre-commit on all files
+git init
+git add .
+pre-commit run --show-diff-on-failure -a
+
 # run the project's tests
 pytest

From c38289493410d2401a5903f6feada0d3f3d79fe3 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 2 Mar 2021 22:50:28 +0000
Subject: [PATCH 1424/2840] Fix pre-commit hook issues

---
 .../.pre-commit-config.yaml                   |  1 -
 {{cookiecutter.project_slug}}/.pylintrc       |  2 +-
 {{cookiecutter.project_slug}}/LICENSE         |  8 ++--
 {{cookiecutter.project_slug}}/Procfile        |  4 +-
 {{cookiecutter.project_slug}}/README.rst      | 41 ++++++++++---------
 .../compose/production/traefik/traefik.yml    |  2 +-
 .../config/settings/base.py                   |  5 ++-
 .../config/settings/production.py             |  3 +-
 {{cookiecutter.project_slug}}/local.yml       |  5 +--
 {{cookiecutter.project_slug}}/production.yml  |  3 +-
 .../utility/install_python_dependencies.sh    |  3 +-
 .../templates/403.html                        |  3 +-
 .../templates/404.html                        |  3 +-
 .../templates/500.html                        |  3 +-
 .../templates/account/account_inactive.html   |  2 +-
 .../templates/account/base.html               |  2 +-
 .../templates/account/email.html              |  2 +-
 .../templates/account/email_confirm.html      |  2 +-
 .../templates/account/login.html              |  2 +-
 .../templates/account/logout.html             |  4 +-
 .../templates/account/password_change.html    |  2 +-
 .../templates/account/password_reset.html     |  2 +-
 .../account/password_reset_done.html          |  6 +--
 .../account/password_reset_from_key.html      |  2 +-
 .../account/password_reset_from_key_done.html |  2 +-
 .../templates/account/password_set.html       |  2 +-
 .../templates/account/signup.html             |  2 +-
 .../templates/account/signup_closed.html      |  2 +-
 .../templates/account/verification_sent.html  |  2 +-
 .../account/verified_email_required.html      |  4 +-
 .../templates/base.html                       | 24 +++++------
 .../templates/pages/about.html                |  2 +-
 .../templates/pages/home.html                 |  2 +-
 .../templates/users/user_detail.html          |  3 +-
 .../templates/users/user_form.html            |  3 +-
 35 files changed, 78 insertions(+), 82 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index fd4572f79..df71ea618 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -26,4 +26,3 @@ repos:
       - id: flake8
         args: ['--config=setup.cfg']
         additional_dependencies: [flake8-isort]
-
diff --git a/{{cookiecutter.project_slug}}/.pylintrc b/{{cookiecutter.project_slug}}/.pylintrc
index a0955f076..dff52e75b 100644
--- a/{{cookiecutter.project_slug}}/.pylintrc
+++ b/{{cookiecutter.project_slug}}/.pylintrc
@@ -1,5 +1,5 @@
 [MASTER]
-load-plugins=pylint_django{% if cookiecutter.use_celery == "y" %}, pylint_celery {% endif %}
+load-plugins=pylint_django{% if cookiecutter.use_celery == "y" %}, pylint_celery{% endif %}
 
 [FORMAT]
 max-line-length=120
diff --git a/{{cookiecutter.project_slug}}/LICENSE b/{{cookiecutter.project_slug}}/LICENSE
index c831e0309..812fa0fa6 100644
--- a/{{cookiecutter.project_slug}}/LICENSE
+++ b/{{cookiecutter.project_slug}}/LICENSE
@@ -7,7 +7,7 @@ Permission is hereby granted, free of charge, to any person obtaining a copy of
 The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-{% elif cookiecutter.open_source_license == 'BSD' %}
+{%- elif cookiecutter.open_source_license == 'BSD' %}
 Copyright (c) {% now 'utc', '%Y' %}, {{ cookiecutter.author_name }}
 All rights reserved.
 
@@ -35,7 +35,7 @@ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
 OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
 OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 OF THE POSSIBILITY OF SUCH DAMAGE.
-{% elif cookiecutter.open_source_license == 'GPLv3' %}
+{%- elif cookiecutter.open_source_license == 'GPLv3' %}
 Copyright (c) {% now 'utc', '%Y' %}, {{ cookiecutter.author_name }}
 
 This program is free software: you can redistribute it and/or modify
@@ -50,7 +50,7 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with this program. If not, see <http://www.gnu.org/licenses/>.
-{% elif cookiecutter.open_source_license == 'Apache Software License 2.0' %}
+{%- elif cookiecutter.open_source_license == 'Apache Software License 2.0' %}
 
                                  Apache License
                            Version 2.0, January 2004
@@ -242,4 +242,4 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
    See the License for the specific language governing permissions and
    limitations under the License.
-{% endif %}
+{%- endif %}
diff --git a/{{cookiecutter.project_slug}}/Procfile b/{{cookiecutter.project_slug}}/Procfile
index 0becb2cbe..8679a0669 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  %}
 web: gunicorn config.wsgi:application
 {%- endif %}
-{% if cookiecutter.use_celery == "y" -%}
+{%- if cookiecutter.use_celery == "y" -%}
 worker: celery worker --app=config.celery_app --loglevel=info
 beat: celery beat --app=config.celery_app --loglevel=info
 {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/README.rst b/{{cookiecutter.project_slug}}/README.rst
index 2aae422ce..b120f16a6 100644
--- a/{{cookiecutter.project_slug}}/README.rst
+++ b/{{cookiecutter.project_slug}}/README.rst
@@ -9,10 +9,10 @@
 .. image:: https://img.shields.io/badge/code%20style-black-000000.svg
      :target: https://github.com/ambv/black
      :alt: Black code style
-{% if cookiecutter.open_source_license != "Not open source" %}
+{%- if cookiecutter.open_source_license != "Not open source" %}
 
 :License: {{cookiecutter.open_source_license}}
-{% endif %}
+{%- endif %}
 
 Settings
 --------
@@ -67,7 +67,7 @@ Moved to `Live reloading and SASS compilation`_.
 
 .. _`Live reloading and SASS compilation`: http://cookiecutter-django.readthedocs.io/en/latest/live-reloading-and-sass-compilation.html
 
-{% if cookiecutter.use_celery == "y" %}
+{%- if cookiecutter.use_celery == "y" %}
 
 Celery
 ^^^^^^
@@ -83,19 +83,21 @@ To run a celery worker:
 
 Please note: For Celery's import magic to work, it is important *where* the celery commands are run. If you are in the same folder with *manage.py*, you should be right.
 
-{% endif %}
-{% if cookiecutter.use_mailhog == "y" %}
+{%- endif %}
+{%- if cookiecutter.use_mailhog == "y" %}
 
 Email Server
 ^^^^^^^^^^^^
-{% if cookiecutter.use_docker == 'y' %}
+{%- if cookiecutter.use_docker == 'y' %}
+
 In development, it is often nice to be able to see emails that are being sent from your application. For that reason local SMTP server `MailHog`_ with a web interface is available as docker container.
 
 Container mailhog will start automatically when you will run all docker containers.
 Please check `cookiecutter-django Docker documentation`_ for more details how to start all containers.
 
 With MailHog running, to view messages that are sent by your application, open your browser and go to ``http://127.0.0.1:8025``
-{% else %}
+{%- else %}
+
 In development, it is often nice to be able to see emails that are being sent from your application. If you choose to use `MailHog`_ when generating the project a local SMTP server with a web interface will be available.
 
 #. `Download the latest MailHog release`_ for your OS.
@@ -117,10 +119,10 @@ In development, it is often nice to be able to see emails that are being sent fr
 Now you have your own mail server running locally, ready to receive whatever you send it.
 
 .. _`Download the latest MailHog release`: https://github.com/mailhog/MailHog/releases
-{% endif %}
+{%- endif %}
 .. _mailhog: https://github.com/mailhog/MailHog
-{% endif %}
-{% if cookiecutter.use_sentry == "y" %}
+{%- endif %}
+{%- if cookiecutter.use_sentry == "y" %}
 
 Sentry
 ^^^^^^
@@ -129,13 +131,13 @@ Sentry is an error logging aggregator service. You can sign up for a free accoun
 The system is setup with reasonable defaults, including 404 logging and integration with the WSGI application.
 
 You must set the DSN url in production.
-{% endif %}
+{%- endif %}
 
 Deployment
 ----------
 
 The following details how to deploy this application.
-{% if cookiecutter.use_heroku.lower() == "y" %}
+{%- if cookiecutter.use_heroku.lower() == "y" %}
 
 Heroku
 ^^^^^^
@@ -143,8 +145,8 @@ Heroku
 See detailed `cookiecutter-django Heroku documentation`_.
 
 .. _`cookiecutter-django Heroku documentation`: http://cookiecutter-django.readthedocs.io/en/latest/deployment-on-heroku.html
-{% endif %}
-{% if cookiecutter.use_docker.lower() == "y" %}
+{%- endif %}
+{%- if cookiecutter.use_docker.lower() == "y" %}
 
 Docker
 ^^^^^^
@@ -152,9 +154,8 @@ Docker
 See detailed `cookiecutter-django Docker documentation`_.
 
 .. _`cookiecutter-django Docker documentation`: http://cookiecutter-django.readthedocs.io/en/latest/deployment-with-docker.html
-{% endif %}
-
-{% if cookiecutter.custom_bootstrap_compilation == "y" %}
+{%- endif %}
+{%- if cookiecutter.custom_bootstrap_compilation == "y" %}
 Custom Bootstrap Compilation
 ^^^^^^
 
@@ -163,11 +164,11 @@ Bootstrap v4 is installed using npm and customised by tweaking your variables in
 
 You can find a list of available variables `in the bootstrap source`_, or get explanations on them in the `Bootstrap docs`_.
 
-{% if cookiecutter.js_task_runner == 'Gulp' %}
+{%- if cookiecutter.js_task_runner == 'Gulp' %}
 Bootstrap's javascript as well as its dependencies is concatenated into a single file: ``static/js/vendors.js``.
-{% endif %}
+{%- endif %}
 
 .. _in the bootstrap source: https://github.com/twbs/bootstrap/blob/v4-dev/scss/_variables.scss
 .. _Bootstrap docs: https://getbootstrap.com/docs/4.1/getting-started/theming/
 
-{% endif %}
+{%- endif %}
diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
index 7b56063f3..cc183cd6c 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
@@ -35,7 +35,7 @@ http:
     web-secure-router:
       {%- if cookiecutter.domain_name.count('.') == 1 %}
       rule: "Host(`{{ cookiecutter.domain_name }}`) || Host(`www.{{ cookiecutter.domain_name }}`)"
-      {% else %}
+      {%- else %}
       rule: "Host(`{{ cookiecutter.domain_name }}`)"
       {%- endif %}
       entryPoints:
diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index f69908c2d..640d8b62c 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -44,7 +44,7 @@ LOCALE_PATHS = [str(ROOT_DIR / "locale")]
 DATABASES = {"default": env.db("DATABASE_URL")}
 {%- else %}
 DATABASES = {
-    "default": env.db("DATABASE_URL", default="postgres://{% if cookiecutter.windows == 'y' %}localhost{% endif %}/{{cookiecutter.project_slug}}")
+    "default": env.db("DATABASE_URL", default="postgres://{% if cookiecutter.windows == 'y' %}localhost{% endif %}/{{cookiecutter.project_slug}}"),
 }
 {%- endif %}
 DATABASES["default"]["ATOMIC_REQUESTS"] = True
@@ -230,7 +230,8 @@ X_FRAME_OPTIONS = "DENY"
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#email-backend
 EMAIL_BACKEND = env(
-    "DJANGO_EMAIL_BACKEND", default="django.core.mail.backends.smtp.EmailBackend"
+    "DJANGO_EMAIL_BACKEND",
+    default="django.core.mail.backends.smtp.EmailBackend",
 )
 # https://docs.djangoproject.com/en/dev/ref/settings/#email-timeout
 EMAIL_TIMEOUT = 5
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index bd0acfbd4..59928f829 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -146,7 +146,8 @@ DEFAULT_FROM_EMAIL = env(
 SERVER_EMAIL = env("DJANGO_SERVER_EMAIL", default=DEFAULT_FROM_EMAIL)
 # https://docs.djangoproject.com/en/dev/ref/settings/#email-subject-prefix
 EMAIL_SUBJECT_PREFIX = env(
-    "DJANGO_EMAIL_SUBJECT_PREFIX", default="[{{cookiecutter.project_name}}]"
+    "DJANGO_EMAIL_SUBJECT_PREFIX",
+    default="[{{cookiecutter.project_name}}]",
 )
 
 # ADMIN
diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index e285f3498..6241ceede 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -52,7 +52,6 @@ services:
     ports:
       - "7000:7000"
     command: /start-docs
-
   {%- if cookiecutter.use_mailhog == 'y' %}
 
   mailhog:
@@ -75,7 +74,7 @@ services:
     depends_on:
       - redis
       - postgres
-      {% if cookiecutter.use_mailhog == 'y' -%}
+      {%- if cookiecutter.use_mailhog == 'y' %}
       - mailhog
       {%- endif %}
     ports: []
@@ -88,7 +87,7 @@ services:
     depends_on:
       - redis
       - postgres
-      {% if cookiecutter.use_mailhog == 'y' -%}
+      {%- if cookiecutter.use_mailhog == 'y' %}
       - mailhog
       {%- endif %}
     ports: []
diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index 93b61b134..3cccdb653 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -64,10 +64,9 @@ services:
     <<: *django
     image: {{ cookiecutter.project_slug }}_production_flower
     command: /start-flower
-
   {%- endif %}
+  {%- if cookiecutter.cloud_provider == 'AWS' %}
 
-  {% if cookiecutter.cloud_provider == 'AWS' %}
   awscli:
     build:
       context: .
diff --git a/{{cookiecutter.project_slug}}/utility/install_python_dependencies.sh b/{{cookiecutter.project_slug}}/utility/install_python_dependencies.sh
index 517934841..e09ebf6f8 100755
--- a/{{cookiecutter.project_slug}}/utility/install_python_dependencies.sh
+++ b/{{cookiecutter.project_slug}}/utility/install_python_dependencies.sh
@@ -33,9 +33,8 @@ if [ -z "$VIRTUAL_ENV" ]; then
     echo >&2 -e "\n"
     exit 1;
 else
-
     pip install -r $PROJECT_DIR/requirements/local.txt
-    {% if cookiecutter.use_heroku == "y" -%}
+    {%- if cookiecutter.use_heroku == "y" -%}
     pip install -r $PROJECT_DIR/requirements.txt
     {%- endif %}
 fi
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/403.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/403.html
index 31da98826..4c4745f7d 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/403.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/403.html
@@ -6,4 +6,5 @@
 <h1>Forbidden (403)</h1>
 
 <p>{% if exception %}{{ exception }}{% else %}You're not allowed to access this page.{% endif %}</p>
-{% endblock content %}{% endraw %}
+{% endblock content %}
+{%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/404.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/404.html
index 187c1fc9d..d98241858 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/404.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/404.html
@@ -6,4 +6,5 @@
 <h1>Page not found</h1>
 
 <p>{% if exception %}{{ exception }}{% else %}This is not the page you were looking for.{% endif %}</p>
-{% endblock content %}{% endraw %}
+{% endblock content %}
+{%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/500.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/500.html
index 122e0813e..481bb2d0b 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/500.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/500.html
@@ -9,5 +9,4 @@
 
 <p>We track these errors automatically, but if the problem persists feel free to contact us. In the meantime, try refreshing.</p>
 {% endblock content %}
-
-{% endraw %}
+{%- endraw %}
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 fe9b68078..0713ff110 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
@@ -9,4 +9,4 @@
 
 <p>{% trans "This account is inactive." %}</p>
 {% endblock %}
-{% endraw %}
+{%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/base.html
index cd07bbabf..03c86724b 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/base.html
@@ -8,4 +8,4 @@
   </div>
 </div>
 {% endblock %}
-{% endraw %}
\ No newline at end of file
+{%- 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 2b7e12789..055904ae9 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html
@@ -77,4 +77,4 @@ window.addEventListener('DOMContentLoaded',function() {
 $('.form-group').removeClass('row');
 </script>
 {% endblock %}
-{% endraw %}
+{%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email_confirm.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email_confirm.html
index eb45cf600..2a0722a1d 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
@@ -29,4 +29,4 @@
 {% endif %}
 
 {% endblock %}
-{% endraw %}
+{%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/login.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/login.html
index a71932225..247ca690a 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/login.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/login.html
@@ -45,4 +45,4 @@ for a {{ site_name }} account and sign in below:{% endblocktrans %}</p>
 </form>
 
 {% endblock %}
-{% endraw %}
+{%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/logout.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/logout.html
index baa8183c9..6659724e0 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/logout.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/logout.html
@@ -16,7 +16,5 @@
   {% endif %}
   <button class="btn btn-danger" type="submit">{% trans 'Sign Out' %}</button>
 </form>
-
-
 {% endblock %}
-{% endraw %}
+{%- 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 62bbbc138..7f2fbed07 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
@@ -14,4 +14,4 @@
         <button class="btn btn-primary" type="submit" name="action">{% trans "Change Password" %}</button>
     </form>
 {% endblock %}
-{% endraw %}
+{%- 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 b9869fb23..474b0f4a9 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
@@ -23,4 +23,4 @@
 
     <p>{% blocktrans %}Please contact us if you have any trouble resetting your password.{% endblocktrans %}</p>
 {% endblock %}
-{% endraw %}
+{%- 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 cf2129b1e..94ea2dfbe 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
@@ -7,11 +7,11 @@
 
 {% block inner %}
     <h1>{% trans "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>
 {% endblock %}
-{% endraw %}
+{%- 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 671eb12c9..66ea9ba60 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
@@ -22,4 +22,4 @@
         {% endif %}
     {% endif %}
 {% endblock %}
-{% endraw %}
+{%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset_from_key_done.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset_from_key_done.html
index 925b7aa23..7defcc86c 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
@@ -7,4 +7,4 @@
     <h1>{% trans "Change Password" %}</h1>
     <p>{% trans 'Your password is now changed.' %}</p>
 {% endblock %}
-{% endraw %}
+{%- 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 563a0b185..435ed073e 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
@@ -14,4 +14,4 @@
         <input class="btn btn-primary" type="submit" name="action" value="{% trans 'Set Password' %}"/>
     </form>
 {% endblock %}
-{% endraw %}
+{%- 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 80490a2e1..7a1e29a4d 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/signup.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/signup.html
@@ -20,4 +20,4 @@
 </form>
 
 {% endblock %}
-{% endraw %}
+{%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/signup_closed.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/signup_closed.html
index eca9b1568..08b937726 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
@@ -9,4 +9,4 @@
 
 <p>{% trans "We are sorry, but the sign up is currently closed." %}</p>
 {% endblock %}
-{% endraw %}
+{%- 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 ccc8d9a1f..4394e9c67 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
@@ -10,4 +10,4 @@
     <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>
 
 {% endblock %}
-{% endraw %}
+{%- 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 f3078b68e..8eafcbedb 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
@@ -18,7 +18,5 @@ 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>
 
 <p>{% blocktrans %}<strong>Note:</strong> you can still <a href="{{ email_url }}">change your e-mail address</a>.{% endblocktrans %}</p>
-
-
 {% endblock %}
-{% endraw %}
+{%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
index 127068878..951b17dbe 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -16,26 +16,26 @@
     <link rel="icon" href="{% static 'images/favicons/favicon.ico' %}">
 
     {% block css %}
-    {% endraw %}{% if cookiecutter.custom_bootstrap_compilation == "n" %}{% raw %}
+    {%- endraw %}{% if cookiecutter.custom_bootstrap_compilation == "n" %}{% raw %}
     <!-- Latest compiled and minified Bootstrap CSS -->
     <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
-    {% endraw %}{% endif %}{% raw %}
+    {%- endraw %}{% endif %}{% raw %}
 
     <!-- Your stuff: Third-party CSS libraries go here -->
-    {% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% compress css %}{% endraw %}{% endif %}{% raw %}
+    {%- endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% compress css %}{% endraw %}{% endif %}{% raw %}
     <!-- This file stores project-specific CSS -->
-    {% endraw %}{% if cookiecutter.js_task_runner == "Gulp" and cookiecutter.use_compressor == "n" %}{% raw %}
+    {%- endraw %}{% if cookiecutter.js_task_runner == "Gulp" and cookiecutter.use_compressor == "n" %}{% raw %}
     <link href="{% static 'css/project.min.css' %}" rel="stylesheet">
-    {% endraw %}{% else %}{% raw %}
+    {%- endraw %}{% else %}{% raw %}
     <link href="{% static 'css/project.css' %}" rel="stylesheet">
-    {% endraw %}{% endif %}{% raw %}
-    {% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %}
+    {%- endraw %}{% endif %}{% raw %}
+    {%- endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %}
     {% endblock %}
     <!-- Le javascript
     ================================================== -->
     {# Placed at the top of the document so pages load faster with defer #}
     {% block javascript %}
-      {% endraw %}{% if cookiecutter.custom_bootstrap_compilation == "y" and cookiecutter.js_task_runner == "Gulp" %}{% raw %}
+      {%- endraw %}{% if cookiecutter.custom_bootstrap_compilation == "y" and cookiecutter.js_task_runner == "Gulp" %}{% raw %}
       <!-- Vendor dependencies bundled as one file-->
       {% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% compress js %}{% endraw %}{% endif %}{% raw %}
       <script defer src="{% static 'js/vendors.js' %}"></script>
@@ -47,12 +47,12 @@
       <script defer src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
 
       <!-- Your stuff: Third-party javascript libraries go here -->
-      {% endraw %}{% endif %}{% raw %}
+      {%- endraw %}{% endif %}{% raw %}
 
       <!-- place project specific Javascript in this file -->
-      {% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% compress js %}{% endraw %}{% endif %}{% raw %}
+      {%- endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% compress js %}{% endraw %}{% endif %}{% raw %}
       <script defer src="{% static 'js/project.js' %}"></script>
-      {% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %}
+      {%- endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %}
 
     {% endblock javascript %}
 
@@ -121,4 +121,4 @@
     {% endblock inline_javascript %}
   </body>
 </html>
- {% endraw %}
+{%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/pages/about.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/pages/about.html
index 94beff9c8..8968a3d4f 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/pages/about.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/pages/about.html
@@ -1 +1 @@
-{% raw %}{% extends "base.html" %}{% endraw %}
\ No newline at end of file
+{% raw %}{% extends "base.html" %}{% endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/pages/home.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/pages/home.html
index 94beff9c8..8968a3d4f 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/pages/home.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/pages/home.html
@@ -1 +1 @@
-{% raw %}{% extends "base.html" %}{% endraw %}
\ No newline at end of file
+{% raw %}{% extends "base.html" %}{% endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_detail.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_detail.html
index 47b611220..eed39ca3a 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_detail.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_detail.html
@@ -30,7 +30,6 @@
 <!-- End Action buttons -->
 {% endif %}
 
-
 </div>
 {% endblock content %}
-{% endraw %}
+{%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_form.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_form.html
index e9da0d48f..53e14a530 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_form.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_form.html
@@ -14,4 +14,5 @@
       </div>
     </div>
   </form>
-{% endblock %}{% endraw %}
+{% endblock %}
+{%- endraw %}

From c7bb4834e03ef022f7f80ccbf871e8ebc0704720 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 3 Mar 2021 19:50:13 +0000
Subject: [PATCH 1425/2840] Fix pre-commit hook issues with Docker & Celery

---
 {{cookiecutter.project_slug}}/.envs/.local/.django              | 2 +-
 {{cookiecutter.project_slug}}/compose/local/django/start        | 2 +-
 .../compose/production/aws/maintenance/download                 | 1 -
 .../compose/production/aws/maintenance/upload                   | 1 -
 4 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/.envs/.local/.django b/{{cookiecutter.project_slug}}/.envs/.local/.django
index 919f31185..ef581a1c0 100644
--- a/{{cookiecutter.project_slug}}/.envs/.local/.django
+++ b/{{cookiecutter.project_slug}}/.envs/.local/.django
@@ -14,4 +14,4 @@ REDIS_URL=redis://redis:6379/0
 # Flower
 CELERY_FLOWER_USER=!!!SET CELERY_FLOWER_USER!!!
 CELERY_FLOWER_PASSWORD=!!!SET CELERY_FLOWER_PASSWORD!!!
-{% endif %}
+{%- endif %}
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start b/{{cookiecutter.project_slug}}/compose/local/django/start
index 660eda34c..9cbb6c897 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/start
@@ -10,4 +10,4 @@ python manage.py migrate
 uvicorn config.asgi:application --host 0.0.0.0 --reload
 {%- else %}
 python manage.py runserver_plus 0.0.0.0:8000
-{% endif %}
+{%- endif %}
diff --git a/{{cookiecutter.project_slug}}/compose/production/aws/maintenance/download b/{{cookiecutter.project_slug}}/compose/production/aws/maintenance/download
index 8d5ea091f..0c515935f 100644
--- a/{{cookiecutter.project_slug}}/compose/production/aws/maintenance/download
+++ b/{{cookiecutter.project_slug}}/compose/production/aws/maintenance/download
@@ -21,4 +21,3 @@ export AWS_STORAGE_BUCKET_NAME="${DJANGO_AWS_STORAGE_BUCKET_NAME}"
 aws s3 cp s3://${AWS_STORAGE_BUCKET_NAME}${BACKUP_DIR_PATH}/${1} ${BACKUP_DIR_PATH}/${1}
 
 message_success "Finished downloading ${1}."
-
diff --git a/{{cookiecutter.project_slug}}/compose/production/aws/maintenance/upload b/{{cookiecutter.project_slug}}/compose/production/aws/maintenance/upload
index 4a89dcb5a..9446b9304 100644
--- a/{{cookiecutter.project_slug}}/compose/production/aws/maintenance/upload
+++ b/{{cookiecutter.project_slug}}/compose/production/aws/maintenance/upload
@@ -27,4 +27,3 @@ message_info "Cleaning the directory ${BACKUP_DIR_PATH}"
 rm -rf ${BACKUP_DIR_PATH}/*
 
 message_success "Finished uploading and cleaning."
-

From e08b17a234c6a7dbafcb72bd7d95a6036184e380 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 3 Mar 2021 19:53:56 +0000
Subject: [PATCH 1426/2840] Run pre-commit for linting in Docker

---
 requirements.txt     |  1 +
 tests/test_bare.sh   |  1 +
 tests/test_docker.sh | 10 +++++++---
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 3b16db8d8..b4ae9467a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,6 +8,7 @@ black==20.8b1
 isort==5.8.0
 flake8==3.9.0
 flake8-isort==4.0.0
+pre-commit==2.10.1
 
 # Testing
 # ------------------------------------------------------------------------------
diff --git a/tests/test_bare.sh b/tests/test_bare.sh
index c7938ecf6..1f52d91b6 100755
--- a/tests/test_bare.sh
+++ b/tests/test_bare.sh
@@ -28,6 +28,7 @@ sudo utility/install_os_dependencies.sh install
 pip install -r requirements/local.txt
 
 # Lint by running pre-commit on all files
+# Needs a git repo to find the project root
 git init
 git add .
 pre-commit run --show-diff-on-failure -a
diff --git a/tests/test_docker.sh b/tests/test_docker.sh
index f6df6b8ab..001ef06d0 100755
--- a/tests/test_docker.sh
+++ b/tests/test_docker.sh
@@ -17,12 +17,16 @@ cd .cache/docker
 cookiecutter ../../ --no-input --overwrite-if-exists use_docker=y $@
 cd my_awesome_project
 
+# Lint by running pre-commit on all files
+# Needs a git repo to find the project root
+# We don't have git inside Docker, so run it outside
+git init
+git add .
+pre-commit run --show-diff-on-failure -a
+
 # run the project's type checks
 docker-compose -f local.yml run django mypy my_awesome_project
 
-# Run black with --check option
-docker-compose -f local.yml run django black --check --diff  --exclude 'migrations' ./
-
 # run the project's tests
 docker-compose -f local.yml run django pytest
 

From 382dce2803a9a74b4ec1490abd421c9635ccf550 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 3 Mar 2021 20:00:18 +0000
Subject: [PATCH 1427/2840] Fix linting issues in Gulpfile

---
 {{cookiecutter.project_slug}}/gulpfile.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/gulpfile.js b/{{cookiecutter.project_slug}}/gulpfile.js
index 206f8a019..56a08e8fc 100644
--- a/{{cookiecutter.project_slug}}/gulpfile.js
+++ b/{{cookiecutter.project_slug}}/gulpfile.js
@@ -29,14 +29,14 @@ function pathsConfig(appName) {
   const vendorsRoot = 'node_modules'
 
   return {
-    {% if cookiecutter.custom_bootstrap_compilation == 'y' %}
+    {%- if cookiecutter.custom_bootstrap_compilation == 'y' %}
     bootstrapSass: `${vendorsRoot}/bootstrap/scss`,
     vendorsJs: [
       `${vendorsRoot}/jquery/dist/jquery.slim.js`,
       `${vendorsRoot}/popper.js/dist/umd/popper.js`,
       `${vendorsRoot}/bootstrap/dist/js/bootstrap.js`,
     ],
-    {% endif %}
+    {%- endif %}
     app: this.app,
     templates: `${this.app}/templates`,
     css: `${this.app}/static/css`,
@@ -67,9 +67,9 @@ function styles() {
   return src(`${paths.sass}/project.scss`)
     .pipe(sass({
       includePaths: [
-        {% if cookiecutter.custom_bootstrap_compilation == 'y' %}
+        {%- if cookiecutter.custom_bootstrap_compilation == 'y' %}
         paths.bootstrapSass,
-        {% endif %}
+        {%- endif %}
         paths.sass
       ]
     }).on('error', sass.logError))
@@ -90,7 +90,7 @@ function scripts() {
     .pipe(dest(paths.js))
 }
 
-{% if cookiecutter.custom_bootstrap_compilation == 'y' %}
+{%- if cookiecutter.custom_bootstrap_compilation == 'y' %}
 // Vendor Javascript minification
 function vendorScripts() {
   return src(paths.vendorsJs)
@@ -101,7 +101,7 @@ function vendorScripts() {
     .pipe(rename({ suffix: '.min' }))
     .pipe(dest(paths.js))
 }
-{% endif %}
+{%- endif %}
 
 // Image compression
 function imgCompression() {
@@ -110,7 +110,7 @@ function imgCompression() {
     .pipe(dest(paths.images))
 }
 
-{% if cookiecutter.use_async == 'y' -%}
+{%- if cookiecutter.use_async == 'y' -%}
 // Run django server
 function asyncRunServer() {
   var cmd = spawn('gunicorn', [
@@ -143,7 +143,7 @@ function initBrowserSync() {
         // https://www.browsersync.io/docs/options/#option-proxy
         {%- if cookiecutter.use_docker == 'n' %}
         proxy: 'localhost:8000'
-        {% else %}
+        {%- else %}
         proxy:  {
           target: 'django:8000',
           proxyReq: [
@@ -172,7 +172,7 @@ function watchPaths() {
 const generateAssets = parallel(
   styles,
   scripts,
-  {% if cookiecutter.custom_bootstrap_compilation == 'y' %}vendorScripts,{% endif %}
+  {%- if cookiecutter.custom_bootstrap_compilation == 'y' %}vendorScripts,{% endif %}
   imgCompression
 )
 

From 675cef0a95b5ee48ca0ab2cb84258878364d9065 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 3 Mar 2021 20:02:32 +0000
Subject: [PATCH 1428/2840] Fix linting issues in template

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

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
index 951b17dbe..c36794048 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -37,10 +37,10 @@
     {% block javascript %}
       {%- endraw %}{% if cookiecutter.custom_bootstrap_compilation == "y" and cookiecutter.js_task_runner == "Gulp" %}{% raw %}
       <!-- Vendor dependencies bundled as one file-->
-      {% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% compress js %}{% endraw %}{% endif %}{% raw %}
+      {%- endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% compress js %}{% endraw %}{% endif %}{% raw %}
       <script defer src="{% static 'js/vendors.js' %}"></script>
-      {% endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %}
-      {% endraw %}{% else %}{% raw %}
+      {%- endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %}
+      {%- endraw %}{% else %}{% raw %}
       <!-- Bootstrap JS and its dependencies-->
       <script defer src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
       <script defer src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>

From 9c4f047886ce8c25d3df7d7023cb3a8692b581c7 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 7 Apr 2021 13:01:52 -0700
Subject: [PATCH 1429/2840] Update pre-commit from 2.10.1 to 2.12.0

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

diff --git a/requirements.txt b/requirements.txt
index b4ae9467a..1e75dbced 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ black==20.8b1
 isort==5.8.0
 flake8==3.9.0
 flake8-isort==4.0.0
-pre-commit==2.10.1
+pre-commit==2.12.0
 
 # Testing
 # ------------------------------------------------------------------------------

From e6604f9a7d0211216c18f792a91a2366c3fac411 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 7 Apr 2021 21:12:36 +0100
Subject: [PATCH 1430/2840] Fix style

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

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index bdcd87ba7..f174bcefd 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -78,4 +78,4 @@ RUN chmod +x /start-flower
 # copy application code to WORKDIR
 COPY . ${APP_HOME}
 
-ENTRYPOINT ["/entrypoint"]
\ No newline at end of file
+ENTRYPOINT ["/entrypoint"]

From c08f6115b0b1721f726e2474aff8f754008659f8 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 8 Apr 2021 02:26:56 +0000
Subject: [PATCH 1431/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d1479a28e..d9559b9f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,20 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-04-07]
+### Changed
+- Update django to 3.1.8 ([#3117](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3117))
+### Fixed
+- Fix linting via pre-commit on Github CI ([#3077](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3077))
+- Fix gitlab-ci using duplicate key name for image ([#3112](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3112))
+### Updated
+- Update sentry-sdk to 1.0.0 ([#3080](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3080))
+- Update gunicorn to 20.1.0 ([#3108](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3108))
+- Update pre-commit to 2.12.0 ([#3118](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3118))
+- Update django-extensions to 3.1.2 ([#3116](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3116))
+- Update pillow to 8.2.0 ([#3113](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3113))
+- Update pytest to 6.2.3 ([#3115](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3115))
+
 ## [2021-03-26]
 ### Updated
 - Update djangorestframework to 3.12.4 ([#3107](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3107))

From 47f5b40ace3f845ea4e5498100cc610dd25c97d2 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 8 Apr 2021 18:53:14 +0100
Subject: [PATCH 1432/2840] Update Heroku to latest 3.9.x

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

From 49b739fc9eeae87b0ea2579e699c4a79bd088c92 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 8 Apr 2021 19:41:58 +0100
Subject: [PATCH 1433/2840] Switch .dockerignore to explicit list

Use explicit list of files to ignore instead of exceptions.

Fix #713
---
 {{cookiecutter.project_slug}}/.dockerignore | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/.dockerignore b/{{cookiecutter.project_slug}}/.dockerignore
index e63c0c184..d01db04a6 100644
--- a/{{cookiecutter.project_slug}}/.dockerignore
+++ b/{{cookiecutter.project_slug}}/.dockerignore
@@ -1,4 +1,9 @@
-.*
-!.coveragerc
-!.env
-!.pylintrc
+.editorconfig
+.gitattributes
+.github
+.gitignore
+.gitlab-ci.yml
+.idea
+.pre-commit-config.yaml
+.readthedocs.yml
+.travis.yml

From 2320206467cfe9e3a3ca7c32bde62b1e7cb939ae Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 9 Apr 2021 02:23:38 +0000
Subject: [PATCH 1434/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9559b9f6..1a82e45bb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-04-08]
+### Changed
+- Switch .dockerignore to explicit list ([#3121](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3121))
+- Change Docker image to multi-stage build for Django ([#2815](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2815))
+- Fix deprecated warning in middleware tests ([#3038](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3038))
+### Updated
+- Update pre-commit to 2.12.0 ([#3120](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3120))
+
 ## [2021-04-07]
 ### Changed
 - Update django to 3.1.8 ([#3117](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3117))

From c7ef61db2b49bb330960a3044cb425fb13a3b871 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 9 Apr 2021 00:21:28 -0700
Subject: [PATCH 1435/2840] Update pylint-django from 2.4.2 to 2.4.3

---
 {{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 801c2d2d5..4553a65e9 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -29,7 +29,7 @@ flake8==3.9.0  # 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==20.8b1  # https://github.com/ambv/black
-pylint-django==2.4.2  # https://github.com/PyCQA/pylint-django
+pylint-django==2.4.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}

From 27872cc81bb201e28ed623cb49454723b26b7c59 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 10 Apr 2021 02:22:20 +0000
Subject: [PATCH 1436/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a82e45bb..a0e3bdebe 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-04-09]
+### Changed
+- Update from Python 3.8 to Python 3.9 ([#3023](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3023))
+
 ## [2021-04-08]
 ### Changed
 - Switch .dockerignore to explicit list ([#3121](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3121))

From 1b9e7608a058bbac6681b2e7da39e1bc2c9084c5 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 10 Apr 2021 15:53:23 -0700
Subject: [PATCH 1437/2840] Update pytest-django from 4.1.0 to 4.2.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 801c2d2d5..460d858a6 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -42,4 +42,4 @@ factory-boy==3.2.0  # https://github.com/FactoryBoy/factory_boy
 django-debug-toolbar==3.2  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.1.2  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
-pytest-django==4.1.0  # https://github.com/pytest-dev/pytest-django
+pytest-django==4.2.0  # https://github.com/pytest-dev/pytest-django

From ac17eeb8f5b7865374ed15708da477f9e62f4423 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Mon, 12 Apr 2021 02:25:04 +0000
Subject: [PATCH 1438/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a0e3bdebe..59bd10ea8 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-04-11]
+### Updated
+- Update pytest-django to 4.2.0 ([#3125](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3125))
+- Update pylint-django to 2.4.3 ([#3122](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3122))
+
 ## [2021-04-09]
 ### Changed
 - Update from Python 3.8 to Python 3.9 ([#3023](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3023))

From 9ffcec913e92fbadba00cb08398c0393f4dc5c4e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 11 Apr 2021 19:25:09 -0700
Subject: [PATCH 1439/2840] Update sphinx from 3.5.3 to 3.5.4

---
 {{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 822305ee8..d3a761e87 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==3.5.3  # https://github.com/sphinx-doc/sphinx
+sphinx==3.5.4  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From 3017ccfd2c147b66fd978a14817ee4d852e96d09 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 12 Apr 2021 03:58:44 -0700
Subject: [PATCH 1440/2840] Update django-stubs from 1.7.0 to 1.8.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 822305ee8..e290b2fb2 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -14,7 +14,7 @@ watchgod==0.6  # https://github.com/samuelcolvin/watchgod
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.812  # https://github.com/python/mypy
-django-stubs==1.7.0  # https://github.com/typeddjango/django-stubs
+django-stubs==1.8.0  # https://github.com/typeddjango/django-stubs
 pytest==6.2.3  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 

From 43e3eff6273fef79552cf7e4ccdc03cf917bd376 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 13 Apr 2021 05:53:38 +0000
Subject: [PATCH 1441/2840] Bump stefanzweifel/git-auto-commit-action from
 v4.9.2 to v4.10.0

Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from v4.9.2 to v4.10.0.
- [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases)
- [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.9.2...48d37c1ffbe4639e16d47fef924857386bc4a44a)

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-changelog.yml    | 2 +-
 .github/workflows/update-contributors.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index d4672c47e..62079f3d8 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -28,7 +28,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Commit changes
-      uses: stefanzweifel/git-auto-commit-action@v4.9.2
+      uses: stefanzweifel/git-auto-commit-action@v4.10.0
       with:
         commit_message: Update Changelog
         file_pattern: CHANGELOG.md
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 0c1c00509..e416e9614 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -24,7 +24,7 @@ jobs:
       run: python scripts/update_contributors.py
 
     - name: Commit changes
-      uses: stefanzweifel/git-auto-commit-action@v4.9.2
+      uses: stefanzweifel/git-auto-commit-action@v4.10.0
       with:
         commit_message: Update Contributors
         file_pattern: CONTRIBUTORS.md .github/contributors.json

From 6b719997d2b845349ceb1c8639947b467a1ce9c2 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 15 Apr 2021 02:20:23 +0000
Subject: [PATCH 1442/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59bd10ea8..49005ee9d 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-04-14]
+### Updated
+- Bump stefanzweifel/git-auto-commit-action from v4.9.2 to v4.10.0 ([#3128](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3128))
+
 ## [2021-04-11]
 ### Updated
 - Update pytest-django to 4.2.0 ([#3125](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3125))

From df0cd7fa9c59ff09d57976c35bd2e3bcb1f45326 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 15 Apr 2021 09:04:39 -0700
Subject: [PATCH 1443/2840] Update django-debug-toolbar from 3.2 to 3.2.1

---
 {{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 822305ee8..e6d35c70a 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -39,7 +39,7 @@ pre-commit==2.12.0  # https://github.com/pre-commit/pre-commit
 # ------------------------------------------------------------------------------
 factory-boy==3.2.0  # https://github.com/FactoryBoy/factory_boy
 
-django-debug-toolbar==3.2  # https://github.com/jazzband/django-debug-toolbar
+django-debug-toolbar==3.2.1  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.1.2  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.2.0  # https://github.com/pytest-dev/pytest-django

From 713220f305cb61df67711d6d1010f4b660a56fca Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 16 Apr 2021 02:23:57 +0000
Subject: [PATCH 1444/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49005ee9d..852dd56e8 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-04-15]
+### Updated
+- Update django-debug-toolbar to 3.2.1 ([#3129](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3129))
+
 ## [2021-04-14]
 ### Updated
 - Bump stefanzweifel/git-auto-commit-action from v4.9.2 to v4.10.0 ([#3128](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3128))

From 5ff17c0ce035e632dd5c52d01c6d059ec35d8cb2 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 16 Apr 2021 11:52:53 -0700
Subject: [PATCH 1445/2840] Update flake8 from 3.9.0 to 3.9.1

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

diff --git a/requirements.txt b/requirements.txt
index 1e75dbced..8c7e431ce 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ binaryornot==0.4.4
 # ------------------------------------------------------------------------------
 black==20.8b1
 isort==5.8.0
-flake8==3.9.0
+flake8==3.9.1
 flake8-isort==4.0.0
 pre-commit==2.12.0
 

From a34f6e9781890c17f40d10f55c3f6df486f75a2b Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 16 Apr 2021 11:52:53 -0700
Subject: [PATCH 1446/2840] Update flake8 from 3.9.0 to 3.9.1

---
 {{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 e6d35c70a..77c196a2e 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -25,7 +25,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality
 # ------------------------------------------------------------------------------
-flake8==3.9.0  # https://github.com/PyCQA/flake8
+flake8==3.9.1  # 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==20.8b1  # https://github.com/ambv/black

From 204acbd65d0123ee6bd133920853b10d969a3e42 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 17 Apr 2021 00:10:17 +0000
Subject: [PATCH 1447/2840] 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 df71ea618..bad267fe3 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -21,7 +21,7 @@ repos:
       - id: isort
 
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.9.0
+    rev: 3.9.1
     hooks:
       - id: flake8
         args: ['--config=setup.cfg']

From 55e89730d57c57ca72fe23962ab3a15141f16629 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 17 Apr 2021 03:41:47 -0700
Subject: [PATCH 1448/2840] Update pre-commit from 2.12.0 to 2.12.1

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

diff --git a/requirements.txt b/requirements.txt
index 1e75dbced..40aa46fff 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ black==20.8b1
 isort==5.8.0
 flake8==3.9.0
 flake8-isort==4.0.0
-pre-commit==2.12.0
+pre-commit==2.12.1
 
 # Testing
 # ------------------------------------------------------------------------------

From 4b2e95a46fd1cf679cdaec1d729491076175a590 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 17 Apr 2021 03:41:47 -0700
Subject: [PATCH 1449/2840] Update pre-commit from 2.12.0 to 2.12.1

---
 {{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 e6d35c70a..4fc34838b 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -33,7 +33,7 @@ pylint-django==2.4.3  # 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.12.0  # https://github.com/pre-commit/pre-commit
+pre-commit==2.12.1  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From 6eaddddf8783e70bad0b71811cdd9ab6f7ec90cc Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 18 Apr 2021 06:00:37 -0700
Subject: [PATCH 1450/2840] Update django-compressor from 2.4 to 2.4.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 a4ab01b00..2bc2edcab 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -35,7 +35,7 @@ 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-crispy-forms==1.11.2  # https://github.com/django-crispy-forms/django-crispy-forms
 {%- if cookiecutter.use_compressor == "y" %}
-django-compressor==2.4  # https://github.com/django-compressor/django-compressor
+django-compressor==2.4.1  # https://github.com/django-compressor/django-compressor
 {%- endif %}
 django-redis==4.12.1  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == "y" %}

From bfe8c7bd2bc5660524cd55654645b6cd69fbb19d Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 20 Apr 2021 10:56:51 -0700
Subject: [PATCH 1451/2840] Update django-extensions from 3.1.2 to 3.1.3

---
 {{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 e6d35c70a..267167a65 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -40,6 +40,6 @@ pre-commit==2.12.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-extensions==3.1.2  # https://github.com/django-extensions/django-extensions
+django-extensions==3.1.3  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.2.0  # https://github.com/pytest-dev/pytest-django

From bc50b9b7f86487553b6e35fe2b8d84dfcf197988 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 22 Apr 2021 02:23:58 +0000
Subject: [PATCH 1452/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 852dd56e8..9afda9981 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-04-21]
+### Updated
+- Auto-update pre-commit hooks ([#3133](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3133))
+- Update django-extensions to 3.1.3 ([#3136](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3136))
+- Update django-compressor to 2.4.1 ([#3135](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3135))
+- Update pre-commit to 2.12.1 ([#3134](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3134))
+- Update flake8 to 3.9.1 ([#3131](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3131))
+- Update django-stubs to 1.8.0 ([#3127](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3127))
+- Update sphinx to 3.5.4 ([#3126](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3126))
+
 ## [2021-04-15]
 ### Updated
 - Update django-debug-toolbar to 3.2.1 ([#3129](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3129))

From 7ad5dffe8512c857220e38b4d000024f5f4b7b21 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Mon, 26 Apr 2021 00:11:48 +0000
Subject: [PATCH 1453/2840] 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 bad267fe3..348f7fb12 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: 20.8b1
+    rev: 21.4b0
     hooks:
       - id: black
 

From e7e15e45d9000d31e334c2aa074df872fcda4173 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 25 Apr 2021 17:11:54 -0700
Subject: [PATCH 1454/2840] Update black from 20.8b1 to 21.4b0

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

diff --git a/requirements.txt b/requirements.txt
index e1079a68e..781916b82 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-black==20.8b1
+black==21.4b0
 isort==5.8.0
 flake8==3.9.1
 flake8-isort==4.0.0

From ec061d2fc11618864e766a6feef64ac2c568c1f4 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 25 Apr 2021 17:11:54 -0700
Subject: [PATCH 1455/2840] Update black from 20.8b1 to 21.4b0

---
 {{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 6d4e0ca72..d4f07600e 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.1  # 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==20.8b1  # https://github.com/ambv/black
+black==21.4b0  # https://github.com/ambv/black
 pylint-django==2.4.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-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 1456/2840] 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 5fafc6966..cb4cbaeda 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 1457/2840] 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 7e585ea40..cbe3324ac 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 75585cd6beb142c7436600d1fcd0652ceb839a6d Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 27 Apr 2021 02:24:40 +0000
Subject: [PATCH 1458/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9afda9981..051898f7b 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-04-26]
+### Updated
+- Update black to 21.4b0 ([#3138](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3138))
+- Auto-update pre-commit hooks ([#3137](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3137))
+
 ## [2021-04-21]
 ### Updated
 - Auto-update pre-commit hooks ([#3133](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3133))

From ab75cf3a3f2330b5cda13c47765bb087c0528354 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 27 Apr 2021 03:31:00 -0700
Subject: [PATCH 1459/2840] Update pygithub from 1.54.1 to 1.55

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

diff --git a/requirements.txt b/requirements.txt
index 781916b82..e6d94d188 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -20,5 +20,5 @@ pyyaml==5.4.1
 
 # Scripting
 # ------------------------------------------------------------------------------
-PyGithub==1.54.1
+PyGithub==1.55
 jinja2==2.11.3

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 1460/2840] 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 cbe3324ac..f62d4bc9a 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 10c24974121f92b42fa7d94c3c37b53cf3d2dc5a Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 27 Apr 2021 10:45:40 -0700
Subject: [PATCH 1461/2840] Update black from 21.4b0 to 21.4b1

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

diff --git a/requirements.txt b/requirements.txt
index 781916b82..e908020c1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-black==21.4b0
+black==21.4b1
 isort==5.8.0
 flake8==3.9.1
 flake8-isort==4.0.0

From f518d920413edbfb1428e8233e5df88d45201eb1 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 27 Apr 2021 10:45:40 -0700
Subject: [PATCH 1462/2840] Update black from 21.4b0 to 21.4b1

---
 {{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 d4f07600e..02a6b0170 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.1  # 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.4b0  # https://github.com/ambv/black
+black==21.4b1  # https://github.com/ambv/black
 pylint-django==2.4.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery

From 9e1c99fad2c376900faf5b17551ea91a8d6bedd4 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Tue, 27 Apr 2021 15:32:18 -0400
Subject: [PATCH 1463/2840] Fix README link

---
 {{cookiecutter.project_slug}}/README.rst | 1 +
 1 file changed, 1 insertion(+)

diff --git a/{{cookiecutter.project_slug}}/README.rst b/{{cookiecutter.project_slug}}/README.rst
index b120f16a6..aa4e48d3d 100644
--- a/{{cookiecutter.project_slug}}/README.rst
+++ b/{{cookiecutter.project_slug}}/README.rst
@@ -120,6 +120,7 @@ Now you have your own mail server running locally, ready to receive whatever you
 
 .. _`Download the latest MailHog release`: https://github.com/mailhog/MailHog/releases
 {%- endif %}
+
 .. _mailhog: https://github.com/mailhog/MailHog
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}

From 90a02f2c046f0aec03b0088a6332f63c3afc35c6 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 28 Apr 2021 00:10:26 +0000
Subject: [PATCH 1464/2840] 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 348f7fb12..9ec9c5aba 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.4b0
+    rev: 21.4b1
     hooks:
       - id: black
 

From c1735dc54c0f9835eea86bb00fa8edd8e927ec36 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 28 Apr 2021 02:25:50 +0000
Subject: [PATCH 1465/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 051898f7b..cdf4c88c5 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-04-27]
+### Updated
+- Update pygithub to 1.55 ([#3141](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3141))
+- Update black to 21.4b1 ([#3143](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3143))
+
 ## [2021-04-26]
 ### Updated
 - Update black to 21.4b0 ([#3138](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3138))

From fc37f09c6db3ef3dde938da8046f9d86586b36a3 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 29 Apr 2021 00:10:47 +0000
Subject: [PATCH 1466/2840] 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 9ec9c5aba..ffad28934 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.4b1
+    rev: 21.4b2
     hooks:
       - id: black
 

From 907268555bca08d2dc9206a9397aa049ea6d7693 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 29 Apr 2021 02:23:38 +0000
Subject: [PATCH 1467/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cdf4c88c5..93afba90d 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-04-28]
+### Changed
+- Fix README link ([#3144](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3144))
+### Updated
+- Auto-update pre-commit hooks ([#3145](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3145))
+
 ## [2021-04-27]
 ### Updated
 - Update pygithub to 1.55 ([#3141](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3141))

From 1b6b1e3fb51c79aeefea4f65a846a80786a9e3f7 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 29 Apr 2021 10:54:36 -0700
Subject: [PATCH 1468/2840] Update black from 21.4b1 to 21.4b2

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

diff --git a/requirements.txt b/requirements.txt
index 60504bff7..9b2477c7a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-black==21.4b1
+black==21.4b2
 isort==5.8.0
 flake8==3.9.1
 flake8-isort==4.0.0

From 1243b82d4f6c2f168a53c1ca5ef7db6f1120ccfc Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 29 Apr 2021 10:54:37 -0700
Subject: [PATCH 1469/2840] Update black from 21.4b1 to 21.4b2

---
 {{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 02a6b0170..528ab0bde 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.1  # 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.4b1  # https://github.com/ambv/black
+black==21.4b2  # https://github.com/ambv/black
 pylint-django==2.4.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery

From 30362312aa104ea97ed2a958a736d64871049b96 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 30 Apr 2021 02:23:51 +0000
Subject: [PATCH 1470/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 93afba90d..2e5f97d67 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-04-29]
+### Updated
+- Update black to 21.4b2 ([#3147](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3147))
+- Auto-update pre-commit hooks ([#3146](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3146))
+
 ## [2021-04-28]
 ### Changed
 - Fix README link ([#3144](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3144))

From 8b35c835006124925edf37aec8ee3d8f70572a46 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Fri, 30 Apr 2021 12:50:35 -0400
Subject: [PATCH 1471/2840] Lint production.py

---
 .../config/settings/production.py                          | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 59928f829..a9e38b07a 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -353,7 +353,12 @@ sentry_logging = LoggingIntegration(
 )
 
 {%- if cookiecutter.use_celery == 'y' %}
-integrations = [sentry_logging, DjangoIntegration(), CeleryIntegration(), RedisIntegration()]
+integrations = [
+    sentry_logging,
+    DjangoIntegration(),
+    CeleryIntegration(),
+    RedisIntegration(),
+]
 {% else %}
 integrations = [sentry_logging, DjangoIntegration(), RedisIntegration()]
 {% endif -%}

From 801b3b10cb51d36595cb09b946516a6d001a2a6a Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 1 May 2021 02:25:48 +0000
Subject: [PATCH 1472/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2e5f97d67..405b6e4e9 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-04-30]
+### Fixed
+- Fix linting error in production.py ([#3148](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3148))
+
 ## [2021-04-29]
 ### Updated
 - Update black to 21.4b2 ([#3147](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3147))

From 405e2623225b479427234591d8ae118363c69036 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwangpython@gmail.com>
Date: Tue, 4 May 2021 11:34:25 -0400
Subject: [PATCH 1473/2840] Update PG versions. Drop PG 9

Signed-off-by: Andrew-Chen-Wang <acwangpython@gmail.com>
---
 README.rst                            | 9 ++++-----
 cookiecutter.json                     | 9 ++++-----
 tests/test_cookiecutter_generation.py | 9 ++++-----
 3 files changed, 12 insertions(+), 15 deletions(-)

diff --git a/README.rst b/README.rst
index ae8699503..3a9d931a4 100644
--- a/README.rst
+++ b/README.rst
@@ -177,11 +177,10 @@ Answer the prompts with your own desired options_. For example::
     use_heroku [n]: y
     use_compressor [n]: y
     Select postgresql_version:
-    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
     Choose from 1, 2, 3, 4, 5 [1]: 1
     Select js_task_runner:
     1 - None
diff --git a/cookiecutter.json b/cookiecutter.json
index 4a580036d..0f9a2c769 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -18,11 +18,10 @@
   "use_pycharm": "n",
   "use_docker": "n",
   "postgresql_version": [
-    "12.3",
-    "11.8",
-    "10.8",
-    "9.6",
-    "9.5"
+    "13.2",
+    "12.6",
+    "11.11",
+    "10.16"
   ],
   "js_task_runner": [
     "None",
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index c8514493f..ed9932060 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -37,11 +37,10 @@ SUPPORTED_COMBINATIONS = [
     {"use_pycharm": "n"},
     {"use_docker": "y"},
     {"use_docker": "n"},
-    {"postgresql_version": "12.3"},
-    {"postgresql_version": "11.8"},
-    {"postgresql_version": "10.8"},
-    {"postgresql_version": "9.6"},
-    {"postgresql_version": "9.5"},
+    {"postgresql_version": "13.2"},
+    {"postgresql_version": "12.6"},
+    {"postgresql_version": "11.11"},
+    {"postgresql_version": "10.16"},
     {"cloud_provider": "AWS", "use_whitenoise": "y"},
     {"cloud_provider": "AWS", "use_whitenoise": "n"},
     {"cloud_provider": "GCP", "use_whitenoise": "y"},

From 460e4aa3041f45ac0ceecbb35339d7b0aa9cb7e1 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Tue, 4 May 2021 11:39:03 -0400
Subject: [PATCH 1474/2840] Update README with PG version constraint

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 3a9d931a4..cf6778e0a 100644
--- a/README.rst
+++ b/README.rst
@@ -96,7 +96,7 @@ Constraints
 -----------
 
 * Only maintained 3rd party libraries are used.
-* Uses PostgreSQL everywhere (9.4 - 12.3)
+* Uses PostgreSQL everywhere (10.16 - 13.2)
 * Environment variables for configuration (This won't work with Apache/mod_wsgi).
 
 Support this Project!

From 8f09ef7a51fe89293f44f7d2c72c47cdc6847efd Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 4 May 2021 14:13:36 -0700
Subject: [PATCH 1475/2840] Update django from 3.1.8 to 3.1.9

---
 {{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 2bc2edcab..4c66854a9 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,7 +29,7 @@ uvicorn[standard]==0.13.4  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.1.8  # pyup: < 3.2  # https://www.djangoproject.com/
+django==3.1.9  # 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

From d0470348328f77676ea805174fadc50861ea71a7 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 4 May 2021 14:13:38 -0700
Subject: [PATCH 1476/2840] Update pytest from 6.2.3 to 6.2.4

---
 {{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 528ab0bde..43d1d9662 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -15,7 +15,7 @@ watchgod==0.6  # https://github.com/samuelcolvin/watchgod
 # ------------------------------------------------------------------------------
 mypy==0.812  # https://github.com/python/mypy
 django-stubs==1.8.0  # https://github.com/typeddjango/django-stubs
-pytest==6.2.3  # https://github.com/pytest-dev/pytest
+pytest==6.2.4  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 
 # Documentation

From c650acc19bd7aadeaca9ba4fa2a17a13a8ab0e68 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 5 May 2021 02:20:07 +0000
Subject: [PATCH 1477/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 405b6e4e9..b21800751 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-05-04]
+### Updated
+- Update django to 3.1.9 ([#3155](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3155))
+
 ## [2021-04-30]
 ### Fixed
 - Fix linting error in production.py ([#3148](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3148))

From 1c901f1ba516b123f28f5b64600fd794d0b0c181 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 5 May 2021 11:18:47 -0700
Subject: [PATCH 1478/2840] Update tox from 3.23.0 to 3.23.1

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

diff --git a/requirements.txt b/requirements.txt
index 9b2477c7a..a39a96eec 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==2.12.1
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.23.0
+tox==3.23.1
 pytest==5.4.3  # pyup: <6  # https://github.com/hackebrot/pytest-cookies/issues/51
 pytest-cookies==0.5.1
 pytest-instafail==0.4.2

From 5368d63dc0f38f441a8f3b7d94dcf441769aa111 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 5 May 2021 18:17:39 -0700
Subject: [PATCH 1479/2840] Update python-slugify from 4.0.1 to 5.0.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 4c66854a9..0347ef087 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,5 +1,5 @@
 pytz==2021.1  # https://github.com/stub42/pytz
-python-slugify==4.0.1  # https://github.com/un33k/python-slugify
+python-slugify==5.0.2  # https://github.com/un33k/python-slugify
 Pillow==8.2.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
 {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %}

From b2c49acc9b65d450b46341b59e0784aa5ac1948e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 6 May 2021 14:20:20 -0700
Subject: [PATCH 1480/2840] Update django from 3.1.9 to 3.1.10

---
 {{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 4c66854a9..250a903e6 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,7 +29,7 @@ uvicorn[standard]==0.13.4  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.1.9  # pyup: < 3.2  # https://www.djangoproject.com/
+django==3.1.10  # 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

From 22d9f99500bd4ed87ecd6d9667a0d502a27ecbaa Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 7 May 2021 02:23:39 +0000
Subject: [PATCH 1481/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b21800751..fb0c76444 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-05-06]
+### Updated
+- Update django to 3.1.10 ([#3162](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3162))
+
 ## [2021-05-04]
 ### Updated
 - Update django to 3.1.9 ([#3155](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3155))

From 2aa0c3e5757cd3196abc753515222fadd1424b82 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 7 May 2021 07:38:30 -0700
Subject: [PATCH 1482/2840] Update sentry-sdk from 1.0.0 to 1.1.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 6e566eccf..3df7c5668 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.0.0  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.1.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 46be2df79ea4652b345604da216be2ef3f1603b5 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 8 May 2021 17:03:14 -0700
Subject: [PATCH 1483/2840] Update flake8 from 3.9.1 to 3.9.2

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

diff --git a/requirements.txt b/requirements.txt
index 9b2477c7a..4baa75676 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ binaryornot==0.4.4
 # ------------------------------------------------------------------------------
 black==21.4b2
 isort==5.8.0
-flake8==3.9.1
+flake8==3.9.2
 flake8-isort==4.0.0
 pre-commit==2.12.1
 

From fffe0d74e54b60a3a96cceda595b67e8c7970a3d Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 8 May 2021 17:03:14 -0700
Subject: [PATCH 1484/2840] Update flake8 from 3.9.1 to 3.9.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 528ab0bde..99e3c8787 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -25,7 +25,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality
 # ------------------------------------------------------------------------------
-flake8==3.9.1  # https://github.com/PyCQA/flake8
+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.4b2  # https://github.com/ambv/black

From 20ea166732e87d258b7e15e6b7edaabceb80e1c5 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 10 May 2021 11:42:15 -0700
Subject: [PATCH 1485/2840] Update black from 21.4b2 to 21.5b1

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

diff --git a/requirements.txt b/requirements.txt
index 9b2477c7a..06ce4255e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-black==21.4b2
+black==21.5b1
 isort==5.8.0
 flake8==3.9.1
 flake8-isort==4.0.0

From f37e472c35811bcd5559741f9c77264affae8903 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 10 May 2021 11:42:15 -0700
Subject: [PATCH 1486/2840] Update black from 21.4b2 to 21.5b1

---
 {{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 528ab0bde..366f97803 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.1  # 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.4b2  # https://github.com/ambv/black
+black==21.5b1  # https://github.com/ambv/black
 pylint-django==2.4.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery

From 5d665bbc7142f5844f578f1df171832e3e616b27 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 11 May 2021 00:04:21 +0000
Subject: [PATCH 1487/2840] 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 ffad28934..e21ebc1f6 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.4b2
+    rev: 21.5b1
     hooks:
       - id: black
 
@@ -21,7 +21,7 @@ repos:
       - id: isort
 
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.9.1
+    rev: 3.9.2
     hooks:
       - id: flake8
         args: ['--config=setup.cfg']

From f42dc4bdbcc22b1405ab4a26cc04a4af73235bf7 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 11 May 2021 11:31:39 -0700
Subject: [PATCH 1488/2840] Update sphinx from 3.5.4 to 4.0.1

---
 {{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 528ab0bde..0be52c4a1 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==3.5.4  # https://github.com/sphinx-doc/sphinx
+sphinx==4.0.1  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From f75de19e26d74291d0847289b9067fe06e3daeb1 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 May 2021 05:11:28 +0000
Subject: [PATCH 1489/2840] Bump stefanzweifel/git-auto-commit-action from
 4.10.0 to 4.11.0

Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from 4.10.0 to 4.11.0.
- [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases)
- [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.10.0...v4.11.0)

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-changelog.yml    | 2 +-
 .github/workflows/update-contributors.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index 62079f3d8..5a9c6bd07 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -28,7 +28,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Commit changes
-      uses: stefanzweifel/git-auto-commit-action@v4.10.0
+      uses: stefanzweifel/git-auto-commit-action@v4.11.0
       with:
         commit_message: Update Changelog
         file_pattern: CHANGELOG.md
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index e416e9614..4a110959e 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -24,7 +24,7 @@ jobs:
       run: python scripts/update_contributors.py
 
     - name: Commit changes
-      uses: stefanzweifel/git-auto-commit-action@v4.10.0
+      uses: stefanzweifel/git-auto-commit-action@v4.11.0
       with:
         commit_message: Update Contributors
         file_pattern: CONTRIBUTORS.md .github/contributors.json

From 05ac73b7b91a5da0e09f86b92bdaaf7cdbf7763e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 12 May 2021 05:12:25 +0000
Subject: [PATCH 1490/2840] Bump actions/setup-python from 2 to 2.2.2

Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2 to 2.2.2.
- [Release notes](https://github.com/actions/setup-python/releases)
- [Commits](https://github.com/actions/setup-python/compare/v2...v2.2.2)

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/ci.yml                    | 6 +++---
 .github/workflows/pre-commit-autoupdate.yml | 2 +-
 .github/workflows/update-changelog.yml      | 2 +-
 .github/workflows/update-contributors.yml   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cd1389c0d..a1b635959 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v2.2.2
         with:
           python-version: 3.9
       - name: Install dependencies
@@ -44,7 +44,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v2.2.2
         with:
           python-version: 3.9
       - name: Docker ${{ matrix.script.name }}
@@ -78,7 +78,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v2.2.2
         with:
           python-version: 3.9
       - name: Bare Metal ${{ matrix.script.name }}
diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml
index d433e00d6..8e3b21e08 100644
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
+    - uses: actions/setup-python@v2.2.2
       with:
         python-version: 3.9
 
diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index 62079f3d8..159b19985 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -15,7 +15,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v2.2.2
       with:
         python-version: 3.9
     - name: Install dependencies
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index e416e9614..d4d211a58 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -13,7 +13,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Set up Python
-      uses: actions/setup-python@v2
+      uses: actions/setup-python@v2.2.2
       with:
         python-version: 3.9
     - name: Install dependencies

From a80c91de44e66ae062f3112a4c73bab8e9c61608 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Thu, 13 May 2021 02:01:24 -0400
Subject: [PATCH 1491/2840] Update watchgod to 0.7

---
 {{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 528ab0bde..a9b65606f 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -8,7 +8,7 @@ psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 psycopg2-binary==2.8.6  # https://github.com/psycopg/psycopg2
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %}
-watchgod==0.6  # https://github.com/samuelcolvin/watchgod
+watchgod==0.7  # https://github.com/samuelcolvin/watchgod
 {%- endif %}
 
 # Testing

From 95fd002127fbbf476c246b1755f119c25aa8abbb Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 13 May 2021 14:49:41 -0700
Subject: [PATCH 1492/2840] Update django from 3.1.10 to 3.1.11

---
 {{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 250a903e6..42b4e6d42 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,7 +29,7 @@ uvicorn[standard]==0.13.4  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.1.10  # pyup: < 3.2  # https://www.djangoproject.com/
+django==3.1.11  # 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

From 577603c55ca6f367cffcc26ca149b515411b0774 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 May 2021 05:31:45 +0000
Subject: [PATCH 1493/2840] Bump peter-evans/create-pull-request from 3.8.2 to
 3.9.2

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 3.8.2 to 3.9.2.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v3.8.2...v3.9.2)

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 d433e00d6..fa4fe2c31 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.8.2
+      uses: peter-evans/create-pull-request@v3.9.2
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         branch: update/pre-commit-autoupdate

From ca2ed2086ad9b2f95716bb5cb4ff8fbdd50d3a40 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 14 May 2021 04:30:40 -0700
Subject: [PATCH 1494/2840] Update cookiecutter from 1.7.2 to 1.7.3

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

diff --git a/requirements.txt b/requirements.txt
index 9b2477c7a..1ca339900 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-cookiecutter==1.7.2
+cookiecutter==1.7.3
 sh==1.14.1
 binaryornot==0.4.4
 

From 0c27117dbd9dd89d18fe9d94149da5e3a3773ca1 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 15 May 2021 11:48:27 -0700
Subject: [PATCH 1495/2840] Update pytest-django from 4.2.0 to 4.3.0

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

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 838a57da7..6958c3573 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -42,4 +42,4 @@ 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-extensions==3.1.3  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
-pytest-django==4.2.0  # https://github.com/pytest-dev/pytest-django
+pytest-django==4.3.0  # https://github.com/pytest-dev/pytest-django

From 9c24e8a879443d01aa9f3d6c3add7044cc92a09b Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 14 May 2021 22:01:04 -0700
Subject: [PATCH 1496/2840] Update sh from 1.14.1 to 1.14.2

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

diff --git a/requirements.txt b/requirements.txt
index b826d75ba..bedaab9ba 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 cookiecutter==1.7.3
-sh==1.14.1
+sh==1.14.2
 binaryornot==0.4.4
 
 # Code quality

From aac58a094b5ddb57aecdaada1aa97068516450cc Mon Sep 17 00:00:00 2001
From: luzfcb <luzfcb@users.noreply.github.com>
Date: Sat, 15 May 2021 22:27:42 +0000
Subject: [PATCH 1497/2840] 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 e21ebc1f6..e96f64f20 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -4,7 +4,7 @@ fail_fast: true
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v3.4.0
+    rev: v4.0.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer

From d76fe09163df260a66560e91e035086e247d3afd Mon Sep 17 00:00:00 2001
From: "Fabio C. Barrionuevo da Luz" <bnafta@gmail.com>
Date: Sat, 15 May 2021 21:37:03 -0300
Subject: [PATCH 1498/2840] Replaced ugettext_lazy by gettext_lazy

---
 .../{{cookiecutter.project_slug}}/users/tests/test_forms.py     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
index 66118f493..35db91b4d 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
@@ -2,7 +2,7 @@
 Module for all Form Tests.
 """
 import pytest
-from django.utils.translation import ugettext_lazy as _
+from django.utils.translation import gettext_lazy as _
 
 from {{ cookiecutter.project_slug }}.users.forms import UserCreationForm
 from {{ cookiecutter.project_slug }}.users.models import User

From 34db12e5d6cef69e9184a6692c3d14cee4ed1401 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sun, 16 May 2021 02:31:10 +0000
Subject: [PATCH 1499/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fb0c76444..49056ad81 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,26 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-05-15]
+### Changed
+- Update watchgod to 0.7 ([#3177](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3177))
+### Updated
+- Auto-update pre-commit hooks ([#3184](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3184))
+- Update black to 21.5b1 ([#3167](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3167))
+- Update flake8 to 3.9.2 ([#3164](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3164))
+- Update pytest-django to 4.3.0 ([#3182](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3182))
+- Auto-update pre-commit hooks ([#3157](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3157))
+- Update python-slugify to 5.0.2 ([#3161](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3161))
+- Bump stefanzweifel/git-auto-commit-action from 4.10.0 to 4.11.0 ([#3171](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3171))
+- Update sentry-sdk to 1.1.0 ([#3163](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3163))
+- Bump actions/setup-python from 2 to 2.2.2 ([#3173](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3173))
+- Update tox to 3.23.1 ([#3160](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3160))
+- Update pytest to 6.2.4 ([#3156](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3156))
+- Bump peter-evans/create-pull-request from 3.8.2 to 3.9.2 ([#3179](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3179))
+- Update sphinx to 4.0.1 ([#3169](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3169))
+- Update cookiecutter to 1.7.3 ([#3180](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3180))
+- Update django to 3.1.11 ([#3178](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3178))
+
 ## [2021-05-06]
 ### Updated
 - Update django to 3.1.10 ([#3162](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3162))

From 0c773f4ada9efd3a2466590bbef950926553bd21 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Mon, 17 May 2021 00:06:30 +0000
Subject: [PATCH 1500/2840] 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 e96f64f20..d054489d4 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -4,7 +4,7 @@ fail_fast: true
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.0
+    rev: v4.0.1
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer

From fd7e575fa85393b220b97e05453787958329d285 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 17 May 2021 06:20:08 +0000
Subject: [PATCH 1501/2840] Bump tiangolo/issue-manager from 0.3.0 to 0.4.0

Bumps [tiangolo/issue-manager](https://github.com/tiangolo/issue-manager) from 0.3.0 to 0.4.0.
- [Release notes](https://github.com/tiangolo/issue-manager/releases)
- [Commits](https://github.com/tiangolo/issue-manager/compare/0.3.0...0.4.0)

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

diff --git a/.github/workflows/issue-manager.yml b/.github/workflows/issue-manager.yml
index f6b465276..6e272f75f 100644
--- a/.github/workflows/issue-manager.yml
+++ b/.github/workflows/issue-manager.yml
@@ -23,7 +23,7 @@ jobs:
   issue-manager:
     runs-on: ubuntu-latest
     steps:
-    - uses: tiangolo/issue-manager@0.3.0
+    - uses: tiangolo/issue-manager@0.4.0
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
 

From abba9de2bd747a92c6a4d41580f6fcfdc6fa38d8 Mon Sep 17 00:00:00 2001
From: "Fabio C. Barrionuevo da Luz" <bnafta@gmail.com>
Date: Mon, 17 May 2021 22:04:38 -0300
Subject: [PATCH 1502/2840] Move ARG PYTHON_VERSION=3.9-slim-buster to the
 global scope

of production Dockerfile to fix #3187 which occurs when
 Gulp is selected as `js_task_runner` on project generation.
---
 .../compose/production/django/Dockerfile                      | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index c1b3e97bb..5f1bc78b3 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -1,3 +1,5 @@
+ARG PYTHON_VERSION=3.9-slim-buster
+
 {% if cookiecutter.js_task_runner == 'Gulp' -%}
 FROM node:10-stretch-slim as client-builder
 
@@ -11,8 +13,6 @@ RUN npm run build
 
 {%- endif %}
 
-ARG PYTHON_VERSION=3.9-slim-buster
-
 # define an alias for the specfic python version used in this file.
 FROM python:${PYTHON_VERSION} as python
 

From f16224ddfd9c7d8ac79955badca4165350b24b15 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 18 May 2021 02:29:43 +0000
Subject: [PATCH 1503/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 49056ad81..0b12369ff 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-05-17]
+### Updated
+- Bump tiangolo/issue-manager from 0.3.0 to 0.4.0 ([#3186](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3186))
+- Auto-update pre-commit hooks ([#3185](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3185))
+
 ## [2021-05-15]
 ### Changed
 - Update watchgod to 0.7 ([#3177](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3177))

From 052e715e83d1dac8a3e22f72bf391ee885d25989 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 18 May 2021 14:16:57 -0700
Subject: [PATCH 1504/2840] Update jinja2 from 2.11.3 to 3.0.1

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

diff --git a/requirements.txt b/requirements.txt
index bedaab9ba..c2ff7f808 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,4 +21,4 @@ pyyaml==5.4.1
 # Scripting
 # ------------------------------------------------------------------------------
 PyGithub==1.55
-jinja2==2.11.3
+jinja2==3.0.1

From 381793e3962197711df335846a1944e81bcc8c23 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 19 May 2021 02:27:25 +0000
Subject: [PATCH 1505/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b12369ff..126a5c005 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-05-18]
+### Changed
+- Move ARG PYTHON_VERSION=3.9-slim-buster to the global scope ([#3188](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3188))
+
 ## [2021-05-17]
 ### Updated
 - Bump tiangolo/issue-manager from 0.3.0 to 0.4.0 ([#3186](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3186))

From 5db1e0f719611c7e7db9f27d4cea4f781f21e065 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 21 May 2021 13:56:16 -0700
Subject: [PATCH 1506/2840] Update sphinx from 4.0.1 to 4.0.2

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

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index b49891aaf..82f6a7cec 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.1  # https://github.com/sphinx-doc/sphinx
+sphinx==4.0.2  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From be5e175ba775f7eb799dd0c419898e7bd9e470a2 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 22 May 2021 10:09:39 -0700
Subject: [PATCH 1507/2840] Update pre-commit from 2.12.1 to 2.13.0

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

diff --git a/requirements.txt b/requirements.txt
index bedaab9ba..82d4b35b5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ black==21.5b1
 isort==5.8.0
 flake8==3.9.2
 flake8-isort==4.0.0
-pre-commit==2.12.1
+pre-commit==2.13.0
 
 # Testing
 # ------------------------------------------------------------------------------

From 8640220d334583d2585b5ffe6021b29b78f16ba3 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 22 May 2021 10:09:39 -0700
Subject: [PATCH 1508/2840] Update pre-commit from 2.12.1 to 2.13.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 b49891aaf..6fc0159ab 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -33,7 +33,7 @@ pylint-django==2.4.3  # 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.12.1  # https://github.com/pre-commit/pre-commit
+pre-commit==2.13.0  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From 4685483fc80d5f4e2a24959e4216af3bb67cbe92 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 24 May 2021 07:58:58 -0700
Subject: [PATCH 1509/2840] Update pytest-cookies from 0.5.1 to 0.6.1

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

diff --git a/requirements.txt b/requirements.txt
index bedaab9ba..28cc5ae33 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,7 +14,7 @@ pre-commit==2.12.1
 # ------------------------------------------------------------------------------
 tox==3.23.1
 pytest==5.4.3  # pyup: <6  # https://github.com/hackebrot/pytest-cookies/issues/51
-pytest-cookies==0.5.1
+pytest-cookies==0.6.1
 pytest-instafail==0.4.2
 pyyaml==5.4.1
 

From bd0bba6e6c4ba75a32da5d44e18888f958612aa3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 May 2021 05:29:46 +0000
Subject: [PATCH 1510/2840] Bump peter-evans/create-pull-request from 3.9.2 to
 3.10.0

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

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 cc8d46801..25a6f7a0a 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.9.2
+      uses: peter-evans/create-pull-request@v3.10.0
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         branch: update/pre-commit-autoupdate

From 02592a3d37639511a9d8905b4470fda838a1707a Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 31 May 2021 10:50:39 -0700
Subject: [PATCH 1511/2840] Update black from 21.5b1 to 21.5b2

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

diff --git a/requirements.txt b/requirements.txt
index bedaab9ba..f1170e3be 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-black==21.5b1
+black==21.5b2
 isort==5.8.0
 flake8==3.9.2
 flake8-isort==4.0.0

From d0667d9b3c39d4c7c2b131d228b06af48232b7a3 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 31 May 2021 10:50:39 -0700
Subject: [PATCH 1512/2840] Update black from 21.5b1 to 21.5b2

---
 {{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 b49891aaf..d5c5bd886 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.5b1  # https://github.com/ambv/black
+black==21.5b2  # https://github.com/ambv/black
 pylint-django==2.4.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery

From 5fb7dded0c6e9b36b3f516f4a404097e6f4ffb23 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 31 May 2021 12:33:44 -0700
Subject: [PATCH 1513/2840] Update django-redis from 4.12.1 to 5.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 e57007fd6..f94b7abd2 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -37,7 +37,7 @@ django-crispy-forms==1.11.2  # https://github.com/django-crispy-forms/django-cri
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==2.4.1  # https://github.com/django-compressor/django-compressor
 {%- endif %}
-django-redis==4.12.1  # https://github.com/jazzband/django-redis
+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

From 1cd8dffbc369991165e51db92eb2da41545d0d2b Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 1 Jun 2021 07:25:15 -0700
Subject: [PATCH 1514/2840] Update uvicorn from 0.13.4 to 0.14.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 e57007fd6..e8fb74c34 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.13.4  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.14.0  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django

From f1e66ff8428441ad9a3e81255cf9590ea6045f52 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Wed, 2 Jun 2021 13:17:37 +0530
Subject: [PATCH 1515/2840] Updated .pre-commit-config.yaml to self-update its
 dependencies

Pre-commit will now automatically also run on any raised PRs. This will ensure committed code will always stay consistent.
---
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index d054489d4..321d834d1 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -26,3 +26,10 @@ repos:
       - id: flake8
         args: ['--config=setup.cfg']
         additional_dependencies: [flake8-isort]
+
+
+# sets up .pre-commit-ci.yaml to ensure pre-commit dependencies stay up to date
+ci:
+    autoupdate_schedule: weekly
+    skip: []
+    submodules: false

From a1e649629432956f12bf966331cfe10cbf1cdf56 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 2 Jun 2021 07:20:42 -0700
Subject: [PATCH 1516/2840] Update django from 3.1.11 to 3.1.12

---
 {{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 e57007fd6..fd455434a 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,7 +29,7 @@ uvicorn[standard]==0.13.4  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.1.11  # pyup: < 3.2  # https://www.djangoproject.com/
+django==3.1.12  # 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

From 9e57d844c0ca00cfa439854660cf5565582cbde3 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 2 Jun 2021 07:20:44 -0700
Subject: [PATCH 1517/2840] Update ipdb from 0.13.7 to 0.13.9

---
 {{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 b49891aaf..33bdeb960 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,7 +1,7 @@
 -r base.txt
 
 Werkzeug==1.0.1 # https://github.com/pallets/werkzeug
-ipdb==0.13.7  # https://github.com/gotcha/ipdb
+ipdb==0.13.9  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 {%- else %}

From f1b9e070a004c3afb59053ccc2de67e58ebf10b1 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 3 Jun 2021 03:01:34 +0000
Subject: [PATCH 1518/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 126a5c005..eb865916d 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-06-02]
+### Updated
+- Update django to 3.1.12 ([#3209](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3209))
+
 ## [2021-05-18]
 ### Changed
 - Move ARG PYTHON_VERSION=3.9-slim-buster to the global scope ([#3188](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3188))

From e3c646f726a4be8992a4bac3b163b4f83d1f256d Mon Sep 17 00:00:00 2001
From: Ray Besiga <raybesiga@gmail.com>
Date: Sat, 5 Jun 2021 22:02:57 +0300
Subject: [PATCH 1519/2840] Shorthand for the official supported buildpack

Replacing the Github link with the Heroku shorthand defined for the officially supported buildpack.
---
 docs/deployment-on-heroku.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/deployment-on-heroku.rst b/docs/deployment-on-heroku.rst
index 53e980379..0681a50ca 100644
--- a/docs/deployment-on-heroku.rst
+++ b/docs/deployment-on-heroku.rst
@@ -10,7 +10,7 @@ Run these commands to deploy the project to Heroku:
 
 .. code-block:: bash
 
-    heroku create --buildpack https://github.com/heroku/heroku-buildpack-python
+    heroku create --buildpack heroku/python 
 
     heroku addons:create heroku-postgresql:hobby-dev
     # On Windows use double quotes for the time zone, e.g.

From 7302fe8bbf6bb34d77f6078040125c96bf8feb32 Mon Sep 17 00:00:00 2001
From: luzfcb <luzfcb@users.noreply.github.com>
Date: Sat, 5 Jun 2021 20:00:52 +0000
Subject: [PATCH 1520/2840] 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 846375687..ac59fbf9c 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1082,5 +1082,10 @@
     "name": "Tames McTigue",
     "github_login": "Tamerz",
     "twitter_username": ""
+  },
+  {
+    "name": "Ray Besiga",
+    "github_login": "raybesiga",
+    "twitter_username": "raybesiga"
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index ea8701879..5790997a9 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1251,6 +1251,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Ray Besiga</td>
+    <td>
+      <a href="https://github.com/raybesiga">raybesiga</a>
+    </td>
+    <td>raybesiga</td>
+  </tr>
   <tr>
     <td>Reggie Riser</td>
     <td>

From 350064f630b07c9c10ee35062428041de695a1c0 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sun, 6 Jun 2021 02:43:13 +0000
Subject: [PATCH 1521/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb865916d..9a478b101 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-06-05]
+### Changed
+- Shorthand for the officially supported buildpack ([#3211](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3211))
+
 ## [2021-06-02]
 ### Updated
 - Update django to 3.1.12 ([#3209](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3209))

From e101fb286f7e76fd219308fcbc15e453b3652aca Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 6 Jun 2021 11:53:50 -0700
Subject: [PATCH 1522/2840] Update pytest-django from 4.3.0 to 4.4.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 b49891aaf..43b1fe704 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -42,4 +42,4 @@ 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-extensions==3.1.3  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
-pytest-django==4.3.0  # https://github.com/pytest-dev/pytest-django
+pytest-django==4.4.0  # https://github.com/pytest-dev/pytest-django

From 972b8274a5d7589e7ce88855152f1f9c8c537fa3 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Mon, 7 Jun 2021 02:48:54 +0000
Subject: [PATCH 1523/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9a478b101..2d51794c8 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-06-06]
+### Changed
+- Updated .pre-commit-config.yaml to self-update its dependencies ([#3208](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3208))
+
 ## [2021-06-05]
 ### Changed
 - Shorthand for the officially supported buildpack ([#3211](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3211))

From 75d07e35bc35cde011302932e3db76bc39721b42 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 8 Jun 2021 00:15:41 +0000
Subject: [PATCH 1524/2840] 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 321d834d1..c8ea7f578 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.5b1
+    rev: 21.5b2
     hooks:
       - id: black
 

From 05249e9954922b710e3303a296cfae48844b8196 Mon Sep 17 00:00:00 2001
From: Grant McLean <grant@mclean.net.nz>
Date: Wed, 9 Jun 2021 10:33:13 +1200
Subject: [PATCH 1525/2840] Fix link format in developing-locally.rst

Link was markdown format - changed to RST.
---
 docs/developing-locally.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index 661c9f266..3a6206535 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -37,7 +37,7 @@ First things first.
    .. note::
 
        the `pre-commit` exists in the generated project as default.
-       for the details of `pre-commit`, follow the [site of pre-commit](https://pre-commit.com/).
+       for the details of `pre-commit`, follow the `site of pre-commit <https://pre-commit.com/>`_.
 
 #. Create a new PostgreSQL database using createdb_: ::
 

From 93882486ffc852419410c1d6253c905940c7f027 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 8 Jun 2021 16:16:52 -0700
Subject: [PATCH 1526/2840] Update mypy from 0.812 to 0.901

---
 {{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 b49891aaf..d3e1990ee 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.812  # https://github.com/python/mypy
+mypy==0.901  # 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 9c3b0bcca02cb94c2bb90f0c05839f99fb4c3710 Mon Sep 17 00:00:00 2001
From: Grant McLean <grant@catalyst.net.nz>
Date: Wed, 9 Jun 2021 15:38:12 +1200
Subject: [PATCH 1527/2840] revise previous patch to conform to project style
 for RST links

---
 docs/developing-locally.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index 3a6206535..f33588668 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -36,8 +36,8 @@ First things first.
 
    .. note::
 
-       the `pre-commit` exists in the generated project as default.
-       for the details of `pre-commit`, follow the `site of pre-commit <https://pre-commit.com/>`_.
+       the `pre-commit` hook exists in the generated project as default.
+       For the details of `pre-commit`, follow the `pre-commit`_ site.
 
 #. Create a new PostgreSQL database using createdb_: ::
 
@@ -88,6 +88,7 @@ or if you're running asynchronously: ::
 .. _createdb: https://www.postgresql.org/docs/current/static/app-createdb.html
 .. _initial PostgreSQL set up: http://suite.opengeo.org/docs/latest/dataadmin/pgGettingStarted/firstconnect.html
 .. _postgres documentation: https://www.postgresql.org/docs/current/static/auth-pg-hba-conf.html
+.. _pre-commit: https://pre-commit.com/
 .. _direnv: https://direnv.net/
 
 

From 2f38023d070adc7b5648ad92b4605539744977eb Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 9 Jun 2021 08:53:43 +0000
Subject: [PATCH 1528/2840] 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 ac59fbf9c..a165effe4 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1087,5 +1087,10 @@
     "name": "Ray Besiga",
     "github_login": "raybesiga",
     "twitter_username": "raybesiga"
+  },
+  {
+    "name": "Grant McLean",
+    "github_login": "grantm",
+    "twitter_username": "grantmnz"
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 5790997a9..c97c620a8 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -712,6 +712,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Grant McLean</td>
+    <td>
+      <a href="https://github.com/grantm">grantm</a>
+    </td>
+    <td>grantmnz</td>
+  </tr>
   <tr>
     <td>Guilherme Guy</td>
     <td>

From f2b0ddb78afb3dd535154ecdd3804ad10b4ceda5 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 9 Jun 2021 06:19:42 -0700
Subject: [PATCH 1529/2840] Update django-coverage-plugin from 1.8.0 to 2.0.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 77d168e84..cfaeaacfd 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -41,5 +41,5 @@ 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-extensions==3.1.3  # https://github.com/django-extensions/django-extensions
-django-coverage-plugin==1.8.0  # https://github.com/nedbat/django_coverage_plugin
+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 d90a091cd69fb75535365661a366e6d80a730623 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 10 Jun 2021 02:28:30 +0000
Subject: [PATCH 1530/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2d51794c8..7b2bb89dc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-06-09]
+### Changed
+- Fix link format in developing-locally.rst ([#3214](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3214))
+### Updated
+- Update pre-commit to 2.13.0 ([#3195](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3195))
+- Update pytest-django to 4.4.0 ([#3212](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3212))
+- Update mypy to 0.901 ([#3215](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3215))
+- Auto-update pre-commit hooks ([#3206](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3206))
+- Update black to 21.5b2 ([#3204](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3204))
+
 ## [2021-06-06]
 ### Changed
 - Updated .pre-commit-config.yaml to self-update its dependencies ([#3208](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3208))

From d4ca82457360cbd6b6eef3295efd712e507ee5fd Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 10 Jun 2021 16:19:55 -0700
Subject: [PATCH 1531/2840] Update mypy from 0.901 to 0.902

---
 {{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 77d168e84..d16f71138 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.901  # https://github.com/python/mypy
+mypy==0.902  # 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 5bf09040ebeca1c8fc110c360fc9de15b82f7c3a Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 12 Jun 2021 06:55:08 -0700
Subject: [PATCH 1532/2840] Update django-crispy-forms from 1.11.2 to 1.12.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 fd455434a..bcbbb3ceb 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -33,7 +33,7 @@ django==3.1.12  # 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-crispy-forms==1.11.2  # https://github.com/django-crispy-forms/django-crispy-forms
+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
 {%- endif %}

From abb736478aef49eabfe5ad8c650979248bfea94a Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Sat, 12 Jun 2021 20:51:48 -0400
Subject: [PATCH 1533/2840] Update black GitHub link in requirements

---
 {{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 77d168e84..6b6200428 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.5b2  # https://github.com/ambv/black
+black==21.5b2  # https://github.com/psf/black
 pylint-django==2.4.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery

From fe187ddb6a7d30b5b9d0bc09277f5b6dddcb382e Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 15 Jun 2021 02:23:36 +0000
Subject: [PATCH 1534/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b2bb89dc..113da3f28 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-06-14]
+### Changed
+- Update black GitHub link in requirements ([#3222](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3222))
+
 ## [2021-06-09]
 ### Changed
 - Fix link format in developing-locally.rst ([#3214](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3214))

From 19af4c063a5b76b0508b70596eacb204958e047b Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 16 Jun 2021 06:22:20 -0700
Subject: [PATCH 1535/2840] Update django-anymail from 8.2 to 8.4

---
 {{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 3df7c5668..47f8b1ed7 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -22,7 +22,7 @@ django-storages[boto3]==1.11.1  # https://github.com/jschneier/django-storages
 django-storages[google]==1.11.1  # https://github.com/jschneier/django-storages
 {%- endif %}
 {%- if cookiecutter.mail_service == 'Mailgun' %}
-django-anymail[mailgun]==8.2  # https://github.com/anymail/django-anymail
+django-anymail[mailgun]==8.4  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
 django-anymail[amazon_ses]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}

From e57f283d80897cadd022d2632c815d1590c0781a Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 16 Jun 2021 06:22:20 -0700
Subject: [PATCH 1536/2840] Update django-anymail from 8.2 to 8.4

---
 {{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 47f8b1ed7..f2befbc79 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -24,7 +24,7 @@ django-storages[google]==1.11.1  # https://github.com/jschneier/django-storages
 {%- if cookiecutter.mail_service == 'Mailgun' %}
 django-anymail[mailgun]==8.4  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
-django-anymail[amazon_ses]==8.2  # https://github.com/anymail/django-anymail
+django-anymail[amazon_ses]==8.4  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
 django-anymail[mailjet]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}

From 5cea74a7eb60b322861a7c85f5f812025aceb0e4 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 16 Jun 2021 06:22:20 -0700
Subject: [PATCH 1537/2840] Update django-anymail from 8.2 to 8.4

---
 {{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 f2befbc79..fcfe79787 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -26,7 +26,7 @@ django-anymail[mailgun]==8.4  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
 django-anymail[amazon_ses]==8.4  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
-django-anymail[mailjet]==8.2  # https://github.com/anymail/django-anymail
+django-anymail[mailjet]==8.4  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
 django-anymail[mandrill]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}

From b02d986abd9e987c40f4be967d3f6905861097ae Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 16 Jun 2021 06:22:21 -0700
Subject: [PATCH 1538/2840] Update django-anymail from 8.2 to 8.4

---
 {{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 fcfe79787..69c22da01 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -28,7 +28,7 @@ django-anymail[amazon_ses]==8.4  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
 django-anymail[mailjet]==8.4  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
-django-anymail[mandrill]==8.2  # https://github.com/anymail/django-anymail
+django-anymail[mandrill]==8.4  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
 django-anymail[postmark]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}

From d10fe10e9cb360ecb5904400b22ee0055885c80e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 16 Jun 2021 06:22:21 -0700
Subject: [PATCH 1539/2840] Update django-anymail from 8.2 to 8.4

---
 {{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 69c22da01..87711f5a1 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -30,7 +30,7 @@ django-anymail[mailjet]==8.4  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
 django-anymail[mandrill]==8.4  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
-django-anymail[postmark]==8.2  # https://github.com/anymail/django-anymail
+django-anymail[postmark]==8.4  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
 django-anymail[sendgrid]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}

From f4f7fd0094ee86b59437bfadcc28d40d20ac95dc Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 16 Jun 2021 06:22:21 -0700
Subject: [PATCH 1540/2840] Update django-anymail from 8.2 to 8.4

---
 {{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 87711f5a1..436c9db3d 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -32,7 +32,7 @@ django-anymail[mandrill]==8.4  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
 django-anymail[postmark]==8.4  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
-django-anymail[sendgrid]==8.2  # https://github.com/anymail/django-anymail
+django-anymail[sendgrid]==8.4  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
 django-anymail[sendinblue]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}

From aed5d2e701c283480dbad977e3c77d73fd69cf00 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 16 Jun 2021 06:22:22 -0700
Subject: [PATCH 1541/2840] Update django-anymail from 8.2 to 8.4

---
 {{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 436c9db3d..6ad586d66 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -34,7 +34,7 @@ django-anymail[postmark]==8.4  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
 django-anymail[sendgrid]==8.4  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
-django-anymail[sendinblue]==8.2  # https://github.com/anymail/django-anymail
+django-anymail[sendinblue]==8.4  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
 django-anymail[sparkpost]==8.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}

From 2532937fbd8821e736b63e28d85a0093f456468a Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 16 Jun 2021 06:22:22 -0700
Subject: [PATCH 1542/2840] Update django-anymail from 8.2 to 8.4

---
 {{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 6ad586d66..9f0603682 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -36,7 +36,7 @@ django-anymail[sendgrid]==8.4  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
 django-anymail[sendinblue]==8.4  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
-django-anymail[sparkpost]==8.2  # https://github.com/anymail/django-anymail
+django-anymail[sparkpost]==8.4  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
 django-anymail==8.2  # https://github.com/anymail/django-anymail
 {%- endif %}

From 350ab6c93b03fbd129ad3e19b83927ed7e39dbf0 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 16 Jun 2021 06:22:23 -0700
Subject: [PATCH 1543/2840] Update django-anymail from 8.2 to 8.4

---
 {{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 9f0603682..0bb6bfd84 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -38,5 +38,5 @@ django-anymail[sendinblue]==8.4  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
 django-anymail[sparkpost]==8.4  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
-django-anymail==8.2  # https://github.com/anymail/django-anymail
+django-anymail==8.4  # https://github.com/anymail/django-anymail
 {%- endif %}

From f8bbcf0788232ec49bbd60012eafa156fdf653cc Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 17 Jun 2021 09:36:11 -0700
Subject: [PATCH 1544/2840] Update psycopg2 from 2.8.6 to 2.9.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 3df7c5668..e8ad6018d 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -3,7 +3,7 @@
 -r base.txt
 
 gunicorn==20.1.0  # https://github.com/benoitc/gunicorn
-psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
+psycopg2==2.9.1  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}

From 6cd27194370333fb7daf1ba21e4596402b3f8fc5 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 17 Jun 2021 09:36:12 -0700
Subject: [PATCH 1545/2840] Update psycopg2 from 2.8.6 to 2.9.1

---
 {{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 6b6200428..96c41929a 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -3,7 +3,7 @@
 Werkzeug==1.0.1 # https://github.com/pallets/werkzeug
 ipdb==0.13.7  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
-psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
+psycopg2==2.9.1  # https://github.com/psycopg/psycopg2
 {%- else %}
 psycopg2-binary==2.8.6  # https://github.com/psycopg/psycopg2
 {%- endif %}

From facd5c40fcac7b02f0af2d236e23c7dc0796ab42 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 17 Jun 2021 17:47:07 -0700
Subject: [PATCH 1546/2840] Update psycopg2-binary from 2.8.6 to 2.9.1

---
 {{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 6b6200428..a27db92ae 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -5,7 +5,7 @@ ipdb==0.13.7  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.6  # https://github.com/psycopg/psycopg2
 {%- else %}
-psycopg2-binary==2.8.6  # https://github.com/psycopg/psycopg2
+psycopg2-binary==2.9.1  # https://github.com/psycopg/psycopg2
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %}
 watchgod==0.7  # https://github.com/samuelcolvin/watchgod

From 18a94046b1b7b53651ce1bb23a63fd3a8e2b9b50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?=
 <bnafta@gmail.com>
Date: Sat, 19 Jun 2021 01:18:31 -0300
Subject: [PATCH 1547/2840] Add venv to .dockerignore

---
 {{cookiecutter.project_slug}}/.dockerignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/{{cookiecutter.project_slug}}/.dockerignore b/{{cookiecutter.project_slug}}/.dockerignore
index d01db04a6..5518e60af 100644
--- a/{{cookiecutter.project_slug}}/.dockerignore
+++ b/{{cookiecutter.project_slug}}/.dockerignore
@@ -7,3 +7,4 @@
 .pre-commit-config.yaml
 .readthedocs.yml
 .travis.yml
+venv

From efcab1b4d6b0c91e1ac51e46684752f08af90397 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sun, 20 Jun 2021 02:23:30 +0000
Subject: [PATCH 1548/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 113da3f28..ef143bc83 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-06-19]
+### Updated
+- Update psycopg2 to 2.9.1 ([#3227](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3227))
+- Update psycopg2-binary to 2.9.1 ([#3228](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3228))
+
 ## [2021-06-14]
 ### Changed
 - Update black GitHub link in requirements ([#3222](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3222))

From 4214b1b8efcb86b264d64d3bf8592c382a70acd6 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Sun, 20 Jun 2021 12:47:07 -0400
Subject: [PATCH 1549/2840] Update docs/howto.rst

---
 {{cookiecutter.project_slug}}/docs/howto.rst | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/docs/howto.rst b/{{cookiecutter.project_slug}}/docs/howto.rst
index 25f442c37..0ef90d023 100644
--- a/{{cookiecutter.project_slug}}/docs/howto.rst
+++ b/{{cookiecutter.project_slug}}/docs/howto.rst
@@ -4,20 +4,19 @@ How To - Project Documentation
 Get Started
 ----------------------------------------------------------------------
 
-Documentation can be written as rst files in the `{{cookiecutter.project_slug}}/docs/_source`.
+Documentation can be written as rst files in `{{cookiecutter.project_slug}}/docs`.
 
 {% if cookiecutter.use_docker == 'n' %}
-To build and serve docs, use the command:
-    ::
+To build and serve docs, use the command::
     
-        make livehtml 
+    make livehtml 
     
 from inside the `{{cookiecutter.project_slug}}/docs` directory. 
 {% else %}
-To build and serve docs, use the commands:
-    ::
+To build and serve docs, use the commands::
     
-        docker-compose -f local.yml up docs
+    docker-compose -f local.yml up docs
+
 {% endif %}
 
 Changes to files in `docs/_source` will be picked up and reloaded automatically.

From 9cbb840ec92c261798d1b5d5f7e6c99f39226524 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Mon, 21 Jun 2021 00:06:34 +0000
Subject: [PATCH 1550/2840] 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 c8ea7f578..57207a748 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.5b2
+    rev: 21.6b0
     hooks:
       - id: black
 

From 2aeb6a13703762f02bf39a02d956c59d495e524a Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 21 Jun 2021 12:17:56 +0100
Subject: [PATCH 1551/2840] Remove version restriction on pytest

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

diff --git a/requirements.txt b/requirements.txt
index 3b7c3b8e7..c616a8b13 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,7 +13,7 @@ pre-commit==2.13.0
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.23.1
-pytest==5.4.3  # pyup: <6  # https://github.com/hackebrot/pytest-cookies/issues/51
+pytest==5.4.3
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2
 pyyaml==5.4.1

From 3b419295ff84644e57d3e13142fcf3fe8de67ecd Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 21 Jun 2021 04:18:10 -0700
Subject: [PATCH 1552/2840] Update pytest from 5.4.3 to 6.2.4

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

diff --git a/requirements.txt b/requirements.txt
index c616a8b13..0bfb16bb4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,7 +13,7 @@ pre-commit==2.13.0
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.23.1
-pytest==5.4.3
+pytest==6.2.4
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2
 pyyaml==5.4.1

From 608cbef44041375222e8f8eac4c4e1c5b4cbe000 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 21 Jun 2021 04:23:35 -0700
Subject: [PATCH 1553/2840] Update black from 21.5b2 to 21.6b0

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

diff --git a/requirements.txt b/requirements.txt
index c616a8b13..34d783dfa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-black==21.5b2
+black==21.6b0
 isort==5.8.0
 flake8==3.9.2
 flake8-isort==4.0.0

From 810e8b46724ef1613383edacae0763b1cedcb1eb Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 21 Jun 2021 04:23:36 -0700
Subject: [PATCH 1554/2840] Update black from 21.5b2 to 21.6b0

---
 {{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 9263f0850..34517e3a1 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.5b2  # https://github.com/psf/black
+black==21.6b0  # https://github.com/psf/black
 pylint-django==2.4.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery

From eaa70138648a10cd52951c89a6b728e2235f2056 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 21 Jun 2021 04:46:11 -0700
Subject: [PATCH 1555/2840] Update pylint-django from 2.4.3 to 2.4.4

---
 {{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 6f41cecfc..e77e15b99 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -29,7 +29,7 @@ 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
-pylint-django==2.4.3  # https://github.com/PyCQA/pylint-django
+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 %}

From 8bbba913eaae766b397f78455633bf172b3e4794 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 21 Jun 2021 08:42:31 -0700
Subject: [PATCH 1556/2840] Update isort from 5.8.0 to 5.9.0

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

diff --git a/requirements.txt b/requirements.txt
index 1c652fd6f..89b1f7a64 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==21.6b0
-isort==5.8.0
+isort==5.9.0
 flake8==3.9.2
 flake8-isort==4.0.0
 pre-commit==2.13.0

From 84729606489cc30e2d84815c94f1eb1cd959e5f3 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 22 Jun 2021 00:04:46 +0000
Subject: [PATCH 1557/2840] 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 57207a748..ac71019ab 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.8.0
+    rev: 5.9.1
     hooks:
       - id: isort
 

From 10e1e264d27ce1eec9387c236f48bafe5513c0c7 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 22 Jun 2021 02:17:41 +0000
Subject: [PATCH 1558/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ef143bc83..b1a9a0ee2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,25 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-06-21]
+### Updated
+- Update isort to 5.9.0 ([#3234](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3234))
+- Update django-anymail to 8.4 ([#3225](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3225))
+- Update django-redis to 5.0.0 ([#3205](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3205))
+- Update pylint-django to 2.4.4 ([#3233](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3233))
+- Auto-update pre-commit hooks ([#3220](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3220))
+- Bump peter-evans/create-pull-request from 3.9.2 to 3.10.0 ([#3197](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3197))
+- Update black to 21.6b0 ([#3232](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3232))
+- Update pytest to 6.2.4 ([#3231](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3231))
+- Update django-crispy-forms to 1.12.0 ([#3221](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3221))
+- Update mypy to 0.902 ([#3219](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3219))
+- Update django-coverage-plugin to 2.0.0 ([#3217](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3217))
+- Update ipdb to 0.13.9 ([#3210](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3210))
+- Update uvicorn to 0.14.0 ([#3207](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3207))
+- Update pytest-cookies to 0.6.1 ([#3196](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3196))
+- Update sphinx to 4.0.2 ([#3193](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3193))
+- Update jinja2 to 3.0.1 ([#3189](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3189))
+
 ## [2021-06-19]
 ### Updated
 - Update psycopg2 to 2.9.1 ([#3227](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3227))

From 03df4970aeda6c884962a29eacdbc0553003840f Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 22 Jun 2021 08:42:35 -0700
Subject: [PATCH 1559/2840] Update isort from 5.9.0 to 5.9.1

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

diff --git a/requirements.txt b/requirements.txt
index 89b1f7a64..b48a5ab91 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==21.6b0
-isort==5.9.0
+isort==5.9.1
 flake8==3.9.2
 flake8-isort==4.0.0
 pre-commit==2.13.0

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 1560/2840] 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 e77e15b99..4e10401bb 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 391e31c4dd8e8efdf0d3694c5bf6d1e2ca472a13 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 23 Jun 2021 02:13:45 +0000
Subject: [PATCH 1561/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1a9a0ee2..620d7eb0b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-06-22]
+### Changed
+- Update docs/howto.rst ([#3230](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3230))
+- Add support for PG 13. Drop PG 9. Update all minor versions ([#3154](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3154))
+### Updated
+- Update isort to 5.9.1 ([#3236](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3236))
+- Auto-update pre-commit hooks ([#3235](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3235))
+
 ## [2021-06-21]
 ### Updated
 - Update isort to 5.9.0 ([#3234](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3234))

From 9cc54eea33db925d0ce96d6ca25e2e0d10bc6a92 Mon Sep 17 00:00:00 2001
From: LECbg <laeseal94@hotmail.com>
Date: Thu, 24 Jun 2021 11:57:23 +0200
Subject: [PATCH 1562/2840] Update gitignore for VSCode

Update VSCode section as of https://github.com/github/gitignore/blob/991e760c1c6d50fdda246e0178b9c58b06770b90/Global/VisualStudioCode.gitignore
---
 {{cookiecutter.project_slug}}/.gitignore | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore
index 311b43a57..613e8beab 100644
--- a/{{cookiecutter.project_slug}}/.gitignore
+++ b/{{cookiecutter.project_slug}}/.gitignore
@@ -159,6 +159,10 @@ typings/
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+*.code-workspace
+
+# Local History for Visual Studio Code
+.history/
 
 
 {% if cookiecutter.use_pycharm == 'y' -%}

From 28544cb247e4a43e8ba3914fe85db348ae6ed096 Mon Sep 17 00:00:00 2001
From: Kuo Chao Cheng <tony7199371@gmail.com>
Date: Fri, 25 Jun 2021 12:05:12 +0800
Subject: [PATCH 1563/2840] Wrap jQuery event after DOMContentLoaded

---
 .../templates/account/email.html                              | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 055904ae9..5c9406f3f 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html
@@ -74,7 +74,9 @@ window.addEventListener('DOMContentLoaded',function() {
   }
 });
 
-$('.form-group').removeClass('row');
+document.addEventListener('DOMContentLoaded', function() {
+  $('.form-group').removeClass('row');
+})
 </script>
 {% endblock %}
 {%- endraw %}

From 6f971b7ac4b2f2b2a06d4eabc5a6a1b96393498c Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 25 Jun 2021 07:45:22 +0000
Subject: [PATCH 1564/2840] 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 a165effe4..64987bd11 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1092,5 +1092,10 @@
     "name": "Grant McLean",
     "github_login": "grantm",
     "twitter_username": "grantmnz"
+  },
+  {
+    "name": "Kuo Chao Cheng",
+    "github_login": "wwwtony5488",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index c97c620a8..580bd912f 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -985,6 +985,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Kuo Chao Cheng</td>
+    <td>
+      <a href="https://github.com/wwwtony5488">wwwtony5488</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>lcd1232</td>
     <td>

From fa83d9cf6efa75909905e4e8dccce20f0c68fbec Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 25 Jun 2021 07:46:59 +0000
Subject: [PATCH 1565/2840] 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 64987bd11..c11c531f1 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1097,5 +1097,10 @@
     "name": "Kuo Chao Cheng",
     "github_login": "wwwtony5488",
     "twitter_username": ""
+  },
+  {
+    "name": "LECbg",
+    "github_login": "LECbg",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 580bd912f..1903bcc19 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -999,6 +999,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>LECbg</td>
+    <td>
+      <a href="https://github.com/LECbg">LECbg</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Leo won</td>
     <td>

From f576f280ee1ac03abfb679f594097f445610f91f Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 25 Jun 2021 09:55:56 +0200
Subject: [PATCH 1566/2840] Update version in setup.py

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

diff --git a/setup.py b/setup.py
index 73ccb863b..ddc9524d4 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.8"
+version = "3.1.12"
 
 if sys.argv[-1] == "tag":
     os.system(f'git tag -a {version} -m "version {version}"')

From f250178a7596b0b41e6afae10ef5093b77a50c2f Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 26 Jun 2021 02:13:05 +0000
Subject: [PATCH 1567/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 620d7eb0b..ccef7c8de 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-06-25]
+### Changed
+- Update `.gitignore` file for VSCode ([#3238](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3238))
+### Fixed
+- Wrap jQuery call in `DOMContentLoaded` event listener on account email page ([#3239](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3239))
+
 ## [2021-06-22]
 ### Changed
 - Update docs/howto.rst ([#3230](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3230))

From d8b39f32aef37491b8f10210bcfe6ce0ab516ea4 Mon Sep 17 00:00:00 2001
From: Haseeb ur Rehman <professorhaseeb@users.noreply.github.com>
Date: Mon, 28 Jun 2021 15:30:30 +0500
Subject: [PATCH 1568/2840] Fix Celery ports error on local Docker (#3241)

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

diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index 6241ceede..eee70c542 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -77,7 +77,6 @@ services:
       {%- if cookiecutter.use_mailhog == 'y' %}
       - mailhog
       {%- endif %}
-    ports: []
     command: /start-celeryworker
 
   celerybeat:
@@ -90,7 +89,6 @@ services:
       {%- if cookiecutter.use_mailhog == 'y' %}
       - mailhog
       {%- endif %}
-    ports: []
     command: /start-celerybeat
 
   flower:

From 7ea4194b6b4369a453b57c3ae33cbcf3109eee01 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Mon, 28 Jun 2021 10:31:08 +0000
Subject: [PATCH 1569/2840] 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 c11c531f1..f7c0a05b7 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1102,5 +1102,10 @@
     "name": "LECbg",
     "github_login": "LECbg",
     "twitter_username": ""
+  },
+  {
+    "name": "Haseeb ur Rehman",
+    "github_login": "professorhaseeb",
+    "twitter_username": "professorhaseeb"
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 1903bcc19..0493530b6 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -761,6 +761,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Haseeb ur Rehman</td>
+    <td>
+      <a href="https://github.com/professorhaseeb">professorhaseeb</a>
+    </td>
+    <td>professorhaseeb</td>
+  </tr>
   <tr>
     <td>Hendrik Schneider</td>
     <td>

From c6d53d753a300a2a296544054a8250b0b09a0dee Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?=
 <bnafta@gmail.com>
Date: Mon, 28 Jun 2021 09:02:16 -0300
Subject: [PATCH 1570/2840] Revert "Fix Celery ports error on local Docker
 (#3241)"

This reverts commit d8b39f32aef37491b8f10210bcfe6ce0ab516ea4.
---
 {{cookiecutter.project_slug}}/local.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index eee70c542..6241ceede 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -77,6 +77,7 @@ services:
       {%- if cookiecutter.use_mailhog == 'y' %}
       - mailhog
       {%- endif %}
+    ports: []
     command: /start-celeryworker
 
   celerybeat:
@@ -89,6 +90,7 @@ services:
       {%- if cookiecutter.use_mailhog == 'y' %}
       - mailhog
       {%- endif %}
+    ports: []
     command: /start-celerybeat
 
   flower:

From 9316846691eb53940f6e54e7248c874830a38f18 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?=
 <bnafta@gmail.com>
Date: Mon, 28 Jun 2021 10:20:08 -0300
Subject: [PATCH 1571/2840] Improve github bug report template

---
 .github/ISSUE_TEMPLATE/bug.md | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index 757b5990f..d1bf4da68 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -14,12 +14,38 @@ labels: bug
 
 * Host system configuration: 
     * Version of cookiecutter CLI (get it with `cookiecutter --version`):
-    * OS:
-    * Python version:
-    * Docker versions (if using Docker):
+    * OS name and version:
+
+      On Linux, run 
+      ```bash
+      lsb_release -a 2> /dev/null || cat /etc/redhat-release 2> /dev/null || cat /etc/*-release 2> /dev/null || cat /etc/issue 2> /dev/null
+      ```
+
+      On MacOs, run
+      ```bash
+      sw_vers
+      ```
+      
+      On Windows, via CMD, run
+      ```
+      systeminfo | findstr /B /C:"OS Name" /C:"OS Version"
+      ```
+
+
+      ```bash
+      # Insert here the OS name and version
+      
+      ```
+
+    * Python version, run `python3 -V`:
+    * Docker version (if using Docker), run `docker --version`:
+    * docker-compose version (if using Docker), run `docker-compose --version`:
     * ...
 * Options selected and/or [replay file](https://cookiecutter.readthedocs.io/en/latest/advanced/replay.html):
-    ``` 
+  On Linux and MacOS: `cat ${HOME}/.cookiecutter_replay/cookiecutter-django.json`
+  (Please, take care to remove sensitive information)
+    ```json
+    # Insert here the replay file content
     ```
 <summary>
 Logs:

From 10b9f22a3f660a3db7fe5d1199361c3cfc325659 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 29 Jun 2021 02:14:38 +0000
Subject: [PATCH 1572/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ccef7c8de..9fb8d310a 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-06-28]
+### Changed
+- Revert &#34;Fix Celery ports error on local Docker&#34; ([#3242](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3242))
+### Fixed
+- Fix Celery ports error on local Docker ([#3241](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3241))
+
 ## [2021-06-25]
 ### Changed
 - Update `.gitignore` file for VSCode ([#3238](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3238))

From 91f93fe371cd5a413e6622cd0d4321594e2f30a1 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 30 Jun 2021 02:17:24 +0000
Subject: [PATCH 1573/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9fb8d310a..1a6537cf7 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-06-29]
+### Changed
+- Improve github bug report template ([#3243](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3243))
+
 ## [2021-06-28]
 ### Changed
 - Revert &#34;Fix Celery ports error on local Docker&#34; ([#3242](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3242))

From abe3588bedf4d7be0bd62045e82af8febb2dac19 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 1 Jul 2021 08:19:11 -0700
Subject: [PATCH 1574/2840] Update django from 3.1.12 to 3.1.13

---
 {{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 36f02a3c4..a39de1bc3 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,7 +29,7 @@ uvicorn[standard]==0.14.0  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.1.12  # pyup: < 3.2  # https://www.djangoproject.com/
+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

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 1575/2840] 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 70023b53d..d2d7f703c 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 6241ceede..a9f80307f 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 3cccdb653..551d05a0d 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 1576/2840] 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 36f02a3c4..5ce153911 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 1577/2840] 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 06d33ae05..a560d0f12 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 0aca0a8782f6b44e1903067c73a85a67fe29b29f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?=
 <bnafta@gmail.com>
Date: Thu, 8 Jul 2021 19:29:25 -0300
Subject: [PATCH 1578/2840] Define REMAP_SIGTERM=SIGQUIT on Profile of Celery

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 8679a0669..e23ca13cb 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: celery worker --app=config.celery_app --loglevel=info
-beat: celery beat --app=config.celery_app --loglevel=info
+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 f58f134deca5f3d504fe100200f67ac82789c5d9 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 9 Jul 2021 02:14:27 +0000
Subject: [PATCH 1579/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a6537cf7..b07de8c16 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-07-08]
+### Updated
+- Update django to 3.1.13 ([#3247](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3247))
+
 ## [2021-06-29]
 ### Changed
 - Improve github bug report template ([#3243](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3243))

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 1580/2840] 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 a39de1bc3..17583afe2 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 76f1a2875f14bf0cb7478eb12c3cd3e2630ee0d5 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 13 Jul 2021 02:14:22 +0000
Subject: [PATCH 1581/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b07de8c16..588c58ab7 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-07-12]
+### Changed
+- Define REMAP_SIGTERM=SIGQUIT on Profile of Celery on Heroku ([#3263](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3263))
+
 ## [2021-07-08]
 ### Updated
 - Update django to 3.1.13 ([#3247](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3247))

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 1582/2840] 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 6ccb7cf1e..875d737eb 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 1583/2840] 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 b48a5ab91..5a12d6dc4 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 1584/2840] 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 b48a5ab91..edef7ef6a 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 1585/2840] 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 e77e15b99..792023f0c 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 1586/2840] 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 ac71019ab..81c3011b9 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 1587/2840] 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 a39de1bc3..6b00cbe2e 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 ba2f423600a4a0386838c2141d2b509aa49357ca Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwangpython@gmail.com>
Date: Tue, 27 Jul 2021 01:10:18 -0400
Subject: [PATCH 1588/2840] Add bootstrap5 support + drop IE support

Signed-off-by: Andrew-Chen-Wang <acwangpython@gmail.com>
---
 .../config/settings/base.py                   |  4 +++-
 .../requirements/base.txt                     |  1 +
 .../templates/account/email.html              |  5 ++---
 .../templates/base.html                       | 22 +++++++++----------
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 640d8b62c..bbe45a395 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -71,6 +71,7 @@ DJANGO_APPS = [
 ]
 THIRD_PARTY_APPS = [
     "crispy_forms",
+    "crispy_bootstrap5",
     "allauth",
     "allauth.account",
     "allauth.socialaccount",
@@ -208,7 +209,8 @@ TEMPLATES = [
 FORM_RENDERER = "django.forms.renderers.TemplatesSetting"
 
 # http://django-crispy-forms.readthedocs.io/en/latest/install.html#template-packs
-CRISPY_TEMPLATE_PACK = "bootstrap4"
+CRISPY_TEMPLATE_PACK = "bootstrap5"
+CRISPY_ALLOWED_TEMPLATE_PACKS = "bootstrap5"
 
 # FIXTURES
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 250a903e6..b4aecc741 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -34,6 +34,7 @@ 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-crispy-forms==1.11.2  # https://github.com/django-crispy-forms/django-crispy-forms
+crispy-bootstrap5==0.4  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==2.4.1  # https://github.com/django-compressor/django-compressor
 {%- endif %}
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 055904ae9..0bb32c229 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html
@@ -66,15 +66,14 @@ window.addEventListener('DOMContentLoaded',function() {
   const message = "{% trans '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) {
+    actions[0].addEventListener("click",function(e) {
       if (!confirm(message)) {
         e.preventDefault();
       }
     });
   }
+  Array.from(document.getElementsByClassName('form-group')).forEach(x => x.classList.remove('row'));
 });
-
-$('.form-group').removeClass('row');
 </script>
 {% 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 c36794048..25b99b0a1 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -8,17 +8,12 @@
     <meta name="description" content="{% endraw %}{{ cookiecutter.description }}{% raw %}">
     <meta name="author" content="{% endraw %}{{ cookiecutter.author_name }}{% raw %}">
 
-    <!-- HTML5 shim, for IE6-8 support of HTML5 elements -->
-    <!--[if lt IE 9]>
-      <script src="https://cdnjs.cloudflare.com/ajax/libs/html5shiv/3.7.3/html5shiv.min.js"></script>
-    <![endif]-->
-
     <link rel="icon" href="{% static 'images/favicons/favicon.ico' %}">
 
     {% block css %}
     {%- endraw %}{% if cookiecutter.custom_bootstrap_compilation == "n" %}{% raw %}
     <!-- Latest compiled and minified Bootstrap CSS -->
-    <link href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/bootstrap.min.css" rel="stylesheet" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/5.0.2/css/bootstrap.min.css" integrity="sha512-usVBAd66/NpVNfBge19gws2j6JZinnca12rAe2l+d+QkLU9fiG02O1X8Q6hepIpr/EYKZvKx/I9WsnujJuOmBA==" crossorigin="anonymous" referrerpolicy="no-referrer" />
     {%- endraw %}{% endif %}{% raw %}
 
     <!-- Your stuff: Third-party CSS libraries go here -->
@@ -41,11 +36,8 @@
       <script defer src="{% static 'js/vendors.js' %}"></script>
       {%- endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %}
       {%- endraw %}{% else %}{% raw %}
-      <!-- Bootstrap JS and its dependencies-->
-      <script defer src="https://code.jquery.com/jquery-3.3.1.slim.min.js" integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo" crossorigin="anonymous"></script>
-      <script defer src="https://cdnjs.cloudflare.com/ajax/libs/popper.js/1.14.3/umd/popper.min.js" integrity="sha384-ZMP7rVo3mIykV+2+9J3UJ46jBk0WLaUAdn689aCwoqbBJiSnjAK/l8WvCWPIPm49" crossorigin="anonymous"></script>
-      <script defer src="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/js/bootstrap.min.js" integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous"></script>
-
+      <!-- Bootstrap JS -->
+      <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/5.0.2/js/bootstrap.bundle.min.js" integrity="sha512-72WD92hLs7T5FAXn3vkNZflWG6pglUDDpm87TeQmfSg8KnrymL2G30R7as4FmTwhgu9H7eSzDCX3mjitSecKnw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
       <!-- Your stuff: Third-party javascript libraries go here -->
       {%- endraw %}{% endif %}{% raw %}
 
@@ -117,7 +109,13 @@
     {% block modal %}{% endblock modal %}
 
     {% block inline_javascript %}
-    {# Script tags with only code, no src (defer by default) #}
+    {% comment %}
+    Script tags with only code, no src (defer by default). To run
+    with a "defer" so that you run run inline code:
+    <script>
+      window.addEventListener('DOMContentLoaded', () => {/* Run whatever you want */});
+    </script>
+    {% endcomment %}
     {% endblock inline_javascript %}
   </body>
 </html>

From 7a87b1bd1f906d32b49b490231388ec2c333b996 Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwangpython@gmail.com>
Date: Tue, 27 Jul 2021 01:15:22 -0400
Subject: [PATCH 1589/2840] Fix gulp package installation (dropped jQuery) *
 Add defer

Signed-off-by: Andrew-Chen-Wang <acwangpython@gmail.com>
---
 {{cookiecutter.project_slug}}/gulpfile.js                    | 1 -
 {{cookiecutter.project_slug}}/package.json                   | 5 ++---
 .../{{cookiecutter.project_slug}}/templates/base.html        | 2 +-
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/gulpfile.js b/{{cookiecutter.project_slug}}/gulpfile.js
index 56a08e8fc..31aa420ee 100644
--- a/{{cookiecutter.project_slug}}/gulpfile.js
+++ b/{{cookiecutter.project_slug}}/gulpfile.js
@@ -32,7 +32,6 @@ function pathsConfig(appName) {
     {%- if cookiecutter.custom_bootstrap_compilation == 'y' %}
     bootstrapSass: `${vendorsRoot}/bootstrap/scss`,
     vendorsJs: [
-      `${vendorsRoot}/jquery/dist/jquery.slim.js`,
       `${vendorsRoot}/popper.js/dist/umd/popper.js`,
       `${vendorsRoot}/bootstrap/dist/js/bootstrap.js`,
     ],
diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json
index 6edf2e114..9748f90cc 100644
--- a/{{cookiecutter.project_slug}}/package.json
+++ b/{{cookiecutter.project_slug}}/package.json
@@ -5,10 +5,9 @@
   "devDependencies": {
     {% if cookiecutter.js_task_runner == 'Gulp' -%}
     {% if cookiecutter.custom_bootstrap_compilation == 'y' -%}
-    "bootstrap": "4.3.1",
+    "bootstrap": "5.0.2",
     "gulp-concat": "^2.6.1",
-    "jquery": "3.3.1",
-    "popper.js": "1.14.3",
+    "popper.js": "2.9.2",
     {% endif -%}
     "autoprefixer": "^9.4.7",
     "browser-sync": "^2.14.0",
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
index 25b99b0a1..6f77754fc 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -37,7 +37,7 @@
       {%- endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %}
       {%- endraw %}{% else %}{% raw %}
       <!-- Bootstrap JS -->
-      <script src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/5.0.2/js/bootstrap.bundle.min.js" integrity="sha512-72WD92hLs7T5FAXn3vkNZflWG6pglUDDpm87TeQmfSg8KnrymL2G30R7as4FmTwhgu9H7eSzDCX3mjitSecKnw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+      <script defer src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/5.0.2/js/bootstrap.bundle.min.js" integrity="sha512-72WD92hLs7T5FAXn3vkNZflWG6pglUDDpm87TeQmfSg8KnrymL2G30R7as4FmTwhgu9H7eSzDCX3mjitSecKnw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
       <!-- Your stuff: Third-party javascript libraries go here -->
       {%- endraw %}{% endif %}{% raw %}
 

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 1590/2840] 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 0713ff110..ab910820e 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 5c9406f3f..07b5789e6 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 2a0722a1d..5e4924c83 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 247ca690a..8c7b5ae60 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 6659724e0..5edc60478 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 7f2fbed07..b8dd7ac53 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 474b0f4a9..f424b2111 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 94ea2dfbe..76d07eb21 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 66ea9ba60..ce5d72a6d 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 7defcc86c..34123fd53 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 435ed073e..812410fc0 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 7a1e29a4d..8c1c11aca 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 08b937726..c2e64d14f 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 4394e9c67..be8f1cef9 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 8eafcbedb..2148a1804 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 c36794048..c233028b6 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 1591/2840] 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 e77e15b99..18de69d22 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 30e9e99296d0ab25b13963ec9018eac0b8adb8bc Mon Sep 17 00:00:00 2001
From: Andrew-Chen-Wang <acwangpython@gmail.com>
Date: Tue, 27 Jul 2021 05:25:05 -0400
Subject: [PATCH 1592/2840] Add create_django_issue.py script for GitHub
 actions cron

Signed-off-by: Andrew-Chen-Wang <acwangpython@gmail.com>
---
 .github/workflows/django-issue-checker.yml |  29 +++
 requirements.txt                           |   1 +
 scripts/create_django_issue.py             | 279 +++++++++++++++++++++
 3 files changed, 309 insertions(+)
 create mode 100644 .github/workflows/django-issue-checker.yml
 create mode 100644 scripts/create_django_issue.py

diff --git a/.github/workflows/django-issue-checker.yml b/.github/workflows/django-issue-checker.yml
new file mode 100644
index 000000000..6b1b0e700
--- /dev/null
+++ b/.github/workflows/django-issue-checker.yml
@@ -0,0 +1,29 @@
+# Creates a new issue for Major/Minor Django updates that keeps track
+# of all dependencies that need to be updated/merged in order for the
+# latest Django version to also be merged.
+name: Django Issue Checker
+
+on:
+  # Every day at midnight
+  schedule:
+  - cron: "0 3 * * *"
+  # Manual trigger
+  workflow_dispatch:
+
+
+jobs:
+  issue-manager:
+    runs-on: ubuntu-latest
+    steps:
+    - uses: actions/checkout@v2
+    - uses: actions/setup-python@v2.2.2
+      with:
+        python-version: 3.9
+    - name: Install dependencies
+      run: |
+        python -m pip install --upgrade pip
+        pip install -r requirements.txt
+    - name: Create Django Major Issue
+      run: python scripts/create_django_issue.py
+      env:
+        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/requirements.txt b/requirements.txt
index b48a5ab91..67d6c6e2e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -22,3 +22,4 @@ pyyaml==5.4.1
 # ------------------------------------------------------------------------------
 PyGithub==1.55
 jinja2==3.0.1
+requests==2.25.1
diff --git a/scripts/create_django_issue.py b/scripts/create_django_issue.py
new file mode 100644
index 000000000..42fd375da
--- /dev/null
+++ b/scripts/create_django_issue.py
@@ -0,0 +1,279 @@
+"""
+Creates an issue that generates a table for dependency checking whether
+all packages support the latest Django version. "Latest" does not include
+patches, only comparing major and minor version numbers.
+
+This script handles when there are multiple Django versions that need
+to keep up to date.
+"""
+
+import os
+from typing import Sequence, TYPE_CHECKING
+
+import requests
+import sys
+from pathlib import Path
+
+from github import Github
+
+
+if TYPE_CHECKING:
+    from github.Issue import Issue
+
+CURRENT_FILE = Path(__file__)
+ROOT = CURRENT_FILE.parents[1]
+REQUIREMENTS_DIR = ROOT / "{{cookiecutter.project_slug}}" / "requirements"
+GITHUB_REPO = "pydanny/cookiecutter-django"
+
+
+def get_package_info(package: str) -> dict:
+    # "django" converts to "Django" on redirect
+    r = requests.get(f"https://pypi.org/pypi/{package}/json", allow_redirects=True)
+    if not r.ok:
+        print(f"Couldn't find package: {package}")
+        sys.exit(1)
+    return r.json()
+
+
+def get_package_versions(package_info: dict, reverse=True, *, include_pre=False):
+    # Mostly used for the Django check really... to get the latest
+    # package version, you could simple do get_package_info()["info"]["version"]
+    releases: Sequence[str] = package_info["releases"].keys()
+    if not include_pre:
+        releases = [x for x in releases if x.replace(".", "").isdigit()]
+    return sorted(releases, reverse=reverse)
+
+
+def get_name_and_version(requirements_line: str) -> list[str, str]:
+    return requirements_line.split(" ", 1)[0].split("==")
+
+
+def get_all_latest_django_versions() -> tuple[str, list[str]]:
+    """
+    Grabs all Django versions that are worthy of a GitHub issue. Depends on
+    if Django versions has higher major version or minor version
+    """
+    base_txt = REQUIREMENTS_DIR / "base.txt"
+    with base_txt.open() as f:
+        for line in f.readlines():
+            if "django==" in line:
+                break
+        else:
+            print(f"django not found in {base_txt}")  # Huh...?
+            sys.exit(1)
+
+    # Begin parsing and verification
+    base_django_version = get_name_and_version(line)[1].split(".")
+    django_versions = get_package_versions(get_package_info("django"), include_pre=True)
+    _needed_django_versions: set[tuple] = set()
+    actual_needed_django_versions: list[str] = []
+    for x in django_versions:
+        _version = x.split(".")
+        # Compare if major is higher or if minor is higher iff major is the same
+        if (_version[0] > base_django_version[0]) or (
+            _version[0] == base_django_version[0]
+            and _version[1] > base_django_version[1]
+        ):
+            will_add = (_version[0], _version[1])
+            if will_add not in _needed_django_versions:
+                _needed_django_versions.add(will_add)
+                actual_needed_django_versions.append(x)
+
+    return line, actual_needed_django_versions
+
+
+def get_first_digit(tokens) -> str:
+    return next(item for item in tokens if item.isdigit())
+
+
+_TABLE_HEADER = """{file}.txt
+
+| Name | Version in Master | {dj_version} Compatible Version | OK |
+| ---- | :---------------: | :-----------------------------: | :-: |
+"""
+VITAL_BUT_UNKNOWN = [
+    "django-environ",  # not updated often
+    "pylint-django",  # classifier not included in setup.py
+]
+
+
+class GitHubManager:
+    def __init__(self, base_dj_version: str, needed_dj_versions: list[str]):
+        self.github = Github(os.getenv("GITHUB_TOKEN", None))
+        self.repo = self.github.get_repo(GITHUB_REPO)
+
+        self.base_dj_version = base_dj_version
+        self.needed_dj_versions = needed_dj_versions
+        # (major+minor) Version and description
+        self.existing_issues: dict[str, "Issue"] = {}
+
+        # Load all requirements from our requirements files and preload their
+        # package information like a cache:
+        self.requirements_files = ["base", "local", "production"]
+        # Format:
+        # requirement file name: {package name: (master_version, package_info)}
+        self.requirements: dict[str, dict[str, tuple[str, dict]]] = {
+            x: {} for x in self.requirements_files
+        }
+
+    def setup(self) -> None:
+        self.load_requirements()
+        self.load_existing_issues()
+
+    def load_requirements(self):
+        for requirements_file in self.requirements_files:
+            with (REQUIREMENTS_DIR / f"{requirements_file}.txt").open() as f:
+                for line in f.readlines():
+                    if "==" in line:
+                        name, version = get_name_and_version(line)
+                        self.requirements[requirements_file][name] = (
+                            version, get_package_info(name)
+                        )
+
+    def load_existing_issues(self):
+        """Closes the issue if the base Django version is greater than the needed"""
+        qualifiers = {
+            "repo": GITHUB_REPO,
+            "author": "actions-user",
+            "state": "open",
+            "is": "issue",
+            "in": "title",
+        }
+        issues = list(
+            self.github.search_issues(
+                "[Django Update]", "created", "desc", **qualifiers
+            )
+        )
+        for issue in issues:
+            try:
+                dj_version = get_first_digit(issue.title.split(" "))
+            except StopIteration:
+                try:
+                    # Some padding; randomly chose 4 to make sure we don't get a random
+                    # version number from a package that's not Django
+                    dj_version = get_first_digit(issue.body.split(" ", 4))
+                except StopIteration:
+                    print(
+                        f"Found issue {issue.title} that had an invalid syntax",
+                        "(Did not have a Django version number in the title or body's"
+                        f" first word. Issue number: [{issue.id}]({issue.url}))"
+                    )
+                    continue
+            if self.base_dj_version > dj_version:
+                issue.edit(state="closed")
+                print(f"Closed issue {issue.title} (ID: [{issue.id}]({issue.url}))")
+                try:
+                    self.needed_dj_versions.remove(dj_version)
+                except ValueError:
+                    print("Something weird happened. Continuing anyway (Warning ID: 1)")
+            else:
+                self.existing_issues[dj_version] = issue
+
+    def get_compatibility(
+        self, package_name: str, package_info: dict, needed_dj_version
+    ):
+        """
+        Verify compatibility via setup.py classifiers. If Django is not in the
+        classifiers, then default compatibility is n/a and OK is ✅.
+
+        If it's a package that's vital but known to not be updated often, we give it
+        a ❓. If a package has ❓ or 🕒, then we allow manual update. Automatic updates
+         only include ❌ and ✅.
+        """
+        # If issue previously existed, find package and skip any gtg, manually
+        # updated packages, or known releases that will happen but haven't yet
+        if issue := self.existing_issues.get(needed_dj_version):
+            if index := issue.body.find(package_name):
+                name, _current, prev_compat, ok = issue.body[index:].split("|", 4)[:4]
+                if ok in ("✅", "❓", "🕒"):
+                    return prev_compat, ok
+
+        if package_name in VITAL_BUT_UNKNOWN:
+            return "", "❓"
+
+        # Check classifiers if it includes Django
+        supported_dj_versions = []
+        for classifier in package_info["info"]["classifiers"]:
+            # Usually in the form of "Framework :: Django :: 3.2"
+            tokens = classifier.split(" ")
+            for token in tokens:
+                if token.lower() == "django":
+                    try:
+                        _version = get_first_digit(reversed(tokens))
+                    except StopIteration:
+                        pass
+                    else:
+                        supported_dj_versions.append(
+                            float(".".join(_version.split(".", 2)[:2]))
+                        )
+
+        if supported_dj_versions:
+            needed_dj_version = float(needed_dj_version)
+            if any(x >= needed_dj_version for x in supported_dj_versions):
+                return package_info["info"]["version"], "✅"
+            else:
+                return "", "❌"
+
+        # Django classifier DNE; assume it just isn't a Django lib
+        # Great exceptions include pylint-django, where we need to do this manually...
+        return "n/a", "✅"
+
+    HOME_PAGE_URL_KEYS = [
+        "home_page",
+        "project_url",
+        "docs_url",
+        "package_url",
+        "release_url",
+        "bugtrack_url",
+    ]
+
+    def _get_md_home_page_url(self, package_info: dict):
+        urls = [package_info["info"].get(x) for x in self.HOME_PAGE_URL_KEYS]
+        try:
+            return f"[{{}}]({next(item for item in urls if item)})"
+        except StopIteration:
+            return "{}"
+
+    def generate_markdown(self, needed_dj_version: str):
+        requirements = f"{needed_dj_version} requirements tables\n\n"
+        for _file in self.requirements_files:
+            requirements += (
+                _TABLE_HEADER.format_map(
+                    {"file": _file, "dj_version": needed_dj_version}
+                )
+            )
+            for package_name, (version, info) in self.requirements[_file].items():
+                compat_version, icon = self.get_compatibility(
+                    package_name, info, needed_dj_version
+                )
+                requirements += (
+                    f"|{self._get_md_home_page_url(info).format(package_name)}"
+                    f"|{version}|{compat_version}|{icon}|"
+                )
+        return requirements
+
+    def create_or_edit_issue(self, needed_dj_version, description):
+        if issue := self.existing_issues.get(str(needed_dj_version)):
+            issue.edit(body=description)
+        else:
+            self.repo.create_issue(
+                f"[Update Django] Django {needed_dj_version}", description
+            )
+
+    def generate(self):
+        for version in self.needed_dj_versions:
+            self.create_or_edit_issue(version, self.generate_markdown(version))
+
+
+def main() -> None:
+    # Check if there are any djs
+    current_dj, latest_djs = get_all_latest_django_versions()
+    if not latest_djs:
+        sys.exit(0)
+    manager = GitHubManager(current_dj, latest_djs)
+    manager.setup()
+    manager.generate()
+
+
+if __name__ == "__main__":
+    main()

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 1593/2840] 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 edef7ef6a..ce7ef90ce 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 5f70a802a6524ad85ecddefcf517a2d34ad6c5e4 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Tue, 27 Jul 2021 19:39:15 -0400
Subject: [PATCH 1594/2840] Fix popper package installation

Co-authored-by: Steve Putman <steve.putman@gmail.com>
---
 {{cookiecutter.project_slug}}/gulpfile.js  | 2 +-
 {{cookiecutter.project_slug}}/package.json | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/gulpfile.js b/{{cookiecutter.project_slug}}/gulpfile.js
index 31aa420ee..06d2cde16 100644
--- a/{{cookiecutter.project_slug}}/gulpfile.js
+++ b/{{cookiecutter.project_slug}}/gulpfile.js
@@ -32,7 +32,7 @@ function pathsConfig(appName) {
     {%- if cookiecutter.custom_bootstrap_compilation == 'y' %}
     bootstrapSass: `${vendorsRoot}/bootstrap/scss`,
     vendorsJs: [
-      `${vendorsRoot}/popper.js/dist/umd/popper.js`,
+      `${vendorsRoot}/@popperjs/core/dist/umd/popper.js`,
       `${vendorsRoot}/bootstrap/dist/js/bootstrap.js`,
     ],
     {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json
index 9748f90cc..95df37034 100644
--- a/{{cookiecutter.project_slug}}/package.json
+++ b/{{cookiecutter.project_slug}}/package.json
@@ -7,7 +7,7 @@
     {% if cookiecutter.custom_bootstrap_compilation == 'y' -%}
     "bootstrap": "5.0.2",
     "gulp-concat": "^2.6.1",
-    "popper.js": "2.9.2",
+    "@popperjs/core": "2.9.2",
     {% endif -%}
     "autoprefixer": "^9.4.7",
     "browser-sync": "^2.14.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 1595/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 588c58ab7..d95c621ca 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 1596/2840] 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 210573700..61ca0b970 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 1597/2840] 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 8fda1ff68..89cb602cf 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 1598/2840] 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 81c3011b9..5551169eb 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 1599/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d95c621ca..e9a9cd24f 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 1600/2840] 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 89cb602cf..f4cac5c7b 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 1601/2840] 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 0d582d484..be89f6e98 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 1602/2840] 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 89cb602cf..b49b1e94e 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 1603/2840] 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 5ef9656aa..9eab142db 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 1604/2840] 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 be89f6e98..858f89b88 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 1605/2840] 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 39c15f079..261407067 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 c3ce2a0ef..2be67cbce 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 1606/2840] 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 2be67cbce..d0ba6387c 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 1607/2840] 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 f33588668..83bc1342c 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 1608/2840] 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 1b6020f3a..05bdd5157 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 1609/2840] 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 f7c0a05b7..30fdd68b8 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 0493530b6..80e1b3984 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 1610/2840] 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 30fdd68b8..fc81def75 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 80e1b3984..92a134119 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 1611/2840] 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 ddc9524d4..64e923aef 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 1612/2840] 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 fc81def75..a9ed956a3 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 92a134119..665f9ed2a 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 1613/2840] 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 a9ed956a3..c4cbb38d7 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 665f9ed2a..388baa385 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 1614/2840] 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 d2d7f703c..1e17068ee 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 1615/2840] 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 551d05a0d..ea4292a0d 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 1616/2840] 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 05bdd5157..b4cf0c080 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 1617/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e9a9cd24f..d76f08110 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 1618/2840] 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 a9f80307f..8cce827c1 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 1619/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d76f08110..110c3b3f0 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 1620/2840] 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 3680b3904..17c3d932c 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 1621/2840] 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 3680b3904..36166aaf9 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 1622/2840] 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 9eab142db..a092dbb12 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 1623/2840] 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 8a81e19de..a2573b94d 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 1624/2840] 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 e23ca13cb..ddb5cd8a9 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 1625/2840] 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 858f89b88..bdfff2545 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 1626/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 110c3b3f0..f7cdefba2 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 1627/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f7cdefba2..5c0229e11 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 1628/2840] 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 57541921e..3fdf2cde4 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 1629/2840] 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 25a6f7a0a..255122002 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 1630/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5c0229e11..6376c0cf1 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 1631/2840] 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 3680b3904..165ee197d 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 1632/2840] 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 5551169eb..e397722b3 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 1633/2840] 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 3fdf2cde4..67328f853 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 1634/2840] 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 9eab142db..a763d4ae9 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 1635/2840] 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 3fdf2cde4..eb8cb56c3 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 1636/2840] 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 9eab142db..ef6e941d4 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 1637/2840] 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 3680b3904..c7eeaf8ea 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 1638/2840] 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 3680b3904..caddeba94 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 1639/2840] 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 3fdf2cde4..ccb613ba9 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 1640/2840] 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 9eab142db..ca080c1a8 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 1641/2840] 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 c4cbb38d7..045c1f071 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 388baa385..f75e34c99 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 1642/2840] 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 94ab4485e..8d5531f45 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 1643/2840] 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 5bcaa8164..bd3c9f2fd 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 5bcaa8164..bd3c9f2fd 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 1644/2840] 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 ddb5cd8a9..274108d14 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 1645/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6376c0cf1..243c2079a 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 1646/2840] 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 94ab4485e..917fada69 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 1647/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 243c2079a..aa36f5906 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 1648/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa36f5906..3d3c1b958 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 1649/2840] 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 59b4a6f0f..726e2d214 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 1650/2840] 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 f62d4bc9a..295e9c5fe 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 1651/2840] 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 045c1f071..de5807e0c 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 f75e34c99..b655f8fb9 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 1652/2840] 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 87665291b..2153d1e15 100644
--- a/{{cookiecutter.project_slug}}/runtime.txt
+++ b/{{cookiecutter.project_slug}}/runtime.txt
@@ -1 +1 @@
-python-3.9.4
+python-3.9.7

From 7412a3e4a7e0be4bc8884cf7465f3fe179cb0850 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 11 Sep 2021 18:10:22 +0100
Subject: [PATCH 1653/2840] Replace .sr-only by .visually-hidden

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

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
index b7a7abb94..3953f1702 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -62,7 +62,7 @@
         <div class="collapse navbar-collapse" id="navbarSupportedContent">
           <ul class="navbar-nav mr-auto">
             <li class="nav-item active">
-              <a class="nav-link" href="{% url 'home' %}">Home <span class="sr-only">(current)</span></a>
+              <a class="nav-link" href="{% url 'home' %}">Home <span class="visually-hidden">(current)</span></a>
             </li>
             <li class="nav-item">
               <a class="nav-link" href="{% url 'about' %}">About</a>

From 2fecd0624d6f097236853a444b02a7109a97e03e Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 11 Sep 2021 18:12:33 +0100
Subject: [PATCH 1654/2840] Update crispy-bootstrap to the latest

---
 {{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 110aad044..5692a44d7 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -34,7 +34,7 @@ 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
-crispy-bootstrap5==0.4  # https://github.com/django-crispy-forms/crispy-bootstrap5
+crispy-bootstrap5==0.5  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==2.4.1  # https://github.com/django-compressor/django-compressor
 {%- endif %}

From 3274ff1673e1e95f369d765b04ff1e14bc528748 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 11 Sep 2021 18:16:54 +0100
Subject: [PATCH 1655/2840] Update to latest Bootstrap 5

---
 {{cookiecutter.project_slug}}/package.json                    | 2 +-
 .../{{cookiecutter.project_slug}}/templates/base.html         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json
index 95df37034..b50268d42 100644
--- a/{{cookiecutter.project_slug}}/package.json
+++ b/{{cookiecutter.project_slug}}/package.json
@@ -5,7 +5,7 @@
   "devDependencies": {
     {% if cookiecutter.js_task_runner == 'Gulp' -%}
     {% if cookiecutter.custom_bootstrap_compilation == 'y' -%}
-    "bootstrap": "5.0.2",
+    "bootstrap": "5.1.1",
     "gulp-concat": "^2.6.1",
     "@popperjs/core": "2.9.2",
     {% endif -%}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
index 3953f1702..e8c6d0afe 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -13,7 +13,7 @@
     {% block css %}
     {%- endraw %}{% if cookiecutter.custom_bootstrap_compilation == "n" %}{% raw %}
     <!-- Latest compiled and minified Bootstrap CSS -->
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/5.0.2/css/bootstrap.min.css" integrity="sha512-usVBAd66/NpVNfBge19gws2j6JZinnca12rAe2l+d+QkLU9fiG02O1X8Q6hepIpr/EYKZvKx/I9WsnujJuOmBA==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.1/css/bootstrap.min.css" integrity="sha512-6KY5s6UI5J7SVYuZB4S/CZMyPylqyyNZco376NM2Z8Sb8OxEdp02e1jkKk/wZxIEmjQ6DRCEBhni+gpr9c4tvA==" crossorigin="anonymous" referrerpolicy="no-referrer" />
     {%- endraw %}{% endif %}{% raw %}
 
     <!-- Your stuff: Third-party CSS libraries go here -->
@@ -37,7 +37,7 @@
       {%- endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %}
       {%- endraw %}{% else %}{% raw %}
       <!-- Bootstrap JS -->
-      <script defer src="https://cdnjs.cloudflare.com/ajax/libs/twitter-bootstrap/5.0.2/js/bootstrap.bundle.min.js" integrity="sha512-72WD92hLs7T5FAXn3vkNZflWG6pglUDDpm87TeQmfSg8KnrymL2G30R7as4FmTwhgu9H7eSzDCX3mjitSecKnw==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+      <script defer src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.1/js/bootstrap.min.js" integrity="sha512-ewfXo9Gq53e1q1+WDTjaHAGZ8UvCWq0eXONhwDuIoaH8xz2r96uoAYaQCm1oQhnBfRXrvJztNXFsTloJfgbL5Q==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
       <!-- Your stuff: Third-party javascript libraries go here -->
       {%- endraw %}{% endif %}{% raw %}
 

From 658cf84d310a3a074568487054428d57062f8ced Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sun, 12 Sep 2021 02:15:58 +0000
Subject: [PATCH 1656/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d3c1b958..ebf651ab2 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-09-11]
+### Changed
+- Removing pycharm docs if app does not use pycharm ([#3139](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3139))
+### Updated
+- Update django-environ to 0.7.0 ([#3317](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3317))
+
 ## [2021-09-06]
 ### Changed
 - Update Celery to v5 ([#3280](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3280))

From f7cdb1cc4b7b32f01fdbb5e3da5180aff078ec24 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 12 Sep 2021 15:17:56 -0700
Subject: [PATCH 1657/2840] Update sphinx from 4.1.2 to 4.2.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 9d5b7daf8..cd08220aa 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.1.2  # https://github.com/sphinx-doc/sphinx
+sphinx==4.2.0  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From 78bf26c503badbbc7b1a00903822cf1d5ee74c14 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 13 Sep 2021 05:03:48 +0000
Subject: [PATCH 1658/2840] Bump stefanzweifel/git-auto-commit-action from
 4.11.0 to 4.12.0

Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from 4.11.0 to 4.12.0.
- [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases)
- [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.11.0...v4.12.0)

---
updated-dependencies:
- dependency-name: stefanzweifel/git-auto-commit-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 .github/workflows/update-changelog.yml    | 2 +-
 .github/workflows/update-contributors.yml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index 6270fe61b..d7a4f4b8b 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -28,7 +28,7 @@ jobs:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
     - name: Commit changes
-      uses: stefanzweifel/git-auto-commit-action@v4.11.0
+      uses: stefanzweifel/git-auto-commit-action@v4.12.0
       with:
         commit_message: Update Changelog
         file_pattern: CHANGELOG.md
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index ebf1c239e..37d95904e 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -24,7 +24,7 @@ jobs:
       run: python scripts/update_contributors.py
 
     - name: Commit changes
-      uses: stefanzweifel/git-auto-commit-action@v4.11.0
+      uses: stefanzweifel/git-auto-commit-action@v4.12.0
       with:
         commit_message: Update Contributors
         file_pattern: CONTRIBUTORS.md .github/contributors.json

From 212ccc5cadfa32ca5a1e74761cf870d5d0e75078 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 14 Sep 2021 02:13:36 +0000
Subject: [PATCH 1659/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ebf651ab2..900acf0ec 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-09-13]
+### Updated
+- Bump stefanzweifel/git-auto-commit-action from 4.11.0 to 4.12.0 ([#3320](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3320))
+- Update sphinx to 4.2.0 ([#3319](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3319))
+
 ## [2021-09-11]
 ### Changed
 - Removing pycharm docs if app does not use pycharm ([#3139](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3139))

From 3f58b12636bdfc837f6f525ce4f0ee8e4feb85d7 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 13 Sep 2021 22:58:21 -0700
Subject: [PATCH 1660/2840] Update black from 21.8b0 to 21.9b0

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

diff --git a/requirements.txt b/requirements.txt
index cde85f8ff..20c7d2a35 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-black==21.8b0
+black==21.9b0
 isort==5.9.3
 flake8==3.9.2
 flake8-isort==4.0.0

From d6b96e649081e2d8b4eb2e398fb8476ea154789e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 13 Sep 2021 22:58:22 -0700
Subject: [PATCH 1661/2840] Update black from 21.8b0 to 21.9b0

---
 {{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 cd08220aa..5632f5b21 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.8b0  # https://github.com/psf/black
+black==21.9b0  # 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 4fd9bd7ed60563a61ef1abc9d94f4a1767b7563b Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 15 Sep 2021 00:05:13 +0000
Subject: [PATCH 1662/2840] 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 e397722b3..6f1bdcbc6 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.8b0
+    rev: 21.9b0
     hooks:
       - id: black
 

From b3c7053da8e135c1ad469e047df3d27fcb959288 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 15 Sep 2021 02:13:18 +0000
Subject: [PATCH 1663/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 900acf0ec..6109e4365 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-14]
+### Updated
+- Update black to 21.9b0 ([#3321](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3321))
+
 ## [2021-09-13]
 ### Updated
 - Bump stefanzweifel/git-auto-commit-action from 4.11.0 to 4.12.0 ([#3320](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3320))

From 925d3aeccdde0244bbf05a96605164599b80a02a Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 16 Sep 2021 02:17:09 +0000
Subject: [PATCH 1664/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6109e4365..79288ee64 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-15]
+### Updated
+- Auto-update pre-commit hooks ([#3322](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3322))
+
 ## [2021-09-14]
 ### Updated
 - Update black to 21.9b0 ([#3321](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3321))

From f0802b75d0e205b9729e0bcccf698b442886f8d3 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 16 Sep 2021 14:56:10 -0700
Subject: [PATCH 1665/2840] Update tox from 3.24.3 to 3.24.4

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

diff --git a/requirements.txt b/requirements.txt
index 20c7d2a35..d29aab090 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==2.15.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.24.3
+tox==3.24.4
 pytest==6.2.5
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From 36330ce07146eb4d6a77c84b89f9de57878c131e Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 17 Sep 2021 02:17:23 +0000
Subject: [PATCH 1666/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79288ee64..59fcf54e8 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-16]
+### Updated
+- Update tox to 3.24.4 ([#3323](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3323))
+
 ## [2021-09-15]
 ### Updated
 - Auto-update pre-commit hooks ([#3322](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3322))

From cb6c0edba64e772b82401872a665eace5153a775 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 22 Sep 2021 07:55:35 -0700
Subject: [PATCH 1667/2840] Update sentry-sdk from 1.3.1 to 1.4.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 61ca0b970..9ebe1f54f 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.1  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.4.0  # 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 3a2ecd63b66691f3abc72a37f884f19690980875 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 23 Sep 2021 02:17:22 +0000
Subject: [PATCH 1668/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59fcf54e8..72e9377b4 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-22]
+### Updated
+- Update sentry-sdk to 1.4.0 ([#3324](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3324))
+
 ## [2021-09-16]
 ### Updated
 - Update tox to 3.24.4 ([#3323](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3323))

From c93bfaf71aef3ca5d5a5fbaad97e02d2acc1b429 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 23 Sep 2021 07:55:07 -0700
Subject: [PATCH 1669/2840] Update sentry-sdk from 1.4.0 to 1.4.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 9ebe1f54f..1fb2e329a 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.4.0  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.4.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 76aa3b9ab47e6fc9c53eca4d827c04e4c0a9045c Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 24 Sep 2021 02:14:15 +0000
Subject: [PATCH 1670/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 72e9377b4..192dc2c6d 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-23]
+### Updated
+- Update sentry-sdk to 1.4.1 ([#3325](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3325))
+
 ## [2021-09-22]
 ### Updated
 - Update sentry-sdk to 1.4.0 ([#3324](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3324))

From b4039c837bbcdf6f101c25025b1c329227466d62 Mon Sep 17 00:00:00 2001
From: Manjit Pardeshi <manjitpardeshi91991@gmail.com>
Date: Fri, 24 Sep 2021 13:19:08 +0530
Subject: [PATCH 1671/2840] Add django-settings-module to .pylintrc

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

diff --git a/{{cookiecutter.project_slug}}/.pylintrc b/{{cookiecutter.project_slug}}/.pylintrc
index dff52e75b..6f195c6ef 100644
--- a/{{cookiecutter.project_slug}}/.pylintrc
+++ b/{{cookiecutter.project_slug}}/.pylintrc
@@ -1,6 +1,6 @@
 [MASTER]
 load-plugins=pylint_django{% if cookiecutter.use_celery == "y" %}, pylint_celery{% endif %}
-
+django-settings-module=config.settings.base
 [FORMAT]
 max-line-length=120
 

From fdb6acbf1eb818de1b2a0e14e707979e518c09f9 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 24 Sep 2021 08:29:35 +0000
Subject: [PATCH 1672/2840] 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 de5807e0c..4d3510c79 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1137,5 +1137,10 @@
     "name": "Floyd Hightower",
     "github_login": "fhightower",
     "twitter_username": ""
+  },
+  {
+    "name": "Manjit Pardeshi",
+    "github_login": "Manjit2003",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index b655f8fb9..8b7dd378d 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1104,6 +1104,13 @@ Listed in alphabetical order.
     </td>
     <td>flyudvik</td>
   </tr>
+  <tr>
+    <td>Manjit Pardeshi</td>
+    <td>
+      <a href="https://github.com/Manjit2003">Manjit2003</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Martin Blech</td>
     <td>

From dd1c54bde6fac5b6350a4f062f34a2a43b27a5a8 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 25 Sep 2021 02:15:26 +0000
Subject: [PATCH 1673/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 192dc2c6d..3e4fd2f35 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-24]
+### Changed
+- Add django-settings-module to .pylintrc ([#3326](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3326))
+
 ## [2021-09-23]
 ### Updated
 - Update sentry-sdk to 1.4.1 ([#3325](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3325))

From 7c6274186644941d96431429c2e86e5ab93f01b8 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 25 Sep 2021 15:08:23 -0700
Subject: [PATCH 1674/2840] Update django-crispy-forms from 1.12.0 to 1.13.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 726e2d214..fa2152da4 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -33,7 +33,7 @@ django==3.1.13  # pyup: < 3.2  # https://www.djangoproject.com/
 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
+django-crispy-forms==1.13.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
 {%- endif %}

From 1484b8699934b1fcc38f9919bb034c11150aa5b7 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Mon, 27 Sep 2021 02:15:09 +0000
Subject: [PATCH 1675/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e4fd2f35..89b7885b3 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-26]
+### Updated
+- Update django-crispy-forms to 1.13.0 ([#3327](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3327))
+
 ## [2021-09-24]
 ### Changed
 - Add django-settings-module to .pylintrc ([#3326](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3326))

From fa39b8df982af52615c42840bf131a195305f14a Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 27 Sep 2021 14:02:18 -0700
Subject: [PATCH 1676/2840] Update sentry-sdk from 1.4.1 to 1.4.2

---
 {{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 1fb2e329a..83ead26c0 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.4.1  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.4.2  # 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 287799f4c9b496bbf3da30380d38230f341ef9bf Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 28 Sep 2021 02:15:12 +0000
Subject: [PATCH 1677/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 89b7885b3..d12850e66 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-27]
+### Updated
+- Update sentry-sdk to 1.4.2 ([#3329](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3329))
+
 ## [2021-09-26]
 ### Updated
 - Update django-crispy-forms to 1.13.0 ([#3327](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3327))

From 1ac297f8f4e5aba206812120166f9cfd4a28d4c6 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 29 Sep 2021 07:15:05 -0700
Subject: [PATCH 1678/2840] Update django-cors-headers from 3.8.0 to 3.9.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 fa2152da4..ace0938c0 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.8.0 # https://github.com/adamchainz/django-cors-headers
+django-cors-headers==3.9.0 # https://github.com/adamchainz/django-cors-headers
 {%- endif %}

From 3438b5f3d1916fbf2ef25f6a8f7585d284c3d469 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 29 Sep 2021 15:05:49 -0700
Subject: [PATCH 1679/2840] Update sentry-sdk from 1.4.2 to 1.4.3

---
 {{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 83ead26c0..c6214316e 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.4.2  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.4.3  # 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 9a615f4f337e113b437f3a9930acb8d34e76f0e9 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 30 Sep 2021 02:18:36 +0000
Subject: [PATCH 1680/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d12850e66..6948183a0 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-29]
+### Updated
+- Update django-cors-headers to 3.9.0 ([#3332](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3332))
+
 ## [2021-09-27]
 ### Updated
 - Update sentry-sdk to 1.4.2 ([#3329](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3329))

From 16208c2b1591bf632d71df31f90079dae260c9b0 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 1 Oct 2021 02:19:38 +0000
Subject: [PATCH 1681/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6948183a0..79286a8fc 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-30]
+### Updated
+- Update sentry-sdk to 1.4.3 ([#3334](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3334))
+
 ## [2021-09-29]
 ### Updated
 - Update django-cors-headers to 3.9.0 ([#3332](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3332))

From 112c29d77bef638d8701f7b35ec1e31760a35e26 Mon Sep 17 00:00:00 2001
From: Meraj <59417175+ichbinmeraj@users.noreply.github.com>
Date: Fri, 1 Oct 2021 17:02:07 +0330
Subject: [PATCH 1682/2840] Updated developing-locally-docker.rst

changed wrong hyperlink in Prerequisites section
---
 docs/developing-locally-docker.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index bdfff2545..72999be31 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -18,7 +18,7 @@ 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`_.
+* Pre-commit; refer to the official documentation for the [pre-commit](https://pre-commit.com/#install).
 
 .. _`installation instructions`: https://docs.docker.com/install/#supported-platforms
 .. _`installation guide`: https://docs.docker.com/compose/install/

From 847e68994a65fe7e47f7191ec15c218f6b54d69d Mon Sep 17 00:00:00 2001
From: luzfcb <luzfcb@users.noreply.github.com>
Date: Fri, 1 Oct 2021 14:14:33 +0000
Subject: [PATCH 1683/2840] 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 4d3510c79..2c68d8441 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1142,5 +1142,10 @@
     "name": "Manjit Pardeshi",
     "github_login": "Manjit2003",
     "twitter_username": ""
+  },
+  {
+    "name": "Meraj ",
+    "github_login": "ichbinmeraj",
+    "twitter_username": "merajsafari"
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 8b7dd378d..43e9d15b7 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1195,6 +1195,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Meraj </td>
+    <td>
+      <a href="https://github.com/ichbinmeraj">ichbinmeraj</a>
+    </td>
+    <td>merajsafari</td>
+  </tr>
   <tr>
     <td>Mesut Yılmaz</td>
     <td>

From 4c167436c6f17c8c4e750935cfa8a71f1c0ccf95 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 2 Oct 2021 02:15:54 +0000
Subject: [PATCH 1684/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 79286a8fc..ffe84ebf5 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-10-01]
+### Changed
+- Fix the wrong pre-commit hyperlink in Prerequisites section ([#3338](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3338))
+
 ## [2021-09-30]
 ### Updated
 - Update sentry-sdk to 1.4.3 ([#3334](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3334))

From 674dbb642f57c775b2accb8a70701c30ba16bc32 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 2 Oct 2021 07:12:40 -0700
Subject: [PATCH 1685/2840] Update pytz from 2021.1 to 2021.3

---
 {{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 ace0938c0..175aea74e 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,4 +1,4 @@
-pytz==2021.1  # https://github.com/stub42/pytz
+pytz==2021.3  # https://github.com/stub42/pytz
 python-slugify==5.0.2  # https://github.com/un33k/python-slugify
 Pillow==8.3.2  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}

From c1484361a75d19da6c0ff2a71cb3d91bf0dbf0b5 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Mon, 4 Oct 2021 02:18:22 +0000
Subject: [PATCH 1686/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ffe84ebf5..a922abb3b 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-10-03]
+### Updated
+- Update pytz to 2021.3 ([#3340](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3340))
+
 ## [2021-10-01]
 ### Changed
 - Fix the wrong pre-commit hyperlink in Prerequisites section ([#3338](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3338))

From 5ec4ca597a6bc7f9af38386392f24dea69c94b9a Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 5 Oct 2021 00:47:21 -0700
Subject: [PATCH 1687/2840] Update jinja2 from 3.0.1 to 3.0.2

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

diff --git a/requirements.txt b/requirements.txt
index d29aab090..7ba8f8e41 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,4 +21,4 @@ pyyaml==5.4.1
 # Scripting
 # ------------------------------------------------------------------------------
 PyGithub==1.55
-jinja2==3.0.1
+jinja2==3.0.2

From d0748bd2ef2e51a57957b25f4c462e371a64f7c8 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 5 Oct 2021 21:07:31 -0700
Subject: [PATCH 1688/2840] Update werkzeug from 1.0.1 to 2.0.2

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

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 5632f5b21..2871bfa6c 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,6 +1,6 @@
 -r base.txt
 
-Werkzeug==1.0.1 # https://github.com/pallets/werkzeug
+Werkzeug==2.0.2 # https://github.com/pallets/werkzeug
 ipdb==0.13.9  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.9.1  # https://github.com/psycopg/psycopg2

From 8eea74551f882c2f823b6e5c59f3206eeed890c1 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 5 Oct 2021 23:53:27 -0700
Subject: [PATCH 1689/2840] Update django-cors-headers from 3.9.0 to 3.10.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 175aea74e..54b88cf58 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.9.0 # https://github.com/adamchainz/django-cors-headers
+django-cors-headers==3.10.0 # https://github.com/adamchainz/django-cors-headers
 {%- endif %}

From f5b742b6d92519c555472046b77f6344d6749d2b Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 6 Oct 2021 22:32:37 -0700
Subject: [PATCH 1690/2840] Update coverage from 5.5 to 6.0.1

---
 {{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 5632f5b21..9a3efe128 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -27,7 +27,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
+coverage==6.0.1  # https://github.com/nedbat/coveragepy
 black==21.9b0  # https://github.com/psf/black
 pylint-django==2.4.4  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 2c1a3edd205248e20966f4668777a8c5a4894635 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 6 Oct 2021 22:32:41 -0700
Subject: [PATCH 1691/2840] Update django-coverage-plugin from 2.0.0 to 2.0.1

---
 {{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 5632f5b21..1fd305c57 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -41,5 +41,5 @@ factory-boy==3.2.0  # https://github.com/FactoryBoy/factory_boy
 
 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
+django-coverage-plugin==2.0.1  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.4.0  # https://github.com/pytest-dev/pytest-django

From 3617b8bf2777818e83b2669dc2e9fd6079eeab16 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 11 Oct 2021 14:32:04 -0700
Subject: [PATCH 1692/2840] Update django-storages from 1.11.1 to 1.12.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 c6214316e..c9407383b 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -17,7 +17,7 @@ hiredis==2.0.0  # https://github.com/redis/hiredis-py
 # Django
 # ------------------------------------------------------------------------------
 {%- if cookiecutter.cloud_provider == 'AWS' %}
-django-storages[boto3]==1.11.1  # https://github.com/jschneier/django-storages
+django-storages[boto3]==1.12.1  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
 django-storages[google]==1.11.1  # https://github.com/jschneier/django-storages
 {%- endif %}

From 4cb6ff08709cc7dcb3b3bb6674e67c1bba1fb291 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 11 Oct 2021 14:32:05 -0700
Subject: [PATCH 1693/2840] Update django-storages from 1.11.1 to 1.12.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 c9407383b..3d70a8a4c 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -19,7 +19,7 @@ hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- if cookiecutter.cloud_provider == 'AWS' %}
 django-storages[boto3]==1.12.1  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
-django-storages[google]==1.11.1  # https://github.com/jschneier/django-storages
+django-storages[google]==1.12.1  # https://github.com/jschneier/django-storages
 {%- endif %}
 {%- if cookiecutter.mail_service == 'Mailgun' %}
 django-anymail[mailgun]==8.4  # https://github.com/anymail/django-anymail

From e37f2c993d1a6de0a9f00f9553a32f761cde943d Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 11 Oct 2021 15:49:24 -0700
Subject: [PATCH 1694/2840] Update coverage from 6.0.1 to 6.0.2

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

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index a303ac63b..079ccc965 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -27,7 +27,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==6.0.1  # https://github.com/nedbat/coveragepy
+coverage==6.0.2  # https://github.com/nedbat/coveragepy
 black==21.9b0  # https://github.com/psf/black
 pylint-django==2.4.4  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 00ff825b8c29099294deecdd7539b0a1276690d3 Mon Sep 17 00:00:00 2001
From: Dalton Rardin <8892319+dalrrard@users.noreply.github.com>
Date: Sat, 9 Oct 2021 01:09:46 -0500
Subject: [PATCH 1695/2840] Add djangorestframework-stubs

Add djangorestframework-stubs to local.txt requirements
Modify setup.cfg to add stubs to mypy settings
Fix new type error in DRF

`./users/api/views.py:19: error: Incompatible type for lookup 'id': (got "Union[AutoField[Union[Combinable, int, str], int], Any]", expected "Union[str, int]")`

by asserting that `self.request.user.id` is an int
---
 {{cookiecutter.project_slug}}/requirements/local.txt           | 3 +++
 {{cookiecutter.project_slug}}/setup.cfg                        | 2 +-
 .../{{cookiecutter.project_slug}}/users/api/views.py           | 1 +
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 5632f5b21..f0c8424cf 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -17,6 +17,9 @@ mypy==0.910  # https://github.com/python/mypy
 django-stubs==1.8.0  # https://github.com/typeddjango/django-stubs
 pytest==6.2.5  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
+{%- if cookiecutter.use_drf == "y" %}
+djangorestframework-stubs==1.4.0  # https://github.com/typeddjango/djangorestframework-stubs
+{%- endif %}
 
 # Documentation
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/setup.cfg b/{{cookiecutter.project_slug}}/setup.cfg
index d0ba6387c..dad64e1fa 100644
--- a/{{cookiecutter.project_slug}}/setup.cfg
+++ b/{{cookiecutter.project_slug}}/setup.cfg
@@ -24,7 +24,7 @@ ignore_missing_imports = True
 warn_unused_ignores = True
 warn_redundant_casts = True
 warn_unused_configs = True
-plugins = mypy_django_plugin.main
+plugins = mypy_django_plugin.main{% if cookiecutter.use_drf == "y" %}, mypy_drf_plugin.main{% endif %}
 
 [mypy.plugins.django-stubs]
 django_settings_module = config.settings.test
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/views.py
index 288ea7ab2..3d56cf562 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/views.py
@@ -16,6 +16,7 @@ class UserViewSet(RetrieveModelMixin, ListModelMixin, UpdateModelMixin, GenericV
     lookup_field = "username"
 
     def get_queryset(self, *args, **kwargs):
+        assert isinstance(self.request.user.id, int)
         return self.queryset.filter(id=self.request.user.id)
 
     @action(detail=False, methods=["GET"])

From 7e3d6296165cb2468860b86370ed35a0d587ab3d Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 12 Oct 2021 02:17:01 +0000
Subject: [PATCH 1696/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a922abb3b..1b2cdab48 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-10-11]
+### Updated
+- Update werkzeug to 2.0.2 ([#3344](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3344))
+- Update coverage to 6.0.1 ([#3348](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3348))
+- Update django-coverage-plugin to 2.0.1 ([#3349](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3349))
+- Update django-cors-headers to 3.10.0 ([#3345](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3345))
+- Update jinja2 to 3.0.2 ([#3343](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3343))
+- Update django-storages to 1.12.1 ([#3355](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3355))
+
 ## [2021-10-03]
 ### Updated
 - Update pytz to 2021.3 ([#3340](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3340))

From f64cb5b0e33e035f6616951480e1725f72e0f423 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 13 Oct 2021 02:18:21 +0000
Subject: [PATCH 1697/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1b2cdab48..3000c6270 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-10-12]
+### Updated
+- Update coverage to 6.0.2 ([#3356](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3356))
+
 ## [2021-10-11]
 ### Updated
 - Update werkzeug to 2.0.2 ([#3344](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3344))

From c4707d190d1c4ea27e144d52b297d9eee8b86605 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 13 Oct 2021 07:29:20 +0000
Subject: [PATCH 1698/2840] 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 2c68d8441..36737f343 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1147,5 +1147,10 @@
     "name": "Meraj ",
     "github_login": "ichbinmeraj",
     "twitter_username": "merajsafari"
+  },
+  {
+    "name": "dalrrard",
+    "github_login": "dalrrard",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 43e9d15b7..76c3cb02e 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -502,6 +502,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>dalrrard</td>
+    <td>
+      <a href="https://github.com/dalrrard">dalrrard</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Dan Shultz</td>
     <td>

From 741b8c790eb38b1514ff452e47a1ee86bd0e4093 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Wed, 13 Oct 2021 09:10:56 +0100
Subject: [PATCH 1699/2840] Fix pull request URLs in changelog

---
 .github/changelog-template.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/changelog-template.md b/.github/changelog-template.md
index 49550ba12..2c0c512f7 100644
--- a/.github/changelog-template.md
+++ b/.github/changelog-template.md
@@ -3,7 +3,7 @@
 {%- if pulls %}
 ### {{ change_type }}
 {%- for pull_request in pulls %}
-- {{ pull_request.title }} ([#{{ pull_request.number }}]({{ pull_request.url }}))
+- {{ pull_request.title }} ([#{{ pull_request.number }}]({{ pull_request.html_url }}))
 {%- endfor -%}
 {% endif -%}
 {% endfor -%}

From e8794864a59ebe2346d2c476f7b14c8267e0d5ad Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Wed, 13 Oct 2021 09:19:45 +0100
Subject: [PATCH 1700/2840] Fix links in changelog file

---
 CHANGELOG.md | 738 +++++++++++++++++++++++++--------------------------
 1 file changed, 369 insertions(+), 369 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3000c6270..fdca4664a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,804 +5,804 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 ## [2021-10-12]
 ### Updated
-- Update coverage to 6.0.2 ([#3356](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3356))
+- Update coverage to 6.0.2 ([#3356](https://github.com/pydanny/cookiecutter-django/pull/3356))
 
 ## [2021-10-11]
 ### Updated
-- Update werkzeug to 2.0.2 ([#3344](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3344))
-- Update coverage to 6.0.1 ([#3348](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3348))
-- Update django-coverage-plugin to 2.0.1 ([#3349](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3349))
-- Update django-cors-headers to 3.10.0 ([#3345](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3345))
-- Update jinja2 to 3.0.2 ([#3343](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3343))
-- Update django-storages to 1.12.1 ([#3355](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3355))
+- Update werkzeug to 2.0.2 ([#3344](https://github.com/pydanny/cookiecutter-django/pull/3344))
+- Update coverage to 6.0.1 ([#3348](https://github.com/pydanny/cookiecutter-django/pull/3348))
+- Update django-coverage-plugin to 2.0.1 ([#3349](https://github.com/pydanny/cookiecutter-django/pull/3349))
+- Update django-cors-headers to 3.10.0 ([#3345](https://github.com/pydanny/cookiecutter-django/pull/3345))
+- Update jinja2 to 3.0.2 ([#3343](https://github.com/pydanny/cookiecutter-django/pull/3343))
+- Update django-storages to 1.12.1 ([#3355](https://github.com/pydanny/cookiecutter-django/pull/3355))
 
 ## [2021-10-03]
 ### Updated
-- Update pytz to 2021.3 ([#3340](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3340))
+- Update pytz to 2021.3 ([#3340](https://github.com/pydanny/cookiecutter-django/pull/3340))
 
 ## [2021-10-01]
 ### Changed
-- Fix the wrong pre-commit hyperlink in Prerequisites section ([#3338](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3338))
+- Fix the wrong pre-commit hyperlink in Prerequisites section ([#3338](https://github.com/pydanny/cookiecutter-django/pull/3338))
 
 ## [2021-09-30]
 ### Updated
-- Update sentry-sdk to 1.4.3 ([#3334](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3334))
+- Update sentry-sdk to 1.4.3 ([#3334](https://github.com/pydanny/cookiecutter-django/pull/3334))
 
 ## [2021-09-29]
 ### Updated
-- Update django-cors-headers to 3.9.0 ([#3332](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3332))
+- Update django-cors-headers to 3.9.0 ([#3332](https://github.com/pydanny/cookiecutter-django/pull/3332))
 
 ## [2021-09-27]
 ### Updated
-- Update sentry-sdk to 1.4.2 ([#3329](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3329))
+- Update sentry-sdk to 1.4.2 ([#3329](https://github.com/pydanny/cookiecutter-django/pull/3329))
 
 ## [2021-09-26]
 ### Updated
-- Update django-crispy-forms to 1.13.0 ([#3327](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3327))
+- Update django-crispy-forms to 1.13.0 ([#3327](https://github.com/pydanny/cookiecutter-django/pull/3327))
 
 ## [2021-09-24]
 ### Changed
-- Add django-settings-module to .pylintrc ([#3326](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3326))
+- Add django-settings-module to .pylintrc ([#3326](https://github.com/pydanny/cookiecutter-django/pull/3326))
 
 ## [2021-09-23]
 ### Updated
-- Update sentry-sdk to 1.4.1 ([#3325](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3325))
+- Update sentry-sdk to 1.4.1 ([#3325](https://github.com/pydanny/cookiecutter-django/pull/3325))
 
 ## [2021-09-22]
 ### Updated
-- Update sentry-sdk to 1.4.0 ([#3324](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3324))
+- Update sentry-sdk to 1.4.0 ([#3324](https://github.com/pydanny/cookiecutter-django/pull/3324))
 
 ## [2021-09-16]
 ### Updated
-- Update tox to 3.24.4 ([#3323](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3323))
+- Update tox to 3.24.4 ([#3323](https://github.com/pydanny/cookiecutter-django/pull/3323))
 
 ## [2021-09-15]
 ### Updated
-- Auto-update pre-commit hooks ([#3322](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3322))
+- Auto-update pre-commit hooks ([#3322](https://github.com/pydanny/cookiecutter-django/pull/3322))
 
 ## [2021-09-14]
 ### Updated
-- Update black to 21.9b0 ([#3321](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3321))
+- Update black to 21.9b0 ([#3321](https://github.com/pydanny/cookiecutter-django/pull/3321))
 
 ## [2021-09-13]
 ### Updated
-- Bump stefanzweifel/git-auto-commit-action from 4.11.0 to 4.12.0 ([#3320](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3320))
-- Update sphinx to 4.2.0 ([#3319](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3319))
+- Bump stefanzweifel/git-auto-commit-action from 4.11.0 to 4.12.0 ([#3320](https://github.com/pydanny/cookiecutter-django/pull/3320))
+- Update sphinx to 4.2.0 ([#3319](https://github.com/pydanny/cookiecutter-django/pull/3319))
 
 ## [2021-09-11]
 ### Changed
-- Removing pycharm docs if app does not use pycharm ([#3139](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3139))
+- Removing pycharm docs if app does not use pycharm ([#3139](https://github.com/pydanny/cookiecutter-django/pull/3139))
 ### Updated
-- Update django-environ to 0.7.0 ([#3317](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3317))
+- Update django-environ to 0.7.0 ([#3317](https://github.com/pydanny/cookiecutter-django/pull/3317))
 
 ## [2021-09-06]
 ### Changed
-- Update Celery to v5 ([#3280](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3280))
+- Update Celery to v5 ([#3280](https://github.com/pydanny/cookiecutter-django/pull/3280))
 
 ## [2021-09-05]
 ### Updated
-- Update django-environ to 0.6.0 ([#3314](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3314))
+- Update django-environ to 0.6.0 ([#3314](https://github.com/pydanny/cookiecutter-django/pull/3314))
 
 ## [2021-09-03]
 ### Changed
-- Update available postgres versions ([#3297](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3297))
+- Update available postgres versions ([#3297](https://github.com/pydanny/cookiecutter-django/pull/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))
+- Update pre-commit to 2.15.0 ([#3313](https://github.com/pydanny/cookiecutter-django/pull/3313))
+- Auto-update pre-commit hooks ([#3307](https://github.com/pydanny/cookiecutter-django/pull/3307))
+- Update pillow to 8.3.2 ([#3312](https://github.com/pydanny/cookiecutter-django/pull/3312))
+- Update django-environ to 0.5.0 ([#3311](https://github.com/pydanny/cookiecutter-django/pull/3311))
+- Update pytest to 6.2.5 ([#3310](https://github.com/pydanny/cookiecutter-django/pull/3310))
+- Update black to 21.8b0 ([#3308](https://github.com/pydanny/cookiecutter-django/pull/3308))
+- Update argon2-cffi to 21.1.0 ([#3306](https://github.com/pydanny/cookiecutter-django/pull/3306))
+- Bump peter-evans/create-pull-request from 3.10.0 to 3.10.1 ([#3303](https://github.com/pydanny/cookiecutter-django/pull/3303))
+- Update django-debug-toolbar to 3.2.2 ([#3296](https://github.com/pydanny/cookiecutter-django/pull/3296))
+- Update django-cors-headers to 3.8.0 ([#3295](https://github.com/pydanny/cookiecutter-django/pull/3295))
+- Update uvicorn to 0.15.0 ([#3294](https://github.com/pydanny/cookiecutter-django/pull/3294))
 
 ## [2021-08-27]
 ### Updated
-- Update tox to 3.24.3 ([#3302](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3302))
+- Update tox to 3.24.3 ([#3302](https://github.com/pydanny/cookiecutter-django/pull/3302))
 
 ## [2021-08-20]
 ### Changed
-- Fix Jinja2 break line control on Procfile ([#3300](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3300))
+- Fix Jinja2 break line control on Procfile ([#3300](https://github.com/pydanny/cookiecutter-django/pull/3300))
 
 ## [2021-08-19]
 ### Changed
-- Fix several minor typos ([#3301](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3301))
+- Fix several minor typos ([#3301](https://github.com/pydanny/cookiecutter-django/pull/3301))
 
 ## [2021-08-13]
 ### Changed
-- Upgrade to Redis 6 ([#3255](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3255))
+- Upgrade to Redis 6 ([#3255](https://github.com/pydanny/cookiecutter-django/pull/3255))
 ### Fixed
-- Fix RTD build image to support Python 3.9 ([#3293](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3293))
+- Fix RTD build image to support Python 3.9 ([#3293](https://github.com/pydanny/cookiecutter-django/pull/3293))
 
 ## [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))
+- Add documentation for automating backups ([#3268](https://github.com/pydanny/cookiecutter-django/pull/3268))
+- Add missing step to getting started locally in docs ([#3291](https://github.com/pydanny/cookiecutter-django/pull/3291))
+- Moved isort config from `.editorconfig` to `setup.cfg` ([#3290](https://github.com/pydanny/cookiecutter-django/pull/3290))
+- How to pre-commit in Docker Development ([#3287](https://github.com/pydanny/cookiecutter-django/pull/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))
+- Update sentry-sdk to 1.3.1 ([#3281](https://github.com/pydanny/cookiecutter-django/pull/3281))
+- Update tox to 3.24.1 ([#3285](https://github.com/pydanny/cookiecutter-django/pull/3285))
+- Update pre-commit to 2.14.0 ([#3289](https://github.com/pydanny/cookiecutter-django/pull/3289))
 
 ## [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))
+- Auto-update pre-commit hooks ([#3283](https://github.com/pydanny/cookiecutter-django/pull/3283))
+- Update isort to 5.9.3 ([#3282](https://github.com/pydanny/cookiecutter-django/pull/3282))
 
 ## [2021-07-27]
 ### Changed
-- Convert trans to translate in templates ([#3277](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3277))
+- Convert trans to translate in templates ([#3277](https://github.com/pydanny/cookiecutter-django/pull/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))
+- Update hiredis to 2.0.0 ([#3110](https://github.com/pydanny/cookiecutter-django/pull/3110))
+- Update mypy to 0.910 ([#3237](https://github.com/pydanny/cookiecutter-django/pull/3237))
+- Update whitenoise to 5.3.0 ([#3273](https://github.com/pydanny/cookiecutter-django/pull/3273))
+- Update tox to 3.24.0 ([#3269](https://github.com/pydanny/cookiecutter-django/pull/3269))
+- Update django-allauth to 0.45.0 ([#3267](https://github.com/pydanny/cookiecutter-django/pull/3267))
+- Update sentry-sdk to 1.3.0 ([#3262](https://github.com/pydanny/cookiecutter-django/pull/3262))
+- Update sphinx to 4.1.2 ([#3278](https://github.com/pydanny/cookiecutter-django/pull/3278))
+- Auto-update pre-commit hooks ([#3264](https://github.com/pydanny/cookiecutter-django/pull/3264))
+- Update isort to 5.9.2 ([#3279](https://github.com/pydanny/cookiecutter-django/pull/3279))
+- Update pillow to 8.3.1 ([#3259](https://github.com/pydanny/cookiecutter-django/pull/3259))
+- Update black to 21.7b0 ([#3272](https://github.com/pydanny/cookiecutter-django/pull/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))
+- Define REMAP_SIGTERM=SIGQUIT on Profile of Celery on Heroku ([#3263](https://github.com/pydanny/cookiecutter-django/pull/3263))
 
 ## [2021-07-08]
 ### Updated
-- Update django to 3.1.13 ([#3247](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3247))
+- Update django to 3.1.13 ([#3247](https://github.com/pydanny/cookiecutter-django/pull/3247))
 
 ## [2021-06-29]
 ### Changed
-- Improve github bug report template ([#3243](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3243))
+- Improve github bug report template ([#3243](https://github.com/pydanny/cookiecutter-django/pull/3243))
 
 ## [2021-06-28]
 ### Changed
-- Revert &#34;Fix Celery ports error on local Docker&#34; ([#3242](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3242))
+- Revert &#34;Fix Celery ports error on local Docker&#34; ([#3242](https://github.com/pydanny/cookiecutter-django/pull/3242))
 ### Fixed
-- Fix Celery ports error on local Docker ([#3241](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3241))
+- Fix Celery ports error on local Docker ([#3241](https://github.com/pydanny/cookiecutter-django/pull/3241))
 
 ## [2021-06-25]
 ### Changed
-- Update `.gitignore` file for VSCode ([#3238](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3238))
+- Update `.gitignore` file for VSCode ([#3238](https://github.com/pydanny/cookiecutter-django/pull/3238))
 ### Fixed
-- Wrap jQuery call in `DOMContentLoaded` event listener on account email page ([#3239](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3239))
+- Wrap jQuery call in `DOMContentLoaded` event listener on account email page ([#3239](https://github.com/pydanny/cookiecutter-django/pull/3239))
 
 ## [2021-06-22]
 ### Changed
-- Update docs/howto.rst ([#3230](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3230))
-- Add support for PG 13. Drop PG 9. Update all minor versions ([#3154](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3154))
+- Update docs/howto.rst ([#3230](https://github.com/pydanny/cookiecutter-django/pull/3230))
+- Add support for PG 13. Drop PG 9. Update all minor versions ([#3154](https://github.com/pydanny/cookiecutter-django/pull/3154))
 ### Updated
-- Update isort to 5.9.1 ([#3236](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3236))
-- Auto-update pre-commit hooks ([#3235](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3235))
+- Update isort to 5.9.1 ([#3236](https://github.com/pydanny/cookiecutter-django/pull/3236))
+- Auto-update pre-commit hooks ([#3235](https://github.com/pydanny/cookiecutter-django/pull/3235))
 
 ## [2021-06-21]
 ### Updated
-- Update isort to 5.9.0 ([#3234](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3234))
-- Update django-anymail to 8.4 ([#3225](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3225))
-- Update django-redis to 5.0.0 ([#3205](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3205))
-- Update pylint-django to 2.4.4 ([#3233](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3233))
-- Auto-update pre-commit hooks ([#3220](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3220))
-- Bump peter-evans/create-pull-request from 3.9.2 to 3.10.0 ([#3197](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3197))
-- Update black to 21.6b0 ([#3232](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3232))
-- Update pytest to 6.2.4 ([#3231](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3231))
-- Update django-crispy-forms to 1.12.0 ([#3221](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3221))
-- Update mypy to 0.902 ([#3219](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3219))
-- Update django-coverage-plugin to 2.0.0 ([#3217](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3217))
-- Update ipdb to 0.13.9 ([#3210](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3210))
-- Update uvicorn to 0.14.0 ([#3207](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3207))
-- Update pytest-cookies to 0.6.1 ([#3196](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3196))
-- Update sphinx to 4.0.2 ([#3193](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3193))
-- Update jinja2 to 3.0.1 ([#3189](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3189))
+- Update isort to 5.9.0 ([#3234](https://github.com/pydanny/cookiecutter-django/pull/3234))
+- Update django-anymail to 8.4 ([#3225](https://github.com/pydanny/cookiecutter-django/pull/3225))
+- Update django-redis to 5.0.0 ([#3205](https://github.com/pydanny/cookiecutter-django/pull/3205))
+- Update pylint-django to 2.4.4 ([#3233](https://github.com/pydanny/cookiecutter-django/pull/3233))
+- Auto-update pre-commit hooks ([#3220](https://github.com/pydanny/cookiecutter-django/pull/3220))
+- Bump peter-evans/create-pull-request from 3.9.2 to 3.10.0 ([#3197](https://github.com/pydanny/cookiecutter-django/pull/3197))
+- Update black to 21.6b0 ([#3232](https://github.com/pydanny/cookiecutter-django/pull/3232))
+- Update pytest to 6.2.4 ([#3231](https://github.com/pydanny/cookiecutter-django/pull/3231))
+- Update django-crispy-forms to 1.12.0 ([#3221](https://github.com/pydanny/cookiecutter-django/pull/3221))
+- Update mypy to 0.902 ([#3219](https://github.com/pydanny/cookiecutter-django/pull/3219))
+- Update django-coverage-plugin to 2.0.0 ([#3217](https://github.com/pydanny/cookiecutter-django/pull/3217))
+- Update ipdb to 0.13.9 ([#3210](https://github.com/pydanny/cookiecutter-django/pull/3210))
+- Update uvicorn to 0.14.0 ([#3207](https://github.com/pydanny/cookiecutter-django/pull/3207))
+- Update pytest-cookies to 0.6.1 ([#3196](https://github.com/pydanny/cookiecutter-django/pull/3196))
+- Update sphinx to 4.0.2 ([#3193](https://github.com/pydanny/cookiecutter-django/pull/3193))
+- Update jinja2 to 3.0.1 ([#3189](https://github.com/pydanny/cookiecutter-django/pull/3189))
 
 ## [2021-06-19]
 ### Updated
-- Update psycopg2 to 2.9.1 ([#3227](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3227))
-- Update psycopg2-binary to 2.9.1 ([#3228](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3228))
+- Update psycopg2 to 2.9.1 ([#3227](https://github.com/pydanny/cookiecutter-django/pull/3227))
+- Update psycopg2-binary to 2.9.1 ([#3228](https://github.com/pydanny/cookiecutter-django/pull/3228))
 
 ## [2021-06-14]
 ### Changed
-- Update black GitHub link in requirements ([#3222](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3222))
+- Update black GitHub link in requirements ([#3222](https://github.com/pydanny/cookiecutter-django/pull/3222))
 
 ## [2021-06-09]
 ### Changed
-- Fix link format in developing-locally.rst ([#3214](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3214))
+- Fix link format in developing-locally.rst ([#3214](https://github.com/pydanny/cookiecutter-django/pull/3214))
 ### Updated
-- Update pre-commit to 2.13.0 ([#3195](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3195))
-- Update pytest-django to 4.4.0 ([#3212](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3212))
-- Update mypy to 0.901 ([#3215](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3215))
-- Auto-update pre-commit hooks ([#3206](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3206))
-- Update black to 21.5b2 ([#3204](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3204))
+- Update pre-commit to 2.13.0 ([#3195](https://github.com/pydanny/cookiecutter-django/pull/3195))
+- Update pytest-django to 4.4.0 ([#3212](https://github.com/pydanny/cookiecutter-django/pull/3212))
+- Update mypy to 0.901 ([#3215](https://github.com/pydanny/cookiecutter-django/pull/3215))
+- Auto-update pre-commit hooks ([#3206](https://github.com/pydanny/cookiecutter-django/pull/3206))
+- Update black to 21.5b2 ([#3204](https://github.com/pydanny/cookiecutter-django/pull/3204))
 
 ## [2021-06-06]
 ### Changed
-- Updated .pre-commit-config.yaml to self-update its dependencies ([#3208](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3208))
+- Updated .pre-commit-config.yaml to self-update its dependencies ([#3208](https://github.com/pydanny/cookiecutter-django/pull/3208))
 
 ## [2021-06-05]
 ### Changed
-- Shorthand for the officially supported buildpack ([#3211](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3211))
+- Shorthand for the officially supported buildpack ([#3211](https://github.com/pydanny/cookiecutter-django/pull/3211))
 
 ## [2021-06-02]
 ### Updated
-- Update django to 3.1.12 ([#3209](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3209))
+- Update django to 3.1.12 ([#3209](https://github.com/pydanny/cookiecutter-django/pull/3209))
 
 ## [2021-05-18]
 ### Changed
-- Move ARG PYTHON_VERSION=3.9-slim-buster to the global scope ([#3188](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3188))
+- Move ARG PYTHON_VERSION=3.9-slim-buster to the global scope ([#3188](https://github.com/pydanny/cookiecutter-django/pull/3188))
 
 ## [2021-05-17]
 ### Updated
-- Bump tiangolo/issue-manager from 0.3.0 to 0.4.0 ([#3186](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3186))
-- Auto-update pre-commit hooks ([#3185](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3185))
+- Bump tiangolo/issue-manager from 0.3.0 to 0.4.0 ([#3186](https://github.com/pydanny/cookiecutter-django/pull/3186))
+- Auto-update pre-commit hooks ([#3185](https://github.com/pydanny/cookiecutter-django/pull/3185))
 
 ## [2021-05-15]
 ### Changed
-- Update watchgod to 0.7 ([#3177](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3177))
+- Update watchgod to 0.7 ([#3177](https://github.com/pydanny/cookiecutter-django/pull/3177))
 ### Updated
-- Auto-update pre-commit hooks ([#3184](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3184))
-- Update black to 21.5b1 ([#3167](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3167))
-- Update flake8 to 3.9.2 ([#3164](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3164))
-- Update pytest-django to 4.3.0 ([#3182](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3182))
-- Auto-update pre-commit hooks ([#3157](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3157))
-- Update python-slugify to 5.0.2 ([#3161](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3161))
-- Bump stefanzweifel/git-auto-commit-action from 4.10.0 to 4.11.0 ([#3171](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3171))
-- Update sentry-sdk to 1.1.0 ([#3163](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3163))
-- Bump actions/setup-python from 2 to 2.2.2 ([#3173](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3173))
-- Update tox to 3.23.1 ([#3160](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3160))
-- Update pytest to 6.2.4 ([#3156](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3156))
-- Bump peter-evans/create-pull-request from 3.8.2 to 3.9.2 ([#3179](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3179))
-- Update sphinx to 4.0.1 ([#3169](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3169))
-- Update cookiecutter to 1.7.3 ([#3180](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3180))
-- Update django to 3.1.11 ([#3178](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3178))
+- Auto-update pre-commit hooks ([#3184](https://github.com/pydanny/cookiecutter-django/pull/3184))
+- Update black to 21.5b1 ([#3167](https://github.com/pydanny/cookiecutter-django/pull/3167))
+- Update flake8 to 3.9.2 ([#3164](https://github.com/pydanny/cookiecutter-django/pull/3164))
+- Update pytest-django to 4.3.0 ([#3182](https://github.com/pydanny/cookiecutter-django/pull/3182))
+- Auto-update pre-commit hooks ([#3157](https://github.com/pydanny/cookiecutter-django/pull/3157))
+- Update python-slugify to 5.0.2 ([#3161](https://github.com/pydanny/cookiecutter-django/pull/3161))
+- Bump stefanzweifel/git-auto-commit-action from 4.10.0 to 4.11.0 ([#3171](https://github.com/pydanny/cookiecutter-django/pull/3171))
+- Update sentry-sdk to 1.1.0 ([#3163](https://github.com/pydanny/cookiecutter-django/pull/3163))
+- Bump actions/setup-python from 2 to 2.2.2 ([#3173](https://github.com/pydanny/cookiecutter-django/pull/3173))
+- Update tox to 3.23.1 ([#3160](https://github.com/pydanny/cookiecutter-django/pull/3160))
+- Update pytest to 6.2.4 ([#3156](https://github.com/pydanny/cookiecutter-django/pull/3156))
+- Bump peter-evans/create-pull-request from 3.8.2 to 3.9.2 ([#3179](https://github.com/pydanny/cookiecutter-django/pull/3179))
+- Update sphinx to 4.0.1 ([#3169](https://github.com/pydanny/cookiecutter-django/pull/3169))
+- Update cookiecutter to 1.7.3 ([#3180](https://github.com/pydanny/cookiecutter-django/pull/3180))
+- Update django to 3.1.11 ([#3178](https://github.com/pydanny/cookiecutter-django/pull/3178))
 
 ## [2021-05-06]
 ### Updated
-- Update django to 3.1.10 ([#3162](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3162))
+- Update django to 3.1.10 ([#3162](https://github.com/pydanny/cookiecutter-django/pull/3162))
 
 ## [2021-05-04]
 ### Updated
-- Update django to 3.1.9 ([#3155](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3155))
+- Update django to 3.1.9 ([#3155](https://github.com/pydanny/cookiecutter-django/pull/3155))
 
 ## [2021-04-30]
 ### Fixed
-- Fix linting error in production.py ([#3148](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3148))
+- Fix linting error in production.py ([#3148](https://github.com/pydanny/cookiecutter-django/pull/3148))
 
 ## [2021-04-29]
 ### Updated
-- Update black to 21.4b2 ([#3147](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3147))
-- Auto-update pre-commit hooks ([#3146](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3146))
+- Update black to 21.4b2 ([#3147](https://github.com/pydanny/cookiecutter-django/pull/3147))
+- Auto-update pre-commit hooks ([#3146](https://github.com/pydanny/cookiecutter-django/pull/3146))
 
 ## [2021-04-28]
 ### Changed
-- Fix README link ([#3144](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3144))
+- Fix README link ([#3144](https://github.com/pydanny/cookiecutter-django/pull/3144))
 ### Updated
-- Auto-update pre-commit hooks ([#3145](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3145))
+- Auto-update pre-commit hooks ([#3145](https://github.com/pydanny/cookiecutter-django/pull/3145))
 
 ## [2021-04-27]
 ### Updated
-- Update pygithub to 1.55 ([#3141](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3141))
-- Update black to 21.4b1 ([#3143](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3143))
+- Update pygithub to 1.55 ([#3141](https://github.com/pydanny/cookiecutter-django/pull/3141))
+- Update black to 21.4b1 ([#3143](https://github.com/pydanny/cookiecutter-django/pull/3143))
 
 ## [2021-04-26]
 ### Updated
-- Update black to 21.4b0 ([#3138](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3138))
-- Auto-update pre-commit hooks ([#3137](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3137))
+- Update black to 21.4b0 ([#3138](https://github.com/pydanny/cookiecutter-django/pull/3138))
+- Auto-update pre-commit hooks ([#3137](https://github.com/pydanny/cookiecutter-django/pull/3137))
 
 ## [2021-04-21]
 ### Updated
-- Auto-update pre-commit hooks ([#3133](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3133))
-- Update django-extensions to 3.1.3 ([#3136](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3136))
-- Update django-compressor to 2.4.1 ([#3135](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3135))
-- Update pre-commit to 2.12.1 ([#3134](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3134))
-- Update flake8 to 3.9.1 ([#3131](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3131))
-- Update django-stubs to 1.8.0 ([#3127](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3127))
-- Update sphinx to 3.5.4 ([#3126](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3126))
+- Auto-update pre-commit hooks ([#3133](https://github.com/pydanny/cookiecutter-django/pull/3133))
+- Update django-extensions to 3.1.3 ([#3136](https://github.com/pydanny/cookiecutter-django/pull/3136))
+- Update django-compressor to 2.4.1 ([#3135](https://github.com/pydanny/cookiecutter-django/pull/3135))
+- Update pre-commit to 2.12.1 ([#3134](https://github.com/pydanny/cookiecutter-django/pull/3134))
+- Update flake8 to 3.9.1 ([#3131](https://github.com/pydanny/cookiecutter-django/pull/3131))
+- Update django-stubs to 1.8.0 ([#3127](https://github.com/pydanny/cookiecutter-django/pull/3127))
+- Update sphinx to 3.5.4 ([#3126](https://github.com/pydanny/cookiecutter-django/pull/3126))
 
 ## [2021-04-15]
 ### Updated
-- Update django-debug-toolbar to 3.2.1 ([#3129](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3129))
+- Update django-debug-toolbar to 3.2.1 ([#3129](https://github.com/pydanny/cookiecutter-django/pull/3129))
 
 ## [2021-04-14]
 ### Updated
-- Bump stefanzweifel/git-auto-commit-action from v4.9.2 to v4.10.0 ([#3128](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3128))
+- Bump stefanzweifel/git-auto-commit-action from v4.9.2 to v4.10.0 ([#3128](https://github.com/pydanny/cookiecutter-django/pull/3128))
 
 ## [2021-04-11]
 ### Updated
-- Update pytest-django to 4.2.0 ([#3125](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3125))
-- Update pylint-django to 2.4.3 ([#3122](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3122))
+- Update pytest-django to 4.2.0 ([#3125](https://github.com/pydanny/cookiecutter-django/pull/3125))
+- Update pylint-django to 2.4.3 ([#3122](https://github.com/pydanny/cookiecutter-django/pull/3122))
 
 ## [2021-04-09]
 ### Changed
-- Update from Python 3.8 to Python 3.9 ([#3023](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3023))
+- Update from Python 3.8 to Python 3.9 ([#3023](https://github.com/pydanny/cookiecutter-django/pull/3023))
 
 ## [2021-04-08]
 ### Changed
-- Switch .dockerignore to explicit list ([#3121](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3121))
-- Change Docker image to multi-stage build for Django ([#2815](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2815))
-- Fix deprecated warning in middleware tests ([#3038](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3038))
+- Switch .dockerignore to explicit list ([#3121](https://github.com/pydanny/cookiecutter-django/pull/3121))
+- Change Docker image to multi-stage build for Django ([#2815](https://github.com/pydanny/cookiecutter-django/pull/2815))
+- Fix deprecated warning in middleware tests ([#3038](https://github.com/pydanny/cookiecutter-django/pull/3038))
 ### Updated
-- Update pre-commit to 2.12.0 ([#3120](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3120))
+- Update pre-commit to 2.12.0 ([#3120](https://github.com/pydanny/cookiecutter-django/pull/3120))
 
 ## [2021-04-07]
 ### Changed
-- Update django to 3.1.8 ([#3117](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3117))
+- Update django to 3.1.8 ([#3117](https://github.com/pydanny/cookiecutter-django/pull/3117))
 ### Fixed
-- Fix linting via pre-commit on Github CI ([#3077](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3077))
-- Fix gitlab-ci using duplicate key name for image ([#3112](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3112))
+- Fix linting via pre-commit on Github CI ([#3077](https://github.com/pydanny/cookiecutter-django/pull/3077))
+- Fix gitlab-ci using duplicate key name for image ([#3112](https://github.com/pydanny/cookiecutter-django/pull/3112))
 ### Updated
-- Update sentry-sdk to 1.0.0 ([#3080](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3080))
-- Update gunicorn to 20.1.0 ([#3108](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3108))
-- Update pre-commit to 2.12.0 ([#3118](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3118))
-- Update django-extensions to 3.1.2 ([#3116](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3116))
-- Update pillow to 8.2.0 ([#3113](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3113))
-- Update pytest to 6.2.3 ([#3115](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3115))
+- Update sentry-sdk to 1.0.0 ([#3080](https://github.com/pydanny/cookiecutter-django/pull/3080))
+- Update gunicorn to 20.1.0 ([#3108](https://github.com/pydanny/cookiecutter-django/pull/3108))
+- Update pre-commit to 2.12.0 ([#3118](https://github.com/pydanny/cookiecutter-django/pull/3118))
+- Update django-extensions to 3.1.2 ([#3116](https://github.com/pydanny/cookiecutter-django/pull/3116))
+- Update pillow to 8.2.0 ([#3113](https://github.com/pydanny/cookiecutter-django/pull/3113))
+- Update pytest to 6.2.3 ([#3115](https://github.com/pydanny/cookiecutter-django/pull/3115))
 
 ## [2021-03-26]
 ### Updated
-- Update djangorestframework to 3.12.4 ([#3107](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3107))
+- Update djangorestframework to 3.12.4 ([#3107](https://github.com/pydanny/cookiecutter-django/pull/3107))
 
 ## [2021-03-25]
 ### Updated
-- Update djangorestframework to 3.12.3 ([#3105](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3105))
+- Update djangorestframework to 3.12.3 ([#3105](https://github.com/pydanny/cookiecutter-django/pull/3105))
 
 ## [2021-03-22]
 ### Updated
-- Update django-crispy-forms to 1.11.2 ([#3104](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3104))
-- Update sphinx to 3.5.3 ([#3103](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3103))
-- Update ipdb to 0.13.7 ([#3102](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3102))
-- Update sphinx-autobuild to 2021.3.14 ([#3101](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3101))
-- Update isort to 5.8.0 ([#3100](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3100))
-- Update pre-commit to 2.11.1 ([#3089](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3089))
-- Update flake8 to 3.9.0 ([#3096](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3096))
-- Update pillow to 8.1.2 ([#3084](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3084))
-- Auto-update pre-commit hooks ([#3095](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3095))
+- Update django-crispy-forms to 1.11.2 ([#3104](https://github.com/pydanny/cookiecutter-django/pull/3104))
+- Update sphinx to 3.5.3 ([#3103](https://github.com/pydanny/cookiecutter-django/pull/3103))
+- Update ipdb to 0.13.7 ([#3102](https://github.com/pydanny/cookiecutter-django/pull/3102))
+- Update sphinx-autobuild to 2021.3.14 ([#3101](https://github.com/pydanny/cookiecutter-django/pull/3101))
+- Update isort to 5.8.0 ([#3100](https://github.com/pydanny/cookiecutter-django/pull/3100))
+- Update pre-commit to 2.11.1 ([#3089](https://github.com/pydanny/cookiecutter-django/pull/3089))
+- Update flake8 to 3.9.0 ([#3096](https://github.com/pydanny/cookiecutter-django/pull/3096))
+- Update pillow to 8.1.2 ([#3084](https://github.com/pydanny/cookiecutter-django/pull/3084))
+- Auto-update pre-commit hooks ([#3095](https://github.com/pydanny/cookiecutter-django/pull/3095))
 
 ## [2021-03-05]
 ### Changed
-- Updated test_urls.py and views.py to re-use User.get_absolute_url() ([#3070](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3070))
+- Updated test_urls.py and views.py to re-use User.get_absolute_url() ([#3070](https://github.com/pydanny/cookiecutter-django/pull/3070))
 ### Updated
-- Bump stefanzweifel/git-auto-commit-action from v4.9.1 to v4.9.2 ([#3082](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3082))
+- Bump stefanzweifel/git-auto-commit-action from v4.9.1 to v4.9.2 ([#3082](https://github.com/pydanny/cookiecutter-django/pull/3082))
 
 ## [2021-03-03]
 ### Updated
-- Update tox to 3.23.0 ([#3079](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3079))
-- Update ipdb to 0.13.5 ([#3078](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3078))
+- Update tox to 3.23.0 ([#3079](https://github.com/pydanny/cookiecutter-django/pull/3079))
+- Update ipdb to 0.13.5 ([#3078](https://github.com/pydanny/cookiecutter-django/pull/3078))
 
 ## [2021-03-02]
 ### Fixed
-- Fixes for pytest job in Github CI workflow ([#3076](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3076))
+- Fixes for pytest job in Github CI workflow ([#3076](https://github.com/pydanny/cookiecutter-django/pull/3076))
 ### Updated
-- Update pillow to 8.1.1 ([#3075](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3075))
-- Update coverage to 5.5 ([#3074](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3074))
+- Update pillow to 8.1.1 ([#3075](https://github.com/pydanny/cookiecutter-django/pull/3075))
+- Update coverage to 5.5 ([#3074](https://github.com/pydanny/cookiecutter-django/pull/3074))
 
 ## [2021-02-24]
 ### Updated
-- Bump stefanzweifel/git-auto-commit-action from v4.9.0 to v4.9.1 ([#3069](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3069))
+- Bump stefanzweifel/git-auto-commit-action from v4.9.0 to v4.9.1 ([#3069](https://github.com/pydanny/cookiecutter-django/pull/3069))
 
 ## [2021-02-23]
 ### Changed
-- Update to Django 3.1 ([#3043](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3043))
-- Lint with pre-commit on CI with Github actions ([#3066](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3066))
-- Use exception var in status code pages if available ([#2992](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2992))
+- Update to Django 3.1 ([#3043](https://github.com/pydanny/cookiecutter-django/pull/3043))
+- Lint with pre-commit on CI with Github actions ([#3066](https://github.com/pydanny/cookiecutter-django/pull/3066))
+- Use exception var in status code pages if available ([#2992](https://github.com/pydanny/cookiecutter-django/pull/2992))
 
 ## [2021-02-22]
 ### Changed
-- refactor: remove default cache settings in test.py ([#3064](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3064))
-- Update django to 3.0.13 ([#3060](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3060))
+- refactor: remove default cache settings in test.py ([#3064](https://github.com/pydanny/cookiecutter-django/pull/3064))
+- Update django to 3.0.13 ([#3060](https://github.com/pydanny/cookiecutter-django/pull/3060))
 ### Fixed
-- Fix missing Django Debug toolbar with node container ([#2865](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2865))
-- Remove Email from User API ([#3055](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3055))
+- Fix missing Django Debug toolbar with node container ([#2865](https://github.com/pydanny/cookiecutter-django/pull/2865))
+- Remove Email from User API ([#3055](https://github.com/pydanny/cookiecutter-django/pull/3055))
 ### Updated
-- Bump stefanzweifel/git-auto-commit-action from v4.8.0 to v4.9.0 ([#3065](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3065))
-- Update django-crispy-forms to 1.11.1 ([#3063](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3063))
-- Update uvicorn to 0.13.4 ([#3062](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3062))
-- Update mypy to 0.812 ([#3061](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3061))
-- Update sentry-sdk to 0.20.3 ([#3059](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3059))
-- Update tox to 3.22.0 ([#3057](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3057))
-- Update sphinx to 3.5.1 ([#3056](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3056))
+- Bump stefanzweifel/git-auto-commit-action from v4.8.0 to v4.9.0 ([#3065](https://github.com/pydanny/cookiecutter-django/pull/3065))
+- Update django-crispy-forms to 1.11.1 ([#3063](https://github.com/pydanny/cookiecutter-django/pull/3063))
+- Update uvicorn to 0.13.4 ([#3062](https://github.com/pydanny/cookiecutter-django/pull/3062))
+- Update mypy to 0.812 ([#3061](https://github.com/pydanny/cookiecutter-django/pull/3061))
+- Update sentry-sdk to 0.20.3 ([#3059](https://github.com/pydanny/cookiecutter-django/pull/3059))
+- Update tox to 3.22.0 ([#3057](https://github.com/pydanny/cookiecutter-django/pull/3057))
+- Update sphinx to 3.5.1 ([#3056](https://github.com/pydanny/cookiecutter-django/pull/3056))
 
 ## [2021-02-16]
 ### Updated
-- Update sentry-sdk to 0.20.2 ([#3054](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3054))
-- Update sphinx to 3.5.0 ([#3053](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3053))
+- Update sentry-sdk to 0.20.2 ([#3054](https://github.com/pydanny/cookiecutter-django/pull/3054))
+- Update sphinx to 3.5.0 ([#3053](https://github.com/pydanny/cookiecutter-django/pull/3053))
 
 ## [2021-02-13]
 ### Updated
-- Update sentry-sdk to 0.20.1 ([#3052](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3052))
+- Update sentry-sdk to 0.20.1 ([#3052](https://github.com/pydanny/cookiecutter-django/pull/3052))
 
 ## [2021-02-12]
 ### Updated
-- Update pre-commit to 2.10.1 ([#3045](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3045))
-- Update sentry-sdk to 0.20.0 ([#3051](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3051))
+- Update pre-commit to 2.10.1 ([#3045](https://github.com/pydanny/cookiecutter-django/pull/3045))
+- Update sentry-sdk to 0.20.0 ([#3051](https://github.com/pydanny/cookiecutter-django/pull/3051))
 
 ## [2021-02-10]
 ### Updated
-- Bump peter-evans/create-pull-request from v3.8.1 to v3.8.2 ([#3049](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3049))
+- Bump peter-evans/create-pull-request from v3.8.1 to v3.8.2 ([#3049](https://github.com/pydanny/cookiecutter-django/pull/3049))
 
 ## [2021-02-08]
 ### Updated
-- Update django-extensions to 3.1.1 ([#3047](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3047))
-- Bump peter-evans/create-pull-request from v3.8.0 to v3.8.1 ([#3046](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3046))
+- Update django-extensions to 3.1.1 ([#3047](https://github.com/pydanny/cookiecutter-django/pull/3047))
+- Bump peter-evans/create-pull-request from v3.8.0 to v3.8.1 ([#3046](https://github.com/pydanny/cookiecutter-django/pull/3046))
 
 ## [2021-02-06]
 ### Changed
-- Removed Redundant test_case_sensitivity() and made test_not_authenticated() get the LOGIN_URL dynamically. ([#3041](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3041))
-- Refactored users.forms to make the code more readeable ([#3029](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3029))
-- Update django to 3.0.12 ([#3037](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3037))
+- Removed Redundant test_case_sensitivity() and made test_not_authenticated() get the LOGIN_URL dynamically. ([#3041](https://github.com/pydanny/cookiecutter-django/pull/3041))
+- Refactored users.forms to make the code more readeable ([#3029](https://github.com/pydanny/cookiecutter-django/pull/3029))
+- Update django to 3.0.12 ([#3037](https://github.com/pydanny/cookiecutter-django/pull/3037))
 ### Updated
-- Update tox to 3.21.4 ([#3044](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3044))
+- Update tox to 3.21.4 ([#3044](https://github.com/pydanny/cookiecutter-django/pull/3044))
 
 ## [2021-02-01]
 ### Updated
-- Update pytz to 2021.1 ([#3035](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3035))
-- Update jinja2 to 2.11.3 ([#3033](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3033))
-- Bump peter-evans/create-pull-request from v3.7.0 to v3.8.0 ([#3034](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3034))
+- Update pytz to 2021.1 ([#3035](https://github.com/pydanny/cookiecutter-django/pull/3035))
+- Update jinja2 to 2.11.3 ([#3033](https://github.com/pydanny/cookiecutter-django/pull/3033))
+- Bump peter-evans/create-pull-request from v3.7.0 to v3.8.0 ([#3034](https://github.com/pydanny/cookiecutter-django/pull/3034))
 
 ## [2021-01-31]
 ### Changed
-- Adding local celery instructions to developing-locally ([#3031](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3031))
+- Adding local celery instructions to developing-locally ([#3031](https://github.com/pydanny/cookiecutter-django/pull/3031))
 ### Updated
-- Update django-crispy-forms to 1.11.0 ([#3032](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3032))
+- Update django-crispy-forms to 1.11.0 ([#3032](https://github.com/pydanny/cookiecutter-django/pull/3032))
 
 ## [2021-01-28]
 ### Updated
-- Update pre-commit to 2.10.0 ([#3028](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3028))
-- Update django-anymail to 8.2 ([#3027](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3027))
-- Update tox to 3.21.3 ([#3026](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3026))
+- Update pre-commit to 2.10.0 ([#3028](https://github.com/pydanny/cookiecutter-django/pull/3028))
+- Update django-anymail to 8.2 ([#3027](https://github.com/pydanny/cookiecutter-django/pull/3027))
+- Update tox to 3.21.3 ([#3026](https://github.com/pydanny/cookiecutter-django/pull/3026))
 
 ## [2021-01-26]
 ### Changed
-- Bump peter-evans/create-pull-request from v3.6.0 to v3.7.0 ([#3022](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3022))
-- Using SuccessMessageMixin to send success message to django template ([#3021](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3021))
+- Bump peter-evans/create-pull-request from v3.6.0 to v3.7.0 ([#3022](https://github.com/pydanny/cookiecutter-django/pull/3022))
+- Using SuccessMessageMixin to send success message to django template ([#3021](https://github.com/pydanny/cookiecutter-django/pull/3021))
 ### Fixed
-- Update admin to ignore *_name User attributes ([#3018](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3018))
+- Update admin to ignore *_name User attributes ([#3018](https://github.com/pydanny/cookiecutter-django/pull/3018))
 ### Updated
-- Update coverage to 5.4 ([#3024](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3024))
-- Update pytest to 6.2.2 ([#3020](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3020))
-- Update django-cors-headers to 3.7.0 ([#3019](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3019))
+- Update coverage to 5.4 ([#3024](https://github.com/pydanny/cookiecutter-django/pull/3024))
+- Update pytest to 6.2.2 ([#3020](https://github.com/pydanny/cookiecutter-django/pull/3020))
+- Update django-cors-headers to 3.7.0 ([#3019](https://github.com/pydanny/cookiecutter-django/pull/3019))
 
 ## [2021-01-24]
 ### Changed
-- Use defer for script tags (Fix #2922) ([#2927](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2927))
-- Made Traefik conf much easier to understand and improved redirect res… ([#2838](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2838))
-- Sentry Redis integration enabled by default in production. ([#2989](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2989))
-- Add test for UserUpdateView.form_valid() ([#2949](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2949))
+- Use defer for script tags (Fix #2922) ([#2927](https://github.com/pydanny/cookiecutter-django/pull/2927))
+- Made Traefik conf much easier to understand and improved redirect res… ([#2838](https://github.com/pydanny/cookiecutter-django/pull/2838))
+- Sentry Redis integration enabled by default in production. ([#2989](https://github.com/pydanny/cookiecutter-django/pull/2989))
+- Add test for UserUpdateView.form_valid() ([#2949](https://github.com/pydanny/cookiecutter-django/pull/2949))
 ### Fixed
-- Omit first_name and last_name in User model ([#2998](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2998))
+- Omit first_name and last_name in User model ([#2998](https://github.com/pydanny/cookiecutter-django/pull/2998))
 ### Updated
-- Update django-celery-beat to 2.2.0 ([#3009](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3009))
-- Update pyyaml to 5.4.1 ([#3011](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3011))
-- Update mypy to 0.800 ([#3013](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3013))
-- Update factory-boy to 3.2.0 ([#2986](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2986))
-- Update tox to 3.21.2 ([#3010](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3010))
+- Update django-celery-beat to 2.2.0 ([#3009](https://github.com/pydanny/cookiecutter-django/pull/3009))
+- Update pyyaml to 5.4.1 ([#3011](https://github.com/pydanny/cookiecutter-django/pull/3011))
+- Update mypy to 0.800 ([#3013](https://github.com/pydanny/cookiecutter-django/pull/3013))
+- Update factory-boy to 3.2.0 ([#2986](https://github.com/pydanny/cookiecutter-django/pull/2986))
+- Update tox to 3.21.2 ([#3010](https://github.com/pydanny/cookiecutter-django/pull/3010))
 
 ## [2021-01-22]
 ### Changed
-- Use self.request.user instead of second query ([#3012](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3012))
+- Use self.request.user instead of second query ([#3012](https://github.com/pydanny/cookiecutter-django/pull/3012))
 
 ## [2021-01-14]
 ### Updated
-- Update tox to 3.21.1 ([#3006](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3006))
+- Update tox to 3.21.1 ([#3006](https://github.com/pydanny/cookiecutter-django/pull/3006))
 
 ## [2021-01-10]
 ### Updated
-- Update pylint-django to 2.4.2 ([#3003](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3003))
-- Update tox to 3.21.0 ([#3002](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3002))
+- Update pylint-django to 2.4.2 ([#3003](https://github.com/pydanny/cookiecutter-django/pull/3003))
+- Update tox to 3.21.0 ([#3002](https://github.com/pydanny/cookiecutter-django/pull/3002))
 
 ## [2021-01-08]
 ### Changed
-- Upgrade Travis to Focal ([#2999](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2999))
+- Upgrade Travis to Focal ([#2999](https://github.com/pydanny/cookiecutter-django/pull/2999))
 ### Updated
-- Update pylint-django to 2.4.1 ([#3001](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3001))
-- Update sphinx to 3.4.3 ([#3000](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/3000))
-- Update pylint-django to 2.4.0 ([#2996](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2996))
+- Update pylint-django to 2.4.1 ([#3001](https://github.com/pydanny/cookiecutter-django/pull/3001))
+- Update sphinx to 3.4.3 ([#3000](https://github.com/pydanny/cookiecutter-django/pull/3000))
+- Update pylint-django to 2.4.0 ([#2996](https://github.com/pydanny/cookiecutter-django/pull/2996))
 
 ## [2021-01-04]
 ### Updated
-- Update isort to 5.7.0 ([#2988](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2988))
-- Update uvicorn to 0.13.3 ([#2987](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2987))
-- Auto-update pre-commit hooks ([#2990](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2990))
-- Update sphinx to 3.4.2 ([#2995](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2995))
-- Update pillow to 8.1.0 ([#2993](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2993))
+- Update isort to 5.7.0 ([#2988](https://github.com/pydanny/cookiecutter-django/pull/2988))
+- Update uvicorn to 0.13.3 ([#2987](https://github.com/pydanny/cookiecutter-django/pull/2987))
+- Auto-update pre-commit hooks ([#2990](https://github.com/pydanny/cookiecutter-django/pull/2990))
+- Update sphinx to 3.4.2 ([#2995](https://github.com/pydanny/cookiecutter-django/pull/2995))
+- Update pillow to 8.1.0 ([#2993](https://github.com/pydanny/cookiecutter-django/pull/2993))
 
 ## [2020-12-29]
 ### Updated
-- Update pygithub to 1.54.1 ([#2982](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2982))
-- Update django-storages to 1.11.1 ([#2981](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2981))
+- Update pygithub to 1.54.1 ([#2982](https://github.com/pydanny/cookiecutter-django/pull/2982))
+- Update django-storages to 1.11.1 ([#2981](https://github.com/pydanny/cookiecutter-django/pull/2981))
 
 ## [2020-12-26]
 ### Updated
-- Update sphinx to 3.4.1 ([#2985](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2985))
-- Update pytz to 2020.5 ([#2984](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2984))
+- Update sphinx to 3.4.1 ([#2985](https://github.com/pydanny/cookiecutter-django/pull/2985))
+- Update pytz to 2020.5 ([#2984](https://github.com/pydanny/cookiecutter-django/pull/2984))
 
 ## [2020-12-23]
 ### Changed
-- Bump peter-evans/create-pull-request from v3.5.2 to v3.6.0 ([#2980](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2980))
+- Bump peter-evans/create-pull-request from v3.5.2 to v3.6.0 ([#2980](https://github.com/pydanny/cookiecutter-django/pull/2980))
 ### Updated
-- Update flower to 0.9.7 ([#2979](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2979))
-- Update sphinx to 3.4.0 ([#2978](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2978))
-- Update coverage to 5.3.1 ([#2977](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2977))
-- Update uvicorn to 0.13.2 ([#2976](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2976))
+- Update flower to 0.9.7 ([#2979](https://github.com/pydanny/cookiecutter-django/pull/2979))
+- Update sphinx to 3.4.0 ([#2978](https://github.com/pydanny/cookiecutter-django/pull/2978))
+- Update coverage to 5.3.1 ([#2977](https://github.com/pydanny/cookiecutter-django/pull/2977))
+- Update uvicorn to 0.13.2 ([#2976](https://github.com/pydanny/cookiecutter-django/pull/2976))
 
 ## [2020-12-18]
 ### Changed
-- Bump stefanzweifel/git-auto-commit-action from v4.7.2 to v4.8.0 ([#2972](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2972))
+- Bump stefanzweifel/git-auto-commit-action from v4.7.2 to v4.8.0 ([#2972](https://github.com/pydanny/cookiecutter-django/pull/2972))
 ### Updated
-- Update django-storages to 1.11 ([#2973](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2973))
-- Update pytest to 6.2.1 ([#2971](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2971))
-- Auto-update pre-commit hooks ([#2970](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2970))
+- Update django-storages to 1.11 ([#2973](https://github.com/pydanny/cookiecutter-django/pull/2973))
+- Update pytest to 6.2.1 ([#2971](https://github.com/pydanny/cookiecutter-django/pull/2971))
+- Auto-update pre-commit hooks ([#2970](https://github.com/pydanny/cookiecutter-django/pull/2970))
 
 ## [2020-12-14]
 ### Updated
-- Update pytest to 6.2.0 ([#2968](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2968))
-- Update django-cors-headers to 3.6.0 ([#2967](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2967))
-- Update uvicorn to 0.13.1 ([#2966](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2966))
+- Update pytest to 6.2.0 ([#2968](https://github.com/pydanny/cookiecutter-django/pull/2968))
+- Update django-cors-headers to 3.6.0 ([#2967](https://github.com/pydanny/cookiecutter-django/pull/2967))
+- Update uvicorn to 0.13.1 ([#2966](https://github.com/pydanny/cookiecutter-django/pull/2966))
 
 ## [2020-12-10]
 ### Changed
-- Hot-reload support to celery ([#2554](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2554))
+- Hot-reload support to celery ([#2554](https://github.com/pydanny/cookiecutter-django/pull/2554))
 ### Updated
-- Update uvicorn to 0.13.0 ([#2962](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2962))
-- Update sentry-sdk to 0.19.5 ([#2965](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2965))
+- Update uvicorn to 0.13.0 ([#2962](https://github.com/pydanny/cookiecutter-django/pull/2962))
+- Update sentry-sdk to 0.19.5 ([#2965](https://github.com/pydanny/cookiecutter-django/pull/2965))
 
 ## [2020-12-09]
 ### Changed
-- Bump peter-evans/create-pull-request from v3.5.1 to v3.5.2 ([#2964](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2964))
+- Bump peter-evans/create-pull-request from v3.5.1 to v3.5.2 ([#2964](https://github.com/pydanny/cookiecutter-django/pull/2964))
 
 ## [2020-12-08]
 ### Updated
-- Update pre-commit to 2.9.3 ([#2961](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2961))
+- Update pre-commit to 2.9.3 ([#2961](https://github.com/pydanny/cookiecutter-django/pull/2961))
 
 ## [2020-12-04]
 ### Updated
-- Update django-debug-toolbar to 3.2 ([#2959](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2959))
+- Update django-debug-toolbar to 3.2 ([#2959](https://github.com/pydanny/cookiecutter-django/pull/2959))
 
 ## [2020-12-02]
 ### Updated
-- Update django-model-utils to 4.1.1 ([#2957](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2957))
-- Update pygithub to 1.54 ([#2958](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2958))
+- Update django-model-utils to 4.1.1 ([#2957](https://github.com/pydanny/cookiecutter-django/pull/2957))
+- Update pygithub to 1.54 ([#2958](https://github.com/pydanny/cookiecutter-django/pull/2958))
 
 ## [2020-11-26]
 ### Updated
-- Update django-extensions to 3.1.0 ([#2947](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2947))
-- Update pre-commit to 2.9.2 ([#2948](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2948))
-- Update django-allauth to 0.44.0 ([#2945](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2945))
+- Update django-extensions to 3.1.0 ([#2947](https://github.com/pydanny/cookiecutter-django/pull/2947))
+- Update pre-commit to 2.9.2 ([#2948](https://github.com/pydanny/cookiecutter-django/pull/2948))
+- Update django-allauth to 0.44.0 ([#2945](https://github.com/pydanny/cookiecutter-django/pull/2945))
 
 ## [2020-11-25]
 ### Changed
-- Bump peter-evans/create-pull-request from v3.5.0 to v3.5.1 ([#2944](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2944))
+- Bump peter-evans/create-pull-request from v3.5.0 to v3.5.1 ([#2944](https://github.com/pydanny/cookiecutter-django/pull/2944))
 
 ## [2020-11-23]
 ### Updated
-- Update uvicorn to 0.12.3 ([#2943](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2943))
-- Update pre-commit to 2.9.0 ([#2942](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2942))
+- Update uvicorn to 0.12.3 ([#2943](https://github.com/pydanny/cookiecutter-django/pull/2943))
+- Update pre-commit to 2.9.0 ([#2942](https://github.com/pydanny/cookiecutter-django/pull/2942))
 
 ## [2020-11-21]
 ### Changed
-- Fix after uvicorn 0.12.0 - Ship extra dependencies ([#2939](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2939))
+- Fix after uvicorn 0.12.0 - Ship extra dependencies ([#2939](https://github.com/pydanny/cookiecutter-django/pull/2939))
 
 ## [2020-11-20]
 ### Updated
-- Update sentry-sdk to 0.19.4 ([#2938](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2938))
+- Update sentry-sdk to 0.19.4 ([#2938](https://github.com/pydanny/cookiecutter-django/pull/2938))
 
 ## [2020-11-19]
 ### Updated
-- Update django-crispy-forms to 1.10.0 ([#2937](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2937))
+- Update django-crispy-forms to 1.10.0 ([#2937](https://github.com/pydanny/cookiecutter-django/pull/2937))
 
 ## [2020-11-17]
 ### Changed
-- Bump peter-evans/create-pull-request from v2 to v3.5.0 ([#2936](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2936))
+- Bump peter-evans/create-pull-request from v2 to v3.5.0 ([#2936](https://github.com/pydanny/cookiecutter-django/pull/2936))
 
 ## [2020-11-15]
 ### Changed
-- Fix formatting in docs ([#2935](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2935))
+- Fix formatting in docs ([#2935](https://github.com/pydanny/cookiecutter-django/pull/2935))
 
 ## [2020-11-13]
 ### Changed
-- Upgrade factory-boy to 3.1.0 ([#2932](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2932))
+- Upgrade factory-boy to 3.1.0 ([#2932](https://github.com/pydanny/cookiecutter-django/pull/2932))
 ### Updated
-- Update sentry-sdk to 0.19.3 ([#2933](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2933))
-- Update sphinx to 3.3.1 ([#2934](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2934))
+- Update sentry-sdk to 0.19.3 ([#2933](https://github.com/pydanny/cookiecutter-django/pull/2933))
+- Update sphinx to 3.3.1 ([#2934](https://github.com/pydanny/cookiecutter-django/pull/2934))
 
 ## [2020-11-12]
 ### Changed
-- Migrate CI to Github Actions ([#2931](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2931))
+- Migrate CI to Github Actions ([#2931](https://github.com/pydanny/cookiecutter-django/pull/2931))
 
 ## [2020-11-06]
 ### Updated
-- Update djangorestframework to 3.12.2 ([#2930](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2930))
+- Update djangorestframework to 3.12.2 ([#2930](https://github.com/pydanny/cookiecutter-django/pull/2930))
 
 ## [2020-11-04]
 ### Changed
-- Fix docs service and add RTD support ([#2920](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2920))
-- Bump stefanzweifel/git-auto-commit-action from v4.6.0 to v4.7.2 ([#2914](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2914))
+- Fix docs service and add RTD support ([#2920](https://github.com/pydanny/cookiecutter-django/pull/2920))
+- Bump stefanzweifel/git-auto-commit-action from v4.6.0 to v4.7.2 ([#2914](https://github.com/pydanny/cookiecutter-django/pull/2914))
 ### Updated
-- Auto-update pre-commit hooks ([#2908](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2908))
-- Update mypy to 0.790 ([#2886](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2886))
-- Update django-stubs to 1.7.0 ([#2916](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2916))
+- Auto-update pre-commit hooks ([#2908](https://github.com/pydanny/cookiecutter-django/pull/2908))
+- Update mypy to 0.790 ([#2886](https://github.com/pydanny/cookiecutter-django/pull/2886))
+- Update django-stubs to 1.7.0 ([#2916](https://github.com/pydanny/cookiecutter-django/pull/2916))
 
 ## [2020-11-03]
 ### Updated
-- Update sentry-sdk to 0.19.2 ([#2926](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2926))
-- Update sphinx to 3.3.0 ([#2925](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2925))
-- Update django to 3.0.11 ([#2924](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2924))
-- Update pytz to 2020.4 ([#2923](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2923))
-- Update pre-commit to 2.8.2 ([#2919](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2919))
-- Update pytest to 6.1.2 ([#2917](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2917))
-- Update sh to 1.14.1 ([#2912](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2912))
-- Update pytest-django to 4.1.0 ([#2911](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2911))
-- Update pillow to 8.0.1 ([#2910](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2910))
-- Update django-celery-beat to 2.1.0 ([#2907](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2907))
-- Update uvicorn to 0.12.2 ([#2906](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2906))
+- Update sentry-sdk to 0.19.2 ([#2926](https://github.com/pydanny/cookiecutter-django/pull/2926))
+- Update sphinx to 3.3.0 ([#2925](https://github.com/pydanny/cookiecutter-django/pull/2925))
+- Update django to 3.0.11 ([#2924](https://github.com/pydanny/cookiecutter-django/pull/2924))
+- Update pytz to 2020.4 ([#2923](https://github.com/pydanny/cookiecutter-django/pull/2923))
+- Update pre-commit to 2.8.2 ([#2919](https://github.com/pydanny/cookiecutter-django/pull/2919))
+- Update pytest to 6.1.2 ([#2917](https://github.com/pydanny/cookiecutter-django/pull/2917))
+- Update sh to 1.14.1 ([#2912](https://github.com/pydanny/cookiecutter-django/pull/2912))
+- Update pytest-django to 4.1.0 ([#2911](https://github.com/pydanny/cookiecutter-django/pull/2911))
+- Update pillow to 8.0.1 ([#2910](https://github.com/pydanny/cookiecutter-django/pull/2910))
+- Update django-celery-beat to 2.1.0 ([#2907](https://github.com/pydanny/cookiecutter-django/pull/2907))
+- Update uvicorn to 0.12.2 ([#2906](https://github.com/pydanny/cookiecutter-django/pull/2906))
 
 ## [2020-10-19]
 ### Updated
-- Update sentry-sdk to 0.19.1 ([#2905](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2905))
+- Update sentry-sdk to 0.19.1 ([#2905](https://github.com/pydanny/cookiecutter-django/pull/2905))
 
 ## [2020-10-17]
 ### Updated
-- Update django-allauth to 0.43.0 ([#2901](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2901))
-- Update pytest-django to 4.0.0 ([#2903](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2903))
+- Update django-allauth to 0.43.0 ([#2901](https://github.com/pydanny/cookiecutter-django/pull/2901))
+- Update pytest-django to 4.0.0 ([#2903](https://github.com/pydanny/cookiecutter-django/pull/2903))
 
 ## [2020-10-15]
 ### Updated
-- Update pillow to 8.0.0 ([#2898](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2898))
+- Update pillow to 8.0.0 ([#2898](https://github.com/pydanny/cookiecutter-django/pull/2898))
 
 ## [2020-10-14]
 ### Updated
-- Auto-update pre-commit hooks ([#2897](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2897))
-- Update sentry-sdk to 0.19.0 ([#2896](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2896))
+- Auto-update pre-commit hooks ([#2897](https://github.com/pydanny/cookiecutter-django/pull/2897))
+- Update sentry-sdk to 0.19.0 ([#2896](https://github.com/pydanny/cookiecutter-django/pull/2896))
 
 ## [2020-10-13]
 ### Updated
-- Update isort to 5.6.4 ([#2895](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2895))
+- Update isort to 5.6.4 ([#2895](https://github.com/pydanny/cookiecutter-django/pull/2895))
 
 ## [2020-10-12]
 ### Changed
-- Bump stefanzweifel/git-auto-commit-action from v4.5.1 to v4.6.0 ([#2893](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2893))
+- Bump stefanzweifel/git-auto-commit-action from v4.5.1 to v4.6.0 ([#2893](https://github.com/pydanny/cookiecutter-django/pull/2893))
 ### Updated
-- Auto-update pre-commit hooks ([#2892](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2892))
+- Auto-update pre-commit hooks ([#2892](https://github.com/pydanny/cookiecutter-django/pull/2892))
 
 ## [2020-10-11]
 ### Updated
-- Auto-update pre-commit hooks ([#2890](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2890))
-- Update isort to 5.6.3 ([#2891](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2891))
-- Update django-anymail to 8.1 ([#2887](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2887))
-- Update tox to 3.20.1 ([#2885](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2885))
+- Auto-update pre-commit hooks ([#2890](https://github.com/pydanny/cookiecutter-django/pull/2890))
+- Update isort to 5.6.3 ([#2891](https://github.com/pydanny/cookiecutter-django/pull/2891))
+- Update django-anymail to 8.1 ([#2887](https://github.com/pydanny/cookiecutter-django/pull/2887))
+- Update tox to 3.20.1 ([#2885](https://github.com/pydanny/cookiecutter-django/pull/2885))
 
 ## [2020-10-09]
 ### Updated
-- Auto-update pre-commit hooks ([#2884](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2884))
-- Update isort to 5.6.1 ([#2883](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2883))
+- Auto-update pre-commit hooks ([#2884](https://github.com/pydanny/cookiecutter-django/pull/2884))
+- Update isort to 5.6.1 ([#2883](https://github.com/pydanny/cookiecutter-django/pull/2883))
 
 ## [2020-10-08]
 ### Changed
-- Add dedicated websockets package ([#2881](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2881))
+- Add dedicated websockets package ([#2881](https://github.com/pydanny/cookiecutter-django/pull/2881))
 ### Updated
-- Update isort to 5.6.0 ([#2882](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2882))
+- Update isort to 5.6.0 ([#2882](https://github.com/pydanny/cookiecutter-django/pull/2882))
 
 ## [2020-10-04]
 ### Updated
-- Update pytest to 6.1.1 ([#2880](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2880))
-- Update mypy and django-stubs ([#2874](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2874))
-- Auto-update pre-commit hooks ([#2876](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2876))
-- Update flake8 to 3.8.4 ([#2877](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2877))
+- Update pytest to 6.1.1 ([#2880](https://github.com/pydanny/cookiecutter-django/pull/2880))
+- Update mypy and django-stubs ([#2874](https://github.com/pydanny/cookiecutter-django/pull/2874))
+- Auto-update pre-commit hooks ([#2876](https://github.com/pydanny/cookiecutter-django/pull/2876))
+- Update flake8 to 3.8.4 ([#2877](https://github.com/pydanny/cookiecutter-django/pull/2877))
 
 ## [2020-10-01]
 ### Changed
-- Bump actions/setup-python from v2.1.2 to v2.1.3 ([#2869](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2869))
+- Bump actions/setup-python from v2.1.2 to v2.1.3 ([#2869](https://github.com/pydanny/cookiecutter-django/pull/2869))
 ### Updated
-- Update ipdb to 0.13.4 ([#2873](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2873))
-- Auto-update pre-commit hooks ([#2867](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2867))
-- Update uvicorn to 0.12.1 ([#2866](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2866))
-- Update isort to 5.5.4 ([#2864](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2864))
-- Update sentry-sdk to 0.18.0 ([#2863](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2863))
-- Update djangorestframework to 3.12.1 ([#2862](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2862))
-- Update pytest to 6.1.0 ([#2859](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2859))
-- Update django-debug-toolbar to 3.1.1 ([#2855](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2855))
+- Update ipdb to 0.13.4 ([#2873](https://github.com/pydanny/cookiecutter-django/pull/2873))
+- Auto-update pre-commit hooks ([#2867](https://github.com/pydanny/cookiecutter-django/pull/2867))
+- Update uvicorn to 0.12.1 ([#2866](https://github.com/pydanny/cookiecutter-django/pull/2866))
+- Update isort to 5.5.4 ([#2864](https://github.com/pydanny/cookiecutter-django/pull/2864))
+- Update sentry-sdk to 0.18.0 ([#2863](https://github.com/pydanny/cookiecutter-django/pull/2863))
+- Update djangorestframework to 3.12.1 ([#2862](https://github.com/pydanny/cookiecutter-django/pull/2862))
+- Update pytest to 6.1.0 ([#2859](https://github.com/pydanny/cookiecutter-django/pull/2859))
+- Update django-debug-toolbar to 3.1.1 ([#2855](https://github.com/pydanny/cookiecutter-django/pull/2855))
 
 ## [2020-09-23]
 ### Updated
-- Update sentry-sdk to 0.17.7 ([#2847](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2847))
-- Update django-debug-toolbar to 3.1 ([#2846](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2846))
+- Update sentry-sdk to 0.17.7 ([#2847](https://github.com/pydanny/cookiecutter-django/pull/2847))
+- Update django-debug-toolbar to 3.1 ([#2846](https://github.com/pydanny/cookiecutter-django/pull/2846))
 
 ## [2020-09-21]
 ### Changed
-- Adding GitHub-Action CI Option ([#2837](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2837))
+- Adding GitHub-Action CI Option ([#2837](https://github.com/pydanny/cookiecutter-django/pull/2837))
 ### Updated
-- Update django-debug-toolbar to 3.0 ([#2842](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2842))
-- Auto-update pre-commit hooks ([#2843](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2843))
-- Update isort to 5.5.3 ([#2844](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2844))
+- Update django-debug-toolbar to 3.0 ([#2842](https://github.com/pydanny/cookiecutter-django/pull/2842))
+- Auto-update pre-commit hooks ([#2843](https://github.com/pydanny/cookiecutter-django/pull/2843))
+- Update isort to 5.5.3 ([#2844](https://github.com/pydanny/cookiecutter-django/pull/2844))
 
 ## [2020-09-18]
 ### Updated
-- Update django-extensions to 3.0.9 ([#2839](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2839))
+- Update django-extensions to 3.0.9 ([#2839](https://github.com/pydanny/cookiecutter-django/pull/2839))
 
 ## [2020-09-16]
 ### Updated
-- Update sentry-sdk to 0.17.6 ([#2833](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2833))
-- Update pytest-django to 3.10.0 ([#2832](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2832))
+- Update sentry-sdk to 0.17.6 ([#2833](https://github.com/pydanny/cookiecutter-django/pull/2833))
+- Update pytest-django to 3.10.0 ([#2832](https://github.com/pydanny/cookiecutter-django/pull/2832))
 
 ## [2020-09-14]
 ### Fixed
-- Downgrade Celery to 4.4.6 ([#2829](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2829))
+- Downgrade Celery to 4.4.6 ([#2829](https://github.com/pydanny/cookiecutter-django/pull/2829))
 ### Updated
-- Update sentry-sdk to 0.17.5 ([#2828](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2828))
-- Update coverage to 5.3 ([#2826](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2826))
-- Update django-storages to 1.10.1 ([#2825](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2825))
+- Update sentry-sdk to 0.17.5 ([#2828](https://github.com/pydanny/cookiecutter-django/pull/2828))
+- Update coverage to 5.3 ([#2826](https://github.com/pydanny/cookiecutter-django/pull/2826))
+- Update django-storages to 1.10.1 ([#2825](https://github.com/pydanny/cookiecutter-django/pull/2825))
 
 ## [2020-09-12]
 ### Updated
-- Updating Traefik version from 2.0 to 2.2.11 ([#2814](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2814))
-- Update pytest to 6.0.2 ([#2819](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2819))
-- Update django-anymail to 8.0 ([#2818](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2818))
+- Updating Traefik version from 2.0 to 2.2.11 ([#2814](https://github.com/pydanny/cookiecutter-django/pull/2814))
+- Update pytest to 6.0.2 ([#2819](https://github.com/pydanny/cookiecutter-django/pull/2819))
+- Update django-anymail to 8.0 ([#2818](https://github.com/pydanny/cookiecutter-django/pull/2818))
 
 ## [2020-09-11]
 ### Updated
-- Auto-update pre-commit hooks ([#2809](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2809))
+- Auto-update pre-commit hooks ([#2809](https://github.com/pydanny/cookiecutter-django/pull/2809))
 
 ## [2020-09-10]
 ### Updated
-- Update isort to 5.5.2 ([#2807](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2807))
-- Update sentry-sdk to 0.17.4 ([#2805](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2805))
+- Update isort to 5.5.2 ([#2807](https://github.com/pydanny/cookiecutter-django/pull/2807))
+- Update sentry-sdk to 0.17.4 ([#2805](https://github.com/pydanny/cookiecutter-django/pull/2805))
 
 ## [2020-09-09]
 ### Changed
-- Update actions/setup-python requirement to v2.1.2 ([#2804](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2804))
-- Clean up nested venv files from `.gitignore` ([#2800](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2800))
+- Update actions/setup-python requirement to v2.1.2 ([#2804](https://github.com/pydanny/cookiecutter-django/pull/2804))
+- Clean up nested venv files from `.gitignore` ([#2800](https://github.com/pydanny/cookiecutter-django/pull/2800))
 
 ## [2020-09-08]
 ### Changed
-- Traeffik and Django dockerfile changes ([#2801](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2801))
+- Traeffik and Django dockerfile changes ([#2801](https://github.com/pydanny/cookiecutter-django/pull/2801))
 
 ## [2020-09-07]
 ### Changed
-- Add :z/:Z to mounted volumes in {local,production}.yml ([#2663](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2663))
-- Remove --no-binary option for psycopg2 ([#2798](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2798))
-- Updated Gitlab CI to use Python 3.8 instead of Python 3.7 ([#2794](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2794))
+- Add :z/:Z to mounted volumes in {local,production}.yml ([#2663](https://github.com/pydanny/cookiecutter-django/pull/2663))
+- Remove --no-binary option for psycopg2 ([#2798](https://github.com/pydanny/cookiecutter-django/pull/2798))
+- Updated Gitlab CI to use Python 3.8 instead of Python 3.7 ([#2794](https://github.com/pydanny/cookiecutter-django/pull/2794))
 ### Fixed
-- Fix options for sphinx-autobuild in docs Makefile ([#2799](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2799))
+- Fix options for sphinx-autobuild in docs Makefile ([#2799](https://github.com/pydanny/cookiecutter-django/pull/2799))
 ### Updated
-- Update psycopg2-binary to 2.8.6 ([#2797](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2797))
+- Update psycopg2-binary to 2.8.6 ([#2797](https://github.com/pydanny/cookiecutter-django/pull/2797))
 
 ## [2020-09-05]
 ### Updated
-- Auto-update pre-commit hooks ([#2793](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2793))
+- Auto-update pre-commit hooks ([#2793](https://github.com/pydanny/cookiecutter-django/pull/2793))
 
 ## [2020-09-04]
 ### Updated
-- Update django-extensions to 3.0.8 ([#2792](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2792))
-- Update isort to 5.5.1 ([#2791](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2791))
-- Auto-update pre-commit hooks ([#2790](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2790))
-- Update isort to 5.5.0 ([#2789](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2789))
+- Update django-extensions to 3.0.8 ([#2792](https://github.com/pydanny/cookiecutter-django/pull/2792))
+- Update isort to 5.5.1 ([#2791](https://github.com/pydanny/cookiecutter-django/pull/2791))
+- Auto-update pre-commit hooks ([#2790](https://github.com/pydanny/cookiecutter-django/pull/2790))
+- Update isort to 5.5.0 ([#2789](https://github.com/pydanny/cookiecutter-django/pull/2789))
 
 ## [2020-09-02]
 ### Changed
-- Add environment and traces_sample_rate keyword to sentry_sdk.init ([#2777](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2777))
+- Add environment and traces_sample_rate keyword to sentry_sdk.init ([#2777](https://github.com/pydanny/cookiecutter-django/pull/2777))
 ### Updated
-- Update sentry-sdk to 0.17.3 ([#2788](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2788))
-- Update django-extensions to 3.0.7 ([#2787](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2787))
+- Update sentry-sdk to 0.17.3 ([#2788](https://github.com/pydanny/cookiecutter-django/pull/2788))
+- Update django-extensions to 3.0.7 ([#2787](https://github.com/pydanny/cookiecutter-django/pull/2787))
 
 ## [2020-09-01]
 ### Changed
-- Exclude venv directory and update document link ([#2780](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2780))
+- Exclude venv directory and update document link ([#2780](https://github.com/pydanny/cookiecutter-django/pull/2780))
 ### Updated
-- Update tox to 3.20.0 ([#2786](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2786))
-- Update django-storages to 1.10 ([#2781](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2781))
-- Update sentry-sdk to 0.17.2 ([#2784](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2784))
-- Update django to 3.0.10 ([#2785](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2785))
-- Update sphinx-autobuild to 2020.9.1 ([#2782](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2782))
-- Update django-extensions to 3.0.6 ([#2783](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2783))
+- Update tox to 3.20.0 ([#2786](https://github.com/pydanny/cookiecutter-django/pull/2786))
+- Update django-storages to 1.10 ([#2781](https://github.com/pydanny/cookiecutter-django/pull/2781))
+- Update sentry-sdk to 0.17.2 ([#2784](https://github.com/pydanny/cookiecutter-django/pull/2784))
+- Update django to 3.0.10 ([#2785](https://github.com/pydanny/cookiecutter-django/pull/2785))
+- Update sphinx-autobuild to 2020.9.1 ([#2782](https://github.com/pydanny/cookiecutter-django/pull/2782))
+- Update django-extensions to 3.0.6 ([#2783](https://github.com/pydanny/cookiecutter-django/pull/2783))
 
 ## [2020-08-31]
 ### Updated
-- Update sh to 1.14.0 ([#2779](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2779))
-- Update sentry-sdk to 0.17.1 ([#2778](https://api.github.com/repos/pydanny/cookiecutter-django/pulls/2778))
+- Update sh to 1.14.0 ([#2779](https://github.com/pydanny/cookiecutter-django/pull/2779))
+- Update sentry-sdk to 0.17.1 ([#2778](https://github.com/pydanny/cookiecutter-django/pull/2778))
 
 ## [2020-04-13]
 ### Changed

From 177c1ab0a1e5b6508d20840ff3a87195a03cb3df Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Wed, 13 Oct 2021 09:20:22 +0100
Subject: [PATCH 1701/2840] Fix a few typos

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fdca4664a..5f51f4bd8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -807,7 +807,7 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 ## [2020-04-13]
 ### Changed
 - Updated to Python 3.8 (@codnee)
-- Moved converage config in setup.cfg (@danihodovic)
+- Moved coverage config in setup.cfg (@danihodovic)
 
 ## [2020-04-08]
 ### Fixed
@@ -815,7 +815,7 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 ## [2020-04-04]
 ### Fixed
-- Added compress command command with Django compressor (@gwiskur)
+- Added compress command with Django compressor (@gwiskur)
 
 ## [2020-03-23]
 ### Changed

From 7601ad09c7ce12980e2a6447290f1b8234a0b127 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 13 Oct 2021 13:19:14 -0700
Subject: [PATCH 1702/2840] Update django-model-utils from 4.1.1 to 4.2.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 54b88cf58..78b715d6e 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -31,7 +31,7 @@ uvicorn[standard]==0.15.0  # https://github.com/encode/uvicorn
 # ------------------------------------------------------------------------------
 django==3.1.13  # pyup: < 3.2  # https://www.djangoproject.com/
 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-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.45.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.13.0  # https://github.com/django-crispy-forms/django-crispy-forms
 {%- if cookiecutter.use_compressor == "y" %}

From a091ee766e66e79e7c7dc6f4c7c41fdb2ee27a97 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 14 Oct 2021 02:15:49 +0000
Subject: [PATCH 1703/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5f51f4bd8..eb9dec349 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-10-13]
+### Changed
+- Add drf stubs ([#3353](https://github.com/pydanny/cookiecutter-django/pull/3353))
+
 ## [2021-10-12]
 ### Updated
 - Update coverage to 6.0.2 ([#3356](https://github.com/pydanny/cookiecutter-django/pull/3356))

From b8ce0ed7ee52dbda16b4c897ca9caea9fc5178f4 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 14 Oct 2021 05:31:55 -0700
Subject: [PATCH 1704/2840] Update flake8-isort from 4.0.0 to 4.1.1

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

diff --git a/requirements.txt b/requirements.txt
index 7ba8f8e41..8b84730f1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ binaryornot==0.4.4
 black==21.9b0
 isort==5.9.3
 flake8==3.9.2
-flake8-isort==4.0.0
+flake8-isort==4.1.1
 pre-commit==2.15.0
 
 # Testing

From b103ce72c2679ed6f5a11d09a3ff2f88cd699883 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 14 Oct 2021 05:31:55 -0700
Subject: [PATCH 1705/2840] Update flake8-isort from 4.0.0 to 4.1.1

---
 {{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 7bb4d00be..0451ec9e5 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -29,7 +29,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # Code quality
 # ------------------------------------------------------------------------------
 flake8==3.9.2  # https://github.com/PyCQA/flake8
-flake8-isort==4.0.0  # https://github.com/gforcada/flake8-isort
+flake8-isort==4.1.1  # https://github.com/gforcada/flake8-isort
 coverage==6.0.2  # https://github.com/nedbat/coveragepy
 black==21.9b0  # https://github.com/psf/black
 pylint-django==2.4.4  # https://github.com/PyCQA/pylint-django

From e5a6a0cfa69c1292b05294e5028944a9caec086b Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 14 Oct 2021 08:06:47 -0700
Subject: [PATCH 1706/2840] Update flake8 from 3.9.2 to 4.0.1

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

diff --git a/requirements.txt b/requirements.txt
index 8b84730f1..6ad675ef4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ binaryornot==0.4.4
 # ------------------------------------------------------------------------------
 black==21.9b0
 isort==5.9.3
-flake8==3.9.2
+flake8==4.0.1
 flake8-isort==4.1.1
 pre-commit==2.15.0
 

From c2e82f8289a737610b41c793d5ee1f3e1170f02a Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 14 Oct 2021 08:06:47 -0700
Subject: [PATCH 1707/2840] Update flake8 from 3.9.2 to 4.0.1

---
 {{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 0451ec9e5..10bcbe190 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
 
 # Code quality
 # ------------------------------------------------------------------------------
-flake8==3.9.2  # https://github.com/PyCQA/flake8
+flake8==4.0.1  # https://github.com/PyCQA/flake8
 flake8-isort==4.1.1  # https://github.com/gforcada/flake8-isort
 coverage==6.0.2  # https://github.com/nedbat/coveragepy
 black==21.9b0  # https://github.com/psf/black

From 557b1ecc35a1a2204891fe2693037af519bbd503 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 14 Oct 2021 09:28:01 -0700
Subject: [PATCH 1708/2840] Update pyyaml from 5.4.1 to 6.0

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

diff --git a/requirements.txt b/requirements.txt
index 6ad675ef4..6755289d8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -16,7 +16,7 @@ tox==3.24.4
 pytest==6.2.5
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2
-pyyaml==5.4.1
+pyyaml==6.0
 
 # Scripting
 # ------------------------------------------------------------------------------

From ba82a35cd7ecb4ccf4177ebf7c6cc2cd2f213dea Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 15 Oct 2021 02:16:40 +0000
Subject: [PATCH 1709/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb9dec349..c29bcb588 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-10-14]
+### Updated
+- Update flake8 to 4.0.1 ([#3361](https://github.com/pydanny/cookiecutter-django/pull/3361))
+- Update flake8-isort to 4.1.1 ([#3360](https://github.com/pydanny/cookiecutter-django/pull/3360))
+- Update django-model-utils to 4.2.0 ([#3359](https://github.com/pydanny/cookiecutter-django/pull/3359))
+
 ## [2021-10-13]
 ### Changed
 - Add drf stubs ([#3353](https://github.com/pydanny/cookiecutter-django/pull/3353))

From ea56c11028460c67a1f390ab7c188e35151699ea Mon Sep 17 00:00:00 2001
From: Noah Hall <noah@nthall.com>
Date: Thu, 14 Oct 2021 22:34:59 -0400
Subject: [PATCH 1710/2840] use Wayback Machine to fix dead link for postgres
 user setup

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

diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index 83bc1342c..b7a1e557a 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -87,7 +87,7 @@ or if you're running asynchronously: ::
 .. _Redis: https://redis.io/download
 .. _CookieCutter: https://github.com/cookiecutter/cookiecutter
 .. _createdb: https://www.postgresql.org/docs/current/static/app-createdb.html
-.. _initial PostgreSQL set up: http://suite.opengeo.org/docs/latest/dataadmin/pgGettingStarted/firstconnect.html
+.. _initial PostgreSQL set up: http://web.archive.org/web/20190303010033/http://suite.opengeo.org/docs/latest/dataadmin/pgGettingStarted/firstconnect.html
 .. _postgres documentation: https://www.postgresql.org/docs/current/static/auth-pg-hba-conf.html
 .. _pre-commit: https://pre-commit.com/
 .. _direnv: https://direnv.net/

From 8ffe2aaa38772872b1ac83e20189fc773ef6e4ec Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 15 Oct 2021 03:01:10 -0700
Subject: [PATCH 1711/2840] Update pillow from 8.3.2 to 8.4.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 78b715d6e..3796d8dcd 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,6 +1,6 @@
 pytz==2021.3  # https://github.com/stub42/pytz
 python-slugify==5.0.2  # https://github.com/un33k/python-slugify
-Pillow==8.3.2  # https://github.com/python-pillow/Pillow
+Pillow==8.4.0  # 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 4771639df7d679baf055ae9e2c61032ee0da9453 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 16 Oct 2021 20:32:04 -0700
Subject: [PATCH 1712/2840] Update django-storages from 1.12.1 to 1.12.2

---
 {{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 3d70a8a4c..977d87392 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -17,7 +17,7 @@ hiredis==2.0.0  # https://github.com/redis/hiredis-py
 # Django
 # ------------------------------------------------------------------------------
 {%- if cookiecutter.cloud_provider == 'AWS' %}
-django-storages[boto3]==1.12.1  # https://github.com/jschneier/django-storages
+django-storages[boto3]==1.12.2  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
 django-storages[google]==1.12.1  # https://github.com/jschneier/django-storages
 {%- endif %}

From 666c989e9ddcc3f7e2c93e0742010099fd3fb379 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 16 Oct 2021 20:32:04 -0700
Subject: [PATCH 1713/2840] Update django-storages from 1.12.1 to 1.12.2

---
 {{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 977d87392..fb9b0ea67 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -19,7 +19,7 @@ hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- if cookiecutter.cloud_provider == 'AWS' %}
 django-storages[boto3]==1.12.2  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
-django-storages[google]==1.12.1  # https://github.com/jschneier/django-storages
+django-storages[google]==1.12.2  # https://github.com/jschneier/django-storages
 {%- endif %}
 {%- if cookiecutter.mail_service == 'Mailgun' %}
 django-anymail[mailgun]==8.4  # https://github.com/anymail/django-anymail

From 60f3b8e54a9de7bdb46dc020918b8d49d4620c80 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 18 Oct 2021 06:56:55 -0700
Subject: [PATCH 1714/2840] Update django-environ from 0.7.0 to 0.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 78b715d6e..464a46af8 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.7.0  # https://github.com/joke2k/django-environ
+django-environ==0.8.0  # https://github.com/joke2k/django-environ
 django-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.45.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.13.0  # https://github.com/django-crispy-forms/django-crispy-forms

From d30de53d106ead23810a70c2e7b26e55c9d8bbff Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 19 Oct 2021 02:16:41 +0000
Subject: [PATCH 1715/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c29bcb588..8bacb9ead 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-10-18]
+### Updated
+- Update django-environ to 0.8.0 ([#3367](https://github.com/pydanny/cookiecutter-django/pull/3367))
+
 ## [2021-10-14]
 ### Updated
 - Update flake8 to 4.0.1 ([#3361](https://github.com/pydanny/cookiecutter-django/pull/3361))

From e4997e76c844ec24a01996e0dd255db93305f891 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 20 Oct 2021 06:57:29 -0700
Subject: [PATCH 1716/2840] Update django-environ from 0.8.0 to 0.8.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 464a46af8..3b8fa0f35 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.8.0  # https://github.com/joke2k/django-environ
+django-environ==0.8.1  # https://github.com/joke2k/django-environ
 django-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.45.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.13.0  # https://github.com/django-crispy-forms/django-crispy-forms

From b2d46296f0fa80b2804c6f9535cf93c8b6fbc53a Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 22 Oct 2021 21:40:53 +0100
Subject: [PATCH 1717/2840] Move repo under cookiecutter organisation (#3357)

---
 .github/ISSUE_TEMPLATE/bug.md            |   2 +-
 .github/ISSUE_TEMPLATE/paid-support.md   |   2 +-
 CHANGELOG.md                             | 752 +++++++++++------------
 README.rst                               |  22 +-
 docs/developing-locally.rst              |   6 +-
 docs/faq.rst                             |   2 +-
 docs/troubleshooting.rst                 |   4 +-
 scripts/update_changelog.py              |   4 +-
 scripts/update_contributors.py           |   2 +-
 setup.py                                 |   2 +-
 {{cookiecutter.project_slug}}/README.rst |   2 +-
 11 files changed, 401 insertions(+), 399 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index d1bf4da68..304e9b34c 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -51,7 +51,7 @@ labels: bug
 Logs:
 <details>
 <pre>
-$ cookiecutter https://github.com/pydanny/cookiecutter-django
+$ cookiecutter https://github.com/cookiecutter/cookiecutter-django
 project_name [Project Name]: ...
 </pre>
 </details>
diff --git a/.github/ISSUE_TEMPLATE/paid-support.md b/.github/ISSUE_TEMPLATE/paid-support.md
index 7ebc06476..9f997a8c8 100644
--- a/.github/ISSUE_TEMPLATE/paid-support.md
+++ b/.github/ISSUE_TEMPLATE/paid-support.md
@@ -3,7 +3,7 @@ name: Paid Support Request
 about: Ask Core Team members to help you out
 ---
 
-Provided your question goes beyond [regular support](https://github.com/pydanny/cookiecutter-django/issues/new?template=question.md), and/or the task at hand is of timely/high priority nature use the below information to reach out for contributors directly.
+Provided your question goes beyond [regular support](https://github.com/cookiecutter/cookiecutter-django/issues/new?template=question.md), and/or the task at hand is of timely/high priority nature use the below information to reach out for contributors directly.
 
 * Daniel Roy Greenfeld, Project Lead ([GitHub](https://github.com/pydanny), [Patreon](https://www.patreon.com/danielroygreenfeld)): expertise in Django and AWS ELB.
 
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8bacb9ead..51c9e5859 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,814 +9,814 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 ## [2021-10-14]
 ### Updated
-- Update flake8 to 4.0.1 ([#3361](https://github.com/pydanny/cookiecutter-django/pull/3361))
-- Update flake8-isort to 4.1.1 ([#3360](https://github.com/pydanny/cookiecutter-django/pull/3360))
-- Update django-model-utils to 4.2.0 ([#3359](https://github.com/pydanny/cookiecutter-django/pull/3359))
+- Update flake8 to 4.0.1 ([#3361](https://github.com/cookicutter/cookiecutter-django/pull/3361))
+- Update flake8-isort to 4.1.1 ([#3360](https://github.com/cookicutter/cookiecutter-django/pull/3360))
+- Update django-model-utils to 4.2.0 ([#3359](https://github.com/cookicutter/cookiecutter-django/pull/3359))
 
 ## [2021-10-13]
 ### Changed
-- Add drf stubs ([#3353](https://github.com/pydanny/cookiecutter-django/pull/3353))
+- Add drf stubs ([#3353](https://github.com/cookicutter/cookiecutter-django/pull/3353))
 
 ## [2021-10-12]
 ### Updated
-- Update coverage to 6.0.2 ([#3356](https://github.com/pydanny/cookiecutter-django/pull/3356))
+- Update coverage to 6.0.2 ([#3356](https://github.com/cookicutter/cookiecutter-django/pull/3356))
 
 ## [2021-10-11]
 ### Updated
-- Update werkzeug to 2.0.2 ([#3344](https://github.com/pydanny/cookiecutter-django/pull/3344))
-- Update coverage to 6.0.1 ([#3348](https://github.com/pydanny/cookiecutter-django/pull/3348))
-- Update django-coverage-plugin to 2.0.1 ([#3349](https://github.com/pydanny/cookiecutter-django/pull/3349))
-- Update django-cors-headers to 3.10.0 ([#3345](https://github.com/pydanny/cookiecutter-django/pull/3345))
-- Update jinja2 to 3.0.2 ([#3343](https://github.com/pydanny/cookiecutter-django/pull/3343))
-- Update django-storages to 1.12.1 ([#3355](https://github.com/pydanny/cookiecutter-django/pull/3355))
+- Update werkzeug to 2.0.2 ([#3344](https://github.com/cookicutter/cookiecutter-django/pull/3344))
+- Update coverage to 6.0.1 ([#3348](https://github.com/cookicutter/cookiecutter-django/pull/3348))
+- Update django-coverage-plugin to 2.0.1 ([#3349](https://github.com/cookicutter/cookiecutter-django/pull/3349))
+- Update django-cors-headers to 3.10.0 ([#3345](https://github.com/cookicutter/cookiecutter-django/pull/3345))
+- Update jinja2 to 3.0.2 ([#3343](https://github.com/cookicutter/cookiecutter-django/pull/3343))
+- Update django-storages to 1.12.1 ([#3355](https://github.com/cookicutter/cookiecutter-django/pull/3355))
 
 ## [2021-10-03]
 ### Updated
-- Update pytz to 2021.3 ([#3340](https://github.com/pydanny/cookiecutter-django/pull/3340))
+- Update pytz to 2021.3 ([#3340](https://github.com/cookicutter/cookiecutter-django/pull/3340))
 
 ## [2021-10-01]
 ### Changed
-- Fix the wrong pre-commit hyperlink in Prerequisites section ([#3338](https://github.com/pydanny/cookiecutter-django/pull/3338))
+- Fix the wrong pre-commit hyperlink in Prerequisites section ([#3338](https://github.com/cookicutter/cookiecutter-django/pull/3338))
 
 ## [2021-09-30]
 ### Updated
-- Update sentry-sdk to 1.4.3 ([#3334](https://github.com/pydanny/cookiecutter-django/pull/3334))
+- Update sentry-sdk to 1.4.3 ([#3334](https://github.com/cookicutter/cookiecutter-django/pull/3334))
 
 ## [2021-09-29]
 ### Updated
-- Update django-cors-headers to 3.9.0 ([#3332](https://github.com/pydanny/cookiecutter-django/pull/3332))
+- Update django-cors-headers to 3.9.0 ([#3332](https://github.com/cookicutter/cookiecutter-django/pull/3332))
 
 ## [2021-09-27]
 ### Updated
-- Update sentry-sdk to 1.4.2 ([#3329](https://github.com/pydanny/cookiecutter-django/pull/3329))
+- Update sentry-sdk to 1.4.2 ([#3329](https://github.com/cookicutter/cookiecutter-django/pull/3329))
 
 ## [2021-09-26]
 ### Updated
-- Update django-crispy-forms to 1.13.0 ([#3327](https://github.com/pydanny/cookiecutter-django/pull/3327))
+- Update django-crispy-forms to 1.13.0 ([#3327](https://github.com/cookicutter/cookiecutter-django/pull/3327))
 
 ## [2021-09-24]
 ### Changed
-- Add django-settings-module to .pylintrc ([#3326](https://github.com/pydanny/cookiecutter-django/pull/3326))
+- Add django-settings-module to .pylintrc ([#3326](https://github.com/cookicutter/cookiecutter-django/pull/3326))
 
 ## [2021-09-23]
 ### Updated
-- Update sentry-sdk to 1.4.1 ([#3325](https://github.com/pydanny/cookiecutter-django/pull/3325))
+- Update sentry-sdk to 1.4.1 ([#3325](https://github.com/cookicutter/cookiecutter-django/pull/3325))
 
 ## [2021-09-22]
 ### Updated
-- Update sentry-sdk to 1.4.0 ([#3324](https://github.com/pydanny/cookiecutter-django/pull/3324))
+- Update sentry-sdk to 1.4.0 ([#3324](https://github.com/cookicutter/cookiecutter-django/pull/3324))
 
 ## [2021-09-16]
 ### Updated
-- Update tox to 3.24.4 ([#3323](https://github.com/pydanny/cookiecutter-django/pull/3323))
+- Update tox to 3.24.4 ([#3323](https://github.com/cookicutter/cookiecutter-django/pull/3323))
 
 ## [2021-09-15]
 ### Updated
-- Auto-update pre-commit hooks ([#3322](https://github.com/pydanny/cookiecutter-django/pull/3322))
+- Auto-update pre-commit hooks ([#3322](https://github.com/cookicutter/cookiecutter-django/pull/3322))
 
 ## [2021-09-14]
 ### Updated
-- Update black to 21.9b0 ([#3321](https://github.com/pydanny/cookiecutter-django/pull/3321))
+- Update black to 21.9b0 ([#3321](https://github.com/cookicutter/cookiecutter-django/pull/3321))
 
 ## [2021-09-13]
 ### Updated
-- Bump stefanzweifel/git-auto-commit-action from 4.11.0 to 4.12.0 ([#3320](https://github.com/pydanny/cookiecutter-django/pull/3320))
-- Update sphinx to 4.2.0 ([#3319](https://github.com/pydanny/cookiecutter-django/pull/3319))
+- Bump stefanzweifel/git-auto-commit-action from 4.11.0 to 4.12.0 ([#3320](https://github.com/cookicutter/cookiecutter-django/pull/3320))
+- Update sphinx to 4.2.0 ([#3319](https://github.com/cookicutter/cookiecutter-django/pull/3319))
 
 ## [2021-09-11]
 ### Changed
-- Removing pycharm docs if app does not use pycharm ([#3139](https://github.com/pydanny/cookiecutter-django/pull/3139))
+- Removing pycharm docs if app does not use pycharm ([#3139](https://github.com/cookicutter/cookiecutter-django/pull/3139))
 ### Updated
-- Update django-environ to 0.7.0 ([#3317](https://github.com/pydanny/cookiecutter-django/pull/3317))
+- Update django-environ to 0.7.0 ([#3317](https://github.com/cookicutter/cookiecutter-django/pull/3317))
 
 ## [2021-09-06]
 ### Changed
-- Update Celery to v5 ([#3280](https://github.com/pydanny/cookiecutter-django/pull/3280))
+- Update Celery to v5 ([#3280](https://github.com/cookicutter/cookiecutter-django/pull/3280))
 
 ## [2021-09-05]
 ### Updated
-- Update django-environ to 0.6.0 ([#3314](https://github.com/pydanny/cookiecutter-django/pull/3314))
+- Update django-environ to 0.6.0 ([#3314](https://github.com/cookicutter/cookiecutter-django/pull/3314))
 
 ## [2021-09-03]
 ### Changed
-- Update available postgres versions ([#3297](https://github.com/pydanny/cookiecutter-django/pull/3297))
+- Update available postgres versions ([#3297](https://github.com/cookicutter/cookiecutter-django/pull/3297))
 ### Updated
-- Update pre-commit to 2.15.0 ([#3313](https://github.com/pydanny/cookiecutter-django/pull/3313))
-- Auto-update pre-commit hooks ([#3307](https://github.com/pydanny/cookiecutter-django/pull/3307))
-- Update pillow to 8.3.2 ([#3312](https://github.com/pydanny/cookiecutter-django/pull/3312))
-- Update django-environ to 0.5.0 ([#3311](https://github.com/pydanny/cookiecutter-django/pull/3311))
-- Update pytest to 6.2.5 ([#3310](https://github.com/pydanny/cookiecutter-django/pull/3310))
-- Update black to 21.8b0 ([#3308](https://github.com/pydanny/cookiecutter-django/pull/3308))
-- Update argon2-cffi to 21.1.0 ([#3306](https://github.com/pydanny/cookiecutter-django/pull/3306))
-- Bump peter-evans/create-pull-request from 3.10.0 to 3.10.1 ([#3303](https://github.com/pydanny/cookiecutter-django/pull/3303))
-- Update django-debug-toolbar to 3.2.2 ([#3296](https://github.com/pydanny/cookiecutter-django/pull/3296))
-- Update django-cors-headers to 3.8.0 ([#3295](https://github.com/pydanny/cookiecutter-django/pull/3295))
-- Update uvicorn to 0.15.0 ([#3294](https://github.com/pydanny/cookiecutter-django/pull/3294))
+- Update pre-commit to 2.15.0 ([#3313](https://github.com/cookicutter/cookiecutter-django/pull/3313))
+- Auto-update pre-commit hooks ([#3307](https://github.com/cookicutter/cookiecutter-django/pull/3307))
+- Update pillow to 8.3.2 ([#3312](https://github.com/cookicutter/cookiecutter-django/pull/3312))
+- Update django-environ to 0.5.0 ([#3311](https://github.com/cookicutter/cookiecutter-django/pull/3311))
+- Update pytest to 6.2.5 ([#3310](https://github.com/cookicutter/cookiecutter-django/pull/3310))
+- Update black to 21.8b0 ([#3308](https://github.com/cookicutter/cookiecutter-django/pull/3308))
+- Update argon2-cffi to 21.1.0 ([#3306](https://github.com/cookicutter/cookiecutter-django/pull/3306))
+- Bump peter-evans/create-pull-request from 3.10.0 to 3.10.1 ([#3303](https://github.com/cookicutter/cookiecutter-django/pull/3303))
+- Update django-debug-toolbar to 3.2.2 ([#3296](https://github.com/cookicutter/cookiecutter-django/pull/3296))
+- Update django-cors-headers to 3.8.0 ([#3295](https://github.com/cookicutter/cookiecutter-django/pull/3295))
+- Update uvicorn to 0.15.0 ([#3294](https://github.com/cookicutter/cookiecutter-django/pull/3294))
 
 ## [2021-08-27]
 ### Updated
-- Update tox to 3.24.3 ([#3302](https://github.com/pydanny/cookiecutter-django/pull/3302))
+- Update tox to 3.24.3 ([#3302](https://github.com/cookicutter/cookiecutter-django/pull/3302))
 
 ## [2021-08-20]
 ### Changed
-- Fix Jinja2 break line control on Procfile ([#3300](https://github.com/pydanny/cookiecutter-django/pull/3300))
+- Fix Jinja2 break line control on Procfile ([#3300](https://github.com/cookicutter/cookiecutter-django/pull/3300))
 
 ## [2021-08-19]
 ### Changed
-- Fix several minor typos ([#3301](https://github.com/pydanny/cookiecutter-django/pull/3301))
+- Fix several minor typos ([#3301](https://github.com/cookicutter/cookiecutter-django/pull/3301))
 
 ## [2021-08-13]
 ### Changed
-- Upgrade to Redis 6 ([#3255](https://github.com/pydanny/cookiecutter-django/pull/3255))
+- Upgrade to Redis 6 ([#3255](https://github.com/cookicutter/cookiecutter-django/pull/3255))
 ### Fixed
-- Fix RTD build image to support Python 3.9 ([#3293](https://github.com/pydanny/cookiecutter-django/pull/3293))
+- Fix RTD build image to support Python 3.9 ([#3293](https://github.com/cookicutter/cookiecutter-django/pull/3293))
 
 ## [2021-08-12]
 ### Changed
-- Add documentation for automating backups ([#3268](https://github.com/pydanny/cookiecutter-django/pull/3268))
-- Add missing step to getting started locally in docs ([#3291](https://github.com/pydanny/cookiecutter-django/pull/3291))
-- Moved isort config from `.editorconfig` to `setup.cfg` ([#3290](https://github.com/pydanny/cookiecutter-django/pull/3290))
-- How to pre-commit in Docker Development ([#3287](https://github.com/pydanny/cookiecutter-django/pull/3287))
+- Add documentation for automating backups ([#3268](https://github.com/cookicutter/cookiecutter-django/pull/3268))
+- Add missing step to getting started locally in docs ([#3291](https://github.com/cookicutter/cookiecutter-django/pull/3291))
+- Moved isort config from `.editorconfig` to `setup.cfg` ([#3290](https://github.com/cookicutter/cookiecutter-django/pull/3290))
+- How to pre-commit in Docker Development ([#3287](https://github.com/cookicutter/cookiecutter-django/pull/3287))
 ### Updated
-- Update sentry-sdk to 1.3.1 ([#3281](https://github.com/pydanny/cookiecutter-django/pull/3281))
-- Update tox to 3.24.1 ([#3285](https://github.com/pydanny/cookiecutter-django/pull/3285))
-- Update pre-commit to 2.14.0 ([#3289](https://github.com/pydanny/cookiecutter-django/pull/3289))
+- Update sentry-sdk to 1.3.1 ([#3281](https://github.com/cookicutter/cookiecutter-django/pull/3281))
+- Update tox to 3.24.1 ([#3285](https://github.com/cookicutter/cookiecutter-django/pull/3285))
+- Update pre-commit to 2.14.0 ([#3289](https://github.com/cookicutter/cookiecutter-django/pull/3289))
 
 ## [2021-07-30]
 ### Updated
-- Auto-update pre-commit hooks ([#3283](https://github.com/pydanny/cookiecutter-django/pull/3283))
-- Update isort to 5.9.3 ([#3282](https://github.com/pydanny/cookiecutter-django/pull/3282))
+- Auto-update pre-commit hooks ([#3283](https://github.com/cookicutter/cookiecutter-django/pull/3283))
+- Update isort to 5.9.3 ([#3282](https://github.com/cookicutter/cookiecutter-django/pull/3282))
 
 ## [2021-07-27]
 ### Changed
-- Convert trans to translate in templates ([#3277](https://github.com/pydanny/cookiecutter-django/pull/3277))
+- Convert trans to translate in templates ([#3277](https://github.com/cookicutter/cookiecutter-django/pull/3277))
 ### Updated
-- Update hiredis to 2.0.0 ([#3110](https://github.com/pydanny/cookiecutter-django/pull/3110))
-- Update mypy to 0.910 ([#3237](https://github.com/pydanny/cookiecutter-django/pull/3237))
-- Update whitenoise to 5.3.0 ([#3273](https://github.com/pydanny/cookiecutter-django/pull/3273))
-- Update tox to 3.24.0 ([#3269](https://github.com/pydanny/cookiecutter-django/pull/3269))
-- Update django-allauth to 0.45.0 ([#3267](https://github.com/pydanny/cookiecutter-django/pull/3267))
-- Update sentry-sdk to 1.3.0 ([#3262](https://github.com/pydanny/cookiecutter-django/pull/3262))
-- Update sphinx to 4.1.2 ([#3278](https://github.com/pydanny/cookiecutter-django/pull/3278))
-- Auto-update pre-commit hooks ([#3264](https://github.com/pydanny/cookiecutter-django/pull/3264))
-- Update isort to 5.9.2 ([#3279](https://github.com/pydanny/cookiecutter-django/pull/3279))
-- Update pillow to 8.3.1 ([#3259](https://github.com/pydanny/cookiecutter-django/pull/3259))
-- Update black to 21.7b0 ([#3272](https://github.com/pydanny/cookiecutter-django/pull/3272))
+- Update hiredis to 2.0.0 ([#3110](https://github.com/cookicutter/cookiecutter-django/pull/3110))
+- Update mypy to 0.910 ([#3237](https://github.com/cookicutter/cookiecutter-django/pull/3237))
+- Update whitenoise to 5.3.0 ([#3273](https://github.com/cookicutter/cookiecutter-django/pull/3273))
+- Update tox to 3.24.0 ([#3269](https://github.com/cookicutter/cookiecutter-django/pull/3269))
+- Update django-allauth to 0.45.0 ([#3267](https://github.com/cookicutter/cookiecutter-django/pull/3267))
+- Update sentry-sdk to 1.3.0 ([#3262](https://github.com/cookicutter/cookiecutter-django/pull/3262))
+- Update sphinx to 4.1.2 ([#3278](https://github.com/cookicutter/cookiecutter-django/pull/3278))
+- Auto-update pre-commit hooks ([#3264](https://github.com/cookicutter/cookiecutter-django/pull/3264))
+- Update isort to 5.9.2 ([#3279](https://github.com/cookicutter/cookiecutter-django/pull/3279))
+- Update pillow to 8.3.1 ([#3259](https://github.com/cookicutter/cookiecutter-django/pull/3259))
+- Update black to 21.7b0 ([#3272](https://github.com/cookicutter/cookiecutter-django/pull/3272))
 
 ## [2021-07-12]
 ### Changed
-- Define REMAP_SIGTERM=SIGQUIT on Profile of Celery on Heroku ([#3263](https://github.com/pydanny/cookiecutter-django/pull/3263))
+- Define REMAP_SIGTERM=SIGQUIT on Profile of Celery on Heroku ([#3263](https://github.com/cookicutter/cookiecutter-django/pull/3263))
 
 ## [2021-07-08]
 ### Updated
-- Update django to 3.1.13 ([#3247](https://github.com/pydanny/cookiecutter-django/pull/3247))
+- Update django to 3.1.13 ([#3247](https://github.com/cookicutter/cookiecutter-django/pull/3247))
 
 ## [2021-06-29]
 ### Changed
-- Improve github bug report template ([#3243](https://github.com/pydanny/cookiecutter-django/pull/3243))
+- Improve github bug report template ([#3243](https://github.com/cookicutter/cookiecutter-django/pull/3243))
 
 ## [2021-06-28]
 ### Changed
-- Revert &#34;Fix Celery ports error on local Docker&#34; ([#3242](https://github.com/pydanny/cookiecutter-django/pull/3242))
+- Revert &#34;Fix Celery ports error on local Docker&#34; ([#3242](https://github.com/cookicutter/cookiecutter-django/pull/3242))
 ### Fixed
-- Fix Celery ports error on local Docker ([#3241](https://github.com/pydanny/cookiecutter-django/pull/3241))
+- Fix Celery ports error on local Docker ([#3241](https://github.com/cookicutter/cookiecutter-django/pull/3241))
 
 ## [2021-06-25]
 ### Changed
-- Update `.gitignore` file for VSCode ([#3238](https://github.com/pydanny/cookiecutter-django/pull/3238))
+- Update `.gitignore` file for VSCode ([#3238](https://github.com/cookicutter/cookiecutter-django/pull/3238))
 ### Fixed
-- Wrap jQuery call in `DOMContentLoaded` event listener on account email page ([#3239](https://github.com/pydanny/cookiecutter-django/pull/3239))
+- Wrap jQuery call in `DOMContentLoaded` event listener on account email page ([#3239](https://github.com/cookicutter/cookiecutter-django/pull/3239))
 
 ## [2021-06-22]
 ### Changed
-- Update docs/howto.rst ([#3230](https://github.com/pydanny/cookiecutter-django/pull/3230))
-- Add support for PG 13. Drop PG 9. Update all minor versions ([#3154](https://github.com/pydanny/cookiecutter-django/pull/3154))
+- Update docs/howto.rst ([#3230](https://github.com/cookicutter/cookiecutter-django/pull/3230))
+- Add support for PG 13. Drop PG 9. Update all minor versions ([#3154](https://github.com/cookicutter/cookiecutter-django/pull/3154))
 ### Updated
-- Update isort to 5.9.1 ([#3236](https://github.com/pydanny/cookiecutter-django/pull/3236))
-- Auto-update pre-commit hooks ([#3235](https://github.com/pydanny/cookiecutter-django/pull/3235))
+- Update isort to 5.9.1 ([#3236](https://github.com/cookicutter/cookiecutter-django/pull/3236))
+- Auto-update pre-commit hooks ([#3235](https://github.com/cookicutter/cookiecutter-django/pull/3235))
 
 ## [2021-06-21]
 ### Updated
-- Update isort to 5.9.0 ([#3234](https://github.com/pydanny/cookiecutter-django/pull/3234))
-- Update django-anymail to 8.4 ([#3225](https://github.com/pydanny/cookiecutter-django/pull/3225))
-- Update django-redis to 5.0.0 ([#3205](https://github.com/pydanny/cookiecutter-django/pull/3205))
-- Update pylint-django to 2.4.4 ([#3233](https://github.com/pydanny/cookiecutter-django/pull/3233))
-- Auto-update pre-commit hooks ([#3220](https://github.com/pydanny/cookiecutter-django/pull/3220))
-- Bump peter-evans/create-pull-request from 3.9.2 to 3.10.0 ([#3197](https://github.com/pydanny/cookiecutter-django/pull/3197))
-- Update black to 21.6b0 ([#3232](https://github.com/pydanny/cookiecutter-django/pull/3232))
-- Update pytest to 6.2.4 ([#3231](https://github.com/pydanny/cookiecutter-django/pull/3231))
-- Update django-crispy-forms to 1.12.0 ([#3221](https://github.com/pydanny/cookiecutter-django/pull/3221))
-- Update mypy to 0.902 ([#3219](https://github.com/pydanny/cookiecutter-django/pull/3219))
-- Update django-coverage-plugin to 2.0.0 ([#3217](https://github.com/pydanny/cookiecutter-django/pull/3217))
-- Update ipdb to 0.13.9 ([#3210](https://github.com/pydanny/cookiecutter-django/pull/3210))
-- Update uvicorn to 0.14.0 ([#3207](https://github.com/pydanny/cookiecutter-django/pull/3207))
-- Update pytest-cookies to 0.6.1 ([#3196](https://github.com/pydanny/cookiecutter-django/pull/3196))
-- Update sphinx to 4.0.2 ([#3193](https://github.com/pydanny/cookiecutter-django/pull/3193))
-- Update jinja2 to 3.0.1 ([#3189](https://github.com/pydanny/cookiecutter-django/pull/3189))
+- Update isort to 5.9.0 ([#3234](https://github.com/cookicutter/cookiecutter-django/pull/3234))
+- Update django-anymail to 8.4 ([#3225](https://github.com/cookicutter/cookiecutter-django/pull/3225))
+- Update django-redis to 5.0.0 ([#3205](https://github.com/cookicutter/cookiecutter-django/pull/3205))
+- Update pylint-django to 2.4.4 ([#3233](https://github.com/cookicutter/cookiecutter-django/pull/3233))
+- Auto-update pre-commit hooks ([#3220](https://github.com/cookicutter/cookiecutter-django/pull/3220))
+- Bump peter-evans/create-pull-request from 3.9.2 to 3.10.0 ([#3197](https://github.com/cookicutter/cookiecutter-django/pull/3197))
+- Update black to 21.6b0 ([#3232](https://github.com/cookicutter/cookiecutter-django/pull/3232))
+- Update pytest to 6.2.4 ([#3231](https://github.com/cookicutter/cookiecutter-django/pull/3231))
+- Update django-crispy-forms to 1.12.0 ([#3221](https://github.com/cookicutter/cookiecutter-django/pull/3221))
+- Update mypy to 0.902 ([#3219](https://github.com/cookicutter/cookiecutter-django/pull/3219))
+- Update django-coverage-plugin to 2.0.0 ([#3217](https://github.com/cookicutter/cookiecutter-django/pull/3217))
+- Update ipdb to 0.13.9 ([#3210](https://github.com/cookicutter/cookiecutter-django/pull/3210))
+- Update uvicorn to 0.14.0 ([#3207](https://github.com/cookicutter/cookiecutter-django/pull/3207))
+- Update pytest-cookies to 0.6.1 ([#3196](https://github.com/cookicutter/cookiecutter-django/pull/3196))
+- Update sphinx to 4.0.2 ([#3193](https://github.com/cookicutter/cookiecutter-django/pull/3193))
+- Update jinja2 to 3.0.1 ([#3189](https://github.com/cookicutter/cookiecutter-django/pull/3189))
 
 ## [2021-06-19]
 ### Updated
-- Update psycopg2 to 2.9.1 ([#3227](https://github.com/pydanny/cookiecutter-django/pull/3227))
-- Update psycopg2-binary to 2.9.1 ([#3228](https://github.com/pydanny/cookiecutter-django/pull/3228))
+- Update psycopg2 to 2.9.1 ([#3227](https://github.com/cookicutter/cookiecutter-django/pull/3227))
+- Update psycopg2-binary to 2.9.1 ([#3228](https://github.com/cookicutter/cookiecutter-django/pull/3228))
 
 ## [2021-06-14]
 ### Changed
-- Update black GitHub link in requirements ([#3222](https://github.com/pydanny/cookiecutter-django/pull/3222))
+- Update black GitHub link in requirements ([#3222](https://github.com/cookicutter/cookiecutter-django/pull/3222))
 
 ## [2021-06-09]
 ### Changed
-- Fix link format in developing-locally.rst ([#3214](https://github.com/pydanny/cookiecutter-django/pull/3214))
+- Fix link format in developing-locally.rst ([#3214](https://github.com/cookicutter/cookiecutter-django/pull/3214))
 ### Updated
-- Update pre-commit to 2.13.0 ([#3195](https://github.com/pydanny/cookiecutter-django/pull/3195))
-- Update pytest-django to 4.4.0 ([#3212](https://github.com/pydanny/cookiecutter-django/pull/3212))
-- Update mypy to 0.901 ([#3215](https://github.com/pydanny/cookiecutter-django/pull/3215))
-- Auto-update pre-commit hooks ([#3206](https://github.com/pydanny/cookiecutter-django/pull/3206))
-- Update black to 21.5b2 ([#3204](https://github.com/pydanny/cookiecutter-django/pull/3204))
+- Update pre-commit to 2.13.0 ([#3195](https://github.com/cookicutter/cookiecutter-django/pull/3195))
+- Update pytest-django to 4.4.0 ([#3212](https://github.com/cookicutter/cookiecutter-django/pull/3212))
+- Update mypy to 0.901 ([#3215](https://github.com/cookicutter/cookiecutter-django/pull/3215))
+- Auto-update pre-commit hooks ([#3206](https://github.com/cookicutter/cookiecutter-django/pull/3206))
+- Update black to 21.5b2 ([#3204](https://github.com/cookicutter/cookiecutter-django/pull/3204))
 
 ## [2021-06-06]
 ### Changed
-- Updated .pre-commit-config.yaml to self-update its dependencies ([#3208](https://github.com/pydanny/cookiecutter-django/pull/3208))
+- Updated .pre-commit-config.yaml to self-update its dependencies ([#3208](https://github.com/cookicutter/cookiecutter-django/pull/3208))
 
 ## [2021-06-05]
 ### Changed
-- Shorthand for the officially supported buildpack ([#3211](https://github.com/pydanny/cookiecutter-django/pull/3211))
+- Shorthand for the officially supported buildpack ([#3211](https://github.com/cookicutter/cookiecutter-django/pull/3211))
 
 ## [2021-06-02]
 ### Updated
-- Update django to 3.1.12 ([#3209](https://github.com/pydanny/cookiecutter-django/pull/3209))
+- Update django to 3.1.12 ([#3209](https://github.com/cookicutter/cookiecutter-django/pull/3209))
 
 ## [2021-05-18]
 ### Changed
-- Move ARG PYTHON_VERSION=3.9-slim-buster to the global scope ([#3188](https://github.com/pydanny/cookiecutter-django/pull/3188))
+- Move ARG PYTHON_VERSION=3.9-slim-buster to the global scope ([#3188](https://github.com/cookicutter/cookiecutter-django/pull/3188))
 
 ## [2021-05-17]
 ### Updated
-- Bump tiangolo/issue-manager from 0.3.0 to 0.4.0 ([#3186](https://github.com/pydanny/cookiecutter-django/pull/3186))
-- Auto-update pre-commit hooks ([#3185](https://github.com/pydanny/cookiecutter-django/pull/3185))
+- Bump tiangolo/issue-manager from 0.3.0 to 0.4.0 ([#3186](https://github.com/cookicutter/cookiecutter-django/pull/3186))
+- Auto-update pre-commit hooks ([#3185](https://github.com/cookicutter/cookiecutter-django/pull/3185))
 
 ## [2021-05-15]
 ### Changed
-- Update watchgod to 0.7 ([#3177](https://github.com/pydanny/cookiecutter-django/pull/3177))
+- Update watchgod to 0.7 ([#3177](https://github.com/cookicutter/cookiecutter-django/pull/3177))
 ### Updated
-- Auto-update pre-commit hooks ([#3184](https://github.com/pydanny/cookiecutter-django/pull/3184))
-- Update black to 21.5b1 ([#3167](https://github.com/pydanny/cookiecutter-django/pull/3167))
-- Update flake8 to 3.9.2 ([#3164](https://github.com/pydanny/cookiecutter-django/pull/3164))
-- Update pytest-django to 4.3.0 ([#3182](https://github.com/pydanny/cookiecutter-django/pull/3182))
-- Auto-update pre-commit hooks ([#3157](https://github.com/pydanny/cookiecutter-django/pull/3157))
-- Update python-slugify to 5.0.2 ([#3161](https://github.com/pydanny/cookiecutter-django/pull/3161))
-- Bump stefanzweifel/git-auto-commit-action from 4.10.0 to 4.11.0 ([#3171](https://github.com/pydanny/cookiecutter-django/pull/3171))
-- Update sentry-sdk to 1.1.0 ([#3163](https://github.com/pydanny/cookiecutter-django/pull/3163))
-- Bump actions/setup-python from 2 to 2.2.2 ([#3173](https://github.com/pydanny/cookiecutter-django/pull/3173))
-- Update tox to 3.23.1 ([#3160](https://github.com/pydanny/cookiecutter-django/pull/3160))
-- Update pytest to 6.2.4 ([#3156](https://github.com/pydanny/cookiecutter-django/pull/3156))
-- Bump peter-evans/create-pull-request from 3.8.2 to 3.9.2 ([#3179](https://github.com/pydanny/cookiecutter-django/pull/3179))
-- Update sphinx to 4.0.1 ([#3169](https://github.com/pydanny/cookiecutter-django/pull/3169))
-- Update cookiecutter to 1.7.3 ([#3180](https://github.com/pydanny/cookiecutter-django/pull/3180))
-- Update django to 3.1.11 ([#3178](https://github.com/pydanny/cookiecutter-django/pull/3178))
+- Auto-update pre-commit hooks ([#3184](https://github.com/cookicutter/cookiecutter-django/pull/3184))
+- Update black to 21.5b1 ([#3167](https://github.com/cookicutter/cookiecutter-django/pull/3167))
+- Update flake8 to 3.9.2 ([#3164](https://github.com/cookicutter/cookiecutter-django/pull/3164))
+- Update pytest-django to 4.3.0 ([#3182](https://github.com/cookicutter/cookiecutter-django/pull/3182))
+- Auto-update pre-commit hooks ([#3157](https://github.com/cookicutter/cookiecutter-django/pull/3157))
+- Update python-slugify to 5.0.2 ([#3161](https://github.com/cookicutter/cookiecutter-django/pull/3161))
+- Bump stefanzweifel/git-auto-commit-action from 4.10.0 to 4.11.0 ([#3171](https://github.com/cookicutter/cookiecutter-django/pull/3171))
+- Update sentry-sdk to 1.1.0 ([#3163](https://github.com/cookicutter/cookiecutter-django/pull/3163))
+- Bump actions/setup-python from 2 to 2.2.2 ([#3173](https://github.com/cookicutter/cookiecutter-django/pull/3173))
+- Update tox to 3.23.1 ([#3160](https://github.com/cookicutter/cookiecutter-django/pull/3160))
+- Update pytest to 6.2.4 ([#3156](https://github.com/cookicutter/cookiecutter-django/pull/3156))
+- Bump peter-evans/create-pull-request from 3.8.2 to 3.9.2 ([#3179](https://github.com/cookicutter/cookiecutter-django/pull/3179))
+- Update sphinx to 4.0.1 ([#3169](https://github.com/cookicutter/cookiecutter-django/pull/3169))
+- Update cookiecutter to 1.7.3 ([#3180](https://github.com/cookicutter/cookiecutter-django/pull/3180))
+- Update django to 3.1.11 ([#3178](https://github.com/cookicutter/cookiecutter-django/pull/3178))
 
 ## [2021-05-06]
 ### Updated
-- Update django to 3.1.10 ([#3162](https://github.com/pydanny/cookiecutter-django/pull/3162))
+- Update django to 3.1.10 ([#3162](https://github.com/cookicutter/cookiecutter-django/pull/3162))
 
 ## [2021-05-04]
 ### Updated
-- Update django to 3.1.9 ([#3155](https://github.com/pydanny/cookiecutter-django/pull/3155))
+- Update django to 3.1.9 ([#3155](https://github.com/cookicutter/cookiecutter-django/pull/3155))
 
 ## [2021-04-30]
 ### Fixed
-- Fix linting error in production.py ([#3148](https://github.com/pydanny/cookiecutter-django/pull/3148))
+- Fix linting error in production.py ([#3148](https://github.com/cookicutter/cookiecutter-django/pull/3148))
 
 ## [2021-04-29]
 ### Updated
-- Update black to 21.4b2 ([#3147](https://github.com/pydanny/cookiecutter-django/pull/3147))
-- Auto-update pre-commit hooks ([#3146](https://github.com/pydanny/cookiecutter-django/pull/3146))
+- Update black to 21.4b2 ([#3147](https://github.com/cookicutter/cookiecutter-django/pull/3147))
+- Auto-update pre-commit hooks ([#3146](https://github.com/cookicutter/cookiecutter-django/pull/3146))
 
 ## [2021-04-28]
 ### Changed
-- Fix README link ([#3144](https://github.com/pydanny/cookiecutter-django/pull/3144))
+- Fix README link ([#3144](https://github.com/cookicutter/cookiecutter-django/pull/3144))
 ### Updated
-- Auto-update pre-commit hooks ([#3145](https://github.com/pydanny/cookiecutter-django/pull/3145))
+- Auto-update pre-commit hooks ([#3145](https://github.com/cookicutter/cookiecutter-django/pull/3145))
 
 ## [2021-04-27]
 ### Updated
-- Update pygithub to 1.55 ([#3141](https://github.com/pydanny/cookiecutter-django/pull/3141))
-- Update black to 21.4b1 ([#3143](https://github.com/pydanny/cookiecutter-django/pull/3143))
+- Update pygithub to 1.55 ([#3141](https://github.com/cookicutter/cookiecutter-django/pull/3141))
+- Update black to 21.4b1 ([#3143](https://github.com/cookicutter/cookiecutter-django/pull/3143))
 
 ## [2021-04-26]
 ### Updated
-- Update black to 21.4b0 ([#3138](https://github.com/pydanny/cookiecutter-django/pull/3138))
-- Auto-update pre-commit hooks ([#3137](https://github.com/pydanny/cookiecutter-django/pull/3137))
+- Update black to 21.4b0 ([#3138](https://github.com/cookicutter/cookiecutter-django/pull/3138))
+- Auto-update pre-commit hooks ([#3137](https://github.com/cookicutter/cookiecutter-django/pull/3137))
 
 ## [2021-04-21]
 ### Updated
-- Auto-update pre-commit hooks ([#3133](https://github.com/pydanny/cookiecutter-django/pull/3133))
-- Update django-extensions to 3.1.3 ([#3136](https://github.com/pydanny/cookiecutter-django/pull/3136))
-- Update django-compressor to 2.4.1 ([#3135](https://github.com/pydanny/cookiecutter-django/pull/3135))
-- Update pre-commit to 2.12.1 ([#3134](https://github.com/pydanny/cookiecutter-django/pull/3134))
-- Update flake8 to 3.9.1 ([#3131](https://github.com/pydanny/cookiecutter-django/pull/3131))
-- Update django-stubs to 1.8.0 ([#3127](https://github.com/pydanny/cookiecutter-django/pull/3127))
-- Update sphinx to 3.5.4 ([#3126](https://github.com/pydanny/cookiecutter-django/pull/3126))
+- Auto-update pre-commit hooks ([#3133](https://github.com/cookicutter/cookiecutter-django/pull/3133))
+- Update django-extensions to 3.1.3 ([#3136](https://github.com/cookicutter/cookiecutter-django/pull/3136))
+- Update django-compressor to 2.4.1 ([#3135](https://github.com/cookicutter/cookiecutter-django/pull/3135))
+- Update pre-commit to 2.12.1 ([#3134](https://github.com/cookicutter/cookiecutter-django/pull/3134))
+- Update flake8 to 3.9.1 ([#3131](https://github.com/cookicutter/cookiecutter-django/pull/3131))
+- Update django-stubs to 1.8.0 ([#3127](https://github.com/cookicutter/cookiecutter-django/pull/3127))
+- Update sphinx to 3.5.4 ([#3126](https://github.com/cookicutter/cookiecutter-django/pull/3126))
 
 ## [2021-04-15]
 ### Updated
-- Update django-debug-toolbar to 3.2.1 ([#3129](https://github.com/pydanny/cookiecutter-django/pull/3129))
+- Update django-debug-toolbar to 3.2.1 ([#3129](https://github.com/cookicutter/cookiecutter-django/pull/3129))
 
 ## [2021-04-14]
 ### Updated
-- Bump stefanzweifel/git-auto-commit-action from v4.9.2 to v4.10.0 ([#3128](https://github.com/pydanny/cookiecutter-django/pull/3128))
+- Bump stefanzweifel/git-auto-commit-action from v4.9.2 to v4.10.0 ([#3128](https://github.com/cookicutter/cookiecutter-django/pull/3128))
 
 ## [2021-04-11]
 ### Updated
-- Update pytest-django to 4.2.0 ([#3125](https://github.com/pydanny/cookiecutter-django/pull/3125))
-- Update pylint-django to 2.4.3 ([#3122](https://github.com/pydanny/cookiecutter-django/pull/3122))
+- Update pytest-django to 4.2.0 ([#3125](https://github.com/cookicutter/cookiecutter-django/pull/3125))
+- Update pylint-django to 2.4.3 ([#3122](https://github.com/cookicutter/cookiecutter-django/pull/3122))
 
 ## [2021-04-09]
 ### Changed
-- Update from Python 3.8 to Python 3.9 ([#3023](https://github.com/pydanny/cookiecutter-django/pull/3023))
+- Update from Python 3.8 to Python 3.9 ([#3023](https://github.com/cookicutter/cookiecutter-django/pull/3023))
 
 ## [2021-04-08]
 ### Changed
-- Switch .dockerignore to explicit list ([#3121](https://github.com/pydanny/cookiecutter-django/pull/3121))
-- Change Docker image to multi-stage build for Django ([#2815](https://github.com/pydanny/cookiecutter-django/pull/2815))
-- Fix deprecated warning in middleware tests ([#3038](https://github.com/pydanny/cookiecutter-django/pull/3038))
+- Switch .dockerignore to explicit list ([#3121](https://github.com/cookicutter/cookiecutter-django/pull/3121))
+- Change Docker image to multi-stage build for Django ([#2815](https://github.com/cookicutter/cookiecutter-django/pull/2815))
+- Fix deprecated warning in middleware tests ([#3038](https://github.com/cookicutter/cookiecutter-django/pull/3038))
 ### Updated
-- Update pre-commit to 2.12.0 ([#3120](https://github.com/pydanny/cookiecutter-django/pull/3120))
+- Update pre-commit to 2.12.0 ([#3120](https://github.com/cookicutter/cookiecutter-django/pull/3120))
 
 ## [2021-04-07]
 ### Changed
-- Update django to 3.1.8 ([#3117](https://github.com/pydanny/cookiecutter-django/pull/3117))
+- Update django to 3.1.8 ([#3117](https://github.com/cookicutter/cookiecutter-django/pull/3117))
 ### Fixed
-- Fix linting via pre-commit on Github CI ([#3077](https://github.com/pydanny/cookiecutter-django/pull/3077))
-- Fix gitlab-ci using duplicate key name for image ([#3112](https://github.com/pydanny/cookiecutter-django/pull/3112))
+- Fix linting via pre-commit on Github CI ([#3077](https://github.com/cookicutter/cookiecutter-django/pull/3077))
+- Fix gitlab-ci using duplicate key name for image ([#3112](https://github.com/cookicutter/cookiecutter-django/pull/3112))
 ### Updated
-- Update sentry-sdk to 1.0.0 ([#3080](https://github.com/pydanny/cookiecutter-django/pull/3080))
-- Update gunicorn to 20.1.0 ([#3108](https://github.com/pydanny/cookiecutter-django/pull/3108))
-- Update pre-commit to 2.12.0 ([#3118](https://github.com/pydanny/cookiecutter-django/pull/3118))
-- Update django-extensions to 3.1.2 ([#3116](https://github.com/pydanny/cookiecutter-django/pull/3116))
-- Update pillow to 8.2.0 ([#3113](https://github.com/pydanny/cookiecutter-django/pull/3113))
-- Update pytest to 6.2.3 ([#3115](https://github.com/pydanny/cookiecutter-django/pull/3115))
+- Update sentry-sdk to 1.0.0 ([#3080](https://github.com/cookicutter/cookiecutter-django/pull/3080))
+- Update gunicorn to 20.1.0 ([#3108](https://github.com/cookicutter/cookiecutter-django/pull/3108))
+- Update pre-commit to 2.12.0 ([#3118](https://github.com/cookicutter/cookiecutter-django/pull/3118))
+- Update django-extensions to 3.1.2 ([#3116](https://github.com/cookicutter/cookiecutter-django/pull/3116))
+- Update pillow to 8.2.0 ([#3113](https://github.com/cookicutter/cookiecutter-django/pull/3113))
+- Update pytest to 6.2.3 ([#3115](https://github.com/cookicutter/cookiecutter-django/pull/3115))
 
 ## [2021-03-26]
 ### Updated
-- Update djangorestframework to 3.12.4 ([#3107](https://github.com/pydanny/cookiecutter-django/pull/3107))
+- Update djangorestframework to 3.12.4 ([#3107](https://github.com/cookicutter/cookiecutter-django/pull/3107))
 
 ## [2021-03-25]
 ### Updated
-- Update djangorestframework to 3.12.3 ([#3105](https://github.com/pydanny/cookiecutter-django/pull/3105))
+- Update djangorestframework to 3.12.3 ([#3105](https://github.com/cookicutter/cookiecutter-django/pull/3105))
 
 ## [2021-03-22]
 ### Updated
-- Update django-crispy-forms to 1.11.2 ([#3104](https://github.com/pydanny/cookiecutter-django/pull/3104))
-- Update sphinx to 3.5.3 ([#3103](https://github.com/pydanny/cookiecutter-django/pull/3103))
-- Update ipdb to 0.13.7 ([#3102](https://github.com/pydanny/cookiecutter-django/pull/3102))
-- Update sphinx-autobuild to 2021.3.14 ([#3101](https://github.com/pydanny/cookiecutter-django/pull/3101))
-- Update isort to 5.8.0 ([#3100](https://github.com/pydanny/cookiecutter-django/pull/3100))
-- Update pre-commit to 2.11.1 ([#3089](https://github.com/pydanny/cookiecutter-django/pull/3089))
-- Update flake8 to 3.9.0 ([#3096](https://github.com/pydanny/cookiecutter-django/pull/3096))
-- Update pillow to 8.1.2 ([#3084](https://github.com/pydanny/cookiecutter-django/pull/3084))
-- Auto-update pre-commit hooks ([#3095](https://github.com/pydanny/cookiecutter-django/pull/3095))
+- Update django-crispy-forms to 1.11.2 ([#3104](https://github.com/cookicutter/cookiecutter-django/pull/3104))
+- Update sphinx to 3.5.3 ([#3103](https://github.com/cookicutter/cookiecutter-django/pull/3103))
+- Update ipdb to 0.13.7 ([#3102](https://github.com/cookicutter/cookiecutter-django/pull/3102))
+- Update sphinx-autobuild to 2021.3.14 ([#3101](https://github.com/cookicutter/cookiecutter-django/pull/3101))
+- Update isort to 5.8.0 ([#3100](https://github.com/cookicutter/cookiecutter-django/pull/3100))
+- Update pre-commit to 2.11.1 ([#3089](https://github.com/cookicutter/cookiecutter-django/pull/3089))
+- Update flake8 to 3.9.0 ([#3096](https://github.com/cookicutter/cookiecutter-django/pull/3096))
+- Update pillow to 8.1.2 ([#3084](https://github.com/cookicutter/cookiecutter-django/pull/3084))
+- Auto-update pre-commit hooks ([#3095](https://github.com/cookicutter/cookiecutter-django/pull/3095))
 
 ## [2021-03-05]
 ### Changed
-- Updated test_urls.py and views.py to re-use User.get_absolute_url() ([#3070](https://github.com/pydanny/cookiecutter-django/pull/3070))
+- Updated test_urls.py and views.py to re-use User.get_absolute_url() ([#3070](https://github.com/cookicutter/cookiecutter-django/pull/3070))
 ### Updated
-- Bump stefanzweifel/git-auto-commit-action from v4.9.1 to v4.9.2 ([#3082](https://github.com/pydanny/cookiecutter-django/pull/3082))
+- Bump stefanzweifel/git-auto-commit-action from v4.9.1 to v4.9.2 ([#3082](https://github.com/cookicutter/cookiecutter-django/pull/3082))
 
 ## [2021-03-03]
 ### Updated
-- Update tox to 3.23.0 ([#3079](https://github.com/pydanny/cookiecutter-django/pull/3079))
-- Update ipdb to 0.13.5 ([#3078](https://github.com/pydanny/cookiecutter-django/pull/3078))
+- Update tox to 3.23.0 ([#3079](https://github.com/cookicutter/cookiecutter-django/pull/3079))
+- Update ipdb to 0.13.5 ([#3078](https://github.com/cookicutter/cookiecutter-django/pull/3078))
 
 ## [2021-03-02]
 ### Fixed
-- Fixes for pytest job in Github CI workflow ([#3076](https://github.com/pydanny/cookiecutter-django/pull/3076))
+- Fixes for pytest job in Github CI workflow ([#3076](https://github.com/cookicutter/cookiecutter-django/pull/3076))
 ### Updated
-- Update pillow to 8.1.1 ([#3075](https://github.com/pydanny/cookiecutter-django/pull/3075))
-- Update coverage to 5.5 ([#3074](https://github.com/pydanny/cookiecutter-django/pull/3074))
+- Update pillow to 8.1.1 ([#3075](https://github.com/cookicutter/cookiecutter-django/pull/3075))
+- Update coverage to 5.5 ([#3074](https://github.com/cookicutter/cookiecutter-django/pull/3074))
 
 ## [2021-02-24]
 ### Updated
-- Bump stefanzweifel/git-auto-commit-action from v4.9.0 to v4.9.1 ([#3069](https://github.com/pydanny/cookiecutter-django/pull/3069))
+- Bump stefanzweifel/git-auto-commit-action from v4.9.0 to v4.9.1 ([#3069](https://github.com/cookicutter/cookiecutter-django/pull/3069))
 
 ## [2021-02-23]
 ### Changed
-- Update to Django 3.1 ([#3043](https://github.com/pydanny/cookiecutter-django/pull/3043))
-- Lint with pre-commit on CI with Github actions ([#3066](https://github.com/pydanny/cookiecutter-django/pull/3066))
-- Use exception var in status code pages if available ([#2992](https://github.com/pydanny/cookiecutter-django/pull/2992))
+- Update to Django 3.1 ([#3043](https://github.com/cookicutter/cookiecutter-django/pull/3043))
+- Lint with pre-commit on CI with Github actions ([#3066](https://github.com/cookicutter/cookiecutter-django/pull/3066))
+- Use exception var in status code pages if available ([#2992](https://github.com/cookicutter/cookiecutter-django/pull/2992))
 
 ## [2021-02-22]
 ### Changed
-- refactor: remove default cache settings in test.py ([#3064](https://github.com/pydanny/cookiecutter-django/pull/3064))
-- Update django to 3.0.13 ([#3060](https://github.com/pydanny/cookiecutter-django/pull/3060))
+- refactor: remove default cache settings in test.py ([#3064](https://github.com/cookicutter/cookiecutter-django/pull/3064))
+- Update django to 3.0.13 ([#3060](https://github.com/cookicutter/cookiecutter-django/pull/3060))
 ### Fixed
-- Fix missing Django Debug toolbar with node container ([#2865](https://github.com/pydanny/cookiecutter-django/pull/2865))
-- Remove Email from User API ([#3055](https://github.com/pydanny/cookiecutter-django/pull/3055))
+- Fix missing Django Debug toolbar with node container ([#2865](https://github.com/cookicutter/cookiecutter-django/pull/2865))
+- Remove Email from User API ([#3055](https://github.com/cookicutter/cookiecutter-django/pull/3055))
 ### Updated
-- Bump stefanzweifel/git-auto-commit-action from v4.8.0 to v4.9.0 ([#3065](https://github.com/pydanny/cookiecutter-django/pull/3065))
-- Update django-crispy-forms to 1.11.1 ([#3063](https://github.com/pydanny/cookiecutter-django/pull/3063))
-- Update uvicorn to 0.13.4 ([#3062](https://github.com/pydanny/cookiecutter-django/pull/3062))
-- Update mypy to 0.812 ([#3061](https://github.com/pydanny/cookiecutter-django/pull/3061))
-- Update sentry-sdk to 0.20.3 ([#3059](https://github.com/pydanny/cookiecutter-django/pull/3059))
-- Update tox to 3.22.0 ([#3057](https://github.com/pydanny/cookiecutter-django/pull/3057))
-- Update sphinx to 3.5.1 ([#3056](https://github.com/pydanny/cookiecutter-django/pull/3056))
+- Bump stefanzweifel/git-auto-commit-action from v4.8.0 to v4.9.0 ([#3065](https://github.com/cookicutter/cookiecutter-django/pull/3065))
+- Update django-crispy-forms to 1.11.1 ([#3063](https://github.com/cookicutter/cookiecutter-django/pull/3063))
+- Update uvicorn to 0.13.4 ([#3062](https://github.com/cookicutter/cookiecutter-django/pull/3062))
+- Update mypy to 0.812 ([#3061](https://github.com/cookicutter/cookiecutter-django/pull/3061))
+- Update sentry-sdk to 0.20.3 ([#3059](https://github.com/cookicutter/cookiecutter-django/pull/3059))
+- Update tox to 3.22.0 ([#3057](https://github.com/cookicutter/cookiecutter-django/pull/3057))
+- Update sphinx to 3.5.1 ([#3056](https://github.com/cookicutter/cookiecutter-django/pull/3056))
 
 ## [2021-02-16]
 ### Updated
-- Update sentry-sdk to 0.20.2 ([#3054](https://github.com/pydanny/cookiecutter-django/pull/3054))
-- Update sphinx to 3.5.0 ([#3053](https://github.com/pydanny/cookiecutter-django/pull/3053))
+- Update sentry-sdk to 0.20.2 ([#3054](https://github.com/cookicutter/cookiecutter-django/pull/3054))
+- Update sphinx to 3.5.0 ([#3053](https://github.com/cookicutter/cookiecutter-django/pull/3053))
 
 ## [2021-02-13]
 ### Updated
-- Update sentry-sdk to 0.20.1 ([#3052](https://github.com/pydanny/cookiecutter-django/pull/3052))
+- Update sentry-sdk to 0.20.1 ([#3052](https://github.com/cookicutter/cookiecutter-django/pull/3052))
 
 ## [2021-02-12]
 ### Updated
-- Update pre-commit to 2.10.1 ([#3045](https://github.com/pydanny/cookiecutter-django/pull/3045))
-- Update sentry-sdk to 0.20.0 ([#3051](https://github.com/pydanny/cookiecutter-django/pull/3051))
+- Update pre-commit to 2.10.1 ([#3045](https://github.com/cookicutter/cookiecutter-django/pull/3045))
+- Update sentry-sdk to 0.20.0 ([#3051](https://github.com/cookicutter/cookiecutter-django/pull/3051))
 
 ## [2021-02-10]
 ### Updated
-- Bump peter-evans/create-pull-request from v3.8.1 to v3.8.2 ([#3049](https://github.com/pydanny/cookiecutter-django/pull/3049))
+- Bump peter-evans/create-pull-request from v3.8.1 to v3.8.2 ([#3049](https://github.com/cookicutter/cookiecutter-django/pull/3049))
 
 ## [2021-02-08]
 ### Updated
-- Update django-extensions to 3.1.1 ([#3047](https://github.com/pydanny/cookiecutter-django/pull/3047))
-- Bump peter-evans/create-pull-request from v3.8.0 to v3.8.1 ([#3046](https://github.com/pydanny/cookiecutter-django/pull/3046))
+- Update django-extensions to 3.1.1 ([#3047](https://github.com/cookicutter/cookiecutter-django/pull/3047))
+- Bump peter-evans/create-pull-request from v3.8.0 to v3.8.1 ([#3046](https://github.com/cookicutter/cookiecutter-django/pull/3046))
 
 ## [2021-02-06]
 ### Changed
-- Removed Redundant test_case_sensitivity() and made test_not_authenticated() get the LOGIN_URL dynamically. ([#3041](https://github.com/pydanny/cookiecutter-django/pull/3041))
-- Refactored users.forms to make the code more readeable ([#3029](https://github.com/pydanny/cookiecutter-django/pull/3029))
-- Update django to 3.0.12 ([#3037](https://github.com/pydanny/cookiecutter-django/pull/3037))
+- Removed Redundant test_case_sensitivity() and made test_not_authenticated() get the LOGIN_URL dynamically. ([#3041](https://github.com/cookicutter/cookiecutter-django/pull/3041))
+- Refactored users.forms to make the code more readeable ([#3029](https://github.com/cookicutter/cookiecutter-django/pull/3029))
+- Update django to 3.0.12 ([#3037](https://github.com/cookicutter/cookiecutter-django/pull/3037))
 ### Updated
-- Update tox to 3.21.4 ([#3044](https://github.com/pydanny/cookiecutter-django/pull/3044))
+- Update tox to 3.21.4 ([#3044](https://github.com/cookicutter/cookiecutter-django/pull/3044))
 
 ## [2021-02-01]
 ### Updated
-- Update pytz to 2021.1 ([#3035](https://github.com/pydanny/cookiecutter-django/pull/3035))
-- Update jinja2 to 2.11.3 ([#3033](https://github.com/pydanny/cookiecutter-django/pull/3033))
-- Bump peter-evans/create-pull-request from v3.7.0 to v3.8.0 ([#3034](https://github.com/pydanny/cookiecutter-django/pull/3034))
+- Update pytz to 2021.1 ([#3035](https://github.com/cookicutter/cookiecutter-django/pull/3035))
+- Update jinja2 to 2.11.3 ([#3033](https://github.com/cookicutter/cookiecutter-django/pull/3033))
+- Bump peter-evans/create-pull-request from v3.7.0 to v3.8.0 ([#3034](https://github.com/cookicutter/cookiecutter-django/pull/3034))
 
 ## [2021-01-31]
 ### Changed
-- Adding local celery instructions to developing-locally ([#3031](https://github.com/pydanny/cookiecutter-django/pull/3031))
+- Adding local celery instructions to developing-locally ([#3031](https://github.com/cookicutter/cookiecutter-django/pull/3031))
 ### Updated
-- Update django-crispy-forms to 1.11.0 ([#3032](https://github.com/pydanny/cookiecutter-django/pull/3032))
+- Update django-crispy-forms to 1.11.0 ([#3032](https://github.com/cookicutter/cookiecutter-django/pull/3032))
 
 ## [2021-01-28]
 ### Updated
-- Update pre-commit to 2.10.0 ([#3028](https://github.com/pydanny/cookiecutter-django/pull/3028))
-- Update django-anymail to 8.2 ([#3027](https://github.com/pydanny/cookiecutter-django/pull/3027))
-- Update tox to 3.21.3 ([#3026](https://github.com/pydanny/cookiecutter-django/pull/3026))
+- Update pre-commit to 2.10.0 ([#3028](https://github.com/cookicutter/cookiecutter-django/pull/3028))
+- Update django-anymail to 8.2 ([#3027](https://github.com/cookicutter/cookiecutter-django/pull/3027))
+- Update tox to 3.21.3 ([#3026](https://github.com/cookicutter/cookiecutter-django/pull/3026))
 
 ## [2021-01-26]
 ### Changed
-- Bump peter-evans/create-pull-request from v3.6.0 to v3.7.0 ([#3022](https://github.com/pydanny/cookiecutter-django/pull/3022))
-- Using SuccessMessageMixin to send success message to django template ([#3021](https://github.com/pydanny/cookiecutter-django/pull/3021))
+- Bump peter-evans/create-pull-request from v3.6.0 to v3.7.0 ([#3022](https://github.com/cookicutter/cookiecutter-django/pull/3022))
+- Using SuccessMessageMixin to send success message to django template ([#3021](https://github.com/cookicutter/cookiecutter-django/pull/3021))
 ### Fixed
-- Update admin to ignore *_name User attributes ([#3018](https://github.com/pydanny/cookiecutter-django/pull/3018))
+- Update admin to ignore *_name User attributes ([#3018](https://github.com/cookicutter/cookiecutter-django/pull/3018))
 ### Updated
-- Update coverage to 5.4 ([#3024](https://github.com/pydanny/cookiecutter-django/pull/3024))
-- Update pytest to 6.2.2 ([#3020](https://github.com/pydanny/cookiecutter-django/pull/3020))
-- Update django-cors-headers to 3.7.0 ([#3019](https://github.com/pydanny/cookiecutter-django/pull/3019))
+- Update coverage to 5.4 ([#3024](https://github.com/cookicutter/cookiecutter-django/pull/3024))
+- Update pytest to 6.2.2 ([#3020](https://github.com/cookicutter/cookiecutter-django/pull/3020))
+- Update django-cors-headers to 3.7.0 ([#3019](https://github.com/cookicutter/cookiecutter-django/pull/3019))
 
 ## [2021-01-24]
 ### Changed
-- Use defer for script tags (Fix #2922) ([#2927](https://github.com/pydanny/cookiecutter-django/pull/2927))
-- Made Traefik conf much easier to understand and improved redirect res… ([#2838](https://github.com/pydanny/cookiecutter-django/pull/2838))
-- Sentry Redis integration enabled by default in production. ([#2989](https://github.com/pydanny/cookiecutter-django/pull/2989))
-- Add test for UserUpdateView.form_valid() ([#2949](https://github.com/pydanny/cookiecutter-django/pull/2949))
+- Use defer for script tags (Fix #2922) ([#2927](https://github.com/cookicutter/cookiecutter-django/pull/2927))
+- Made Traefik conf much easier to understand and improved redirect res… ([#2838](https://github.com/cookicutter/cookiecutter-django/pull/2838))
+- Sentry Redis integration enabled by default in production. ([#2989](https://github.com/cookicutter/cookiecutter-django/pull/2989))
+- Add test for UserUpdateView.form_valid() ([#2949](https://github.com/cookicutter/cookiecutter-django/pull/2949))
 ### Fixed
-- Omit first_name and last_name in User model ([#2998](https://github.com/pydanny/cookiecutter-django/pull/2998))
+- Omit first_name and last_name in User model ([#2998](https://github.com/cookicutter/cookiecutter-django/pull/2998))
 ### Updated
-- Update django-celery-beat to 2.2.0 ([#3009](https://github.com/pydanny/cookiecutter-django/pull/3009))
-- Update pyyaml to 5.4.1 ([#3011](https://github.com/pydanny/cookiecutter-django/pull/3011))
-- Update mypy to 0.800 ([#3013](https://github.com/pydanny/cookiecutter-django/pull/3013))
-- Update factory-boy to 3.2.0 ([#2986](https://github.com/pydanny/cookiecutter-django/pull/2986))
-- Update tox to 3.21.2 ([#3010](https://github.com/pydanny/cookiecutter-django/pull/3010))
+- Update django-celery-beat to 2.2.0 ([#3009](https://github.com/cookicutter/cookiecutter-django/pull/3009))
+- Update pyyaml to 5.4.1 ([#3011](https://github.com/cookicutter/cookiecutter-django/pull/3011))
+- Update mypy to 0.800 ([#3013](https://github.com/cookicutter/cookiecutter-django/pull/3013))
+- Update factory-boy to 3.2.0 ([#2986](https://github.com/cookicutter/cookiecutter-django/pull/2986))
+- Update tox to 3.21.2 ([#3010](https://github.com/cookicutter/cookiecutter-django/pull/3010))
 
 ## [2021-01-22]
 ### Changed
-- Use self.request.user instead of second query ([#3012](https://github.com/pydanny/cookiecutter-django/pull/3012))
+- Use self.request.user instead of second query ([#3012](https://github.com/cookicutter/cookiecutter-django/pull/3012))
 
 ## [2021-01-14]
 ### Updated
-- Update tox to 3.21.1 ([#3006](https://github.com/pydanny/cookiecutter-django/pull/3006))
+- Update tox to 3.21.1 ([#3006](https://github.com/cookicutter/cookiecutter-django/pull/3006))
 
 ## [2021-01-10]
 ### Updated
-- Update pylint-django to 2.4.2 ([#3003](https://github.com/pydanny/cookiecutter-django/pull/3003))
-- Update tox to 3.21.0 ([#3002](https://github.com/pydanny/cookiecutter-django/pull/3002))
+- Update pylint-django to 2.4.2 ([#3003](https://github.com/cookicutter/cookiecutter-django/pull/3003))
+- Update tox to 3.21.0 ([#3002](https://github.com/cookicutter/cookiecutter-django/pull/3002))
 
 ## [2021-01-08]
 ### Changed
-- Upgrade Travis to Focal ([#2999](https://github.com/pydanny/cookiecutter-django/pull/2999))
+- Upgrade Travis to Focal ([#2999](https://github.com/cookicutter/cookiecutter-django/pull/2999))
 ### Updated
-- Update pylint-django to 2.4.1 ([#3001](https://github.com/pydanny/cookiecutter-django/pull/3001))
-- Update sphinx to 3.4.3 ([#3000](https://github.com/pydanny/cookiecutter-django/pull/3000))
-- Update pylint-django to 2.4.0 ([#2996](https://github.com/pydanny/cookiecutter-django/pull/2996))
+- Update pylint-django to 2.4.1 ([#3001](https://github.com/cookicutter/cookiecutter-django/pull/3001))
+- Update sphinx to 3.4.3 ([#3000](https://github.com/cookicutter/cookiecutter-django/pull/3000))
+- Update pylint-django to 2.4.0 ([#2996](https://github.com/cookicutter/cookiecutter-django/pull/2996))
 
 ## [2021-01-04]
 ### Updated
-- Update isort to 5.7.0 ([#2988](https://github.com/pydanny/cookiecutter-django/pull/2988))
-- Update uvicorn to 0.13.3 ([#2987](https://github.com/pydanny/cookiecutter-django/pull/2987))
-- Auto-update pre-commit hooks ([#2990](https://github.com/pydanny/cookiecutter-django/pull/2990))
-- Update sphinx to 3.4.2 ([#2995](https://github.com/pydanny/cookiecutter-django/pull/2995))
-- Update pillow to 8.1.0 ([#2993](https://github.com/pydanny/cookiecutter-django/pull/2993))
+- Update isort to 5.7.0 ([#2988](https://github.com/cookicutter/cookiecutter-django/pull/2988))
+- Update uvicorn to 0.13.3 ([#2987](https://github.com/cookicutter/cookiecutter-django/pull/2987))
+- Auto-update pre-commit hooks ([#2990](https://github.com/cookicutter/cookiecutter-django/pull/2990))
+- Update sphinx to 3.4.2 ([#2995](https://github.com/cookicutter/cookiecutter-django/pull/2995))
+- Update pillow to 8.1.0 ([#2993](https://github.com/cookicutter/cookiecutter-django/pull/2993))
 
 ## [2020-12-29]
 ### Updated
-- Update pygithub to 1.54.1 ([#2982](https://github.com/pydanny/cookiecutter-django/pull/2982))
-- Update django-storages to 1.11.1 ([#2981](https://github.com/pydanny/cookiecutter-django/pull/2981))
+- Update pygithub to 1.54.1 ([#2982](https://github.com/cookicutter/cookiecutter-django/pull/2982))
+- Update django-storages to 1.11.1 ([#2981](https://github.com/cookicutter/cookiecutter-django/pull/2981))
 
 ## [2020-12-26]
 ### Updated
-- Update sphinx to 3.4.1 ([#2985](https://github.com/pydanny/cookiecutter-django/pull/2985))
-- Update pytz to 2020.5 ([#2984](https://github.com/pydanny/cookiecutter-django/pull/2984))
+- Update sphinx to 3.4.1 ([#2985](https://github.com/cookicutter/cookiecutter-django/pull/2985))
+- Update pytz to 2020.5 ([#2984](https://github.com/cookicutter/cookiecutter-django/pull/2984))
 
 ## [2020-12-23]
 ### Changed
-- Bump peter-evans/create-pull-request from v3.5.2 to v3.6.0 ([#2980](https://github.com/pydanny/cookiecutter-django/pull/2980))
+- Bump peter-evans/create-pull-request from v3.5.2 to v3.6.0 ([#2980](https://github.com/cookicutter/cookiecutter-django/pull/2980))
 ### Updated
-- Update flower to 0.9.7 ([#2979](https://github.com/pydanny/cookiecutter-django/pull/2979))
-- Update sphinx to 3.4.0 ([#2978](https://github.com/pydanny/cookiecutter-django/pull/2978))
-- Update coverage to 5.3.1 ([#2977](https://github.com/pydanny/cookiecutter-django/pull/2977))
-- Update uvicorn to 0.13.2 ([#2976](https://github.com/pydanny/cookiecutter-django/pull/2976))
+- Update flower to 0.9.7 ([#2979](https://github.com/cookicutter/cookiecutter-django/pull/2979))
+- Update sphinx to 3.4.0 ([#2978](https://github.com/cookicutter/cookiecutter-django/pull/2978))
+- Update coverage to 5.3.1 ([#2977](https://github.com/cookicutter/cookiecutter-django/pull/2977))
+- Update uvicorn to 0.13.2 ([#2976](https://github.com/cookicutter/cookiecutter-django/pull/2976))
 
 ## [2020-12-18]
 ### Changed
-- Bump stefanzweifel/git-auto-commit-action from v4.7.2 to v4.8.0 ([#2972](https://github.com/pydanny/cookiecutter-django/pull/2972))
+- Bump stefanzweifel/git-auto-commit-action from v4.7.2 to v4.8.0 ([#2972](https://github.com/cookicutter/cookiecutter-django/pull/2972))
 ### Updated
-- Update django-storages to 1.11 ([#2973](https://github.com/pydanny/cookiecutter-django/pull/2973))
-- Update pytest to 6.2.1 ([#2971](https://github.com/pydanny/cookiecutter-django/pull/2971))
-- Auto-update pre-commit hooks ([#2970](https://github.com/pydanny/cookiecutter-django/pull/2970))
+- Update django-storages to 1.11 ([#2973](https://github.com/cookicutter/cookiecutter-django/pull/2973))
+- Update pytest to 6.2.1 ([#2971](https://github.com/cookicutter/cookiecutter-django/pull/2971))
+- Auto-update pre-commit hooks ([#2970](https://github.com/cookicutter/cookiecutter-django/pull/2970))
 
 ## [2020-12-14]
 ### Updated
-- Update pytest to 6.2.0 ([#2968](https://github.com/pydanny/cookiecutter-django/pull/2968))
-- Update django-cors-headers to 3.6.0 ([#2967](https://github.com/pydanny/cookiecutter-django/pull/2967))
-- Update uvicorn to 0.13.1 ([#2966](https://github.com/pydanny/cookiecutter-django/pull/2966))
+- Update pytest to 6.2.0 ([#2968](https://github.com/cookicutter/cookiecutter-django/pull/2968))
+- Update django-cors-headers to 3.6.0 ([#2967](https://github.com/cookicutter/cookiecutter-django/pull/2967))
+- Update uvicorn to 0.13.1 ([#2966](https://github.com/cookicutter/cookiecutter-django/pull/2966))
 
 ## [2020-12-10]
 ### Changed
-- Hot-reload support to celery ([#2554](https://github.com/pydanny/cookiecutter-django/pull/2554))
+- Hot-reload support to celery ([#2554](https://github.com/cookicutter/cookiecutter-django/pull/2554))
 ### Updated
-- Update uvicorn to 0.13.0 ([#2962](https://github.com/pydanny/cookiecutter-django/pull/2962))
-- Update sentry-sdk to 0.19.5 ([#2965](https://github.com/pydanny/cookiecutter-django/pull/2965))
+- Update uvicorn to 0.13.0 ([#2962](https://github.com/cookicutter/cookiecutter-django/pull/2962))
+- Update sentry-sdk to 0.19.5 ([#2965](https://github.com/cookicutter/cookiecutter-django/pull/2965))
 
 ## [2020-12-09]
 ### Changed
-- Bump peter-evans/create-pull-request from v3.5.1 to v3.5.2 ([#2964](https://github.com/pydanny/cookiecutter-django/pull/2964))
+- Bump peter-evans/create-pull-request from v3.5.1 to v3.5.2 ([#2964](https://github.com/cookicutter/cookiecutter-django/pull/2964))
 
 ## [2020-12-08]
 ### Updated
-- Update pre-commit to 2.9.3 ([#2961](https://github.com/pydanny/cookiecutter-django/pull/2961))
+- Update pre-commit to 2.9.3 ([#2961](https://github.com/cookicutter/cookiecutter-django/pull/2961))
 
 ## [2020-12-04]
 ### Updated
-- Update django-debug-toolbar to 3.2 ([#2959](https://github.com/pydanny/cookiecutter-django/pull/2959))
+- Update django-debug-toolbar to 3.2 ([#2959](https://github.com/cookicutter/cookiecutter-django/pull/2959))
 
 ## [2020-12-02]
 ### Updated
-- Update django-model-utils to 4.1.1 ([#2957](https://github.com/pydanny/cookiecutter-django/pull/2957))
-- Update pygithub to 1.54 ([#2958](https://github.com/pydanny/cookiecutter-django/pull/2958))
+- Update django-model-utils to 4.1.1 ([#2957](https://github.com/cookicutter/cookiecutter-django/pull/2957))
+- Update pygithub to 1.54 ([#2958](https://github.com/cookicutter/cookiecutter-django/pull/2958))
 
 ## [2020-11-26]
 ### Updated
-- Update django-extensions to 3.1.0 ([#2947](https://github.com/pydanny/cookiecutter-django/pull/2947))
-- Update pre-commit to 2.9.2 ([#2948](https://github.com/pydanny/cookiecutter-django/pull/2948))
-- Update django-allauth to 0.44.0 ([#2945](https://github.com/pydanny/cookiecutter-django/pull/2945))
+- Update django-extensions to 3.1.0 ([#2947](https://github.com/cookicutter/cookiecutter-django/pull/2947))
+- Update pre-commit to 2.9.2 ([#2948](https://github.com/cookicutter/cookiecutter-django/pull/2948))
+- Update django-allauth to 0.44.0 ([#2945](https://github.com/cookicutter/cookiecutter-django/pull/2945))
 
 ## [2020-11-25]
 ### Changed
-- Bump peter-evans/create-pull-request from v3.5.0 to v3.5.1 ([#2944](https://github.com/pydanny/cookiecutter-django/pull/2944))
+- Bump peter-evans/create-pull-request from v3.5.0 to v3.5.1 ([#2944](https://github.com/cookicutter/cookiecutter-django/pull/2944))
 
 ## [2020-11-23]
 ### Updated
-- Update uvicorn to 0.12.3 ([#2943](https://github.com/pydanny/cookiecutter-django/pull/2943))
-- Update pre-commit to 2.9.0 ([#2942](https://github.com/pydanny/cookiecutter-django/pull/2942))
+- Update uvicorn to 0.12.3 ([#2943](https://github.com/cookicutter/cookiecutter-django/pull/2943))
+- Update pre-commit to 2.9.0 ([#2942](https://github.com/cookicutter/cookiecutter-django/pull/2942))
 
 ## [2020-11-21]
 ### Changed
-- Fix after uvicorn 0.12.0 - Ship extra dependencies ([#2939](https://github.com/pydanny/cookiecutter-django/pull/2939))
+- Fix after uvicorn 0.12.0 - Ship extra dependencies ([#2939](https://github.com/cookicutter/cookiecutter-django/pull/2939))
 
 ## [2020-11-20]
 ### Updated
-- Update sentry-sdk to 0.19.4 ([#2938](https://github.com/pydanny/cookiecutter-django/pull/2938))
+- Update sentry-sdk to 0.19.4 ([#2938](https://github.com/cookicutter/cookiecutter-django/pull/2938))
 
 ## [2020-11-19]
 ### Updated
-- Update django-crispy-forms to 1.10.0 ([#2937](https://github.com/pydanny/cookiecutter-django/pull/2937))
+- Update django-crispy-forms to 1.10.0 ([#2937](https://github.com/cookicutter/cookiecutter-django/pull/2937))
 
 ## [2020-11-17]
 ### Changed
-- Bump peter-evans/create-pull-request from v2 to v3.5.0 ([#2936](https://github.com/pydanny/cookiecutter-django/pull/2936))
+- Bump peter-evans/create-pull-request from v2 to v3.5.0 ([#2936](https://github.com/cookicutter/cookiecutter-django/pull/2936))
 
 ## [2020-11-15]
 ### Changed
-- Fix formatting in docs ([#2935](https://github.com/pydanny/cookiecutter-django/pull/2935))
+- Fix formatting in docs ([#2935](https://github.com/cookicutter/cookiecutter-django/pull/2935))
 
 ## [2020-11-13]
 ### Changed
-- Upgrade factory-boy to 3.1.0 ([#2932](https://github.com/pydanny/cookiecutter-django/pull/2932))
+- Upgrade factory-boy to 3.1.0 ([#2932](https://github.com/cookicutter/cookiecutter-django/pull/2932))
 ### Updated
-- Update sentry-sdk to 0.19.3 ([#2933](https://github.com/pydanny/cookiecutter-django/pull/2933))
-- Update sphinx to 3.3.1 ([#2934](https://github.com/pydanny/cookiecutter-django/pull/2934))
+- Update sentry-sdk to 0.19.3 ([#2933](https://github.com/cookicutter/cookiecutter-django/pull/2933))
+- Update sphinx to 3.3.1 ([#2934](https://github.com/cookicutter/cookiecutter-django/pull/2934))
 
 ## [2020-11-12]
 ### Changed
-- Migrate CI to Github Actions ([#2931](https://github.com/pydanny/cookiecutter-django/pull/2931))
+- Migrate CI to Github Actions ([#2931](https://github.com/cookicutter/cookiecutter-django/pull/2931))
 
 ## [2020-11-06]
 ### Updated
-- Update djangorestframework to 3.12.2 ([#2930](https://github.com/pydanny/cookiecutter-django/pull/2930))
+- Update djangorestframework to 3.12.2 ([#2930](https://github.com/cookicutter/cookiecutter-django/pull/2930))
 
 ## [2020-11-04]
 ### Changed
-- Fix docs service and add RTD support ([#2920](https://github.com/pydanny/cookiecutter-django/pull/2920))
-- Bump stefanzweifel/git-auto-commit-action from v4.6.0 to v4.7.2 ([#2914](https://github.com/pydanny/cookiecutter-django/pull/2914))
+- Fix docs service and add RTD support ([#2920](https://github.com/cookicutter/cookiecutter-django/pull/2920))
+- Bump stefanzweifel/git-auto-commit-action from v4.6.0 to v4.7.2 ([#2914](https://github.com/cookicutter/cookiecutter-django/pull/2914))
 ### Updated
-- Auto-update pre-commit hooks ([#2908](https://github.com/pydanny/cookiecutter-django/pull/2908))
-- Update mypy to 0.790 ([#2886](https://github.com/pydanny/cookiecutter-django/pull/2886))
-- Update django-stubs to 1.7.0 ([#2916](https://github.com/pydanny/cookiecutter-django/pull/2916))
+- Auto-update pre-commit hooks ([#2908](https://github.com/cookicutter/cookiecutter-django/pull/2908))
+- Update mypy to 0.790 ([#2886](https://github.com/cookicutter/cookiecutter-django/pull/2886))
+- Update django-stubs to 1.7.0 ([#2916](https://github.com/cookicutter/cookiecutter-django/pull/2916))
 
 ## [2020-11-03]
 ### Updated
-- Update sentry-sdk to 0.19.2 ([#2926](https://github.com/pydanny/cookiecutter-django/pull/2926))
-- Update sphinx to 3.3.0 ([#2925](https://github.com/pydanny/cookiecutter-django/pull/2925))
-- Update django to 3.0.11 ([#2924](https://github.com/pydanny/cookiecutter-django/pull/2924))
-- Update pytz to 2020.4 ([#2923](https://github.com/pydanny/cookiecutter-django/pull/2923))
-- Update pre-commit to 2.8.2 ([#2919](https://github.com/pydanny/cookiecutter-django/pull/2919))
-- Update pytest to 6.1.2 ([#2917](https://github.com/pydanny/cookiecutter-django/pull/2917))
-- Update sh to 1.14.1 ([#2912](https://github.com/pydanny/cookiecutter-django/pull/2912))
-- Update pytest-django to 4.1.0 ([#2911](https://github.com/pydanny/cookiecutter-django/pull/2911))
-- Update pillow to 8.0.1 ([#2910](https://github.com/pydanny/cookiecutter-django/pull/2910))
-- Update django-celery-beat to 2.1.0 ([#2907](https://github.com/pydanny/cookiecutter-django/pull/2907))
-- Update uvicorn to 0.12.2 ([#2906](https://github.com/pydanny/cookiecutter-django/pull/2906))
+- Update sentry-sdk to 0.19.2 ([#2926](https://github.com/cookicutter/cookiecutter-django/pull/2926))
+- Update sphinx to 3.3.0 ([#2925](https://github.com/cookicutter/cookiecutter-django/pull/2925))
+- Update django to 3.0.11 ([#2924](https://github.com/cookicutter/cookiecutter-django/pull/2924))
+- Update pytz to 2020.4 ([#2923](https://github.com/cookicutter/cookiecutter-django/pull/2923))
+- Update pre-commit to 2.8.2 ([#2919](https://github.com/cookicutter/cookiecutter-django/pull/2919))
+- Update pytest to 6.1.2 ([#2917](https://github.com/cookicutter/cookiecutter-django/pull/2917))
+- Update sh to 1.14.1 ([#2912](https://github.com/cookicutter/cookiecutter-django/pull/2912))
+- Update pytest-django to 4.1.0 ([#2911](https://github.com/cookicutter/cookiecutter-django/pull/2911))
+- Update pillow to 8.0.1 ([#2910](https://github.com/cookicutter/cookiecutter-django/pull/2910))
+- Update django-celery-beat to 2.1.0 ([#2907](https://github.com/cookicutter/cookiecutter-django/pull/2907))
+- Update uvicorn to 0.12.2 ([#2906](https://github.com/cookicutter/cookiecutter-django/pull/2906))
 
 ## [2020-10-19]
 ### Updated
-- Update sentry-sdk to 0.19.1 ([#2905](https://github.com/pydanny/cookiecutter-django/pull/2905))
+- Update sentry-sdk to 0.19.1 ([#2905](https://github.com/cookicutter/cookiecutter-django/pull/2905))
 
 ## [2020-10-17]
 ### Updated
-- Update django-allauth to 0.43.0 ([#2901](https://github.com/pydanny/cookiecutter-django/pull/2901))
-- Update pytest-django to 4.0.0 ([#2903](https://github.com/pydanny/cookiecutter-django/pull/2903))
+- Update django-allauth to 0.43.0 ([#2901](https://github.com/cookicutter/cookiecutter-django/pull/2901))
+- Update pytest-django to 4.0.0 ([#2903](https://github.com/cookicutter/cookiecutter-django/pull/2903))
 
 ## [2020-10-15]
 ### Updated
-- Update pillow to 8.0.0 ([#2898](https://github.com/pydanny/cookiecutter-django/pull/2898))
+- Update pillow to 8.0.0 ([#2898](https://github.com/cookicutter/cookiecutter-django/pull/2898))
 
 ## [2020-10-14]
 ### Updated
-- Auto-update pre-commit hooks ([#2897](https://github.com/pydanny/cookiecutter-django/pull/2897))
-- Update sentry-sdk to 0.19.0 ([#2896](https://github.com/pydanny/cookiecutter-django/pull/2896))
+- Auto-update pre-commit hooks ([#2897](https://github.com/cookicutter/cookiecutter-django/pull/2897))
+- Update sentry-sdk to 0.19.0 ([#2896](https://github.com/cookicutter/cookiecutter-django/pull/2896))
 
 ## [2020-10-13]
 ### Updated
-- Update isort to 5.6.4 ([#2895](https://github.com/pydanny/cookiecutter-django/pull/2895))
+- Update isort to 5.6.4 ([#2895](https://github.com/cookicutter/cookiecutter-django/pull/2895))
 
 ## [2020-10-12]
 ### Changed
-- Bump stefanzweifel/git-auto-commit-action from v4.5.1 to v4.6.0 ([#2893](https://github.com/pydanny/cookiecutter-django/pull/2893))
+- Bump stefanzweifel/git-auto-commit-action from v4.5.1 to v4.6.0 ([#2893](https://github.com/cookicutter/cookiecutter-django/pull/2893))
 ### Updated
-- Auto-update pre-commit hooks ([#2892](https://github.com/pydanny/cookiecutter-django/pull/2892))
+- Auto-update pre-commit hooks ([#2892](https://github.com/cookicutter/cookiecutter-django/pull/2892))
 
 ## [2020-10-11]
 ### Updated
-- Auto-update pre-commit hooks ([#2890](https://github.com/pydanny/cookiecutter-django/pull/2890))
-- Update isort to 5.6.3 ([#2891](https://github.com/pydanny/cookiecutter-django/pull/2891))
-- Update django-anymail to 8.1 ([#2887](https://github.com/pydanny/cookiecutter-django/pull/2887))
-- Update tox to 3.20.1 ([#2885](https://github.com/pydanny/cookiecutter-django/pull/2885))
+- Auto-update pre-commit hooks ([#2890](https://github.com/cookicutter/cookiecutter-django/pull/2890))
+- Update isort to 5.6.3 ([#2891](https://github.com/cookicutter/cookiecutter-django/pull/2891))
+- Update django-anymail to 8.1 ([#2887](https://github.com/cookicutter/cookiecutter-django/pull/2887))
+- Update tox to 3.20.1 ([#2885](https://github.com/cookicutter/cookiecutter-django/pull/2885))
 
 ## [2020-10-09]
 ### Updated
-- Auto-update pre-commit hooks ([#2884](https://github.com/pydanny/cookiecutter-django/pull/2884))
-- Update isort to 5.6.1 ([#2883](https://github.com/pydanny/cookiecutter-django/pull/2883))
+- Auto-update pre-commit hooks ([#2884](https://github.com/cookicutter/cookiecutter-django/pull/2884))
+- Update isort to 5.6.1 ([#2883](https://github.com/cookicutter/cookiecutter-django/pull/2883))
 
 ## [2020-10-08]
 ### Changed
-- Add dedicated websockets package ([#2881](https://github.com/pydanny/cookiecutter-django/pull/2881))
+- Add dedicated websockets package ([#2881](https://github.com/cookicutter/cookiecutter-django/pull/2881))
 ### Updated
-- Update isort to 5.6.0 ([#2882](https://github.com/pydanny/cookiecutter-django/pull/2882))
+- Update isort to 5.6.0 ([#2882](https://github.com/cookicutter/cookiecutter-django/pull/2882))
 
 ## [2020-10-04]
 ### Updated
-- Update pytest to 6.1.1 ([#2880](https://github.com/pydanny/cookiecutter-django/pull/2880))
-- Update mypy and django-stubs ([#2874](https://github.com/pydanny/cookiecutter-django/pull/2874))
-- Auto-update pre-commit hooks ([#2876](https://github.com/pydanny/cookiecutter-django/pull/2876))
-- Update flake8 to 3.8.4 ([#2877](https://github.com/pydanny/cookiecutter-django/pull/2877))
+- Update pytest to 6.1.1 ([#2880](https://github.com/cookicutter/cookiecutter-django/pull/2880))
+- Update mypy and django-stubs ([#2874](https://github.com/cookicutter/cookiecutter-django/pull/2874))
+- Auto-update pre-commit hooks ([#2876](https://github.com/cookicutter/cookiecutter-django/pull/2876))
+- Update flake8 to 3.8.4 ([#2877](https://github.com/cookicutter/cookiecutter-django/pull/2877))
 
 ## [2020-10-01]
 ### Changed
-- Bump actions/setup-python from v2.1.2 to v2.1.3 ([#2869](https://github.com/pydanny/cookiecutter-django/pull/2869))
+- Bump actions/setup-python from v2.1.2 to v2.1.3 ([#2869](https://github.com/cookicutter/cookiecutter-django/pull/2869))
 ### Updated
-- Update ipdb to 0.13.4 ([#2873](https://github.com/pydanny/cookiecutter-django/pull/2873))
-- Auto-update pre-commit hooks ([#2867](https://github.com/pydanny/cookiecutter-django/pull/2867))
-- Update uvicorn to 0.12.1 ([#2866](https://github.com/pydanny/cookiecutter-django/pull/2866))
-- Update isort to 5.5.4 ([#2864](https://github.com/pydanny/cookiecutter-django/pull/2864))
-- Update sentry-sdk to 0.18.0 ([#2863](https://github.com/pydanny/cookiecutter-django/pull/2863))
-- Update djangorestframework to 3.12.1 ([#2862](https://github.com/pydanny/cookiecutter-django/pull/2862))
-- Update pytest to 6.1.0 ([#2859](https://github.com/pydanny/cookiecutter-django/pull/2859))
-- Update django-debug-toolbar to 3.1.1 ([#2855](https://github.com/pydanny/cookiecutter-django/pull/2855))
+- Update ipdb to 0.13.4 ([#2873](https://github.com/cookicutter/cookiecutter-django/pull/2873))
+- Auto-update pre-commit hooks ([#2867](https://github.com/cookicutter/cookiecutter-django/pull/2867))
+- Update uvicorn to 0.12.1 ([#2866](https://github.com/cookicutter/cookiecutter-django/pull/2866))
+- Update isort to 5.5.4 ([#2864](https://github.com/cookicutter/cookiecutter-django/pull/2864))
+- Update sentry-sdk to 0.18.0 ([#2863](https://github.com/cookicutter/cookiecutter-django/pull/2863))
+- Update djangorestframework to 3.12.1 ([#2862](https://github.com/cookicutter/cookiecutter-django/pull/2862))
+- Update pytest to 6.1.0 ([#2859](https://github.com/cookicutter/cookiecutter-django/pull/2859))
+- Update django-debug-toolbar to 3.1.1 ([#2855](https://github.com/cookicutter/cookiecutter-django/pull/2855))
 
 ## [2020-09-23]
 ### Updated
-- Update sentry-sdk to 0.17.7 ([#2847](https://github.com/pydanny/cookiecutter-django/pull/2847))
-- Update django-debug-toolbar to 3.1 ([#2846](https://github.com/pydanny/cookiecutter-django/pull/2846))
+- Update sentry-sdk to 0.17.7 ([#2847](https://github.com/cookicutter/cookiecutter-django/pull/2847))
+- Update django-debug-toolbar to 3.1 ([#2846](https://github.com/cookicutter/cookiecutter-django/pull/2846))
 
 ## [2020-09-21]
 ### Changed
-- Adding GitHub-Action CI Option ([#2837](https://github.com/pydanny/cookiecutter-django/pull/2837))
+- Adding GitHub-Action CI Option ([#2837](https://github.com/cookicutter/cookiecutter-django/pull/2837))
 ### Updated
-- Update django-debug-toolbar to 3.0 ([#2842](https://github.com/pydanny/cookiecutter-django/pull/2842))
-- Auto-update pre-commit hooks ([#2843](https://github.com/pydanny/cookiecutter-django/pull/2843))
-- Update isort to 5.5.3 ([#2844](https://github.com/pydanny/cookiecutter-django/pull/2844))
+- Update django-debug-toolbar to 3.0 ([#2842](https://github.com/cookicutter/cookiecutter-django/pull/2842))
+- Auto-update pre-commit hooks ([#2843](https://github.com/cookicutter/cookiecutter-django/pull/2843))
+- Update isort to 5.5.3 ([#2844](https://github.com/cookicutter/cookiecutter-django/pull/2844))
 
 ## [2020-09-18]
 ### Updated
-- Update django-extensions to 3.0.9 ([#2839](https://github.com/pydanny/cookiecutter-django/pull/2839))
+- Update django-extensions to 3.0.9 ([#2839](https://github.com/cookicutter/cookiecutter-django/pull/2839))
 
 ## [2020-09-16]
 ### Updated
-- Update sentry-sdk to 0.17.6 ([#2833](https://github.com/pydanny/cookiecutter-django/pull/2833))
-- Update pytest-django to 3.10.0 ([#2832](https://github.com/pydanny/cookiecutter-django/pull/2832))
+- Update sentry-sdk to 0.17.6 ([#2833](https://github.com/cookicutter/cookiecutter-django/pull/2833))
+- Update pytest-django to 3.10.0 ([#2832](https://github.com/cookicutter/cookiecutter-django/pull/2832))
 
 ## [2020-09-14]
 ### Fixed
-- Downgrade Celery to 4.4.6 ([#2829](https://github.com/pydanny/cookiecutter-django/pull/2829))
+- Downgrade Celery to 4.4.6 ([#2829](https://github.com/cookicutter/cookiecutter-django/pull/2829))
 ### Updated
-- Update sentry-sdk to 0.17.5 ([#2828](https://github.com/pydanny/cookiecutter-django/pull/2828))
-- Update coverage to 5.3 ([#2826](https://github.com/pydanny/cookiecutter-django/pull/2826))
-- Update django-storages to 1.10.1 ([#2825](https://github.com/pydanny/cookiecutter-django/pull/2825))
+- Update sentry-sdk to 0.17.5 ([#2828](https://github.com/cookicutter/cookiecutter-django/pull/2828))
+- Update coverage to 5.3 ([#2826](https://github.com/cookicutter/cookiecutter-django/pull/2826))
+- Update django-storages to 1.10.1 ([#2825](https://github.com/cookicutter/cookiecutter-django/pull/2825))
 
 ## [2020-09-12]
 ### Updated
-- Updating Traefik version from 2.0 to 2.2.11 ([#2814](https://github.com/pydanny/cookiecutter-django/pull/2814))
-- Update pytest to 6.0.2 ([#2819](https://github.com/pydanny/cookiecutter-django/pull/2819))
-- Update django-anymail to 8.0 ([#2818](https://github.com/pydanny/cookiecutter-django/pull/2818))
+- Updating Traefik version from 2.0 to 2.2.11 ([#2814](https://github.com/cookicutter/cookiecutter-django/pull/2814))
+- Update pytest to 6.0.2 ([#2819](https://github.com/cookicutter/cookiecutter-django/pull/2819))
+- Update django-anymail to 8.0 ([#2818](https://github.com/cookicutter/cookiecutter-django/pull/2818))
 
 ## [2020-09-11]
 ### Updated
-- Auto-update pre-commit hooks ([#2809](https://github.com/pydanny/cookiecutter-django/pull/2809))
+- Auto-update pre-commit hooks ([#2809](https://github.com/cookicutter/cookiecutter-django/pull/2809))
 
 ## [2020-09-10]
 ### Updated
-- Update isort to 5.5.2 ([#2807](https://github.com/pydanny/cookiecutter-django/pull/2807))
-- Update sentry-sdk to 0.17.4 ([#2805](https://github.com/pydanny/cookiecutter-django/pull/2805))
+- Update isort to 5.5.2 ([#2807](https://github.com/cookicutter/cookiecutter-django/pull/2807))
+- Update sentry-sdk to 0.17.4 ([#2805](https://github.com/cookicutter/cookiecutter-django/pull/2805))
 
 ## [2020-09-09]
 ### Changed
-- Update actions/setup-python requirement to v2.1.2 ([#2804](https://github.com/pydanny/cookiecutter-django/pull/2804))
-- Clean up nested venv files from `.gitignore` ([#2800](https://github.com/pydanny/cookiecutter-django/pull/2800))
+- Update actions/setup-python requirement to v2.1.2 ([#2804](https://github.com/cookicutter/cookiecutter-django/pull/2804))
+- Clean up nested venv files from `.gitignore` ([#2800](https://github.com/cookicutter/cookiecutter-django/pull/2800))
 
 ## [2020-09-08]
 ### Changed
-- Traeffik and Django dockerfile changes ([#2801](https://github.com/pydanny/cookiecutter-django/pull/2801))
+- Traeffik and Django dockerfile changes ([#2801](https://github.com/cookicutter/cookiecutter-django/pull/2801))
 
 ## [2020-09-07]
 ### Changed
-- Add :z/:Z to mounted volumes in {local,production}.yml ([#2663](https://github.com/pydanny/cookiecutter-django/pull/2663))
-- Remove --no-binary option for psycopg2 ([#2798](https://github.com/pydanny/cookiecutter-django/pull/2798))
-- Updated Gitlab CI to use Python 3.8 instead of Python 3.7 ([#2794](https://github.com/pydanny/cookiecutter-django/pull/2794))
+- Add :z/:Z to mounted volumes in {local,production}.yml ([#2663](https://github.com/cookicutter/cookiecutter-django/pull/2663))
+- Remove --no-binary option for psycopg2 ([#2798](https://github.com/cookicutter/cookiecutter-django/pull/2798))
+- Updated Gitlab CI to use Python 3.8 instead of Python 3.7 ([#2794](https://github.com/cookicutter/cookiecutter-django/pull/2794))
 ### Fixed
-- Fix options for sphinx-autobuild in docs Makefile ([#2799](https://github.com/pydanny/cookiecutter-django/pull/2799))
+- Fix options for sphinx-autobuild in docs Makefile ([#2799](https://github.com/cookicutter/cookiecutter-django/pull/2799))
 ### Updated
-- Update psycopg2-binary to 2.8.6 ([#2797](https://github.com/pydanny/cookiecutter-django/pull/2797))
+- Update psycopg2-binary to 2.8.6 ([#2797](https://github.com/cookicutter/cookiecutter-django/pull/2797))
 
 ## [2020-09-05]
 ### Updated
-- Auto-update pre-commit hooks ([#2793](https://github.com/pydanny/cookiecutter-django/pull/2793))
+- Auto-update pre-commit hooks ([#2793](https://github.com/cookicutter/cookiecutter-django/pull/2793))
 
 ## [2020-09-04]
 ### Updated
-- Update django-extensions to 3.0.8 ([#2792](https://github.com/pydanny/cookiecutter-django/pull/2792))
-- Update isort to 5.5.1 ([#2791](https://github.com/pydanny/cookiecutter-django/pull/2791))
-- Auto-update pre-commit hooks ([#2790](https://github.com/pydanny/cookiecutter-django/pull/2790))
-- Update isort to 5.5.0 ([#2789](https://github.com/pydanny/cookiecutter-django/pull/2789))
+- Update django-extensions to 3.0.8 ([#2792](https://github.com/cookicutter/cookiecutter-django/pull/2792))
+- Update isort to 5.5.1 ([#2791](https://github.com/cookicutter/cookiecutter-django/pull/2791))
+- Auto-update pre-commit hooks ([#2790](https://github.com/cookicutter/cookiecutter-django/pull/2790))
+- Update isort to 5.5.0 ([#2789](https://github.com/cookicutter/cookiecutter-django/pull/2789))
 
 ## [2020-09-02]
 ### Changed
-- Add environment and traces_sample_rate keyword to sentry_sdk.init ([#2777](https://github.com/pydanny/cookiecutter-django/pull/2777))
+- Add environment and traces_sample_rate keyword to sentry_sdk.init ([#2777](https://github.com/cookicutter/cookiecutter-django/pull/2777))
 ### Updated
-- Update sentry-sdk to 0.17.3 ([#2788](https://github.com/pydanny/cookiecutter-django/pull/2788))
-- Update django-extensions to 3.0.7 ([#2787](https://github.com/pydanny/cookiecutter-django/pull/2787))
+- Update sentry-sdk to 0.17.3 ([#2788](https://github.com/cookicutter/cookiecutter-django/pull/2788))
+- Update django-extensions to 3.0.7 ([#2787](https://github.com/cookicutter/cookiecutter-django/pull/2787))
 
 ## [2020-09-01]
 ### Changed
-- Exclude venv directory and update document link ([#2780](https://github.com/pydanny/cookiecutter-django/pull/2780))
+- Exclude venv directory and update document link ([#2780](https://github.com/cookicutter/cookiecutter-django/pull/2780))
 ### Updated
-- Update tox to 3.20.0 ([#2786](https://github.com/pydanny/cookiecutter-django/pull/2786))
-- Update django-storages to 1.10 ([#2781](https://github.com/pydanny/cookiecutter-django/pull/2781))
-- Update sentry-sdk to 0.17.2 ([#2784](https://github.com/pydanny/cookiecutter-django/pull/2784))
-- Update django to 3.0.10 ([#2785](https://github.com/pydanny/cookiecutter-django/pull/2785))
-- Update sphinx-autobuild to 2020.9.1 ([#2782](https://github.com/pydanny/cookiecutter-django/pull/2782))
-- Update django-extensions to 3.0.6 ([#2783](https://github.com/pydanny/cookiecutter-django/pull/2783))
+- Update tox to 3.20.0 ([#2786](https://github.com/cookicutter/cookiecutter-django/pull/2786))
+- Update django-storages to 1.10 ([#2781](https://github.com/cookicutter/cookiecutter-django/pull/2781))
+- Update sentry-sdk to 0.17.2 ([#2784](https://github.com/cookicutter/cookiecutter-django/pull/2784))
+- Update django to 3.0.10 ([#2785](https://github.com/cookicutter/cookiecutter-django/pull/2785))
+- Update sphinx-autobuild to 2020.9.1 ([#2782](https://github.com/cookicutter/cookiecutter-django/pull/2782))
+- Update django-extensions to 3.0.6 ([#2783](https://github.com/cookicutter/cookiecutter-django/pull/2783))
 
 ## [2020-08-31]
 ### Updated
-- Update sh to 1.14.0 ([#2779](https://github.com/pydanny/cookiecutter-django/pull/2779))
-- Update sentry-sdk to 0.17.1 ([#2778](https://github.com/pydanny/cookiecutter-django/pull/2778))
+- Update sh to 1.14.0 ([#2779](https://github.com/cookicutter/cookiecutter-django/pull/2779))
+- Update sentry-sdk to 0.17.1 ([#2778](https://github.com/cookicutter/cookiecutter-django/pull/2778))
 
 ## [2020-04-13]
 ### Changed
@@ -1130,7 +1130,7 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 - Rename `MIDDLEWARE_CLASSES` to `MIDDLEWARE` to enable support to [new style middleware](https://github.com/django/deps/blob/master/final/0005-improved-middleware.rst) introduced in Django 1.10 (@luzfcb)
 - New setting `MAILGUN_SENDER_DOMAIN` to allow sending mail from any domain other than those registered with mailgun (@jangeador)
 - add `urlpatterns` configuration to django-debug-toolbar, because the automatic configuration of `urlpatterns` was removed from django-debug-toolbar (@luzfcb)
-- Added Temporary workaround on `requirements/local.txt` to fix django-debug-toolbar issue: https://github.com/pydanny/cookiecutter-django/issues/827 (@luzfcb)
+- Added Temporary workaround on `requirements/local.txt` to fix django-debug-toolbar issue: https://github.com/cookicutter/cookiecutter-django/issues/827 (@luzfcb)
 
 ### Changed
 - Upgrade to Django 1.10.1 (@luzfcb)
@@ -1276,7 +1276,7 @@ d changed 'admin' url on `config/urls.py`, to stay the same as generated by djan
 
 ### [2016-05-01]
 ### Changed
-- Restored the Pycharm project configuration files, that was accidentally removed in [15f350f](https://github.com/pydanny/cookiecutter-django/commit/15f350f05e2b49b4bdff0bdaa2b2ff260606e0f6) (@luzfcb @Newton715)
+- Restored the Pycharm project configuration files, that was accidentally removed in [15f350f](https://github.com/cookicutter/cookiecutter-django/commit/15f350f05e2b49b4bdff0bdaa2b2ff260606e0f6) (@luzfcb @Newton715)
 
 ### [2016-04-30]
 ### Changed
@@ -1400,7 +1400,7 @@ d changed 'admin' url on `config/urls.py`, to stay the same as generated by djan
 ## [2016-02-15]
 ### Changed
 - In `users` app adapter, fix `is_open_for_signup` missing parameter (@oryx2)
-- Fixes and improvements in Hitch tests , see [#485](https://github.com/pydanny/cookiecutter-django/pull/485) (@crdoconnor)
+- Fixes and improvements in Hitch tests , see [#485](https://github.com/cookicutter/cookiecutter-django/pull/485) (@crdoconnor)
 
 
 ## [2016-02-12]
diff --git a/README.rst b/README.rst
index 090497319..d7b74e16c 100644
--- a/README.rst
+++ b/README.rst
@@ -1,23 +1,23 @@
 Cookiecutter Django
 ===================
 
-.. image:: https://img.shields.io/github/workflow/status/pydanny/cookiecutter-django/CI/master
-    :target: https://github.com/pydanny/cookiecutter-django/actions?query=workflow%3ACI
+.. image:: https://img.shields.io/github/workflow/status/cookiecutter/cookiecutter-django/CI/master
+    :target: https://github.com/cookiecutter/cookiecutter-django/actions?query=workflow%3ACI
     :alt: Build Status
 
 .. image:: https://readthedocs.org/projects/cookiecutter-django/badge/?version=latest
     :target: https://cookiecutter-django.readthedocs.io/en/latest/?badge=latest
     :alt: Documentation Status
 
-.. image:: https://pyup.io/repos/github/pydanny/cookiecutter-django/shield.svg
-    :target: https://pyup.io/repos/github/pydanny/cookiecutter-django/
+.. image:: https://pyup.io/repos/github/cookiecutter/cookiecutter-django/shield.svg
+    :target: https://pyup.io/repos/github/cookiecutter/cookiecutter-django/
     :alt: Updates
 
 .. image:: https://img.shields.io/badge/cookiecutter-Join%20on%20Slack-green?style=flat&logo=slack
     :target: https://join.slack.com/t/cookie-cutter/shared_invite/enQtNzI0Mzg5NjE5Nzk5LTRlYWI2YTZhYmQ4YmU1Y2Q2NmE1ZjkwOGM0NDQyNTIwY2M4ZTgyNDVkNjMxMDdhZGI5ZGE5YmJjM2M3ODJlY2U
 
-.. image:: https://www.codetriage.com/pydanny/cookiecutter-django/badges/users.svg
-    :target: https://www.codetriage.com/pydanny/cookiecutter-django
+.. image:: https://www.codetriage.com/cookiecutter/cookiecutter-django/badges/users.svg
+    :target: https://www.codetriage.com/cookiecutter/cookiecutter-django
     :alt: Code Helpers Badge
 
 .. image:: https://img.shields.io/badge/code%20style-black-000000.svg
@@ -34,8 +34,8 @@ production-ready Django projects quickly.
 
 .. _Troubleshooting: https://cookiecutter-django.readthedocs.io/en/latest/troubleshooting.html
 
-.. _528: https://github.com/pydanny/cookiecutter-django/issues/528#issuecomment-212650373
-.. _issues: https://github.com/pydanny/cookiecutter-django/issues/new
+.. _528: https://github.com/cookiecutter/cookiecutter-django/issues/528#issuecomment-212650373
+.. _issues: https://github.com/cookiecutter/cookiecutter-django/issues/new
 
 Features
 ---------
@@ -145,7 +145,7 @@ First, get Cookiecutter. Trust me, it's awesome::
 
 Now run it against this repo::
 
-    $ cookiecutter https://github.com/pydanny/cookiecutter-django
+    $ cookiecutter https://github.com/cookiecutter/cookiecutter-django
 
 You'll be prompted for some values. Provide them, then a Django project will be created for you.
 
@@ -234,7 +234,7 @@ Community
 * For anything else, you can chat with us on `Slack`_.
 
 .. _`Stack Overflow`: http://stackoverflow.com/questions/tagged/cookiecutter-django
-.. _`issue`: https://github.com/pydanny/cookiecutter-django/issues
+.. _`issue`: https://github.com/cookiecutter/cookiecutter-django/issues
 .. _`Slack`: https://join.slack.com/t/cookie-cutter/shared_invite/enQtNzI0Mzg5NjE5Nzk5LTRlYWI2YTZhYmQ4YmU1Y2Q2NmE1ZjkwOGM0NDQyNTIwY2M4ZTgyNDVkNjMxMDdhZGI5ZGE5YmJjM2M3ODJlY2U
 
 For Readers of Two Scoops of Django
@@ -257,7 +257,7 @@ Scattered throughout the Python and HTML of this project are places marked with
 Releases
 --------
 
-Need a stable release? You can find them at https://github.com/pydanny/cookiecutter-django/releases
+Need a stable release? You can find them at https://github.com/cookiecutter/cookiecutter-django/releases
 
 
 Not Exactly What You Want?
diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index 83bc1342c..e13a1f92b 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -26,7 +26,7 @@ First things first.
 
 #. Install cookiecutter-django: ::
 
-    $ cookiecutter gh:pydanny/cookiecutter-django
+    $ cookiecutter gh:cookiecutter/cookiecutter-django
 
 #. Install development requirements: ::
 
@@ -145,9 +145,9 @@ when developing locally. If you have the appropriate setup on your local machine
 in ``config/settings/local.py``::
 
     CELERY_TASK_ALWAYS_EAGER = False
-    
+
 To run Celery locally, make sure redis-server is installed (instructions are available at https://redis.io/topics/quickstart), run the server in one terminal with `redis-server`, and then start celery in another terminal with the following command::
-    
+
     celery -A config.celery_app worker --loglevel=info
 
 
diff --git a/docs/faq.rst b/docs/faq.rst
index 59e82465f..820fb60fa 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -10,7 +10,7 @@ It is there to add a migration so you don't have to manually change the ``sites.
 
 See `0003_set_site_domain_and_name.py`_.
 
-.. _`0003_set_site_domain_and_name.py`: https://github.com/pydanny/cookiecutter-django/blob/master/%7B%7Bcookiecutter.project_slug%7D%7D/%7B%7Bcookiecutter.project_slug%7D%7D/contrib/sites/migrations/0003_set_site_domain_and_name.py
+.. _`0003_set_site_domain_and_name.py`: https://github.com/cookiecutter/cookiecutter-django/blob/master/%7B%7Bcookiecutter.project_slug%7D%7D/%7B%7Bcookiecutter.project_slug%7D%7D/contrib/sites/migrations/0003_set_site_domain_and_name.py
 
 
 Why aren't you using just one configuration file (12-Factor App)
diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst
index 8aa1b1f9b..ba8ab53e6 100644
--- a/docs/troubleshooting.rst
+++ b/docs/troubleshooting.rst
@@ -47,5 +47,5 @@ Others
 
 #. New apps not getting created in project root: This is the expected behavior, because cookiecutter-django does not change the way that django startapp works, you'll have to fix this manually (see `#1725`_)
 
-.. _#528: https://github.com/pydanny/cookiecutter-django/issues/528#issuecomment-212650373
-.. _#1725: https://github.com/pydanny/cookiecutter-django/issues/1725#issuecomment-407493176
+.. _#528: https://github.com/cookiecutter/cookiecutter-django/issues/528#issuecomment-212650373
+.. _#1725: https://github.com/cookiecutter/cookiecutter-django/issues/1725#issuecomment-407493176
diff --git a/scripts/update_changelog.py b/scripts/update_changelog.py
index 08ff5b095..85e19d169 100644
--- a/scripts/update_changelog.py
+++ b/scripts/update_changelog.py
@@ -39,7 +39,9 @@ def main() -> None:
 
 def iter_pulls():
     """Fetch merged pull requests at the date we're interested in."""
-    repo = Github(login_or_token=GITHUB_TOKEN).get_repo("pydanny/cookiecutter-django")
+    repo = Github(login_or_token=GITHUB_TOKEN).get_repo(
+        "cookiecutter/cookiecutter-django"
+    )
     recent_pulls = repo.get_pulls(
         state="closed", sort="updated", direction="desc"
     ).get_page(0)
diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py
index 0236daae3..b125ef151 100644
--- a/scripts/update_contributors.py
+++ b/scripts/update_contributors.py
@@ -39,7 +39,7 @@ def iter_recent_authors():
     Use Github API to fetch recent authors rather than
     git CLI to work with Github usernames.
     """
-    repo = Github(per_page=5).get_repo("pydanny/cookiecutter-django")
+    repo = Github(per_page=5).get_repo("cookiecutter/cookiecutter-django")
     recent_pulls = repo.get_pulls(
         state="closed", sort="updated", direction="desc"
     ).get_page(0)
diff --git a/setup.py b/setup.py
index 64e923aef..e0f334b8e 100644
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@ setup(
     long_description=long_description,
     author="Daniel Roy Greenfeld",
     author_email="pydanny@gmail.com",
-    url="https://github.com/pydanny/cookiecutter-django",
+    url="https://github.com/cookiecutter/cookiecutter-django",
     packages=[],
     license="BSD",
     zip_safe=False,
diff --git a/{{cookiecutter.project_slug}}/README.rst b/{{cookiecutter.project_slug}}/README.rst
index aa4e48d3d..3cad6f892 100644
--- a/{{cookiecutter.project_slug}}/README.rst
+++ b/{{cookiecutter.project_slug}}/README.rst
@@ -4,7 +4,7 @@
 {{cookiecutter.description}}
 
 .. image:: https://img.shields.io/badge/built%20with-Cookiecutter%20Django-ff69b4.svg?logo=cookiecutter
-     :target: https://github.com/pydanny/cookiecutter-django/
+     :target: https://github.com/cookiecutter/cookiecutter-django/
      :alt: Built with Cookiecutter Django
 .. image:: https://img.shields.io/badge/code%20style-black-000000.svg
      :target: https://github.com/ambv/black

From d7c8efb3807a6e2dd602cfe6a514aa77861c0608 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 23 Oct 2021 02:17:48 +0000
Subject: [PATCH 1718/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 51c9e5859..963603d82 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-10-22]
+### Changed
+- Move repo under cookiecutter organisation ([#3357](https://github.com/cookiecutter/cookiecutter-django/pull/3357))
+
 ## [2021-10-18]
 ### Updated
 - Update django-environ to 0.8.0 ([#3367](https://github.com/pydanny/cookiecutter-django/pull/3367))

From 2a9f8c295ec06cff427e7f64399fa6e6033a3b02 Mon Sep 17 00:00:00 2001
From: Liam Brenner <liam.brenner@gmail.com>
Date: Tue, 26 Oct 2021 10:08:18 +1100
Subject: [PATCH 1719/2840] Fix pull request links to correct repo URL

---
 CHANGELOG.md | 754 +++++++++++++++++++++++++--------------------------
 1 file changed, 377 insertions(+), 377 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 963603d82..f2eb26835 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,818 +9,818 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 ## [2021-10-18]
 ### Updated
-- Update django-environ to 0.8.0 ([#3367](https://github.com/pydanny/cookiecutter-django/pull/3367))
+- Update django-environ to 0.8.0 ([#3367](https://github.com/cookiecutter/cookiecutter-django/pull/3367))
 
 ## [2021-10-14]
 ### Updated
-- Update flake8 to 4.0.1 ([#3361](https://github.com/cookicutter/cookiecutter-django/pull/3361))
-- Update flake8-isort to 4.1.1 ([#3360](https://github.com/cookicutter/cookiecutter-django/pull/3360))
-- Update django-model-utils to 4.2.0 ([#3359](https://github.com/cookicutter/cookiecutter-django/pull/3359))
+- Update flake8 to 4.0.1 ([#3361](https://github.com/cookiecutter/cookiecutter-django/pull/3361))
+- Update flake8-isort to 4.1.1 ([#3360](https://github.com/cookiecutter/cookiecutter-django/pull/3360))
+- Update django-model-utils to 4.2.0 ([#3359](https://github.com/cookiecutter/cookiecutter-django/pull/3359))
 
 ## [2021-10-13]
 ### Changed
-- Add drf stubs ([#3353](https://github.com/cookicutter/cookiecutter-django/pull/3353))
+- Add drf stubs ([#3353](https://github.com/cookiecutter/cookiecutter-django/pull/3353))
 
 ## [2021-10-12]
 ### Updated
-- Update coverage to 6.0.2 ([#3356](https://github.com/cookicutter/cookiecutter-django/pull/3356))
+- Update coverage to 6.0.2 ([#3356](https://github.com/cookiecutter/cookiecutter-django/pull/3356))
 
 ## [2021-10-11]
 ### Updated
-- Update werkzeug to 2.0.2 ([#3344](https://github.com/cookicutter/cookiecutter-django/pull/3344))
-- Update coverage to 6.0.1 ([#3348](https://github.com/cookicutter/cookiecutter-django/pull/3348))
-- Update django-coverage-plugin to 2.0.1 ([#3349](https://github.com/cookicutter/cookiecutter-django/pull/3349))
-- Update django-cors-headers to 3.10.0 ([#3345](https://github.com/cookicutter/cookiecutter-django/pull/3345))
-- Update jinja2 to 3.0.2 ([#3343](https://github.com/cookicutter/cookiecutter-django/pull/3343))
-- Update django-storages to 1.12.1 ([#3355](https://github.com/cookicutter/cookiecutter-django/pull/3355))
+- Update werkzeug to 2.0.2 ([#3344](https://github.com/cookiecutter/cookiecutter-django/pull/3344))
+- Update coverage to 6.0.1 ([#3348](https://github.com/cookiecutter/cookiecutter-django/pull/3348))
+- Update django-coverage-plugin to 2.0.1 ([#3349](https://github.com/cookiecutter/cookiecutter-django/pull/3349))
+- Update django-cors-headers to 3.10.0 ([#3345](https://github.com/cookiecutter/cookiecutter-django/pull/3345))
+- Update jinja2 to 3.0.2 ([#3343](https://github.com/cookiecutter/cookiecutter-django/pull/3343))
+- Update django-storages to 1.12.1 ([#3355](https://github.com/cookiecutter/cookiecutter-django/pull/3355))
 
 ## [2021-10-03]
 ### Updated
-- Update pytz to 2021.3 ([#3340](https://github.com/cookicutter/cookiecutter-django/pull/3340))
+- Update pytz to 2021.3 ([#3340](https://github.com/cookiecutter/cookiecutter-django/pull/3340))
 
 ## [2021-10-01]
 ### Changed
-- Fix the wrong pre-commit hyperlink in Prerequisites section ([#3338](https://github.com/cookicutter/cookiecutter-django/pull/3338))
+- Fix the wrong pre-commit hyperlink in Prerequisites section ([#3338](https://github.com/cookiecutter/cookiecutter-django/pull/3338))
 
 ## [2021-09-30]
 ### Updated
-- Update sentry-sdk to 1.4.3 ([#3334](https://github.com/cookicutter/cookiecutter-django/pull/3334))
+- Update sentry-sdk to 1.4.3 ([#3334](https://github.com/cookiecutter/cookiecutter-django/pull/3334))
 
 ## [2021-09-29]
 ### Updated
-- Update django-cors-headers to 3.9.0 ([#3332](https://github.com/cookicutter/cookiecutter-django/pull/3332))
+- Update django-cors-headers to 3.9.0 ([#3332](https://github.com/cookiecutter/cookiecutter-django/pull/3332))
 
 ## [2021-09-27]
 ### Updated
-- Update sentry-sdk to 1.4.2 ([#3329](https://github.com/cookicutter/cookiecutter-django/pull/3329))
+- Update sentry-sdk to 1.4.2 ([#3329](https://github.com/cookiecutter/cookiecutter-django/pull/3329))
 
 ## [2021-09-26]
 ### Updated
-- Update django-crispy-forms to 1.13.0 ([#3327](https://github.com/cookicutter/cookiecutter-django/pull/3327))
+- Update django-crispy-forms to 1.13.0 ([#3327](https://github.com/cookiecutter/cookiecutter-django/pull/3327))
 
 ## [2021-09-24]
 ### Changed
-- Add django-settings-module to .pylintrc ([#3326](https://github.com/cookicutter/cookiecutter-django/pull/3326))
+- Add django-settings-module to .pylintrc ([#3326](https://github.com/cookiecutter/cookiecutter-django/pull/3326))
 
 ## [2021-09-23]
 ### Updated
-- Update sentry-sdk to 1.4.1 ([#3325](https://github.com/cookicutter/cookiecutter-django/pull/3325))
+- Update sentry-sdk to 1.4.1 ([#3325](https://github.com/cookiecutter/cookiecutter-django/pull/3325))
 
 ## [2021-09-22]
 ### Updated
-- Update sentry-sdk to 1.4.0 ([#3324](https://github.com/cookicutter/cookiecutter-django/pull/3324))
+- Update sentry-sdk to 1.4.0 ([#3324](https://github.com/cookiecutter/cookiecutter-django/pull/3324))
 
 ## [2021-09-16]
 ### Updated
-- Update tox to 3.24.4 ([#3323](https://github.com/cookicutter/cookiecutter-django/pull/3323))
+- Update tox to 3.24.4 ([#3323](https://github.com/cookiecutter/cookiecutter-django/pull/3323))
 
 ## [2021-09-15]
 ### Updated
-- Auto-update pre-commit hooks ([#3322](https://github.com/cookicutter/cookiecutter-django/pull/3322))
+- Auto-update pre-commit hooks ([#3322](https://github.com/cookiecutter/cookiecutter-django/pull/3322))
 
 ## [2021-09-14]
 ### Updated
-- Update black to 21.9b0 ([#3321](https://github.com/cookicutter/cookiecutter-django/pull/3321))
+- Update black to 21.9b0 ([#3321](https://github.com/cookiecutter/cookiecutter-django/pull/3321))
 
 ## [2021-09-13]
 ### Updated
-- Bump stefanzweifel/git-auto-commit-action from 4.11.0 to 4.12.0 ([#3320](https://github.com/cookicutter/cookiecutter-django/pull/3320))
-- Update sphinx to 4.2.0 ([#3319](https://github.com/cookicutter/cookiecutter-django/pull/3319))
+- Bump stefanzweifel/git-auto-commit-action from 4.11.0 to 4.12.0 ([#3320](https://github.com/cookiecutter/cookiecutter-django/pull/3320))
+- Update sphinx to 4.2.0 ([#3319](https://github.com/cookiecutter/cookiecutter-django/pull/3319))
 
 ## [2021-09-11]
 ### Changed
-- Removing pycharm docs if app does not use pycharm ([#3139](https://github.com/cookicutter/cookiecutter-django/pull/3139))
+- Removing pycharm docs if app does not use pycharm ([#3139](https://github.com/cookiecutter/cookiecutter-django/pull/3139))
 ### Updated
-- Update django-environ to 0.7.0 ([#3317](https://github.com/cookicutter/cookiecutter-django/pull/3317))
+- Update django-environ to 0.7.0 ([#3317](https://github.com/cookiecutter/cookiecutter-django/pull/3317))
 
 ## [2021-09-06]
 ### Changed
-- Update Celery to v5 ([#3280](https://github.com/cookicutter/cookiecutter-django/pull/3280))
+- Update Celery to v5 ([#3280](https://github.com/cookiecutter/cookiecutter-django/pull/3280))
 
 ## [2021-09-05]
 ### Updated
-- Update django-environ to 0.6.0 ([#3314](https://github.com/cookicutter/cookiecutter-django/pull/3314))
+- Update django-environ to 0.6.0 ([#3314](https://github.com/cookiecutter/cookiecutter-django/pull/3314))
 
 ## [2021-09-03]
 ### Changed
-- Update available postgres versions ([#3297](https://github.com/cookicutter/cookiecutter-django/pull/3297))
+- Update available postgres versions ([#3297](https://github.com/cookiecutter/cookiecutter-django/pull/3297))
 ### Updated
-- Update pre-commit to 2.15.0 ([#3313](https://github.com/cookicutter/cookiecutter-django/pull/3313))
-- Auto-update pre-commit hooks ([#3307](https://github.com/cookicutter/cookiecutter-django/pull/3307))
-- Update pillow to 8.3.2 ([#3312](https://github.com/cookicutter/cookiecutter-django/pull/3312))
-- Update django-environ to 0.5.0 ([#3311](https://github.com/cookicutter/cookiecutter-django/pull/3311))
-- Update pytest to 6.2.5 ([#3310](https://github.com/cookicutter/cookiecutter-django/pull/3310))
-- Update black to 21.8b0 ([#3308](https://github.com/cookicutter/cookiecutter-django/pull/3308))
-- Update argon2-cffi to 21.1.0 ([#3306](https://github.com/cookicutter/cookiecutter-django/pull/3306))
-- Bump peter-evans/create-pull-request from 3.10.0 to 3.10.1 ([#3303](https://github.com/cookicutter/cookiecutter-django/pull/3303))
-- Update django-debug-toolbar to 3.2.2 ([#3296](https://github.com/cookicutter/cookiecutter-django/pull/3296))
-- Update django-cors-headers to 3.8.0 ([#3295](https://github.com/cookicutter/cookiecutter-django/pull/3295))
-- Update uvicorn to 0.15.0 ([#3294](https://github.com/cookicutter/cookiecutter-django/pull/3294))
+- Update pre-commit to 2.15.0 ([#3313](https://github.com/cookiecutter/cookiecutter-django/pull/3313))
+- Auto-update pre-commit hooks ([#3307](https://github.com/cookiecutter/cookiecutter-django/pull/3307))
+- Update pillow to 8.3.2 ([#3312](https://github.com/cookiecutter/cookiecutter-django/pull/3312))
+- Update django-environ to 0.5.0 ([#3311](https://github.com/cookiecutter/cookiecutter-django/pull/3311))
+- Update pytest to 6.2.5 ([#3310](https://github.com/cookiecutter/cookiecutter-django/pull/3310))
+- Update black to 21.8b0 ([#3308](https://github.com/cookiecutter/cookiecutter-django/pull/3308))
+- Update argon2-cffi to 21.1.0 ([#3306](https://github.com/cookiecutter/cookiecutter-django/pull/3306))
+- Bump peter-evans/create-pull-request from 3.10.0 to 3.10.1 ([#3303](https://github.com/cookiecutter/cookiecutter-django/pull/3303))
+- Update django-debug-toolbar to 3.2.2 ([#3296](https://github.com/cookiecutter/cookiecutter-django/pull/3296))
+- Update django-cors-headers to 3.8.0 ([#3295](https://github.com/cookiecutter/cookiecutter-django/pull/3295))
+- Update uvicorn to 0.15.0 ([#3294](https://github.com/cookiecutter/cookiecutter-django/pull/3294))
 
 ## [2021-08-27]
 ### Updated
-- Update tox to 3.24.3 ([#3302](https://github.com/cookicutter/cookiecutter-django/pull/3302))
+- Update tox to 3.24.3 ([#3302](https://github.com/cookiecutter/cookiecutter-django/pull/3302))
 
 ## [2021-08-20]
 ### Changed
-- Fix Jinja2 break line control on Procfile ([#3300](https://github.com/cookicutter/cookiecutter-django/pull/3300))
+- Fix Jinja2 break line control on Procfile ([#3300](https://github.com/cookiecutter/cookiecutter-django/pull/3300))
 
 ## [2021-08-19]
 ### Changed
-- Fix several minor typos ([#3301](https://github.com/cookicutter/cookiecutter-django/pull/3301))
+- Fix several minor typos ([#3301](https://github.com/cookiecutter/cookiecutter-django/pull/3301))
 
 ## [2021-08-13]
 ### Changed
-- Upgrade to Redis 6 ([#3255](https://github.com/cookicutter/cookiecutter-django/pull/3255))
+- Upgrade to Redis 6 ([#3255](https://github.com/cookiecutter/cookiecutter-django/pull/3255))
 ### Fixed
-- Fix RTD build image to support Python 3.9 ([#3293](https://github.com/cookicutter/cookiecutter-django/pull/3293))
+- Fix RTD build image to support Python 3.9 ([#3293](https://github.com/cookiecutter/cookiecutter-django/pull/3293))
 
 ## [2021-08-12]
 ### Changed
-- Add documentation for automating backups ([#3268](https://github.com/cookicutter/cookiecutter-django/pull/3268))
-- Add missing step to getting started locally in docs ([#3291](https://github.com/cookicutter/cookiecutter-django/pull/3291))
-- Moved isort config from `.editorconfig` to `setup.cfg` ([#3290](https://github.com/cookicutter/cookiecutter-django/pull/3290))
-- How to pre-commit in Docker Development ([#3287](https://github.com/cookicutter/cookiecutter-django/pull/3287))
+- Add documentation for automating backups ([#3268](https://github.com/cookiecutter/cookiecutter-django/pull/3268))
+- Add missing step to getting started locally in docs ([#3291](https://github.com/cookiecutter/cookiecutter-django/pull/3291))
+- Moved isort config from `.editorconfig` to `setup.cfg` ([#3290](https://github.com/cookiecutter/cookiecutter-django/pull/3290))
+- How to pre-commit in Docker Development ([#3287](https://github.com/cookiecutter/cookiecutter-django/pull/3287))
 ### Updated
-- Update sentry-sdk to 1.3.1 ([#3281](https://github.com/cookicutter/cookiecutter-django/pull/3281))
-- Update tox to 3.24.1 ([#3285](https://github.com/cookicutter/cookiecutter-django/pull/3285))
-- Update pre-commit to 2.14.0 ([#3289](https://github.com/cookicutter/cookiecutter-django/pull/3289))
+- Update sentry-sdk to 1.3.1 ([#3281](https://github.com/cookiecutter/cookiecutter-django/pull/3281))
+- Update tox to 3.24.1 ([#3285](https://github.com/cookiecutter/cookiecutter-django/pull/3285))
+- Update pre-commit to 2.14.0 ([#3289](https://github.com/cookiecutter/cookiecutter-django/pull/3289))
 
 ## [2021-07-30]
 ### Updated
-- Auto-update pre-commit hooks ([#3283](https://github.com/cookicutter/cookiecutter-django/pull/3283))
-- Update isort to 5.9.3 ([#3282](https://github.com/cookicutter/cookiecutter-django/pull/3282))
+- Auto-update pre-commit hooks ([#3283](https://github.com/cookiecutter/cookiecutter-django/pull/3283))
+- Update isort to 5.9.3 ([#3282](https://github.com/cookiecutter/cookiecutter-django/pull/3282))
 
 ## [2021-07-27]
 ### Changed
-- Convert trans to translate in templates ([#3277](https://github.com/cookicutter/cookiecutter-django/pull/3277))
+- Convert trans to translate in templates ([#3277](https://github.com/cookiecutter/cookiecutter-django/pull/3277))
 ### Updated
-- Update hiredis to 2.0.0 ([#3110](https://github.com/cookicutter/cookiecutter-django/pull/3110))
-- Update mypy to 0.910 ([#3237](https://github.com/cookicutter/cookiecutter-django/pull/3237))
-- Update whitenoise to 5.3.0 ([#3273](https://github.com/cookicutter/cookiecutter-django/pull/3273))
-- Update tox to 3.24.0 ([#3269](https://github.com/cookicutter/cookiecutter-django/pull/3269))
-- Update django-allauth to 0.45.0 ([#3267](https://github.com/cookicutter/cookiecutter-django/pull/3267))
-- Update sentry-sdk to 1.3.0 ([#3262](https://github.com/cookicutter/cookiecutter-django/pull/3262))
-- Update sphinx to 4.1.2 ([#3278](https://github.com/cookicutter/cookiecutter-django/pull/3278))
-- Auto-update pre-commit hooks ([#3264](https://github.com/cookicutter/cookiecutter-django/pull/3264))
-- Update isort to 5.9.2 ([#3279](https://github.com/cookicutter/cookiecutter-django/pull/3279))
-- Update pillow to 8.3.1 ([#3259](https://github.com/cookicutter/cookiecutter-django/pull/3259))
-- Update black to 21.7b0 ([#3272](https://github.com/cookicutter/cookiecutter-django/pull/3272))
+- Update hiredis to 2.0.0 ([#3110](https://github.com/cookiecutter/cookiecutter-django/pull/3110))
+- Update mypy to 0.910 ([#3237](https://github.com/cookiecutter/cookiecutter-django/pull/3237))
+- Update whitenoise to 5.3.0 ([#3273](https://github.com/cookiecutter/cookiecutter-django/pull/3273))
+- Update tox to 3.24.0 ([#3269](https://github.com/cookiecutter/cookiecutter-django/pull/3269))
+- Update django-allauth to 0.45.0 ([#3267](https://github.com/cookiecutter/cookiecutter-django/pull/3267))
+- Update sentry-sdk to 1.3.0 ([#3262](https://github.com/cookiecutter/cookiecutter-django/pull/3262))
+- Update sphinx to 4.1.2 ([#3278](https://github.com/cookiecutter/cookiecutter-django/pull/3278))
+- Auto-update pre-commit hooks ([#3264](https://github.com/cookiecutter/cookiecutter-django/pull/3264))
+- Update isort to 5.9.2 ([#3279](https://github.com/cookiecutter/cookiecutter-django/pull/3279))
+- Update pillow to 8.3.1 ([#3259](https://github.com/cookiecutter/cookiecutter-django/pull/3259))
+- Update black to 21.7b0 ([#3272](https://github.com/cookiecutter/cookiecutter-django/pull/3272))
 
 ## [2021-07-12]
 ### Changed
-- Define REMAP_SIGTERM=SIGQUIT on Profile of Celery on Heroku ([#3263](https://github.com/cookicutter/cookiecutter-django/pull/3263))
+- Define REMAP_SIGTERM=SIGQUIT on Profile of Celery on Heroku ([#3263](https://github.com/cookiecutter/cookiecutter-django/pull/3263))
 
 ## [2021-07-08]
 ### Updated
-- Update django to 3.1.13 ([#3247](https://github.com/cookicutter/cookiecutter-django/pull/3247))
+- Update django to 3.1.13 ([#3247](https://github.com/cookiecutter/cookiecutter-django/pull/3247))
 
 ## [2021-06-29]
 ### Changed
-- Improve github bug report template ([#3243](https://github.com/cookicutter/cookiecutter-django/pull/3243))
+- Improve github bug report template ([#3243](https://github.com/cookiecutter/cookiecutter-django/pull/3243))
 
 ## [2021-06-28]
 ### Changed
-- Revert &#34;Fix Celery ports error on local Docker&#34; ([#3242](https://github.com/cookicutter/cookiecutter-django/pull/3242))
+- Revert &#34;Fix Celery ports error on local Docker&#34; ([#3242](https://github.com/cookiecutter/cookiecutter-django/pull/3242))
 ### Fixed
-- Fix Celery ports error on local Docker ([#3241](https://github.com/cookicutter/cookiecutter-django/pull/3241))
+- Fix Celery ports error on local Docker ([#3241](https://github.com/cookiecutter/cookiecutter-django/pull/3241))
 
 ## [2021-06-25]
 ### Changed
-- Update `.gitignore` file for VSCode ([#3238](https://github.com/cookicutter/cookiecutter-django/pull/3238))
+- Update `.gitignore` file for VSCode ([#3238](https://github.com/cookiecutter/cookiecutter-django/pull/3238))
 ### Fixed
-- Wrap jQuery call in `DOMContentLoaded` event listener on account email page ([#3239](https://github.com/cookicutter/cookiecutter-django/pull/3239))
+- Wrap jQuery call in `DOMContentLoaded` event listener on account email page ([#3239](https://github.com/cookiecutter/cookiecutter-django/pull/3239))
 
 ## [2021-06-22]
 ### Changed
-- Update docs/howto.rst ([#3230](https://github.com/cookicutter/cookiecutter-django/pull/3230))
-- Add support for PG 13. Drop PG 9. Update all minor versions ([#3154](https://github.com/cookicutter/cookiecutter-django/pull/3154))
+- Update docs/howto.rst ([#3230](https://github.com/cookiecutter/cookiecutter-django/pull/3230))
+- Add support for PG 13. Drop PG 9. Update all minor versions ([#3154](https://github.com/cookiecutter/cookiecutter-django/pull/3154))
 ### Updated
-- Update isort to 5.9.1 ([#3236](https://github.com/cookicutter/cookiecutter-django/pull/3236))
-- Auto-update pre-commit hooks ([#3235](https://github.com/cookicutter/cookiecutter-django/pull/3235))
+- Update isort to 5.9.1 ([#3236](https://github.com/cookiecutter/cookiecutter-django/pull/3236))
+- Auto-update pre-commit hooks ([#3235](https://github.com/cookiecutter/cookiecutter-django/pull/3235))
 
 ## [2021-06-21]
 ### Updated
-- Update isort to 5.9.0 ([#3234](https://github.com/cookicutter/cookiecutter-django/pull/3234))
-- Update django-anymail to 8.4 ([#3225](https://github.com/cookicutter/cookiecutter-django/pull/3225))
-- Update django-redis to 5.0.0 ([#3205](https://github.com/cookicutter/cookiecutter-django/pull/3205))
-- Update pylint-django to 2.4.4 ([#3233](https://github.com/cookicutter/cookiecutter-django/pull/3233))
-- Auto-update pre-commit hooks ([#3220](https://github.com/cookicutter/cookiecutter-django/pull/3220))
-- Bump peter-evans/create-pull-request from 3.9.2 to 3.10.0 ([#3197](https://github.com/cookicutter/cookiecutter-django/pull/3197))
-- Update black to 21.6b0 ([#3232](https://github.com/cookicutter/cookiecutter-django/pull/3232))
-- Update pytest to 6.2.4 ([#3231](https://github.com/cookicutter/cookiecutter-django/pull/3231))
-- Update django-crispy-forms to 1.12.0 ([#3221](https://github.com/cookicutter/cookiecutter-django/pull/3221))
-- Update mypy to 0.902 ([#3219](https://github.com/cookicutter/cookiecutter-django/pull/3219))
-- Update django-coverage-plugin to 2.0.0 ([#3217](https://github.com/cookicutter/cookiecutter-django/pull/3217))
-- Update ipdb to 0.13.9 ([#3210](https://github.com/cookicutter/cookiecutter-django/pull/3210))
-- Update uvicorn to 0.14.0 ([#3207](https://github.com/cookicutter/cookiecutter-django/pull/3207))
-- Update pytest-cookies to 0.6.1 ([#3196](https://github.com/cookicutter/cookiecutter-django/pull/3196))
-- Update sphinx to 4.0.2 ([#3193](https://github.com/cookicutter/cookiecutter-django/pull/3193))
-- Update jinja2 to 3.0.1 ([#3189](https://github.com/cookicutter/cookiecutter-django/pull/3189))
+- Update isort to 5.9.0 ([#3234](https://github.com/cookiecutter/cookiecutter-django/pull/3234))
+- Update django-anymail to 8.4 ([#3225](https://github.com/cookiecutter/cookiecutter-django/pull/3225))
+- Update django-redis to 5.0.0 ([#3205](https://github.com/cookiecutter/cookiecutter-django/pull/3205))
+- Update pylint-django to 2.4.4 ([#3233](https://github.com/cookiecutter/cookiecutter-django/pull/3233))
+- Auto-update pre-commit hooks ([#3220](https://github.com/cookiecutter/cookiecutter-django/pull/3220))
+- Bump peter-evans/create-pull-request from 3.9.2 to 3.10.0 ([#3197](https://github.com/cookiecutter/cookiecutter-django/pull/3197))
+- Update black to 21.6b0 ([#3232](https://github.com/cookiecutter/cookiecutter-django/pull/3232))
+- Update pytest to 6.2.4 ([#3231](https://github.com/cookiecutter/cookiecutter-django/pull/3231))
+- Update django-crispy-forms to 1.12.0 ([#3221](https://github.com/cookiecutter/cookiecutter-django/pull/3221))
+- Update mypy to 0.902 ([#3219](https://github.com/cookiecutter/cookiecutter-django/pull/3219))
+- Update django-coverage-plugin to 2.0.0 ([#3217](https://github.com/cookiecutter/cookiecutter-django/pull/3217))
+- Update ipdb to 0.13.9 ([#3210](https://github.com/cookiecutter/cookiecutter-django/pull/3210))
+- Update uvicorn to 0.14.0 ([#3207](https://github.com/cookiecutter/cookiecutter-django/pull/3207))
+- Update pytest-cookies to 0.6.1 ([#3196](https://github.com/cookiecutter/cookiecutter-django/pull/3196))
+- Update sphinx to 4.0.2 ([#3193](https://github.com/cookiecutter/cookiecutter-django/pull/3193))
+- Update jinja2 to 3.0.1 ([#3189](https://github.com/cookiecutter/cookiecutter-django/pull/3189))
 
 ## [2021-06-19]
 ### Updated
-- Update psycopg2 to 2.9.1 ([#3227](https://github.com/cookicutter/cookiecutter-django/pull/3227))
-- Update psycopg2-binary to 2.9.1 ([#3228](https://github.com/cookicutter/cookiecutter-django/pull/3228))
+- Update psycopg2 to 2.9.1 ([#3227](https://github.com/cookiecutter/cookiecutter-django/pull/3227))
+- Update psycopg2-binary to 2.9.1 ([#3228](https://github.com/cookiecutter/cookiecutter-django/pull/3228))
 
 ## [2021-06-14]
 ### Changed
-- Update black GitHub link in requirements ([#3222](https://github.com/cookicutter/cookiecutter-django/pull/3222))
+- Update black GitHub link in requirements ([#3222](https://github.com/cookiecutter/cookiecutter-django/pull/3222))
 
 ## [2021-06-09]
 ### Changed
-- Fix link format in developing-locally.rst ([#3214](https://github.com/cookicutter/cookiecutter-django/pull/3214))
+- Fix link format in developing-locally.rst ([#3214](https://github.com/cookiecutter/cookiecutter-django/pull/3214))
 ### Updated
-- Update pre-commit to 2.13.0 ([#3195](https://github.com/cookicutter/cookiecutter-django/pull/3195))
-- Update pytest-django to 4.4.0 ([#3212](https://github.com/cookicutter/cookiecutter-django/pull/3212))
-- Update mypy to 0.901 ([#3215](https://github.com/cookicutter/cookiecutter-django/pull/3215))
-- Auto-update pre-commit hooks ([#3206](https://github.com/cookicutter/cookiecutter-django/pull/3206))
-- Update black to 21.5b2 ([#3204](https://github.com/cookicutter/cookiecutter-django/pull/3204))
+- Update pre-commit to 2.13.0 ([#3195](https://github.com/cookiecutter/cookiecutter-django/pull/3195))
+- Update pytest-django to 4.4.0 ([#3212](https://github.com/cookiecutter/cookiecutter-django/pull/3212))
+- Update mypy to 0.901 ([#3215](https://github.com/cookiecutter/cookiecutter-django/pull/3215))
+- Auto-update pre-commit hooks ([#3206](https://github.com/cookiecutter/cookiecutter-django/pull/3206))
+- Update black to 21.5b2 ([#3204](https://github.com/cookiecutter/cookiecutter-django/pull/3204))
 
 ## [2021-06-06]
 ### Changed
-- Updated .pre-commit-config.yaml to self-update its dependencies ([#3208](https://github.com/cookicutter/cookiecutter-django/pull/3208))
+- Updated .pre-commit-config.yaml to self-update its dependencies ([#3208](https://github.com/cookiecutter/cookiecutter-django/pull/3208))
 
 ## [2021-06-05]
 ### Changed
-- Shorthand for the officially supported buildpack ([#3211](https://github.com/cookicutter/cookiecutter-django/pull/3211))
+- Shorthand for the officially supported buildpack ([#3211](https://github.com/cookiecutter/cookiecutter-django/pull/3211))
 
 ## [2021-06-02]
 ### Updated
-- Update django to 3.1.12 ([#3209](https://github.com/cookicutter/cookiecutter-django/pull/3209))
+- Update django to 3.1.12 ([#3209](https://github.com/cookiecutter/cookiecutter-django/pull/3209))
 
 ## [2021-05-18]
 ### Changed
-- Move ARG PYTHON_VERSION=3.9-slim-buster to the global scope ([#3188](https://github.com/cookicutter/cookiecutter-django/pull/3188))
+- Move ARG PYTHON_VERSION=3.9-slim-buster to the global scope ([#3188](https://github.com/cookiecutter/cookiecutter-django/pull/3188))
 
 ## [2021-05-17]
 ### Updated
-- Bump tiangolo/issue-manager from 0.3.0 to 0.4.0 ([#3186](https://github.com/cookicutter/cookiecutter-django/pull/3186))
-- Auto-update pre-commit hooks ([#3185](https://github.com/cookicutter/cookiecutter-django/pull/3185))
+- Bump tiangolo/issue-manager from 0.3.0 to 0.4.0 ([#3186](https://github.com/cookiecutter/cookiecutter-django/pull/3186))
+- Auto-update pre-commit hooks ([#3185](https://github.com/cookiecutter/cookiecutter-django/pull/3185))
 
 ## [2021-05-15]
 ### Changed
-- Update watchgod to 0.7 ([#3177](https://github.com/cookicutter/cookiecutter-django/pull/3177))
+- Update watchgod to 0.7 ([#3177](https://github.com/cookiecutter/cookiecutter-django/pull/3177))
 ### Updated
-- Auto-update pre-commit hooks ([#3184](https://github.com/cookicutter/cookiecutter-django/pull/3184))
-- Update black to 21.5b1 ([#3167](https://github.com/cookicutter/cookiecutter-django/pull/3167))
-- Update flake8 to 3.9.2 ([#3164](https://github.com/cookicutter/cookiecutter-django/pull/3164))
-- Update pytest-django to 4.3.0 ([#3182](https://github.com/cookicutter/cookiecutter-django/pull/3182))
-- Auto-update pre-commit hooks ([#3157](https://github.com/cookicutter/cookiecutter-django/pull/3157))
-- Update python-slugify to 5.0.2 ([#3161](https://github.com/cookicutter/cookiecutter-django/pull/3161))
-- Bump stefanzweifel/git-auto-commit-action from 4.10.0 to 4.11.0 ([#3171](https://github.com/cookicutter/cookiecutter-django/pull/3171))
-- Update sentry-sdk to 1.1.0 ([#3163](https://github.com/cookicutter/cookiecutter-django/pull/3163))
-- Bump actions/setup-python from 2 to 2.2.2 ([#3173](https://github.com/cookicutter/cookiecutter-django/pull/3173))
-- Update tox to 3.23.1 ([#3160](https://github.com/cookicutter/cookiecutter-django/pull/3160))
-- Update pytest to 6.2.4 ([#3156](https://github.com/cookicutter/cookiecutter-django/pull/3156))
-- Bump peter-evans/create-pull-request from 3.8.2 to 3.9.2 ([#3179](https://github.com/cookicutter/cookiecutter-django/pull/3179))
-- Update sphinx to 4.0.1 ([#3169](https://github.com/cookicutter/cookiecutter-django/pull/3169))
-- Update cookiecutter to 1.7.3 ([#3180](https://github.com/cookicutter/cookiecutter-django/pull/3180))
-- Update django to 3.1.11 ([#3178](https://github.com/cookicutter/cookiecutter-django/pull/3178))
+- Auto-update pre-commit hooks ([#3184](https://github.com/cookiecutter/cookiecutter-django/pull/3184))
+- Update black to 21.5b1 ([#3167](https://github.com/cookiecutter/cookiecutter-django/pull/3167))
+- Update flake8 to 3.9.2 ([#3164](https://github.com/cookiecutter/cookiecutter-django/pull/3164))
+- Update pytest-django to 4.3.0 ([#3182](https://github.com/cookiecutter/cookiecutter-django/pull/3182))
+- Auto-update pre-commit hooks ([#3157](https://github.com/cookiecutter/cookiecutter-django/pull/3157))
+- Update python-slugify to 5.0.2 ([#3161](https://github.com/cookiecutter/cookiecutter-django/pull/3161))
+- Bump stefanzweifel/git-auto-commit-action from 4.10.0 to 4.11.0 ([#3171](https://github.com/cookiecutter/cookiecutter-django/pull/3171))
+- Update sentry-sdk to 1.1.0 ([#3163](https://github.com/cookiecutter/cookiecutter-django/pull/3163))
+- Bump actions/setup-python from 2 to 2.2.2 ([#3173](https://github.com/cookiecutter/cookiecutter-django/pull/3173))
+- Update tox to 3.23.1 ([#3160](https://github.com/cookiecutter/cookiecutter-django/pull/3160))
+- Update pytest to 6.2.4 ([#3156](https://github.com/cookiecutter/cookiecutter-django/pull/3156))
+- Bump peter-evans/create-pull-request from 3.8.2 to 3.9.2 ([#3179](https://github.com/cookiecutter/cookiecutter-django/pull/3179))
+- Update sphinx to 4.0.1 ([#3169](https://github.com/cookiecutter/cookiecutter-django/pull/3169))
+- Update cookiecutter to 1.7.3 ([#3180](https://github.com/cookiecutter/cookiecutter-django/pull/3180))
+- Update django to 3.1.11 ([#3178](https://github.com/cookiecutter/cookiecutter-django/pull/3178))
 
 ## [2021-05-06]
 ### Updated
-- Update django to 3.1.10 ([#3162](https://github.com/cookicutter/cookiecutter-django/pull/3162))
+- Update django to 3.1.10 ([#3162](https://github.com/cookiecutter/cookiecutter-django/pull/3162))
 
 ## [2021-05-04]
 ### Updated
-- Update django to 3.1.9 ([#3155](https://github.com/cookicutter/cookiecutter-django/pull/3155))
+- Update django to 3.1.9 ([#3155](https://github.com/cookiecutter/cookiecutter-django/pull/3155))
 
 ## [2021-04-30]
 ### Fixed
-- Fix linting error in production.py ([#3148](https://github.com/cookicutter/cookiecutter-django/pull/3148))
+- Fix linting error in production.py ([#3148](https://github.com/cookiecutter/cookiecutter-django/pull/3148))
 
 ## [2021-04-29]
 ### Updated
-- Update black to 21.4b2 ([#3147](https://github.com/cookicutter/cookiecutter-django/pull/3147))
-- Auto-update pre-commit hooks ([#3146](https://github.com/cookicutter/cookiecutter-django/pull/3146))
+- Update black to 21.4b2 ([#3147](https://github.com/cookiecutter/cookiecutter-django/pull/3147))
+- Auto-update pre-commit hooks ([#3146](https://github.com/cookiecutter/cookiecutter-django/pull/3146))
 
 ## [2021-04-28]
 ### Changed
-- Fix README link ([#3144](https://github.com/cookicutter/cookiecutter-django/pull/3144))
+- Fix README link ([#3144](https://github.com/cookiecutter/cookiecutter-django/pull/3144))
 ### Updated
-- Auto-update pre-commit hooks ([#3145](https://github.com/cookicutter/cookiecutter-django/pull/3145))
+- Auto-update pre-commit hooks ([#3145](https://github.com/cookiecutter/cookiecutter-django/pull/3145))
 
 ## [2021-04-27]
 ### Updated
-- Update pygithub to 1.55 ([#3141](https://github.com/cookicutter/cookiecutter-django/pull/3141))
-- Update black to 21.4b1 ([#3143](https://github.com/cookicutter/cookiecutter-django/pull/3143))
+- Update pygithub to 1.55 ([#3141](https://github.com/cookiecutter/cookiecutter-django/pull/3141))
+- Update black to 21.4b1 ([#3143](https://github.com/cookiecutter/cookiecutter-django/pull/3143))
 
 ## [2021-04-26]
 ### Updated
-- Update black to 21.4b0 ([#3138](https://github.com/cookicutter/cookiecutter-django/pull/3138))
-- Auto-update pre-commit hooks ([#3137](https://github.com/cookicutter/cookiecutter-django/pull/3137))
+- Update black to 21.4b0 ([#3138](https://github.com/cookiecutter/cookiecutter-django/pull/3138))
+- Auto-update pre-commit hooks ([#3137](https://github.com/cookiecutter/cookiecutter-django/pull/3137))
 
 ## [2021-04-21]
 ### Updated
-- Auto-update pre-commit hooks ([#3133](https://github.com/cookicutter/cookiecutter-django/pull/3133))
-- Update django-extensions to 3.1.3 ([#3136](https://github.com/cookicutter/cookiecutter-django/pull/3136))
-- Update django-compressor to 2.4.1 ([#3135](https://github.com/cookicutter/cookiecutter-django/pull/3135))
-- Update pre-commit to 2.12.1 ([#3134](https://github.com/cookicutter/cookiecutter-django/pull/3134))
-- Update flake8 to 3.9.1 ([#3131](https://github.com/cookicutter/cookiecutter-django/pull/3131))
-- Update django-stubs to 1.8.0 ([#3127](https://github.com/cookicutter/cookiecutter-django/pull/3127))
-- Update sphinx to 3.5.4 ([#3126](https://github.com/cookicutter/cookiecutter-django/pull/3126))
+- Auto-update pre-commit hooks ([#3133](https://github.com/cookiecutter/cookiecutter-django/pull/3133))
+- Update django-extensions to 3.1.3 ([#3136](https://github.com/cookiecutter/cookiecutter-django/pull/3136))
+- Update django-compressor to 2.4.1 ([#3135](https://github.com/cookiecutter/cookiecutter-django/pull/3135))
+- Update pre-commit to 2.12.1 ([#3134](https://github.com/cookiecutter/cookiecutter-django/pull/3134))
+- Update flake8 to 3.9.1 ([#3131](https://github.com/cookiecutter/cookiecutter-django/pull/3131))
+- Update django-stubs to 1.8.0 ([#3127](https://github.com/cookiecutter/cookiecutter-django/pull/3127))
+- Update sphinx to 3.5.4 ([#3126](https://github.com/cookiecutter/cookiecutter-django/pull/3126))
 
 ## [2021-04-15]
 ### Updated
-- Update django-debug-toolbar to 3.2.1 ([#3129](https://github.com/cookicutter/cookiecutter-django/pull/3129))
+- Update django-debug-toolbar to 3.2.1 ([#3129](https://github.com/cookiecutter/cookiecutter-django/pull/3129))
 
 ## [2021-04-14]
 ### Updated
-- Bump stefanzweifel/git-auto-commit-action from v4.9.2 to v4.10.0 ([#3128](https://github.com/cookicutter/cookiecutter-django/pull/3128))
+- Bump stefanzweifel/git-auto-commit-action from v4.9.2 to v4.10.0 ([#3128](https://github.com/cookiecutter/cookiecutter-django/pull/3128))
 
 ## [2021-04-11]
 ### Updated
-- Update pytest-django to 4.2.0 ([#3125](https://github.com/cookicutter/cookiecutter-django/pull/3125))
-- Update pylint-django to 2.4.3 ([#3122](https://github.com/cookicutter/cookiecutter-django/pull/3122))
+- Update pytest-django to 4.2.0 ([#3125](https://github.com/cookiecutter/cookiecutter-django/pull/3125))
+- Update pylint-django to 2.4.3 ([#3122](https://github.com/cookiecutter/cookiecutter-django/pull/3122))
 
 ## [2021-04-09]
 ### Changed
-- Update from Python 3.8 to Python 3.9 ([#3023](https://github.com/cookicutter/cookiecutter-django/pull/3023))
+- Update from Python 3.8 to Python 3.9 ([#3023](https://github.com/cookiecutter/cookiecutter-django/pull/3023))
 
 ## [2021-04-08]
 ### Changed
-- Switch .dockerignore to explicit list ([#3121](https://github.com/cookicutter/cookiecutter-django/pull/3121))
-- Change Docker image to multi-stage build for Django ([#2815](https://github.com/cookicutter/cookiecutter-django/pull/2815))
-- Fix deprecated warning in middleware tests ([#3038](https://github.com/cookicutter/cookiecutter-django/pull/3038))
+- Switch .dockerignore to explicit list ([#3121](https://github.com/cookiecutter/cookiecutter-django/pull/3121))
+- Change Docker image to multi-stage build for Django ([#2815](https://github.com/cookiecutter/cookiecutter-django/pull/2815))
+- Fix deprecated warning in middleware tests ([#3038](https://github.com/cookiecutter/cookiecutter-django/pull/3038))
 ### Updated
-- Update pre-commit to 2.12.0 ([#3120](https://github.com/cookicutter/cookiecutter-django/pull/3120))
+- Update pre-commit to 2.12.0 ([#3120](https://github.com/cookiecutter/cookiecutter-django/pull/3120))
 
 ## [2021-04-07]
 ### Changed
-- Update django to 3.1.8 ([#3117](https://github.com/cookicutter/cookiecutter-django/pull/3117))
+- Update django to 3.1.8 ([#3117](https://github.com/cookiecutter/cookiecutter-django/pull/3117))
 ### Fixed
-- Fix linting via pre-commit on Github CI ([#3077](https://github.com/cookicutter/cookiecutter-django/pull/3077))
-- Fix gitlab-ci using duplicate key name for image ([#3112](https://github.com/cookicutter/cookiecutter-django/pull/3112))
+- Fix linting via pre-commit on Github CI ([#3077](https://github.com/cookiecutter/cookiecutter-django/pull/3077))
+- Fix gitlab-ci using duplicate key name for image ([#3112](https://github.com/cookiecutter/cookiecutter-django/pull/3112))
 ### Updated
-- Update sentry-sdk to 1.0.0 ([#3080](https://github.com/cookicutter/cookiecutter-django/pull/3080))
-- Update gunicorn to 20.1.0 ([#3108](https://github.com/cookicutter/cookiecutter-django/pull/3108))
-- Update pre-commit to 2.12.0 ([#3118](https://github.com/cookicutter/cookiecutter-django/pull/3118))
-- Update django-extensions to 3.1.2 ([#3116](https://github.com/cookicutter/cookiecutter-django/pull/3116))
-- Update pillow to 8.2.0 ([#3113](https://github.com/cookicutter/cookiecutter-django/pull/3113))
-- Update pytest to 6.2.3 ([#3115](https://github.com/cookicutter/cookiecutter-django/pull/3115))
+- Update sentry-sdk to 1.0.0 ([#3080](https://github.com/cookiecutter/cookiecutter-django/pull/3080))
+- Update gunicorn to 20.1.0 ([#3108](https://github.com/cookiecutter/cookiecutter-django/pull/3108))
+- Update pre-commit to 2.12.0 ([#3118](https://github.com/cookiecutter/cookiecutter-django/pull/3118))
+- Update django-extensions to 3.1.2 ([#3116](https://github.com/cookiecutter/cookiecutter-django/pull/3116))
+- Update pillow to 8.2.0 ([#3113](https://github.com/cookiecutter/cookiecutter-django/pull/3113))
+- Update pytest to 6.2.3 ([#3115](https://github.com/cookiecutter/cookiecutter-django/pull/3115))
 
 ## [2021-03-26]
 ### Updated
-- Update djangorestframework to 3.12.4 ([#3107](https://github.com/cookicutter/cookiecutter-django/pull/3107))
+- Update djangorestframework to 3.12.4 ([#3107](https://github.com/cookiecutter/cookiecutter-django/pull/3107))
 
 ## [2021-03-25]
 ### Updated
-- Update djangorestframework to 3.12.3 ([#3105](https://github.com/cookicutter/cookiecutter-django/pull/3105))
+- Update djangorestframework to 3.12.3 ([#3105](https://github.com/cookiecutter/cookiecutter-django/pull/3105))
 
 ## [2021-03-22]
 ### Updated
-- Update django-crispy-forms to 1.11.2 ([#3104](https://github.com/cookicutter/cookiecutter-django/pull/3104))
-- Update sphinx to 3.5.3 ([#3103](https://github.com/cookicutter/cookiecutter-django/pull/3103))
-- Update ipdb to 0.13.7 ([#3102](https://github.com/cookicutter/cookiecutter-django/pull/3102))
-- Update sphinx-autobuild to 2021.3.14 ([#3101](https://github.com/cookicutter/cookiecutter-django/pull/3101))
-- Update isort to 5.8.0 ([#3100](https://github.com/cookicutter/cookiecutter-django/pull/3100))
-- Update pre-commit to 2.11.1 ([#3089](https://github.com/cookicutter/cookiecutter-django/pull/3089))
-- Update flake8 to 3.9.0 ([#3096](https://github.com/cookicutter/cookiecutter-django/pull/3096))
-- Update pillow to 8.1.2 ([#3084](https://github.com/cookicutter/cookiecutter-django/pull/3084))
-- Auto-update pre-commit hooks ([#3095](https://github.com/cookicutter/cookiecutter-django/pull/3095))
+- Update django-crispy-forms to 1.11.2 ([#3104](https://github.com/cookiecutter/cookiecutter-django/pull/3104))
+- Update sphinx to 3.5.3 ([#3103](https://github.com/cookiecutter/cookiecutter-django/pull/3103))
+- Update ipdb to 0.13.7 ([#3102](https://github.com/cookiecutter/cookiecutter-django/pull/3102))
+- Update sphinx-autobuild to 2021.3.14 ([#3101](https://github.com/cookiecutter/cookiecutter-django/pull/3101))
+- Update isort to 5.8.0 ([#3100](https://github.com/cookiecutter/cookiecutter-django/pull/3100))
+- Update pre-commit to 2.11.1 ([#3089](https://github.com/cookiecutter/cookiecutter-django/pull/3089))
+- Update flake8 to 3.9.0 ([#3096](https://github.com/cookiecutter/cookiecutter-django/pull/3096))
+- Update pillow to 8.1.2 ([#3084](https://github.com/cookiecutter/cookiecutter-django/pull/3084))
+- Auto-update pre-commit hooks ([#3095](https://github.com/cookiecutter/cookiecutter-django/pull/3095))
 
 ## [2021-03-05]
 ### Changed
-- Updated test_urls.py and views.py to re-use User.get_absolute_url() ([#3070](https://github.com/cookicutter/cookiecutter-django/pull/3070))
+- Updated test_urls.py and views.py to re-use User.get_absolute_url() ([#3070](https://github.com/cookiecutter/cookiecutter-django/pull/3070))
 ### Updated
-- Bump stefanzweifel/git-auto-commit-action from v4.9.1 to v4.9.2 ([#3082](https://github.com/cookicutter/cookiecutter-django/pull/3082))
+- Bump stefanzweifel/git-auto-commit-action from v4.9.1 to v4.9.2 ([#3082](https://github.com/cookiecutter/cookiecutter-django/pull/3082))
 
 ## [2021-03-03]
 ### Updated
-- Update tox to 3.23.0 ([#3079](https://github.com/cookicutter/cookiecutter-django/pull/3079))
-- Update ipdb to 0.13.5 ([#3078](https://github.com/cookicutter/cookiecutter-django/pull/3078))
+- Update tox to 3.23.0 ([#3079](https://github.com/cookiecutter/cookiecutter-django/pull/3079))
+- Update ipdb to 0.13.5 ([#3078](https://github.com/cookiecutter/cookiecutter-django/pull/3078))
 
 ## [2021-03-02]
 ### Fixed
-- Fixes for pytest job in Github CI workflow ([#3076](https://github.com/cookicutter/cookiecutter-django/pull/3076))
+- Fixes for pytest job in Github CI workflow ([#3076](https://github.com/cookiecutter/cookiecutter-django/pull/3076))
 ### Updated
-- Update pillow to 8.1.1 ([#3075](https://github.com/cookicutter/cookiecutter-django/pull/3075))
-- Update coverage to 5.5 ([#3074](https://github.com/cookicutter/cookiecutter-django/pull/3074))
+- Update pillow to 8.1.1 ([#3075](https://github.com/cookiecutter/cookiecutter-django/pull/3075))
+- Update coverage to 5.5 ([#3074](https://github.com/cookiecutter/cookiecutter-django/pull/3074))
 
 ## [2021-02-24]
 ### Updated
-- Bump stefanzweifel/git-auto-commit-action from v4.9.0 to v4.9.1 ([#3069](https://github.com/cookicutter/cookiecutter-django/pull/3069))
+- Bump stefanzweifel/git-auto-commit-action from v4.9.0 to v4.9.1 ([#3069](https://github.com/cookiecutter/cookiecutter-django/pull/3069))
 
 ## [2021-02-23]
 ### Changed
-- Update to Django 3.1 ([#3043](https://github.com/cookicutter/cookiecutter-django/pull/3043))
-- Lint with pre-commit on CI with Github actions ([#3066](https://github.com/cookicutter/cookiecutter-django/pull/3066))
-- Use exception var in status code pages if available ([#2992](https://github.com/cookicutter/cookiecutter-django/pull/2992))
+- Update to Django 3.1 ([#3043](https://github.com/cookiecutter/cookiecutter-django/pull/3043))
+- Lint with pre-commit on CI with Github actions ([#3066](https://github.com/cookiecutter/cookiecutter-django/pull/3066))
+- Use exception var in status code pages if available ([#2992](https://github.com/cookiecutter/cookiecutter-django/pull/2992))
 
 ## [2021-02-22]
 ### Changed
-- refactor: remove default cache settings in test.py ([#3064](https://github.com/cookicutter/cookiecutter-django/pull/3064))
-- Update django to 3.0.13 ([#3060](https://github.com/cookicutter/cookiecutter-django/pull/3060))
+- refactor: remove default cache settings in test.py ([#3064](https://github.com/cookiecutter/cookiecutter-django/pull/3064))
+- Update django to 3.0.13 ([#3060](https://github.com/cookiecutter/cookiecutter-django/pull/3060))
 ### Fixed
-- Fix missing Django Debug toolbar with node container ([#2865](https://github.com/cookicutter/cookiecutter-django/pull/2865))
-- Remove Email from User API ([#3055](https://github.com/cookicutter/cookiecutter-django/pull/3055))
+- Fix missing Django Debug toolbar with node container ([#2865](https://github.com/cookiecutter/cookiecutter-django/pull/2865))
+- Remove Email from User API ([#3055](https://github.com/cookiecutter/cookiecutter-django/pull/3055))
 ### Updated
-- Bump stefanzweifel/git-auto-commit-action from v4.8.0 to v4.9.0 ([#3065](https://github.com/cookicutter/cookiecutter-django/pull/3065))
-- Update django-crispy-forms to 1.11.1 ([#3063](https://github.com/cookicutter/cookiecutter-django/pull/3063))
-- Update uvicorn to 0.13.4 ([#3062](https://github.com/cookicutter/cookiecutter-django/pull/3062))
-- Update mypy to 0.812 ([#3061](https://github.com/cookicutter/cookiecutter-django/pull/3061))
-- Update sentry-sdk to 0.20.3 ([#3059](https://github.com/cookicutter/cookiecutter-django/pull/3059))
-- Update tox to 3.22.0 ([#3057](https://github.com/cookicutter/cookiecutter-django/pull/3057))
-- Update sphinx to 3.5.1 ([#3056](https://github.com/cookicutter/cookiecutter-django/pull/3056))
+- Bump stefanzweifel/git-auto-commit-action from v4.8.0 to v4.9.0 ([#3065](https://github.com/cookiecutter/cookiecutter-django/pull/3065))
+- Update django-crispy-forms to 1.11.1 ([#3063](https://github.com/cookiecutter/cookiecutter-django/pull/3063))
+- Update uvicorn to 0.13.4 ([#3062](https://github.com/cookiecutter/cookiecutter-django/pull/3062))
+- Update mypy to 0.812 ([#3061](https://github.com/cookiecutter/cookiecutter-django/pull/3061))
+- Update sentry-sdk to 0.20.3 ([#3059](https://github.com/cookiecutter/cookiecutter-django/pull/3059))
+- Update tox to 3.22.0 ([#3057](https://github.com/cookiecutter/cookiecutter-django/pull/3057))
+- Update sphinx to 3.5.1 ([#3056](https://github.com/cookiecutter/cookiecutter-django/pull/3056))
 
 ## [2021-02-16]
 ### Updated
-- Update sentry-sdk to 0.20.2 ([#3054](https://github.com/cookicutter/cookiecutter-django/pull/3054))
-- Update sphinx to 3.5.0 ([#3053](https://github.com/cookicutter/cookiecutter-django/pull/3053))
+- Update sentry-sdk to 0.20.2 ([#3054](https://github.com/cookiecutter/cookiecutter-django/pull/3054))
+- Update sphinx to 3.5.0 ([#3053](https://github.com/cookiecutter/cookiecutter-django/pull/3053))
 
 ## [2021-02-13]
 ### Updated
-- Update sentry-sdk to 0.20.1 ([#3052](https://github.com/cookicutter/cookiecutter-django/pull/3052))
+- Update sentry-sdk to 0.20.1 ([#3052](https://github.com/cookiecutter/cookiecutter-django/pull/3052))
 
 ## [2021-02-12]
 ### Updated
-- Update pre-commit to 2.10.1 ([#3045](https://github.com/cookicutter/cookiecutter-django/pull/3045))
-- Update sentry-sdk to 0.20.0 ([#3051](https://github.com/cookicutter/cookiecutter-django/pull/3051))
+- Update pre-commit to 2.10.1 ([#3045](https://github.com/cookiecutter/cookiecutter-django/pull/3045))
+- Update sentry-sdk to 0.20.0 ([#3051](https://github.com/cookiecutter/cookiecutter-django/pull/3051))
 
 ## [2021-02-10]
 ### Updated
-- Bump peter-evans/create-pull-request from v3.8.1 to v3.8.2 ([#3049](https://github.com/cookicutter/cookiecutter-django/pull/3049))
+- Bump peter-evans/create-pull-request from v3.8.1 to v3.8.2 ([#3049](https://github.com/cookiecutter/cookiecutter-django/pull/3049))
 
 ## [2021-02-08]
 ### Updated
-- Update django-extensions to 3.1.1 ([#3047](https://github.com/cookicutter/cookiecutter-django/pull/3047))
-- Bump peter-evans/create-pull-request from v3.8.0 to v3.8.1 ([#3046](https://github.com/cookicutter/cookiecutter-django/pull/3046))
+- Update django-extensions to 3.1.1 ([#3047](https://github.com/cookiecutter/cookiecutter-django/pull/3047))
+- Bump peter-evans/create-pull-request from v3.8.0 to v3.8.1 ([#3046](https://github.com/cookiecutter/cookiecutter-django/pull/3046))
 
 ## [2021-02-06]
 ### Changed
-- Removed Redundant test_case_sensitivity() and made test_not_authenticated() get the LOGIN_URL dynamically. ([#3041](https://github.com/cookicutter/cookiecutter-django/pull/3041))
-- Refactored users.forms to make the code more readeable ([#3029](https://github.com/cookicutter/cookiecutter-django/pull/3029))
-- Update django to 3.0.12 ([#3037](https://github.com/cookicutter/cookiecutter-django/pull/3037))
+- Removed Redundant test_case_sensitivity() and made test_not_authenticated() get the LOGIN_URL dynamically. ([#3041](https://github.com/cookiecutter/cookiecutter-django/pull/3041))
+- Refactored users.forms to make the code more readeable ([#3029](https://github.com/cookiecutter/cookiecutter-django/pull/3029))
+- Update django to 3.0.12 ([#3037](https://github.com/cookiecutter/cookiecutter-django/pull/3037))
 ### Updated
-- Update tox to 3.21.4 ([#3044](https://github.com/cookicutter/cookiecutter-django/pull/3044))
+- Update tox to 3.21.4 ([#3044](https://github.com/cookiecutter/cookiecutter-django/pull/3044))
 
 ## [2021-02-01]
 ### Updated
-- Update pytz to 2021.1 ([#3035](https://github.com/cookicutter/cookiecutter-django/pull/3035))
-- Update jinja2 to 2.11.3 ([#3033](https://github.com/cookicutter/cookiecutter-django/pull/3033))
-- Bump peter-evans/create-pull-request from v3.7.0 to v3.8.0 ([#3034](https://github.com/cookicutter/cookiecutter-django/pull/3034))
+- Update pytz to 2021.1 ([#3035](https://github.com/cookiecutter/cookiecutter-django/pull/3035))
+- Update jinja2 to 2.11.3 ([#3033](https://github.com/cookiecutter/cookiecutter-django/pull/3033))
+- Bump peter-evans/create-pull-request from v3.7.0 to v3.8.0 ([#3034](https://github.com/cookiecutter/cookiecutter-django/pull/3034))
 
 ## [2021-01-31]
 ### Changed
-- Adding local celery instructions to developing-locally ([#3031](https://github.com/cookicutter/cookiecutter-django/pull/3031))
+- Adding local celery instructions to developing-locally ([#3031](https://github.com/cookiecutter/cookiecutter-django/pull/3031))
 ### Updated
-- Update django-crispy-forms to 1.11.0 ([#3032](https://github.com/cookicutter/cookiecutter-django/pull/3032))
+- Update django-crispy-forms to 1.11.0 ([#3032](https://github.com/cookiecutter/cookiecutter-django/pull/3032))
 
 ## [2021-01-28]
 ### Updated
-- Update pre-commit to 2.10.0 ([#3028](https://github.com/cookicutter/cookiecutter-django/pull/3028))
-- Update django-anymail to 8.2 ([#3027](https://github.com/cookicutter/cookiecutter-django/pull/3027))
-- Update tox to 3.21.3 ([#3026](https://github.com/cookicutter/cookiecutter-django/pull/3026))
+- Update pre-commit to 2.10.0 ([#3028](https://github.com/cookiecutter/cookiecutter-django/pull/3028))
+- Update django-anymail to 8.2 ([#3027](https://github.com/cookiecutter/cookiecutter-django/pull/3027))
+- Update tox to 3.21.3 ([#3026](https://github.com/cookiecutter/cookiecutter-django/pull/3026))
 
 ## [2021-01-26]
 ### Changed
-- Bump peter-evans/create-pull-request from v3.6.0 to v3.7.0 ([#3022](https://github.com/cookicutter/cookiecutter-django/pull/3022))
-- Using SuccessMessageMixin to send success message to django template ([#3021](https://github.com/cookicutter/cookiecutter-django/pull/3021))
+- Bump peter-evans/create-pull-request from v3.6.0 to v3.7.0 ([#3022](https://github.com/cookiecutter/cookiecutter-django/pull/3022))
+- Using SuccessMessageMixin to send success message to django template ([#3021](https://github.com/cookiecutter/cookiecutter-django/pull/3021))
 ### Fixed
-- Update admin to ignore *_name User attributes ([#3018](https://github.com/cookicutter/cookiecutter-django/pull/3018))
+- Update admin to ignore *_name User attributes ([#3018](https://github.com/cookiecutter/cookiecutter-django/pull/3018))
 ### Updated
-- Update coverage to 5.4 ([#3024](https://github.com/cookicutter/cookiecutter-django/pull/3024))
-- Update pytest to 6.2.2 ([#3020](https://github.com/cookicutter/cookiecutter-django/pull/3020))
-- Update django-cors-headers to 3.7.0 ([#3019](https://github.com/cookicutter/cookiecutter-django/pull/3019))
+- Update coverage to 5.4 ([#3024](https://github.com/cookiecutter/cookiecutter-django/pull/3024))
+- Update pytest to 6.2.2 ([#3020](https://github.com/cookiecutter/cookiecutter-django/pull/3020))
+- Update django-cors-headers to 3.7.0 ([#3019](https://github.com/cookiecutter/cookiecutter-django/pull/3019))
 
 ## [2021-01-24]
 ### Changed
-- Use defer for script tags (Fix #2922) ([#2927](https://github.com/cookicutter/cookiecutter-django/pull/2927))
-- Made Traefik conf much easier to understand and improved redirect res… ([#2838](https://github.com/cookicutter/cookiecutter-django/pull/2838))
-- Sentry Redis integration enabled by default in production. ([#2989](https://github.com/cookicutter/cookiecutter-django/pull/2989))
-- Add test for UserUpdateView.form_valid() ([#2949](https://github.com/cookicutter/cookiecutter-django/pull/2949))
+- Use defer for script tags (Fix #2922) ([#2927](https://github.com/cookiecutter/cookiecutter-django/pull/2927))
+- Made Traefik conf much easier to understand and improved redirect res… ([#2838](https://github.com/cookiecutter/cookiecutter-django/pull/2838))
+- Sentry Redis integration enabled by default in production. ([#2989](https://github.com/cookiecutter/cookiecutter-django/pull/2989))
+- Add test for UserUpdateView.form_valid() ([#2949](https://github.com/cookiecutter/cookiecutter-django/pull/2949))
 ### Fixed
-- Omit first_name and last_name in User model ([#2998](https://github.com/cookicutter/cookiecutter-django/pull/2998))
+- Omit first_name and last_name in User model ([#2998](https://github.com/cookiecutter/cookiecutter-django/pull/2998))
 ### Updated
-- Update django-celery-beat to 2.2.0 ([#3009](https://github.com/cookicutter/cookiecutter-django/pull/3009))
-- Update pyyaml to 5.4.1 ([#3011](https://github.com/cookicutter/cookiecutter-django/pull/3011))
-- Update mypy to 0.800 ([#3013](https://github.com/cookicutter/cookiecutter-django/pull/3013))
-- Update factory-boy to 3.2.0 ([#2986](https://github.com/cookicutter/cookiecutter-django/pull/2986))
-- Update tox to 3.21.2 ([#3010](https://github.com/cookicutter/cookiecutter-django/pull/3010))
+- Update django-celery-beat to 2.2.0 ([#3009](https://github.com/cookiecutter/cookiecutter-django/pull/3009))
+- Update pyyaml to 5.4.1 ([#3011](https://github.com/cookiecutter/cookiecutter-django/pull/3011))
+- Update mypy to 0.800 ([#3013](https://github.com/cookiecutter/cookiecutter-django/pull/3013))
+- Update factory-boy to 3.2.0 ([#2986](https://github.com/cookiecutter/cookiecutter-django/pull/2986))
+- Update tox to 3.21.2 ([#3010](https://github.com/cookiecutter/cookiecutter-django/pull/3010))
 
 ## [2021-01-22]
 ### Changed
-- Use self.request.user instead of second query ([#3012](https://github.com/cookicutter/cookiecutter-django/pull/3012))
+- Use self.request.user instead of second query ([#3012](https://github.com/cookiecutter/cookiecutter-django/pull/3012))
 
 ## [2021-01-14]
 ### Updated
-- Update tox to 3.21.1 ([#3006](https://github.com/cookicutter/cookiecutter-django/pull/3006))
+- Update tox to 3.21.1 ([#3006](https://github.com/cookiecutter/cookiecutter-django/pull/3006))
 
 ## [2021-01-10]
 ### Updated
-- Update pylint-django to 2.4.2 ([#3003](https://github.com/cookicutter/cookiecutter-django/pull/3003))
-- Update tox to 3.21.0 ([#3002](https://github.com/cookicutter/cookiecutter-django/pull/3002))
+- Update pylint-django to 2.4.2 ([#3003](https://github.com/cookiecutter/cookiecutter-django/pull/3003))
+- Update tox to 3.21.0 ([#3002](https://github.com/cookiecutter/cookiecutter-django/pull/3002))
 
 ## [2021-01-08]
 ### Changed
-- Upgrade Travis to Focal ([#2999](https://github.com/cookicutter/cookiecutter-django/pull/2999))
+- Upgrade Travis to Focal ([#2999](https://github.com/cookiecutter/cookiecutter-django/pull/2999))
 ### Updated
-- Update pylint-django to 2.4.1 ([#3001](https://github.com/cookicutter/cookiecutter-django/pull/3001))
-- Update sphinx to 3.4.3 ([#3000](https://github.com/cookicutter/cookiecutter-django/pull/3000))
-- Update pylint-django to 2.4.0 ([#2996](https://github.com/cookicutter/cookiecutter-django/pull/2996))
+- Update pylint-django to 2.4.1 ([#3001](https://github.com/cookiecutter/cookiecutter-django/pull/3001))
+- Update sphinx to 3.4.3 ([#3000](https://github.com/cookiecutter/cookiecutter-django/pull/3000))
+- Update pylint-django to 2.4.0 ([#2996](https://github.com/cookiecutter/cookiecutter-django/pull/2996))
 
 ## [2021-01-04]
 ### Updated
-- Update isort to 5.7.0 ([#2988](https://github.com/cookicutter/cookiecutter-django/pull/2988))
-- Update uvicorn to 0.13.3 ([#2987](https://github.com/cookicutter/cookiecutter-django/pull/2987))
-- Auto-update pre-commit hooks ([#2990](https://github.com/cookicutter/cookiecutter-django/pull/2990))
-- Update sphinx to 3.4.2 ([#2995](https://github.com/cookicutter/cookiecutter-django/pull/2995))
-- Update pillow to 8.1.0 ([#2993](https://github.com/cookicutter/cookiecutter-django/pull/2993))
+- Update isort to 5.7.0 ([#2988](https://github.com/cookiecutter/cookiecutter-django/pull/2988))
+- Update uvicorn to 0.13.3 ([#2987](https://github.com/cookiecutter/cookiecutter-django/pull/2987))
+- Auto-update pre-commit hooks ([#2990](https://github.com/cookiecutter/cookiecutter-django/pull/2990))
+- Update sphinx to 3.4.2 ([#2995](https://github.com/cookiecutter/cookiecutter-django/pull/2995))
+- Update pillow to 8.1.0 ([#2993](https://github.com/cookiecutter/cookiecutter-django/pull/2993))
 
 ## [2020-12-29]
 ### Updated
-- Update pygithub to 1.54.1 ([#2982](https://github.com/cookicutter/cookiecutter-django/pull/2982))
-- Update django-storages to 1.11.1 ([#2981](https://github.com/cookicutter/cookiecutter-django/pull/2981))
+- Update pygithub to 1.54.1 ([#2982](https://github.com/cookiecutter/cookiecutter-django/pull/2982))
+- Update django-storages to 1.11.1 ([#2981](https://github.com/cookiecutter/cookiecutter-django/pull/2981))
 
 ## [2020-12-26]
 ### Updated
-- Update sphinx to 3.4.1 ([#2985](https://github.com/cookicutter/cookiecutter-django/pull/2985))
-- Update pytz to 2020.5 ([#2984](https://github.com/cookicutter/cookiecutter-django/pull/2984))
+- Update sphinx to 3.4.1 ([#2985](https://github.com/cookiecutter/cookiecutter-django/pull/2985))
+- Update pytz to 2020.5 ([#2984](https://github.com/cookiecutter/cookiecutter-django/pull/2984))
 
 ## [2020-12-23]
 ### Changed
-- Bump peter-evans/create-pull-request from v3.5.2 to v3.6.0 ([#2980](https://github.com/cookicutter/cookiecutter-django/pull/2980))
+- Bump peter-evans/create-pull-request from v3.5.2 to v3.6.0 ([#2980](https://github.com/cookiecutter/cookiecutter-django/pull/2980))
 ### Updated
-- Update flower to 0.9.7 ([#2979](https://github.com/cookicutter/cookiecutter-django/pull/2979))
-- Update sphinx to 3.4.0 ([#2978](https://github.com/cookicutter/cookiecutter-django/pull/2978))
-- Update coverage to 5.3.1 ([#2977](https://github.com/cookicutter/cookiecutter-django/pull/2977))
-- Update uvicorn to 0.13.2 ([#2976](https://github.com/cookicutter/cookiecutter-django/pull/2976))
+- Update flower to 0.9.7 ([#2979](https://github.com/cookiecutter/cookiecutter-django/pull/2979))
+- Update sphinx to 3.4.0 ([#2978](https://github.com/cookiecutter/cookiecutter-django/pull/2978))
+- Update coverage to 5.3.1 ([#2977](https://github.com/cookiecutter/cookiecutter-django/pull/2977))
+- Update uvicorn to 0.13.2 ([#2976](https://github.com/cookiecutter/cookiecutter-django/pull/2976))
 
 ## [2020-12-18]
 ### Changed
-- Bump stefanzweifel/git-auto-commit-action from v4.7.2 to v4.8.0 ([#2972](https://github.com/cookicutter/cookiecutter-django/pull/2972))
+- Bump stefanzweifel/git-auto-commit-action from v4.7.2 to v4.8.0 ([#2972](https://github.com/cookiecutter/cookiecutter-django/pull/2972))
 ### Updated
-- Update django-storages to 1.11 ([#2973](https://github.com/cookicutter/cookiecutter-django/pull/2973))
-- Update pytest to 6.2.1 ([#2971](https://github.com/cookicutter/cookiecutter-django/pull/2971))
-- Auto-update pre-commit hooks ([#2970](https://github.com/cookicutter/cookiecutter-django/pull/2970))
+- Update django-storages to 1.11 ([#2973](https://github.com/cookiecutter/cookiecutter-django/pull/2973))
+- Update pytest to 6.2.1 ([#2971](https://github.com/cookiecutter/cookiecutter-django/pull/2971))
+- Auto-update pre-commit hooks ([#2970](https://github.com/cookiecutter/cookiecutter-django/pull/2970))
 
 ## [2020-12-14]
 ### Updated
-- Update pytest to 6.2.0 ([#2968](https://github.com/cookicutter/cookiecutter-django/pull/2968))
-- Update django-cors-headers to 3.6.0 ([#2967](https://github.com/cookicutter/cookiecutter-django/pull/2967))
-- Update uvicorn to 0.13.1 ([#2966](https://github.com/cookicutter/cookiecutter-django/pull/2966))
+- Update pytest to 6.2.0 ([#2968](https://github.com/cookiecutter/cookiecutter-django/pull/2968))
+- Update django-cors-headers to 3.6.0 ([#2967](https://github.com/cookiecutter/cookiecutter-django/pull/2967))
+- Update uvicorn to 0.13.1 ([#2966](https://github.com/cookiecutter/cookiecutter-django/pull/2966))
 
 ## [2020-12-10]
 ### Changed
-- Hot-reload support to celery ([#2554](https://github.com/cookicutter/cookiecutter-django/pull/2554))
+- Hot-reload support to celery ([#2554](https://github.com/cookiecutter/cookiecutter-django/pull/2554))
 ### Updated
-- Update uvicorn to 0.13.0 ([#2962](https://github.com/cookicutter/cookiecutter-django/pull/2962))
-- Update sentry-sdk to 0.19.5 ([#2965](https://github.com/cookicutter/cookiecutter-django/pull/2965))
+- Update uvicorn to 0.13.0 ([#2962](https://github.com/cookiecutter/cookiecutter-django/pull/2962))
+- Update sentry-sdk to 0.19.5 ([#2965](https://github.com/cookiecutter/cookiecutter-django/pull/2965))
 
 ## [2020-12-09]
 ### Changed
-- Bump peter-evans/create-pull-request from v3.5.1 to v3.5.2 ([#2964](https://github.com/cookicutter/cookiecutter-django/pull/2964))
+- Bump peter-evans/create-pull-request from v3.5.1 to v3.5.2 ([#2964](https://github.com/cookiecutter/cookiecutter-django/pull/2964))
 
 ## [2020-12-08]
 ### Updated
-- Update pre-commit to 2.9.3 ([#2961](https://github.com/cookicutter/cookiecutter-django/pull/2961))
+- Update pre-commit to 2.9.3 ([#2961](https://github.com/cookiecutter/cookiecutter-django/pull/2961))
 
 ## [2020-12-04]
 ### Updated
-- Update django-debug-toolbar to 3.2 ([#2959](https://github.com/cookicutter/cookiecutter-django/pull/2959))
+- Update django-debug-toolbar to 3.2 ([#2959](https://github.com/cookiecutter/cookiecutter-django/pull/2959))
 
 ## [2020-12-02]
 ### Updated
-- Update django-model-utils to 4.1.1 ([#2957](https://github.com/cookicutter/cookiecutter-django/pull/2957))
-- Update pygithub to 1.54 ([#2958](https://github.com/cookicutter/cookiecutter-django/pull/2958))
+- Update django-model-utils to 4.1.1 ([#2957](https://github.com/cookiecutter/cookiecutter-django/pull/2957))
+- Update pygithub to 1.54 ([#2958](https://github.com/cookiecutter/cookiecutter-django/pull/2958))
 
 ## [2020-11-26]
 ### Updated
-- Update django-extensions to 3.1.0 ([#2947](https://github.com/cookicutter/cookiecutter-django/pull/2947))
-- Update pre-commit to 2.9.2 ([#2948](https://github.com/cookicutter/cookiecutter-django/pull/2948))
-- Update django-allauth to 0.44.0 ([#2945](https://github.com/cookicutter/cookiecutter-django/pull/2945))
+- Update django-extensions to 3.1.0 ([#2947](https://github.com/cookiecutter/cookiecutter-django/pull/2947))
+- Update pre-commit to 2.9.2 ([#2948](https://github.com/cookiecutter/cookiecutter-django/pull/2948))
+- Update django-allauth to 0.44.0 ([#2945](https://github.com/cookiecutter/cookiecutter-django/pull/2945))
 
 ## [2020-11-25]
 ### Changed
-- Bump peter-evans/create-pull-request from v3.5.0 to v3.5.1 ([#2944](https://github.com/cookicutter/cookiecutter-django/pull/2944))
+- Bump peter-evans/create-pull-request from v3.5.0 to v3.5.1 ([#2944](https://github.com/cookiecutter/cookiecutter-django/pull/2944))
 
 ## [2020-11-23]
 ### Updated
-- Update uvicorn to 0.12.3 ([#2943](https://github.com/cookicutter/cookiecutter-django/pull/2943))
-- Update pre-commit to 2.9.0 ([#2942](https://github.com/cookicutter/cookiecutter-django/pull/2942))
+- Update uvicorn to 0.12.3 ([#2943](https://github.com/cookiecutter/cookiecutter-django/pull/2943))
+- Update pre-commit to 2.9.0 ([#2942](https://github.com/cookiecutter/cookiecutter-django/pull/2942))
 
 ## [2020-11-21]
 ### Changed
-- Fix after uvicorn 0.12.0 - Ship extra dependencies ([#2939](https://github.com/cookicutter/cookiecutter-django/pull/2939))
+- Fix after uvicorn 0.12.0 - Ship extra dependencies ([#2939](https://github.com/cookiecutter/cookiecutter-django/pull/2939))
 
 ## [2020-11-20]
 ### Updated
-- Update sentry-sdk to 0.19.4 ([#2938](https://github.com/cookicutter/cookiecutter-django/pull/2938))
+- Update sentry-sdk to 0.19.4 ([#2938](https://github.com/cookiecutter/cookiecutter-django/pull/2938))
 
 ## [2020-11-19]
 ### Updated
-- Update django-crispy-forms to 1.10.0 ([#2937](https://github.com/cookicutter/cookiecutter-django/pull/2937))
+- Update django-crispy-forms to 1.10.0 ([#2937](https://github.com/cookiecutter/cookiecutter-django/pull/2937))
 
 ## [2020-11-17]
 ### Changed
-- Bump peter-evans/create-pull-request from v2 to v3.5.0 ([#2936](https://github.com/cookicutter/cookiecutter-django/pull/2936))
+- Bump peter-evans/create-pull-request from v2 to v3.5.0 ([#2936](https://github.com/cookiecutter/cookiecutter-django/pull/2936))
 
 ## [2020-11-15]
 ### Changed
-- Fix formatting in docs ([#2935](https://github.com/cookicutter/cookiecutter-django/pull/2935))
+- Fix formatting in docs ([#2935](https://github.com/cookiecutter/cookiecutter-django/pull/2935))
 
 ## [2020-11-13]
 ### Changed
-- Upgrade factory-boy to 3.1.0 ([#2932](https://github.com/cookicutter/cookiecutter-django/pull/2932))
+- Upgrade factory-boy to 3.1.0 ([#2932](https://github.com/cookiecutter/cookiecutter-django/pull/2932))
 ### Updated
-- Update sentry-sdk to 0.19.3 ([#2933](https://github.com/cookicutter/cookiecutter-django/pull/2933))
-- Update sphinx to 3.3.1 ([#2934](https://github.com/cookicutter/cookiecutter-django/pull/2934))
+- Update sentry-sdk to 0.19.3 ([#2933](https://github.com/cookiecutter/cookiecutter-django/pull/2933))
+- Update sphinx to 3.3.1 ([#2934](https://github.com/cookiecutter/cookiecutter-django/pull/2934))
 
 ## [2020-11-12]
 ### Changed
-- Migrate CI to Github Actions ([#2931](https://github.com/cookicutter/cookiecutter-django/pull/2931))
+- Migrate CI to Github Actions ([#2931](https://github.com/cookiecutter/cookiecutter-django/pull/2931))
 
 ## [2020-11-06]
 ### Updated
-- Update djangorestframework to 3.12.2 ([#2930](https://github.com/cookicutter/cookiecutter-django/pull/2930))
+- Update djangorestframework to 3.12.2 ([#2930](https://github.com/cookiecutter/cookiecutter-django/pull/2930))
 
 ## [2020-11-04]
 ### Changed
-- Fix docs service and add RTD support ([#2920](https://github.com/cookicutter/cookiecutter-django/pull/2920))
-- Bump stefanzweifel/git-auto-commit-action from v4.6.0 to v4.7.2 ([#2914](https://github.com/cookicutter/cookiecutter-django/pull/2914))
+- Fix docs service and add RTD support ([#2920](https://github.com/cookiecutter/cookiecutter-django/pull/2920))
+- Bump stefanzweifel/git-auto-commit-action from v4.6.0 to v4.7.2 ([#2914](https://github.com/cookiecutter/cookiecutter-django/pull/2914))
 ### Updated
-- Auto-update pre-commit hooks ([#2908](https://github.com/cookicutter/cookiecutter-django/pull/2908))
-- Update mypy to 0.790 ([#2886](https://github.com/cookicutter/cookiecutter-django/pull/2886))
-- Update django-stubs to 1.7.0 ([#2916](https://github.com/cookicutter/cookiecutter-django/pull/2916))
+- Auto-update pre-commit hooks ([#2908](https://github.com/cookiecutter/cookiecutter-django/pull/2908))
+- Update mypy to 0.790 ([#2886](https://github.com/cookiecutter/cookiecutter-django/pull/2886))
+- Update django-stubs to 1.7.0 ([#2916](https://github.com/cookiecutter/cookiecutter-django/pull/2916))
 
 ## [2020-11-03]
 ### Updated
-- Update sentry-sdk to 0.19.2 ([#2926](https://github.com/cookicutter/cookiecutter-django/pull/2926))
-- Update sphinx to 3.3.0 ([#2925](https://github.com/cookicutter/cookiecutter-django/pull/2925))
-- Update django to 3.0.11 ([#2924](https://github.com/cookicutter/cookiecutter-django/pull/2924))
-- Update pytz to 2020.4 ([#2923](https://github.com/cookicutter/cookiecutter-django/pull/2923))
-- Update pre-commit to 2.8.2 ([#2919](https://github.com/cookicutter/cookiecutter-django/pull/2919))
-- Update pytest to 6.1.2 ([#2917](https://github.com/cookicutter/cookiecutter-django/pull/2917))
-- Update sh to 1.14.1 ([#2912](https://github.com/cookicutter/cookiecutter-django/pull/2912))
-- Update pytest-django to 4.1.0 ([#2911](https://github.com/cookicutter/cookiecutter-django/pull/2911))
-- Update pillow to 8.0.1 ([#2910](https://github.com/cookicutter/cookiecutter-django/pull/2910))
-- Update django-celery-beat to 2.1.0 ([#2907](https://github.com/cookicutter/cookiecutter-django/pull/2907))
-- Update uvicorn to 0.12.2 ([#2906](https://github.com/cookicutter/cookiecutter-django/pull/2906))
+- Update sentry-sdk to 0.19.2 ([#2926](https://github.com/cookiecutter/cookiecutter-django/pull/2926))
+- Update sphinx to 3.3.0 ([#2925](https://github.com/cookiecutter/cookiecutter-django/pull/2925))
+- Update django to 3.0.11 ([#2924](https://github.com/cookiecutter/cookiecutter-django/pull/2924))
+- Update pytz to 2020.4 ([#2923](https://github.com/cookiecutter/cookiecutter-django/pull/2923))
+- Update pre-commit to 2.8.2 ([#2919](https://github.com/cookiecutter/cookiecutter-django/pull/2919))
+- Update pytest to 6.1.2 ([#2917](https://github.com/cookiecutter/cookiecutter-django/pull/2917))
+- Update sh to 1.14.1 ([#2912](https://github.com/cookiecutter/cookiecutter-django/pull/2912))
+- Update pytest-django to 4.1.0 ([#2911](https://github.com/cookiecutter/cookiecutter-django/pull/2911))
+- Update pillow to 8.0.1 ([#2910](https://github.com/cookiecutter/cookiecutter-django/pull/2910))
+- Update django-celery-beat to 2.1.0 ([#2907](https://github.com/cookiecutter/cookiecutter-django/pull/2907))
+- Update uvicorn to 0.12.2 ([#2906](https://github.com/cookiecutter/cookiecutter-django/pull/2906))
 
 ## [2020-10-19]
 ### Updated
-- Update sentry-sdk to 0.19.1 ([#2905](https://github.com/cookicutter/cookiecutter-django/pull/2905))
+- Update sentry-sdk to 0.19.1 ([#2905](https://github.com/cookiecutter/cookiecutter-django/pull/2905))
 
 ## [2020-10-17]
 ### Updated
-- Update django-allauth to 0.43.0 ([#2901](https://github.com/cookicutter/cookiecutter-django/pull/2901))
-- Update pytest-django to 4.0.0 ([#2903](https://github.com/cookicutter/cookiecutter-django/pull/2903))
+- Update django-allauth to 0.43.0 ([#2901](https://github.com/cookiecutter/cookiecutter-django/pull/2901))
+- Update pytest-django to 4.0.0 ([#2903](https://github.com/cookiecutter/cookiecutter-django/pull/2903))
 
 ## [2020-10-15]
 ### Updated
-- Update pillow to 8.0.0 ([#2898](https://github.com/cookicutter/cookiecutter-django/pull/2898))
+- Update pillow to 8.0.0 ([#2898](https://github.com/cookiecutter/cookiecutter-django/pull/2898))
 
 ## [2020-10-14]
 ### Updated
-- Auto-update pre-commit hooks ([#2897](https://github.com/cookicutter/cookiecutter-django/pull/2897))
-- Update sentry-sdk to 0.19.0 ([#2896](https://github.com/cookicutter/cookiecutter-django/pull/2896))
+- Auto-update pre-commit hooks ([#2897](https://github.com/cookiecutter/cookiecutter-django/pull/2897))
+- Update sentry-sdk to 0.19.0 ([#2896](https://github.com/cookiecutter/cookiecutter-django/pull/2896))
 
 ## [2020-10-13]
 ### Updated
-- Update isort to 5.6.4 ([#2895](https://github.com/cookicutter/cookiecutter-django/pull/2895))
+- Update isort to 5.6.4 ([#2895](https://github.com/cookiecutter/cookiecutter-django/pull/2895))
 
 ## [2020-10-12]
 ### Changed
-- Bump stefanzweifel/git-auto-commit-action from v4.5.1 to v4.6.0 ([#2893](https://github.com/cookicutter/cookiecutter-django/pull/2893))
+- Bump stefanzweifel/git-auto-commit-action from v4.5.1 to v4.6.0 ([#2893](https://github.com/cookiecutter/cookiecutter-django/pull/2893))
 ### Updated
-- Auto-update pre-commit hooks ([#2892](https://github.com/cookicutter/cookiecutter-django/pull/2892))
+- Auto-update pre-commit hooks ([#2892](https://github.com/cookiecutter/cookiecutter-django/pull/2892))
 
 ## [2020-10-11]
 ### Updated
-- Auto-update pre-commit hooks ([#2890](https://github.com/cookicutter/cookiecutter-django/pull/2890))
-- Update isort to 5.6.3 ([#2891](https://github.com/cookicutter/cookiecutter-django/pull/2891))
-- Update django-anymail to 8.1 ([#2887](https://github.com/cookicutter/cookiecutter-django/pull/2887))
-- Update tox to 3.20.1 ([#2885](https://github.com/cookicutter/cookiecutter-django/pull/2885))
+- Auto-update pre-commit hooks ([#2890](https://github.com/cookiecutter/cookiecutter-django/pull/2890))
+- Update isort to 5.6.3 ([#2891](https://github.com/cookiecutter/cookiecutter-django/pull/2891))
+- Update django-anymail to 8.1 ([#2887](https://github.com/cookiecutter/cookiecutter-django/pull/2887))
+- Update tox to 3.20.1 ([#2885](https://github.com/cookiecutter/cookiecutter-django/pull/2885))
 
 ## [2020-10-09]
 ### Updated
-- Auto-update pre-commit hooks ([#2884](https://github.com/cookicutter/cookiecutter-django/pull/2884))
-- Update isort to 5.6.1 ([#2883](https://github.com/cookicutter/cookiecutter-django/pull/2883))
+- Auto-update pre-commit hooks ([#2884](https://github.com/cookiecutter/cookiecutter-django/pull/2884))
+- Update isort to 5.6.1 ([#2883](https://github.com/cookiecutter/cookiecutter-django/pull/2883))
 
 ## [2020-10-08]
 ### Changed
-- Add dedicated websockets package ([#2881](https://github.com/cookicutter/cookiecutter-django/pull/2881))
+- Add dedicated websockets package ([#2881](https://github.com/cookiecutter/cookiecutter-django/pull/2881))
 ### Updated
-- Update isort to 5.6.0 ([#2882](https://github.com/cookicutter/cookiecutter-django/pull/2882))
+- Update isort to 5.6.0 ([#2882](https://github.com/cookiecutter/cookiecutter-django/pull/2882))
 
 ## [2020-10-04]
 ### Updated
-- Update pytest to 6.1.1 ([#2880](https://github.com/cookicutter/cookiecutter-django/pull/2880))
-- Update mypy and django-stubs ([#2874](https://github.com/cookicutter/cookiecutter-django/pull/2874))
-- Auto-update pre-commit hooks ([#2876](https://github.com/cookicutter/cookiecutter-django/pull/2876))
-- Update flake8 to 3.8.4 ([#2877](https://github.com/cookicutter/cookiecutter-django/pull/2877))
+- Update pytest to 6.1.1 ([#2880](https://github.com/cookiecutter/cookiecutter-django/pull/2880))
+- Update mypy and django-stubs ([#2874](https://github.com/cookiecutter/cookiecutter-django/pull/2874))
+- Auto-update pre-commit hooks ([#2876](https://github.com/cookiecutter/cookiecutter-django/pull/2876))
+- Update flake8 to 3.8.4 ([#2877](https://github.com/cookiecutter/cookiecutter-django/pull/2877))
 
 ## [2020-10-01]
 ### Changed
-- Bump actions/setup-python from v2.1.2 to v2.1.3 ([#2869](https://github.com/cookicutter/cookiecutter-django/pull/2869))
+- Bump actions/setup-python from v2.1.2 to v2.1.3 ([#2869](https://github.com/cookiecutter/cookiecutter-django/pull/2869))
 ### Updated
-- Update ipdb to 0.13.4 ([#2873](https://github.com/cookicutter/cookiecutter-django/pull/2873))
-- Auto-update pre-commit hooks ([#2867](https://github.com/cookicutter/cookiecutter-django/pull/2867))
-- Update uvicorn to 0.12.1 ([#2866](https://github.com/cookicutter/cookiecutter-django/pull/2866))
-- Update isort to 5.5.4 ([#2864](https://github.com/cookicutter/cookiecutter-django/pull/2864))
-- Update sentry-sdk to 0.18.0 ([#2863](https://github.com/cookicutter/cookiecutter-django/pull/2863))
-- Update djangorestframework to 3.12.1 ([#2862](https://github.com/cookicutter/cookiecutter-django/pull/2862))
-- Update pytest to 6.1.0 ([#2859](https://github.com/cookicutter/cookiecutter-django/pull/2859))
-- Update django-debug-toolbar to 3.1.1 ([#2855](https://github.com/cookicutter/cookiecutter-django/pull/2855))
+- Update ipdb to 0.13.4 ([#2873](https://github.com/cookiecutter/cookiecutter-django/pull/2873))
+- Auto-update pre-commit hooks ([#2867](https://github.com/cookiecutter/cookiecutter-django/pull/2867))
+- Update uvicorn to 0.12.1 ([#2866](https://github.com/cookiecutter/cookiecutter-django/pull/2866))
+- Update isort to 5.5.4 ([#2864](https://github.com/cookiecutter/cookiecutter-django/pull/2864))
+- Update sentry-sdk to 0.18.0 ([#2863](https://github.com/cookiecutter/cookiecutter-django/pull/2863))
+- Update djangorestframework to 3.12.1 ([#2862](https://github.com/cookiecutter/cookiecutter-django/pull/2862))
+- Update pytest to 6.1.0 ([#2859](https://github.com/cookiecutter/cookiecutter-django/pull/2859))
+- Update django-debug-toolbar to 3.1.1 ([#2855](https://github.com/cookiecutter/cookiecutter-django/pull/2855))
 
 ## [2020-09-23]
 ### Updated
-- Update sentry-sdk to 0.17.7 ([#2847](https://github.com/cookicutter/cookiecutter-django/pull/2847))
-- Update django-debug-toolbar to 3.1 ([#2846](https://github.com/cookicutter/cookiecutter-django/pull/2846))
+- Update sentry-sdk to 0.17.7 ([#2847](https://github.com/cookiecutter/cookiecutter-django/pull/2847))
+- Update django-debug-toolbar to 3.1 ([#2846](https://github.com/cookiecutter/cookiecutter-django/pull/2846))
 
 ## [2020-09-21]
 ### Changed
-- Adding GitHub-Action CI Option ([#2837](https://github.com/cookicutter/cookiecutter-django/pull/2837))
+- Adding GitHub-Action CI Option ([#2837](https://github.com/cookiecutter/cookiecutter-django/pull/2837))
 ### Updated
-- Update django-debug-toolbar to 3.0 ([#2842](https://github.com/cookicutter/cookiecutter-django/pull/2842))
-- Auto-update pre-commit hooks ([#2843](https://github.com/cookicutter/cookiecutter-django/pull/2843))
-- Update isort to 5.5.3 ([#2844](https://github.com/cookicutter/cookiecutter-django/pull/2844))
+- Update django-debug-toolbar to 3.0 ([#2842](https://github.com/cookiecutter/cookiecutter-django/pull/2842))
+- Auto-update pre-commit hooks ([#2843](https://github.com/cookiecutter/cookiecutter-django/pull/2843))
+- Update isort to 5.5.3 ([#2844](https://github.com/cookiecutter/cookiecutter-django/pull/2844))
 
 ## [2020-09-18]
 ### Updated
-- Update django-extensions to 3.0.9 ([#2839](https://github.com/cookicutter/cookiecutter-django/pull/2839))
+- Update django-extensions to 3.0.9 ([#2839](https://github.com/cookiecutter/cookiecutter-django/pull/2839))
 
 ## [2020-09-16]
 ### Updated
-- Update sentry-sdk to 0.17.6 ([#2833](https://github.com/cookicutter/cookiecutter-django/pull/2833))
-- Update pytest-django to 3.10.0 ([#2832](https://github.com/cookicutter/cookiecutter-django/pull/2832))
+- Update sentry-sdk to 0.17.6 ([#2833](https://github.com/cookiecutter/cookiecutter-django/pull/2833))
+- Update pytest-django to 3.10.0 ([#2832](https://github.com/cookiecutter/cookiecutter-django/pull/2832))
 
 ## [2020-09-14]
 ### Fixed
-- Downgrade Celery to 4.4.6 ([#2829](https://github.com/cookicutter/cookiecutter-django/pull/2829))
+- Downgrade Celery to 4.4.6 ([#2829](https://github.com/cookiecutter/cookiecutter-django/pull/2829))
 ### Updated
-- Update sentry-sdk to 0.17.5 ([#2828](https://github.com/cookicutter/cookiecutter-django/pull/2828))
-- Update coverage to 5.3 ([#2826](https://github.com/cookicutter/cookiecutter-django/pull/2826))
-- Update django-storages to 1.10.1 ([#2825](https://github.com/cookicutter/cookiecutter-django/pull/2825))
+- Update sentry-sdk to 0.17.5 ([#2828](https://github.com/cookiecutter/cookiecutter-django/pull/2828))
+- Update coverage to 5.3 ([#2826](https://github.com/cookiecutter/cookiecutter-django/pull/2826))
+- Update django-storages to 1.10.1 ([#2825](https://github.com/cookiecutter/cookiecutter-django/pull/2825))
 
 ## [2020-09-12]
 ### Updated
-- Updating Traefik version from 2.0 to 2.2.11 ([#2814](https://github.com/cookicutter/cookiecutter-django/pull/2814))
-- Update pytest to 6.0.2 ([#2819](https://github.com/cookicutter/cookiecutter-django/pull/2819))
-- Update django-anymail to 8.0 ([#2818](https://github.com/cookicutter/cookiecutter-django/pull/2818))
+- Updating Traefik version from 2.0 to 2.2.11 ([#2814](https://github.com/cookiecutter/cookiecutter-django/pull/2814))
+- Update pytest to 6.0.2 ([#2819](https://github.com/cookiecutter/cookiecutter-django/pull/2819))
+- Update django-anymail to 8.0 ([#2818](https://github.com/cookiecutter/cookiecutter-django/pull/2818))
 
 ## [2020-09-11]
 ### Updated
-- Auto-update pre-commit hooks ([#2809](https://github.com/cookicutter/cookiecutter-django/pull/2809))
+- Auto-update pre-commit hooks ([#2809](https://github.com/cookiecutter/cookiecutter-django/pull/2809))
 
 ## [2020-09-10]
 ### Updated
-- Update isort to 5.5.2 ([#2807](https://github.com/cookicutter/cookiecutter-django/pull/2807))
-- Update sentry-sdk to 0.17.4 ([#2805](https://github.com/cookicutter/cookiecutter-django/pull/2805))
+- Update isort to 5.5.2 ([#2807](https://github.com/cookiecutter/cookiecutter-django/pull/2807))
+- Update sentry-sdk to 0.17.4 ([#2805](https://github.com/cookiecutter/cookiecutter-django/pull/2805))
 
 ## [2020-09-09]
 ### Changed
-- Update actions/setup-python requirement to v2.1.2 ([#2804](https://github.com/cookicutter/cookiecutter-django/pull/2804))
-- Clean up nested venv files from `.gitignore` ([#2800](https://github.com/cookicutter/cookiecutter-django/pull/2800))
+- Update actions/setup-python requirement to v2.1.2 ([#2804](https://github.com/cookiecutter/cookiecutter-django/pull/2804))
+- Clean up nested venv files from `.gitignore` ([#2800](https://github.com/cookiecutter/cookiecutter-django/pull/2800))
 
 ## [2020-09-08]
 ### Changed
-- Traeffik and Django dockerfile changes ([#2801](https://github.com/cookicutter/cookiecutter-django/pull/2801))
+- Traeffik and Django dockerfile changes ([#2801](https://github.com/cookiecutter/cookiecutter-django/pull/2801))
 
 ## [2020-09-07]
 ### Changed
-- Add :z/:Z to mounted volumes in {local,production}.yml ([#2663](https://github.com/cookicutter/cookiecutter-django/pull/2663))
-- Remove --no-binary option for psycopg2 ([#2798](https://github.com/cookicutter/cookiecutter-django/pull/2798))
-- Updated Gitlab CI to use Python 3.8 instead of Python 3.7 ([#2794](https://github.com/cookicutter/cookiecutter-django/pull/2794))
+- Add :z/:Z to mounted volumes in {local,production}.yml ([#2663](https://github.com/cookiecutter/cookiecutter-django/pull/2663))
+- Remove --no-binary option for psycopg2 ([#2798](https://github.com/cookiecutter/cookiecutter-django/pull/2798))
+- Updated Gitlab CI to use Python 3.8 instead of Python 3.7 ([#2794](https://github.com/cookiecutter/cookiecutter-django/pull/2794))
 ### Fixed
-- Fix options for sphinx-autobuild in docs Makefile ([#2799](https://github.com/cookicutter/cookiecutter-django/pull/2799))
+- Fix options for sphinx-autobuild in docs Makefile ([#2799](https://github.com/cookiecutter/cookiecutter-django/pull/2799))
 ### Updated
-- Update psycopg2-binary to 2.8.6 ([#2797](https://github.com/cookicutter/cookiecutter-django/pull/2797))
+- Update psycopg2-binary to 2.8.6 ([#2797](https://github.com/cookiecutter/cookiecutter-django/pull/2797))
 
 ## [2020-09-05]
 ### Updated
-- Auto-update pre-commit hooks ([#2793](https://github.com/cookicutter/cookiecutter-django/pull/2793))
+- Auto-update pre-commit hooks ([#2793](https://github.com/cookiecutter/cookiecutter-django/pull/2793))
 
 ## [2020-09-04]
 ### Updated
-- Update django-extensions to 3.0.8 ([#2792](https://github.com/cookicutter/cookiecutter-django/pull/2792))
-- Update isort to 5.5.1 ([#2791](https://github.com/cookicutter/cookiecutter-django/pull/2791))
-- Auto-update pre-commit hooks ([#2790](https://github.com/cookicutter/cookiecutter-django/pull/2790))
-- Update isort to 5.5.0 ([#2789](https://github.com/cookicutter/cookiecutter-django/pull/2789))
+- Update django-extensions to 3.0.8 ([#2792](https://github.com/cookiecutter/cookiecutter-django/pull/2792))
+- Update isort to 5.5.1 ([#2791](https://github.com/cookiecutter/cookiecutter-django/pull/2791))
+- Auto-update pre-commit hooks ([#2790](https://github.com/cookiecutter/cookiecutter-django/pull/2790))
+- Update isort to 5.5.0 ([#2789](https://github.com/cookiecutter/cookiecutter-django/pull/2789))
 
 ## [2020-09-02]
 ### Changed
-- Add environment and traces_sample_rate keyword to sentry_sdk.init ([#2777](https://github.com/cookicutter/cookiecutter-django/pull/2777))
+- Add environment and traces_sample_rate keyword to sentry_sdk.init ([#2777](https://github.com/cookiecutter/cookiecutter-django/pull/2777))
 ### Updated
-- Update sentry-sdk to 0.17.3 ([#2788](https://github.com/cookicutter/cookiecutter-django/pull/2788))
-- Update django-extensions to 3.0.7 ([#2787](https://github.com/cookicutter/cookiecutter-django/pull/2787))
+- Update sentry-sdk to 0.17.3 ([#2788](https://github.com/cookiecutter/cookiecutter-django/pull/2788))
+- Update django-extensions to 3.0.7 ([#2787](https://github.com/cookiecutter/cookiecutter-django/pull/2787))
 
 ## [2020-09-01]
 ### Changed
-- Exclude venv directory and update document link ([#2780](https://github.com/cookicutter/cookiecutter-django/pull/2780))
+- Exclude venv directory and update document link ([#2780](https://github.com/cookiecutter/cookiecutter-django/pull/2780))
 ### Updated
-- Update tox to 3.20.0 ([#2786](https://github.com/cookicutter/cookiecutter-django/pull/2786))
-- Update django-storages to 1.10 ([#2781](https://github.com/cookicutter/cookiecutter-django/pull/2781))
-- Update sentry-sdk to 0.17.2 ([#2784](https://github.com/cookicutter/cookiecutter-django/pull/2784))
-- Update django to 3.0.10 ([#2785](https://github.com/cookicutter/cookiecutter-django/pull/2785))
-- Update sphinx-autobuild to 2020.9.1 ([#2782](https://github.com/cookicutter/cookiecutter-django/pull/2782))
-- Update django-extensions to 3.0.6 ([#2783](https://github.com/cookicutter/cookiecutter-django/pull/2783))
+- Update tox to 3.20.0 ([#2786](https://github.com/cookiecutter/cookiecutter-django/pull/2786))
+- Update django-storages to 1.10 ([#2781](https://github.com/cookiecutter/cookiecutter-django/pull/2781))
+- Update sentry-sdk to 0.17.2 ([#2784](https://github.com/cookiecutter/cookiecutter-django/pull/2784))
+- Update django to 3.0.10 ([#2785](https://github.com/cookiecutter/cookiecutter-django/pull/2785))
+- Update sphinx-autobuild to 2020.9.1 ([#2782](https://github.com/cookiecutter/cookiecutter-django/pull/2782))
+- Update django-extensions to 3.0.6 ([#2783](https://github.com/cookiecutter/cookiecutter-django/pull/2783))
 
 ## [2020-08-31]
 ### Updated
-- Update sh to 1.14.0 ([#2779](https://github.com/cookicutter/cookiecutter-django/pull/2779))
-- Update sentry-sdk to 0.17.1 ([#2778](https://github.com/cookicutter/cookiecutter-django/pull/2778))
+- Update sh to 1.14.0 ([#2779](https://github.com/cookiecutter/cookiecutter-django/pull/2779))
+- Update sentry-sdk to 0.17.1 ([#2778](https://github.com/cookiecutter/cookiecutter-django/pull/2778))
 
 ## [2020-04-13]
 ### Changed
@@ -1134,7 +1134,7 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 - Rename `MIDDLEWARE_CLASSES` to `MIDDLEWARE` to enable support to [new style middleware](https://github.com/django/deps/blob/master/final/0005-improved-middleware.rst) introduced in Django 1.10 (@luzfcb)
 - New setting `MAILGUN_SENDER_DOMAIN` to allow sending mail from any domain other than those registered with mailgun (@jangeador)
 - add `urlpatterns` configuration to django-debug-toolbar, because the automatic configuration of `urlpatterns` was removed from django-debug-toolbar (@luzfcb)
-- Added Temporary workaround on `requirements/local.txt` to fix django-debug-toolbar issue: https://github.com/cookicutter/cookiecutter-django/issues/827 (@luzfcb)
+- Added Temporary workaround on `requirements/local.txt` to fix django-debug-toolbar issue: https://github.com/cookiecutter/cookiecutter-django/issues/827 (@luzfcb)
 
 ### Changed
 - Upgrade to Django 1.10.1 (@luzfcb)
@@ -1280,7 +1280,7 @@ d changed 'admin' url on `config/urls.py`, to stay the same as generated by djan
 
 ### [2016-05-01]
 ### Changed
-- Restored the Pycharm project configuration files, that was accidentally removed in [15f350f](https://github.com/cookicutter/cookiecutter-django/commit/15f350f05e2b49b4bdff0bdaa2b2ff260606e0f6) (@luzfcb @Newton715)
+- Restored the Pycharm project configuration files, that was accidentally removed in [15f350f](https://github.com/cookiecutter/cookiecutter-django/commit/15f350f05e2b49b4bdff0bdaa2b2ff260606e0f6) (@luzfcb @Newton715)
 
 ### [2016-04-30]
 ### Changed
@@ -1404,7 +1404,7 @@ d changed 'admin' url on `config/urls.py`, to stay the same as generated by djan
 ## [2016-02-15]
 ### Changed
 - In `users` app adapter, fix `is_open_for_signup` missing parameter (@oryx2)
-- Fixes and improvements in Hitch tests , see [#485](https://github.com/cookicutter/cookiecutter-django/pull/485) (@crdoconnor)
+- Fixes and improvements in Hitch tests , see [#485](https://github.com/cookiecutter/cookiecutter-django/pull/485) (@crdoconnor)
 
 
 ## [2016-02-12]

From 5a395ddcd2cc58df90b066b4da46c66081f8f808 Mon Sep 17 00:00:00 2001
From: luzfcb <luzfcb@users.noreply.github.com>
Date: Tue, 26 Oct 2021 00:40:07 +0000
Subject: [PATCH 1720/2840] 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 36737f343..94032f0d8 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1152,5 +1152,10 @@
     "name": "dalrrard",
     "github_login": "dalrrard",
     "twitter_username": ""
+  },
+  {
+    "name": "Liam Brenner",
+    "github_login": "SableWalnut",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 76c3cb02e..e10a5baea 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1076,6 +1076,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Liam Brenner</td>
+    <td>
+      <a href="https://github.com/SableWalnut">SableWalnut</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Lin Xianyi</td>
     <td>

From 75c140cc0043c96f72ea66f38189bad1091f9c17 Mon Sep 17 00:00:00 2001
From: luzfcb <luzfcb@users.noreply.github.com>
Date: Tue, 26 Oct 2021 00:41:18 +0000
Subject: [PATCH 1721/2840] 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 94032f0d8..4f59c868e 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1157,5 +1157,10 @@
     "name": "Liam Brenner",
     "github_login": "SableWalnut",
     "twitter_username": ""
+  },
+  {
+    "name": "Noah H",
+    "github_login": "nthall",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index e10a5baea..241ef972c 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1272,6 +1272,13 @@ Listed in alphabetical order.
     </td>
     <td>moby_dick91</td>
   </tr>
+  <tr>
+    <td>Noah H</td>
+    <td>
+      <a href="https://github.com/nthall">nthall</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Oleg Russkin</td>
     <td>

From b61c70306f1057376820ca2c46b1aaa6645d15e0 Mon Sep 17 00:00:00 2001
From: Jelmer Draaijer <info@jelmert.nl>
Date: Tue, 26 Oct 2021 13:40:42 +0200
Subject: [PATCH 1722/2840] Update the docker base images from slim-buster to
 slim-bullseye

---
 {{cookiecutter.project_slug}}/compose/local/django/Dockerfile   | 2 +-
 {{cookiecutter.project_slug}}/compose/local/docs/Dockerfile     | 2 +-
 .../compose/production/django/Dockerfile                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index f1a489a30..044ef4a74 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -1,4 +1,4 @@
-ARG PYTHON_VERSION=3.9-slim-buster
+ARG PYTHON_VERSION=3.9-slim-bullseye
 
 # define an alias for the specfic python version used in this file.
 FROM python:${PYTHON_VERSION} as python
diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
index fbb5ce9d0..215cca61b 100644
--- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
@@ -1,4 +1,4 @@
-FROM python:3.9-slim-buster
+FROM python:3.9-slim-bullseye
 
 ENV PYTHONUNBUFFERED 1
 ENV PYTHONDONTWRITEBYTECODE 1
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index 5f1bc78b3..fa969f1c8 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -1,4 +1,4 @@
-ARG PYTHON_VERSION=3.9-slim-buster
+ARG PYTHON_VERSION=3.9-slim-bullseye
 
 {% if cookiecutter.js_task_runner == 'Gulp' -%}
 FROM node:10-stretch-slim as client-builder

From 008aeb21a05d5ff9280864d399de036a87b77c8b Mon Sep 17 00:00:00 2001
From: Jelmer Draaijer <info@jelmert.nl>
Date: Tue, 26 Oct 2021 13:58:18 +0200
Subject: [PATCH 1723/2840] Added Debian 11 (Bullseye) OS dependencies
 (duplicated from buster)

---
 .../utility/requirements-bullseye.apt         | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 {{cookiecutter.project_slug}}/utility/requirements-bullseye.apt

diff --git a/{{cookiecutter.project_slug}}/utility/requirements-bullseye.apt b/{{cookiecutter.project_slug}}/utility/requirements-bullseye.apt
new file mode 100644
index 000000000..60f602873
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/utility/requirements-bullseye.apt
@@ -0,0 +1,23 @@
+##basic build dependencies of various Django apps for Debian Bullseye 11.x
+#build-essential metapackage install: make, gcc, g++,
+build-essential
+#required to translate
+gettext
+python3-dev
+
+##shared dependencies of:
+##Pillow, pylibmc
+zlib1g-dev
+
+##Postgresql and psycopg2 dependencies
+libpq-dev
+
+##Pillow dependencies
+libtiff5-dev
+libjpeg62-turbo-dev
+libfreetype6-dev
+liblcms2-dev
+libwebp-dev
+
+##django-extensions
+libgraphviz-dev

From 7d956adc874a570de8d23e43948771dde2f77926 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 27 Oct 2021 02:13:37 +0000
Subject: [PATCH 1724/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f2eb26835..f468fcf7a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-10-26]
+### Changed
+- use Wayback Machine to fix dead link for postgres user setup ([#3363](https://github.com/cookiecutter/cookiecutter-django/pull/3363))
+- Fix pull request links to correct repo URL on CHANGELOG.md  ([#3370](https://github.com/cookiecutter/cookiecutter-django/pull/3370))
+### Updated
+- Update pyyaml to 6.0 ([#3362](https://github.com/cookiecutter/cookiecutter-django/pull/3362))
+- Update pillow to 8.4.0 ([#3364](https://github.com/cookiecutter/cookiecutter-django/pull/3364))
+- Update django-storages to 1.12.2 ([#3365](https://github.com/cookiecutter/cookiecutter-django/pull/3365))
+- Update django-environ to 0.8.1 ([#3368](https://github.com/cookiecutter/cookiecutter-django/pull/3368))
+
 ## [2021-10-22]
 ### Changed
 - Move repo under cookiecutter organisation ([#3357](https://github.com/cookiecutter/cookiecutter-django/pull/3357))

From 75aa76e956f140363f4877c0d12a15c084ec3d5c Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 27 Oct 2021 06:21:10 -0700
Subject: [PATCH 1725/2840] Update factory-boy from 3.2.0 to 3.2.1

---
 {{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 10bcbe190..905191e26 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -40,7 +40,7 @@ pre-commit==2.15.0  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------
-factory-boy==3.2.0  # https://github.com/FactoryBoy/factory_boy
+factory-boy==3.2.1  # https://github.com/FactoryBoy/factory_boy
 
 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

From bb91625e7795c2edc8c1e34f2edb9ca58a1963eb Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 29 Oct 2021 02:13:51 +0000
Subject: [PATCH 1726/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f468fcf7a..23e793832 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-10-28]
+### Updated
+- Update factory-boy to 3.2.1 ([#3373](https://github.com/cookiecutter/cookiecutter-django/pull/3373))
+
 ## [2021-10-26]
 ### Changed
 - use Wayback Machine to fix dead link for postgres user setup ([#3363](https://github.com/cookiecutter/cookiecutter-django/pull/3363))

From c23e37f7cb2308eeba98bf58af283c238e300b23 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 29 Oct 2021 20:24:58 -0700
Subject: [PATCH 1727/2840] Update django-storages from 1.12.2 to 1.12.3

---
 {{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 fb9b0ea67..32f8e6a87 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -17,7 +17,7 @@ hiredis==2.0.0  # https://github.com/redis/hiredis-py
 # Django
 # ------------------------------------------------------------------------------
 {%- if cookiecutter.cloud_provider == 'AWS' %}
-django-storages[boto3]==1.12.2  # https://github.com/jschneier/django-storages
+django-storages[boto3]==1.12.3  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
 django-storages[google]==1.12.2  # https://github.com/jschneier/django-storages
 {%- endif %}

From 09c6ddbaf353d3611f5c1c58eb9e1a2058b8e171 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 29 Oct 2021 20:24:59 -0700
Subject: [PATCH 1728/2840] Update django-storages from 1.12.2 to 1.12.3

---
 {{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 32f8e6a87..2553aa3e0 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -19,7 +19,7 @@ hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- if cookiecutter.cloud_provider == 'AWS' %}
 django-storages[boto3]==1.12.3  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
-django-storages[google]==1.12.2  # https://github.com/jschneier/django-storages
+django-storages[google]==1.12.3  # https://github.com/jschneier/django-storages
 {%- endif %}
 {%- if cookiecutter.mail_service == 'Mailgun' %}
 django-anymail[mailgun]==8.4  # https://github.com/anymail/django-anymail

From 83bcd1fd45fc251be149916a763016fd39d4814d Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 31 Oct 2021 12:36:53 -0700
Subject: [PATCH 1729/2840] Update coverage from 6.0.2 to 6.1.1

---
 {{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 905191e26..b965ea4fe 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==4.0.1  # https://github.com/PyCQA/flake8
 flake8-isort==4.1.1  # https://github.com/gforcada/flake8-isort
-coverage==6.0.2  # https://github.com/nedbat/coveragepy
+coverage==6.1.1  # https://github.com/nedbat/coveragepy
 black==21.9b0  # https://github.com/psf/black
 pylint-django==2.4.4  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From e6b42ee1876447782834126b996087d56a292bcd Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 2 Nov 2021 00:06:04 +0000
Subject: [PATCH 1730/2840] 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 6f1bdcbc6..a42c17428 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.9b0
+    rev: 21.10b0
     hooks:
       - id: black
 

From dc67299bad82155a51d3806c5766d863bb08f600 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 2 Nov 2021 02:16:28 +0000
Subject: [PATCH 1731/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23e793832..614926eba 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-11-01]
+### Updated
+- Update django-storages to 1.12.3 ([#3374](https://github.com/cookiecutter/cookiecutter-django/pull/3374))
+- Update coverage to 6.1.1 ([#3376](https://github.com/cookiecutter/cookiecutter-django/pull/3376))
+
 ## [2021-10-28]
 ### Updated
 - Update factory-boy to 3.2.1 ([#3373](https://github.com/cookiecutter/cookiecutter-django/pull/3373))

From 115e52867aec78b9b5d3c7951f1a171523a52d09 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 3 Nov 2021 02:13:58 +0000
Subject: [PATCH 1732/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 614926eba..9e7c45ee1 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-11-02]
+### Updated
+- Auto-update pre-commit hooks ([#3377](https://github.com/cookiecutter/cookiecutter-django/pull/3377))
+
 ## [2021-11-01]
 ### Updated
 - Update django-storages to 1.12.3 ([#3374](https://github.com/cookiecutter/cookiecutter-django/pull/3374))

From 07b541b3edaad264dc2c646585c4f32c79f1c8aa Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 3 Nov 2021 10:31:45 -0700
Subject: [PATCH 1733/2840] Update isort from 5.9.3 to 5.10.0

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

diff --git a/requirements.txt b/requirements.txt
index 6755289d8..20f4e2b98 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==21.9b0
-isort==5.9.3
+isort==5.10.0
 flake8==4.0.1
 flake8-isort==4.1.1
 pre-commit==2.15.0

From ce5223fe5999946bd7d517ef4b72ceaf7372b5c4 Mon Sep 17 00:00:00 2001
From: Diego Montes <d57montes@hotmail.com>
Date: Wed, 3 Nov 2021 16:15:40 -0400
Subject: [PATCH 1734/2840] change path in docs Makefile to use APP variable

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

diff --git a/{{cookiecutter.project_slug}}/docs/Makefile b/{{cookiecutter.project_slug}}/docs/Makefile
index 0b56e1f86..ddecc2ee8 100644
--- a/{{cookiecutter.project_slug}}/docs/Makefile
+++ b/{{cookiecutter.project_slug}}/docs/Makefile
@@ -29,9 +29,9 @@ livehtml:
 # Outputs rst files from django application code
 apidocs:
 	{%- if cookiecutter.use_docker == 'y' %}
-	sphinx-apidoc -o $(SOURCEDIR)/api /app
+	sphinx-apidoc -o $(SOURCEDIR)/api $(APP)
 	{%- else %}
-	sphinx-apidoc -o $(SOURCEDIR)/api ../{{cookiecutter.project_slug}}
+	sphinx-apidoc -o $(SOURCEDIR)/api $(APP)
 	{%- endif %}
 
 # Catch-all target: route all unknown targets to Sphinx using the new

From c2af9c3134f6f8cd46741ece78034b8525a3d67b Mon Sep 17 00:00:00 2001
From: Diego Montes <d57montes@hotmail.com>
Date: Wed, 3 Nov 2021 17:03:47 -0400
Subject: [PATCH 1735/2840] fix help in docs Makefile

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

diff --git a/{{cookiecutter.project_slug}}/docs/Makefile b/{{cookiecutter.project_slug}}/docs/Makefile
index 0b56e1f86..a2a220a45 100644
--- a/{{cookiecutter.project_slug}}/docs/Makefile
+++ b/{{cookiecutter.project_slug}}/docs/Makefile
@@ -4,7 +4,7 @@
 # You can set these variables from the command line, and also
 # from the environment for the first two.
 SPHINXOPTS    ?= 
-SPHINXBUILD   ?= sphinx-build -c .
+SPHINXBUILD   ?= sphinx-build
 SOURCEDIR     = .
 BUILDDIR      = ./_build
 {%- if cookiecutter.use_docker == 'y' %}
@@ -17,7 +17,7 @@ APP = ../{{cookiecutter.project_slug}}
 
 # Put it first so that "make" without argument is like "make help".
 help:
-	@$(SPHINXBUILD) help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+	@$(SPHINXBUILD) -M help -c . "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
 
 # Build, watch and serve docs with live reload
 livehtml:
@@ -37,4 +37,4 @@ apidocs:
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %: Makefile
-	@$(SPHINXBUILD) -b $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+	@$(SPHINXBUILD) -c . -b $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)

From faf477a8686eafd7c4c05632b448b22bef511a7a Mon Sep 17 00:00:00 2001
From: Diego Montes <54745152+d57montes@users.noreply.github.com>
Date: Wed, 3 Nov 2021 19:41:08 -0400
Subject: [PATCH 1736/2840] change catch-all -b option as well

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

diff --git a/{{cookiecutter.project_slug}}/docs/Makefile b/{{cookiecutter.project_slug}}/docs/Makefile
index a2a220a45..27e7f2ff2 100644
--- a/{{cookiecutter.project_slug}}/docs/Makefile
+++ b/{{cookiecutter.project_slug}}/docs/Makefile
@@ -17,7 +17,7 @@ APP = ../{{cookiecutter.project_slug}}
 
 # Put it first so that "make" without argument is like "make help".
 help:
-	@$(SPHINXBUILD) -M help -c . "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+	@$(SPHINXBUILD) -M help "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) -c .
 
 # Build, watch and serve docs with live reload
 livehtml:
@@ -37,4 +37,4 @@ apidocs:
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).
 %: Makefile
-	@$(SPHINXBUILD) -c . -b $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O)
+	@$(SPHINXBUILD) -M $@ "$(SOURCEDIR)" "$(BUILDDIR)" $(SPHINXOPTS) $(O) -c .

From bf74761ba41d8c9b6e6a97effa5daf14434fe2ce Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 4 Nov 2021 00:05:49 +0000
Subject: [PATCH 1737/2840] 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 a42c17428..d09272168 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.3
+    rev: 5.10.0
     hooks:
       - id: isort
 

From 06d44987f38cf557576ab8b42746b76f600e0ff2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 4 Nov 2021 05:18:08 +0000
Subject: [PATCH 1738/2840] Bump peter-evans/create-pull-request from 3.10.1 to
 3.11.0

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

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

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 255122002..f3a87bff8 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.1
+      uses: peter-evans/create-pull-request@v3.11.0
       with:
         token: ${{ secrets.GITHUB_TOKEN }}
         branch: update/pre-commit-autoupdate

From 51c149f137d974982596fdbb1a6724d8029ff8db Mon Sep 17 00:00:00 2001
From: Diego Montes <54745152+d57montes@users.noreply.github.com>
Date: Thu, 4 Nov 2021 08:39:00 -0400
Subject: [PATCH 1739/2840] remove if else block in docs makefile

---
 {{cookiecutter.project_slug}}/docs/Makefile | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/docs/Makefile b/{{cookiecutter.project_slug}}/docs/Makefile
index ddecc2ee8..0e6d62e46 100644
--- a/{{cookiecutter.project_slug}}/docs/Makefile
+++ b/{{cookiecutter.project_slug}}/docs/Makefile
@@ -28,11 +28,7 @@ livehtml:
 
 # Outputs rst files from django application code
 apidocs:
-	{%- if cookiecutter.use_docker == 'y' %}
 	sphinx-apidoc -o $(SOURCEDIR)/api $(APP)
-	{%- else %}
-	sphinx-apidoc -o $(SOURCEDIR)/api $(APP)
-	{%- endif %}
 
 # Catch-all target: route all unknown targets to Sphinx using the new
 # "make mode" option.  $(O) is meant as a shortcut for $(SPHINXOPTS).

From db155d1fd5c8c892da405f475e6d05355122b565 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 4 Nov 2021 14:44:55 +0000
Subject: [PATCH 1740/2840] 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 4f59c868e..2be85ae76 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1162,5 +1162,10 @@
     "name": "Noah H",
     "github_login": "nthall",
     "twitter_username": ""
+  },
+  {
+    "name": "Diego Montes",
+    "github_login": "d57montes",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 241ef972c..e2d855bc4 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -614,6 +614,13 @@ Listed in alphabetical order.
     </td>
     <td>purplediane88</td>
   </tr>
+  <tr>
+    <td>Diego Montes</td>
+    <td>
+      <a href="https://github.com/d57montes">d57montes</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Dong Huynh</td>
     <td>

From f77906d135a0f242e07981b49e5e7272d28e7c53 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Thu, 4 Nov 2021 14:55:32 +0000
Subject: [PATCH 1741/2840] Reference official GH actions by major version only

---
 .github/workflows/ci.yml                    | 6 +++---
 .github/workflows/pre-commit-autoupdate.yml | 2 +-
 .github/workflows/update-changelog.yml      | 2 +-
 .github/workflows/update-contributors.yml   | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index a1b635959..cd1389c0d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2.2.2
+      - uses: actions/setup-python@v2
         with:
           python-version: 3.9
       - name: Install dependencies
@@ -44,7 +44,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2.2.2
+      - uses: actions/setup-python@v2
         with:
           python-version: 3.9
       - name: Docker ${{ matrix.script.name }}
@@ -78,7 +78,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2.2.2
+      - uses: actions/setup-python@v2
         with:
           python-version: 3.9
       - name: Bare Metal ${{ matrix.script.name }}
diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml
index f3a87bff8..5c16f7484 100644
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2.2.2
+    - uses: actions/setup-python@v2
       with:
         python-version: 3.9
 
diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index d7a4f4b8b..9b6111424 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -15,7 +15,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Set up Python
-      uses: actions/setup-python@v2.2.2
+      uses: actions/setup-python@v2
       with:
         python-version: 3.9
     - name: Install dependencies
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 37d95904e..88f08d679 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -13,7 +13,7 @@ jobs:
     - uses: actions/checkout@v2
 
     - name: Set up Python
-      uses: actions/setup-python@v2.2.2
+      uses: actions/setup-python@v2
       with:
         python-version: 3.9
     - name: Install dependencies

From 5f404a2bee227de4740e097d1ae6659ace30c294 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Thu, 4 Nov 2021 17:50:46 +0000
Subject: [PATCH 1742/2840] Update badge for Slack -> Discord

---
 README.rst | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index d7b74e16c..085890439 100644
--- a/README.rst
+++ b/README.rst
@@ -13,8 +13,9 @@ Cookiecutter Django
     :target: https://pyup.io/repos/github/cookiecutter/cookiecutter-django/
     :alt: Updates
 
-.. image:: https://img.shields.io/badge/cookiecutter-Join%20on%20Slack-green?style=flat&logo=slack
-    :target: https://join.slack.com/t/cookie-cutter/shared_invite/enQtNzI0Mzg5NjE5Nzk5LTRlYWI2YTZhYmQ4YmU1Y2Q2NmE1ZjkwOGM0NDQyNTIwY2M4ZTgyNDVkNjMxMDdhZGI5ZGE5YmJjM2M3ODJlY2U
+.. image:: https://img.shields.io/badge/Discord-cookiecutter-5865F2?style=flat&logo=discord&logoColor=white
+    :target: https://discord.gg/bTfDa6Zz
+    :alt: Join our Discord
 
 .. image:: https://www.codetriage.com/cookiecutter/cookiecutter-django/badges/users.svg
     :target: https://www.codetriage.com/cookiecutter/cookiecutter-django

From d43dd831ee91f431ad5a868b97653d806c4d09c8 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Thu, 4 Nov 2021 18:06:49 +0000
Subject: [PATCH 1743/2840] Fix broken build for docs

---
 .pyup.yml             |  1 +
 .readthedocs.yaml     | 15 +++++++++++++++
 docs/requirements.txt |  1 +
 3 files changed, 17 insertions(+)
 create mode 100644 .readthedocs.yaml
 create mode 100644 docs/requirements.txt

diff --git a/.pyup.yml b/.pyup.yml
index b330b22bb..e5d4752e4 100644
--- a/.pyup.yml
+++ b/.pyup.yml
@@ -15,6 +15,7 @@ label_prs: update
 
 requirements:
   - "requirements.txt"
+  - "docs/requirements.txt"
   - "{{cookiecutter.project_slug}}/requirements/base.txt"
   - "{{cookiecutter.project_slug}}/requirements/local.txt"
   - "{{cookiecutter.project_slug}}/requirements/production.txt"
diff --git a/.readthedocs.yaml b/.readthedocs.yaml
new file mode 100644
index 000000000..beb30d845
--- /dev/null
+++ b/.readthedocs.yaml
@@ -0,0 +1,15 @@
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
+version: 2
+
+# Build documentation in the docs/ directory with Sphinx
+sphinx:
+  configuration: docs/conf.py
+
+# Version of Python and requirements required to build the docs
+python:
+  version: "3.8"
+  install:
+    - requirements: docs/requirements.txt
diff --git a/docs/requirements.txt b/docs/requirements.txt
new file mode 100644
index 000000000..498f43dba
--- /dev/null
+++ b/docs/requirements.txt
@@ -0,0 +1 @@
+sphinx==4.2.0

From bdb6fe66b27a43611b55fd84a775951efae2b2aa Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 5 Nov 2021 02:15:00 +0000
Subject: [PATCH 1744/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e7c45ee1..40718b03d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-11-04]
+### Changed
+- change path in docs Makefile to use APP variable ([#3379](https://github.com/cookiecutter/cookiecutter-django/pull/3379))
+### Fixed
+- fix help in docs Makefile ([#3380](https://github.com/cookiecutter/cookiecutter-django/pull/3380))
+### Updated
+- Bump peter-evans/create-pull-request from 3.10.1 to 3.11.0 ([#3382](https://github.com/cookiecutter/cookiecutter-django/pull/3382))
+- Auto-update pre-commit hooks ([#3381](https://github.com/cookiecutter/cookiecutter-django/pull/3381))
+- Update isort to 5.10.0 ([#3378](https://github.com/cookiecutter/cookiecutter-django/pull/3378))
+
 ## [2021-11-02]
 ### Updated
 - Auto-update pre-commit hooks ([#3377](https://github.com/cookiecutter/cookiecutter-django/pull/3377))

From 33f812a3eb0de20880490d6c5f04ae250769b9f3 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 7 Nov 2021 09:26:19 -0800
Subject: [PATCH 1745/2840] Update django-extensions from 3.1.3 to 3.1.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 b965ea4fe..8f61f4cd1 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -43,6 +43,6 @@ pre-commit==2.15.0  # https://github.com/pre-commit/pre-commit
 factory-boy==3.2.1  # https://github.com/FactoryBoy/factory_boy
 
 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-extensions==3.1.5  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==2.0.1  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.4.0  # https://github.com/pytest-dev/pytest-django

From 28e4f80432b9364155b3ee55d5fa57cd24e68612 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Mon, 8 Nov 2021 02:14:30 +0000
Subject: [PATCH 1746/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 40718b03d..a4df304ca 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-11-07]
+### Updated
+- Update django-extensions to 3.1.5 ([#3383](https://github.com/cookiecutter/cookiecutter-django/pull/3383))
+
 ## [2021-11-04]
 ### Changed
 - change path in docs Makefile to use APP variable ([#3379](https://github.com/cookiecutter/cookiecutter-django/pull/3379))

From 346e7c9eddda65d353cbf5ed70d8f52c2cd6b038 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 7 Nov 2021 19:24:03 -0800
Subject: [PATCH 1747/2840] Update celery from 5.1.2 to 5.2.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 a078d1f05..42057cac7 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -17,7 +17,7 @@ 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==5.1.2  # pyup: < 6.0  # https://github.com/celery/celery
+celery==5.2.0  # 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==1.0.0  # https://github.com/mher/flower

From 8483bbbdf2af400d9687c01092a619dfcc22e3f6 Mon Sep 17 00:00:00 2001
From: Dani Hodovic <dani.hodovic@gmail.com>
Date: Mon, 8 Nov 2021 21:07:13 +0100
Subject: [PATCH 1748/2840] refactor: remove user API methods parameter

`methods` defaults to ["GET"] if not specified. There is no need to
explicitly set this in the action.

https://github.com/encode/django-rest-framework/blob/71e6c30034a1dd35a39ca74f86c371713e762c79/rest_framework/decorators.py#L145
---
 .../{{cookiecutter.project_slug}}/users/api/views.py            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/views.py
index 3d56cf562..98bb04e7b 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/views.py
@@ -19,7 +19,7 @@ class UserViewSet(RetrieveModelMixin, ListModelMixin, UpdateModelMixin, GenericV
         assert isinstance(self.request.user.id, int)
         return self.queryset.filter(id=self.request.user.id)
 
-    @action(detail=False, methods=["GET"])
+    @action(detail=False)
     def me(self, request):
         serializer = UserSerializer(request.user, context={"request": request})
         return Response(status=status.HTTP_200_OK, data=serializer.data)

From 710998eb6099a9be8289c8d4000413387488c60b Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 8 Nov 2021 23:20:35 +0000
Subject: [PATCH 1749/2840] Small fixes to script for creating Django Upgrade
 issue

---
 scripts/create_django_issue.py | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/scripts/create_django_issue.py b/scripts/create_django_issue.py
index 42fd375da..41b731efb 100644
--- a/scripts/create_django_issue.py
+++ b/scripts/create_django_issue.py
@@ -23,7 +23,7 @@ if TYPE_CHECKING:
 CURRENT_FILE = Path(__file__)
 ROOT = CURRENT_FILE.parents[1]
 REQUIREMENTS_DIR = ROOT / "{{cookiecutter.project_slug}}" / "requirements"
-GITHUB_REPO = "pydanny/cookiecutter-django"
+GITHUB_REPO = "cookiecutter/cookiecutter-django"
 
 
 def get_package_info(package: str) -> dict:
@@ -44,8 +44,10 @@ def get_package_versions(package_info: dict, reverse=True, *, include_pre=False)
     return sorted(releases, reverse=reverse)
 
 
-def get_name_and_version(requirements_line: str) -> list[str, str]:
-    return requirements_line.split(" ", 1)[0].split("==")
+def get_name_and_version(requirements_line: str) -> tuple[str, str]:
+    full_name, version = requirements_line.split(" ", 1)[0].split("==")
+    name_without_extras = full_name.split("[", 1)[0]
+    return name_without_extras, version
 
 
 def get_all_latest_django_versions() -> tuple[str, list[str]]:
@@ -124,7 +126,7 @@ class GitHubManager:
         for requirements_file in self.requirements_files:
             with (REQUIREMENTS_DIR / f"{requirements_file}.txt").open() as f:
                 for line in f.readlines():
-                    if "==" in line:
+                    if "==" in line and not line.startswith('{%'):
                         name, version = get_name_and_version(line)
                         self.requirements[requirements_file][name] = (
                             version, get_package_info(name)
@@ -248,7 +250,7 @@ class GitHubManager:
                 )
                 requirements += (
                     f"|{self._get_md_home_page_url(info).format(package_name)}"
-                    f"|{version}|{compat_version}|{icon}|"
+                    f"|{version}|{compat_version}|{icon}|\n"
                 )
         return requirements
 
@@ -262,7 +264,8 @@ class GitHubManager:
 
     def generate(self):
         for version in self.needed_dj_versions:
-            self.create_or_edit_issue(version, self.generate_markdown(version))
+            md_content = self.generate_markdown(version)
+            self.create_or_edit_issue(version, md_content)
 
 
 def main() -> None:

From 007fd0206eff302fe5c40c853623b8dc840ce776 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 8 Nov 2021 23:41:29 +0000
Subject: [PATCH 1750/2840] Ignore pre-releases of Django

---
 scripts/create_django_issue.py | 31 ++++++++++++++-----------------
 1 file changed, 14 insertions(+), 17 deletions(-)

diff --git a/scripts/create_django_issue.py b/scripts/create_django_issue.py
index 41b731efb..f10a94469 100644
--- a/scripts/create_django_issue.py
+++ b/scripts/create_django_issue.py
@@ -65,30 +65,27 @@ def get_all_latest_django_versions() -> tuple[str, list[str]]:
             sys.exit(1)
 
     # Begin parsing and verification
-    base_django_version = get_name_and_version(line)[1].split(".")
-    django_versions = get_package_versions(get_package_info("django"), include_pre=True)
-    _needed_django_versions: set[tuple] = set()
-    actual_needed_django_versions: list[str] = []
-    for x in django_versions:
-        _version = x.split(".")
-        # Compare if major is higher or if minor is higher iff major is the same
-        if (_version[0] > base_django_version[0]) or (
-            _version[0] == base_django_version[0]
-            and _version[1] > base_django_version[1]
-        ):
-            will_add = (_version[0], _version[1])
-            if will_add not in _needed_django_versions:
-                _needed_django_versions.add(will_add)
-                actual_needed_django_versions.append(x)
+    _, current_version_str = get_name_and_version(line)
+    # Get a tuple of (major, minor) - ignoring patch version
+    current_minor_version = tuple(current_version_str.split(".")[:2])
+    all_django_versions = get_package_versions(get_package_info("django"))
+    newer_versions: set[tuple] = set()
+    for version_str in all_django_versions:
+        released_minor_version = tuple(version_str.split(".")[:2])
+        if released_minor_version > current_minor_version:
+            newer_versions.add(released_minor_version)
 
-    return line, actual_needed_django_versions
+    needed_versions_str = ['.'.join(v) for v in sorted(newer_versions)]
+    return line, needed_versions_str
 
 
 def get_first_digit(tokens) -> str:
     return next(item for item in tokens if item.isdigit())
 
 
-_TABLE_HEADER = """{file}.txt
+_TABLE_HEADER = """
+
+## {file}.txt
 
 | Name | Version in Master | {dj_version} Compatible Version | OK |
 | ---- | :---------------: | :-----------------------------: | :-: |

From 44ba3cf19e0956c23bad3a72bf7c3085ab6bedf4 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 9 Nov 2021 00:21:08 +0000
Subject: [PATCH 1751/2840] Refactor how versions are handled

---
 scripts/create_django_issue.py | 101 +++++++++++++++------------------
 1 file changed, 46 insertions(+), 55 deletions(-)

diff --git a/scripts/create_django_issue.py b/scripts/create_django_issue.py
index f10a94469..ccf921c80 100644
--- a/scripts/create_django_issue.py
+++ b/scripts/create_django_issue.py
@@ -6,9 +6,10 @@ patches, only comparing major and minor version numbers.
 This script handles when there are multiple Django versions that need
 to keep up to date.
 """
+from __future__ import annotations
 
 import os
-from typing import Sequence, TYPE_CHECKING
+from typing import NamedTuple, Sequence, TYPE_CHECKING
 
 import requests
 import sys
@@ -26,6 +27,19 @@ REQUIREMENTS_DIR = ROOT / "{{cookiecutter.project_slug}}" / "requirements"
 GITHUB_REPO = "cookiecutter/cookiecutter-django"
 
 
+class Version(NamedTuple):
+    major: str
+    minor: str
+
+    def __str__(self) -> str:
+        return f"{self.major}.{self.minor}"
+
+    @classmethod
+    def parse(cls, version_str: str) -> Version:
+        major, minor, *_ = version_str.split(".")
+        return cls(major=major, minor=minor)
+
+
 def get_package_info(package: str) -> dict:
     # "django" converts to "Django" on redirect
     r = requests.get(f"https://pypi.org/pypi/{package}/json", allow_redirects=True)
@@ -40,17 +54,17 @@ def get_package_versions(package_info: dict, reverse=True, *, include_pre=False)
     # package version, you could simple do get_package_info()["info"]["version"]
     releases: Sequence[str] = package_info["releases"].keys()
     if not include_pre:
-        releases = [x for x in releases if x.replace(".", "").isdigit()]
+        releases = [r for r in releases if r.replace(".", "").isdigit()]
     return sorted(releases, reverse=reverse)
 
 
-def get_name_and_version(requirements_line: str) -> tuple[str, str]:
+def get_name_and_version(requirements_line: str) -> tuple[str, ...]:
     full_name, version = requirements_line.split(" ", 1)[0].split("==")
     name_without_extras = full_name.split("[", 1)[0]
     return name_without_extras, version
 
 
-def get_all_latest_django_versions() -> tuple[str, list[str]]:
+def get_all_latest_django_versions() -> tuple[Version, list[Version]]:
     """
     Grabs all Django versions that are worthy of a GitHub issue. Depends on
     if Django versions has higher major version or minor version
@@ -67,16 +81,15 @@ def get_all_latest_django_versions() -> tuple[str, list[str]]:
     # Begin parsing and verification
     _, current_version_str = get_name_and_version(line)
     # Get a tuple of (major, minor) - ignoring patch version
-    current_minor_version = tuple(current_version_str.split(".")[:2])
+    current_minor_version = Version.parse(current_version_str)
     all_django_versions = get_package_versions(get_package_info("django"))
-    newer_versions: set[tuple] = set()
+    newer_versions: set[Version] = set()
     for version_str in all_django_versions:
-        released_minor_version = tuple(version_str.split(".")[:2])
+        released_minor_version = Version.parse(version_str)
         if released_minor_version > current_minor_version:
             newer_versions.add(released_minor_version)
 
-    needed_versions_str = ['.'.join(v) for v in sorted(newer_versions)]
-    return line, needed_versions_str
+    return current_minor_version, sorted(newer_versions, reverse=True)
 
 
 def get_first_digit(tokens) -> str:
@@ -97,14 +110,14 @@ VITAL_BUT_UNKNOWN = [
 
 
 class GitHubManager:
-    def __init__(self, base_dj_version: str, needed_dj_versions: list[str]):
+    def __init__(self, base_dj_version: Version, needed_dj_versions: list[Version]):
         self.github = Github(os.getenv("GITHUB_TOKEN", None))
         self.repo = self.github.get_repo(GITHUB_REPO)
 
         self.base_dj_version = base_dj_version
         self.needed_dj_versions = needed_dj_versions
         # (major+minor) Version and description
-        self.existing_issues: dict[str, "Issue"] = {}
+        self.existing_issues: dict[Version, Issue] = {}
 
         # Load all requirements from our requirements files and preload their
         # package information like a cache:
@@ -123,10 +136,11 @@ class GitHubManager:
         for requirements_file in self.requirements_files:
             with (REQUIREMENTS_DIR / f"{requirements_file}.txt").open() as f:
                 for line in f.readlines():
-                    if "==" in line and not line.startswith('{%'):
+                    if "==" in line and not line.startswith("{%"):
                         name, version = get_name_and_version(line)
                         self.requirements[requirements_file][name] = (
-                            version, get_package_info(name)
+                            version,
+                            get_package_info(name),
                         )
 
     def load_existing_issues(self):
@@ -144,32 +158,16 @@ class GitHubManager:
             )
         )
         for issue in issues:
-            try:
-                dj_version = get_first_digit(issue.title.split(" "))
-            except StopIteration:
-                try:
-                    # Some padding; randomly chose 4 to make sure we don't get a random
-                    # version number from a package that's not Django
-                    dj_version = get_first_digit(issue.body.split(" ", 4))
-                except StopIteration:
-                    print(
-                        f"Found issue {issue.title} that had an invalid syntax",
-                        "(Did not have a Django version number in the title or body's"
-                        f" first word. Issue number: [{issue.id}]({issue.url}))"
-                    )
-                    continue
-            if self.base_dj_version > dj_version:
+            issue_version_str = issue.title.split(" ")[-1]
+            issue_version = Version.parse(issue_version_str)
+            if self.base_dj_version > issue_version:
                 issue.edit(state="closed")
                 print(f"Closed issue {issue.title} (ID: [{issue.id}]({issue.url}))")
-                try:
-                    self.needed_dj_versions.remove(dj_version)
-                except ValueError:
-                    print("Something weird happened. Continuing anyway (Warning ID: 1)")
             else:
-                self.existing_issues[dj_version] = issue
+                self.existing_issues[issue_version] = issue
 
     def get_compatibility(
-        self, package_name: str, package_info: dict, needed_dj_version
+        self, package_name: str, package_info: dict, needed_dj_version: Version
     ):
         """
         Verify compatibility via setup.py classifiers. If Django is not in the
@@ -191,24 +189,17 @@ class GitHubManager:
             return "", "❓"
 
         # Check classifiers if it includes Django
-        supported_dj_versions = []
+        supported_dj_versions: list[Version] = []
         for classifier in package_info["info"]["classifiers"]:
             # Usually in the form of "Framework :: Django :: 3.2"
             tokens = classifier.split(" ")
-            for token in tokens:
-                if token.lower() == "django":
-                    try:
-                        _version = get_first_digit(reversed(tokens))
-                    except StopIteration:
-                        pass
-                    else:
-                        supported_dj_versions.append(
-                            float(".".join(_version.split(".", 2)[:2]))
-                        )
+            if len(tokens) >= 5 and tokens[2].lower() == "django":
+                version = Version.parse(tokens[4])
+                if len(version) == 2:
+                    supported_dj_versions.append(version)
 
         if supported_dj_versions:
-            needed_dj_version = float(needed_dj_version)
-            if any(x >= needed_dj_version for x in supported_dj_versions):
+            if any(v >= needed_dj_version for v in supported_dj_versions):
                 return package_info["info"]["version"], "✅"
             else:
                 return "", "❌"
@@ -227,19 +218,19 @@ class GitHubManager:
     ]
 
     def _get_md_home_page_url(self, package_info: dict):
-        urls = [package_info["info"].get(x) for x in self.HOME_PAGE_URL_KEYS]
+        urls = [
+            package_info["info"].get(url_key) for url_key in self.HOME_PAGE_URL_KEYS
+        ]
         try:
             return f"[{{}}]({next(item for item in urls if item)})"
         except StopIteration:
             return "{}"
 
-    def generate_markdown(self, needed_dj_version: str):
+    def generate_markdown(self, needed_dj_version: Version):
         requirements = f"{needed_dj_version} requirements tables\n\n"
         for _file in self.requirements_files:
-            requirements += (
-                _TABLE_HEADER.format_map(
-                    {"file": _file, "dj_version": needed_dj_version}
-                )
+            requirements += _TABLE_HEADER.format_map(
+                {"file": _file, "dj_version": needed_dj_version}
             )
             for package_name, (version, info) in self.requirements[_file].items():
                 compat_version, icon = self.get_compatibility(
@@ -251,8 +242,8 @@ class GitHubManager:
                 )
         return requirements
 
-    def create_or_edit_issue(self, needed_dj_version, description):
-        if issue := self.existing_issues.get(str(needed_dj_version)):
+    def create_or_edit_issue(self, needed_dj_version: Version, description: str):
+        if issue := self.existing_issues.get(needed_dj_version):
             issue.edit(body=description)
         else:
             self.repo.create_issue(

From f163e1966198b91e03507bd08d9959208992316c Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 9 Nov 2021 00:32:41 +0000
Subject: [PATCH 1752/2840] Remove unused function

---
 scripts/create_django_issue.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/scripts/create_django_issue.py b/scripts/create_django_issue.py
index ccf921c80..60ebb7e30 100644
--- a/scripts/create_django_issue.py
+++ b/scripts/create_django_issue.py
@@ -92,10 +92,6 @@ def get_all_latest_django_versions() -> tuple[Version, list[Version]]:
     return current_minor_version, sorted(newer_versions, reverse=True)
 
 
-def get_first_digit(tokens) -> str:
-    return next(item for item in tokens if item.isdigit())
-
-
 _TABLE_HEADER = """
 
 ## {file}.txt

From 8e0f65b858a44d2c003c6be19824cea74d414305 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 9 Nov 2021 02:14:18 +0000
Subject: [PATCH 1753/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4df304ca..5af364fb1 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-11-08]
+### Changed
+- Update docker and non-docker configs to Debian 11 (bullseye) ([#3372](https://github.com/cookiecutter/cookiecutter-django/pull/3372))
+
 ## [2021-11-07]
 ### Updated
 - Update django-extensions to 3.1.5 ([#3383](https://github.com/cookiecutter/cookiecutter-django/pull/3383))

From 588c7c857cd9002de298ab56f19c12a894be4198 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 8 Nov 2021 23:29:53 -0800
Subject: [PATCH 1754/2840] Update isort from 5.10.0 to 5.10.1

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

diff --git a/requirements.txt b/requirements.txt
index 20f4e2b98..8e1123925 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==21.9b0
-isort==5.10.0
+isort==5.10.1
 flake8==4.0.1
 flake8-isort==4.1.1
 pre-commit==2.15.0

From e2c9808c7e69e683b1874416f779c66bf2a75d89 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 9 Nov 2021 10:32:08 +0000
Subject: [PATCH 1755/2840] Get GitHub repo from environment

---
 scripts/update_changelog.py    | 9 ++++++---
 scripts/update_contributors.py | 9 ++++++++-
 2 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/scripts/update_changelog.py b/scripts/update_changelog.py
index 85e19d169..306fc46b6 100644
--- a/scripts/update_changelog.py
+++ b/scripts/update_changelog.py
@@ -7,6 +7,7 @@ import datetime as dt
 CURRENT_FILE = Path(__file__)
 ROOT = CURRENT_FILE.parents[1]
 GITHUB_TOKEN = os.getenv("GITHUB_TOKEN", None)
+GITHUB_REPO = os.getenv("GITHUB_REPOSITORY", None)
 
 # Generate changelog for PRs merged yesterday
 MERGED_DATE = dt.date.today() - dt.timedelta(days=1)
@@ -39,9 +40,7 @@ def main() -> None:
 
 def iter_pulls():
     """Fetch merged pull requests at the date we're interested in."""
-    repo = Github(login_or_token=GITHUB_TOKEN).get_repo(
-        "cookiecutter/cookiecutter-django"
-    )
+    repo = Github(login_or_token=GITHUB_TOKEN).get_repo(GITHUB_REPO)
     recent_pulls = repo.get_pulls(
         state="closed", sort="updated", direction="desc"
     ).get_page(0)
@@ -77,4 +76,8 @@ def generate_md(grouped_pulls):
 
 
 if __name__ == "__main__":
+    if GITHUB_REPO is None:
+        raise RuntimeError(
+            "No github repo, please set the environment variable GITHUB_REPOSITORY"
+        )
     main()
diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py
index b125ef151..e1077e453 100644
--- a/scripts/update_contributors.py
+++ b/scripts/update_contributors.py
@@ -1,4 +1,5 @@
 import json
+import os
 from pathlib import Path
 from github import Github
 from github.NamedUser import NamedUser
@@ -7,6 +8,8 @@ from jinja2 import Template
 CURRENT_FILE = Path(__file__)
 ROOT = CURRENT_FILE.parents[1]
 BOT_LOGINS = ["pyup-bot"]
+GITHUB_TOKEN = os.getenv("GITHUB_TOKEN", None)
+GITHUB_REPO = os.getenv("GITHUB_REPOSITORY", None)
 
 
 def main() -> None:
@@ -39,7 +42,7 @@ def iter_recent_authors():
     Use Github API to fetch recent authors rather than
     git CLI to work with Github usernames.
     """
-    repo = Github(per_page=5).get_repo("cookiecutter/cookiecutter-django")
+    repo = Github(login_or_token=GITHUB_TOKEN, per_page=5).get_repo(GITHUB_REPO)
     recent_pulls = repo.get_pulls(
         state="closed", sort="updated", direction="desc"
     ).get_page(0)
@@ -101,4 +104,8 @@ def write_md_file(contributors):
 
 
 if __name__ == "__main__":
+    if GITHUB_REPO is None:
+        raise RuntimeError(
+            "No github repo, please set the environment variable GITHUB_REPOSITORY"
+        )
     main()

From 88b223fe407fc903d6560bb3d7ceba62f24f4363 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 9 Nov 2021 10:41:09 +0000
Subject: [PATCH 1756/2840] Move a few constant to the environment

---
 scripts/create_django_issue.py | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/scripts/create_django_issue.py b/scripts/create_django_issue.py
index 60ebb7e30..4ff9f902a 100644
--- a/scripts/create_django_issue.py
+++ b/scripts/create_django_issue.py
@@ -24,7 +24,9 @@ if TYPE_CHECKING:
 CURRENT_FILE = Path(__file__)
 ROOT = CURRENT_FILE.parents[1]
 REQUIREMENTS_DIR = ROOT / "{{cookiecutter.project_slug}}" / "requirements"
-GITHUB_REPO = "cookiecutter/cookiecutter-django"
+GITHUB_TOKEN = os.getenv("GITHUB_TOKEN", None)
+GITHUB_REPO = os.getenv("GITHUB_REPOSITORY", None)
+ISSUE_AUTHOR = os.getenv("GITHUB_ISSUE_AUTHOR", "actions-user")
 
 
 class Version(NamedTuple):
@@ -107,7 +109,7 @@ VITAL_BUT_UNKNOWN = [
 
 class GitHubManager:
     def __init__(self, base_dj_version: Version, needed_dj_versions: list[Version]):
-        self.github = Github(os.getenv("GITHUB_TOKEN", None))
+        self.github = Github(GITHUB_TOKEN)
         self.repo = self.github.get_repo(GITHUB_REPO)
 
         self.base_dj_version = base_dj_version
@@ -143,7 +145,7 @@ class GitHubManager:
         """Closes the issue if the base Django version is greater than the needed"""
         qualifiers = {
             "repo": GITHUB_REPO,
-            "author": "actions-user",
+            "author": ISSUE_AUTHOR,
             "state": "open",
             "is": "issue",
             "in": "title",
@@ -263,4 +265,8 @@ def main() -> None:
 
 
 if __name__ == "__main__":
+    if GITHUB_REPO is None:
+        raise RuntimeError(
+            "No github repo, please set the environment variable GITHUB_REPOSITORY"
+        )
     main()

From 82b2b5e29dfb14f42643b05f0837b3504bf57169 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 9 Nov 2021 11:19:12 +0000
Subject: [PATCH 1757/2840] Fix author name

---
 scripts/create_django_issue.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/create_django_issue.py b/scripts/create_django_issue.py
index 4ff9f902a..092da2b9d 100644
--- a/scripts/create_django_issue.py
+++ b/scripts/create_django_issue.py
@@ -26,7 +26,7 @@ ROOT = CURRENT_FILE.parents[1]
 REQUIREMENTS_DIR = ROOT / "{{cookiecutter.project_slug}}" / "requirements"
 GITHUB_TOKEN = os.getenv("GITHUB_TOKEN", None)
 GITHUB_REPO = os.getenv("GITHUB_REPOSITORY", None)
-ISSUE_AUTHOR = os.getenv("GITHUB_ISSUE_AUTHOR", "actions-user")
+ISSUE_AUTHOR = os.getenv("GITHUB_ISSUE_AUTHOR", "actions-user[bot]")
 
 
 class Version(NamedTuple):

From 21db044570fc1cbe8f47c3f420dd8bbe40d0a258 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 9 Nov 2021 11:24:06 +0000
Subject: [PATCH 1758/2840] Remove author from query: permission error

"The listed users cannot be searched either because the users do not exist or you do not have permission to view the users."
---
 scripts/create_django_issue.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/scripts/create_django_issue.py b/scripts/create_django_issue.py
index 092da2b9d..1fe5072bb 100644
--- a/scripts/create_django_issue.py
+++ b/scripts/create_django_issue.py
@@ -26,7 +26,6 @@ ROOT = CURRENT_FILE.parents[1]
 REQUIREMENTS_DIR = ROOT / "{{cookiecutter.project_slug}}" / "requirements"
 GITHUB_TOKEN = os.getenv("GITHUB_TOKEN", None)
 GITHUB_REPO = os.getenv("GITHUB_REPOSITORY", None)
-ISSUE_AUTHOR = os.getenv("GITHUB_ISSUE_AUTHOR", "actions-user[bot]")
 
 
 class Version(NamedTuple):
@@ -145,7 +144,6 @@ class GitHubManager:
         """Closes the issue if the base Django version is greater than the needed"""
         qualifiers = {
             "repo": GITHUB_REPO,
-            "author": ISSUE_AUTHOR,
             "state": "open",
             "is": "issue",
             "in": "title",

From eaaf096ded0ec0f9dc7ffe2cce962521f4aa6c75 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 9 Nov 2021 11:36:41 +0000
Subject: [PATCH 1759/2840] Update a few docstrings

---
 scripts/create_django_issue.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/scripts/create_django_issue.py b/scripts/create_django_issue.py
index 1fe5072bb..07a24941c 100644
--- a/scripts/create_django_issue.py
+++ b/scripts/create_django_issue.py
@@ -60,6 +60,7 @@ def get_package_versions(package_info: dict, reverse=True, *, include_pre=False)
 
 
 def get_name_and_version(requirements_line: str) -> tuple[str, ...]:
+    """Get the name a verion of a package from a line in the requirement file."""
     full_name, version = requirements_line.split(" ", 1)[0].split("==")
     name_without_extras = full_name.split("[", 1)[0]
     return name_without_extras, version
@@ -67,8 +68,9 @@ def get_name_and_version(requirements_line: str) -> tuple[str, ...]:
 
 def get_all_latest_django_versions() -> tuple[Version, list[Version]]:
     """
-    Grabs all Django versions that are worthy of a GitHub issue. Depends on
-    if Django versions has higher major version or minor version
+    Grabs all Django versions that are worthy of a GitHub issue.
+
+    Depends on Django versions having higher major version or minor version.
     """
     base_txt = REQUIREMENTS_DIR / "base.txt"
     with base_txt.open() as f:
@@ -141,7 +143,7 @@ class GitHubManager:
                         )
 
     def load_existing_issues(self):
-        """Closes the issue if the base Django version is greater than the needed"""
+        """Closes the issue if the base Django version is greater than needed"""
         qualifiers = {
             "repo": GITHUB_REPO,
             "state": "open",
@@ -200,7 +202,7 @@ class GitHubManager:
             else:
                 return "", "❌"
 
-        # Django classifier DNE; assume it just isn't a Django lib
+        # Django classifier DNE; assume it isn't a Django lib
         # Great exceptions include pylint-django, where we need to do this manually...
         return "n/a", "✅"
 

From d886e68af6845406a54f87fa8d91b117de275ba5 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 9 Nov 2021 11:40:08 +0000
Subject: [PATCH 1760/2840] Refactor helper class for Django version

---
 scripts/create_django_issue.py | 41 ++++++++++++++++++++--------------
 1 file changed, 24 insertions(+), 17 deletions(-)

diff --git a/scripts/create_django_issue.py b/scripts/create_django_issue.py
index 07a24941c..e0bb47a0c 100644
--- a/scripts/create_django_issue.py
+++ b/scripts/create_django_issue.py
@@ -28,17 +28,24 @@ GITHUB_TOKEN = os.getenv("GITHUB_TOKEN", None)
 GITHUB_REPO = os.getenv("GITHUB_REPOSITORY", None)
 
 
-class Version(NamedTuple):
-    major: str
-    minor: str
+class DjVersion(NamedTuple):
+    """
+    Wrapper to parse, compare and render Django versions.
+
+    Only keeps track on (major, minor) versions, excluding patches and pre-releases.
+    """
+    major: int
+    minor: int
 
     def __str__(self) -> str:
+        """To render as string."""
         return f"{self.major}.{self.minor}"
 
     @classmethod
-    def parse(cls, version_str: str) -> Version:
+    def parse(cls, version_str: str) -> DjVersion:
+        """Parse interesting values from the version string."""
         major, minor, *_ = version_str.split(".")
-        return cls(major=major, minor=minor)
+        return cls(major=int(major), minor=int(minor))
 
 
 def get_package_info(package: str) -> dict:
@@ -66,7 +73,7 @@ def get_name_and_version(requirements_line: str) -> tuple[str, ...]:
     return name_without_extras, version
 
 
-def get_all_latest_django_versions() -> tuple[Version, list[Version]]:
+def get_all_latest_django_versions() -> tuple[DjVersion, list[DjVersion]]:
     """
     Grabs all Django versions that are worthy of a GitHub issue.
 
@@ -84,11 +91,11 @@ def get_all_latest_django_versions() -> tuple[Version, list[Version]]:
     # Begin parsing and verification
     _, current_version_str = get_name_and_version(line)
     # Get a tuple of (major, minor) - ignoring patch version
-    current_minor_version = Version.parse(current_version_str)
+    current_minor_version = DjVersion.parse(current_version_str)
     all_django_versions = get_package_versions(get_package_info("django"))
-    newer_versions: set[Version] = set()
+    newer_versions: set[DjVersion] = set()
     for version_str in all_django_versions:
-        released_minor_version = Version.parse(version_str)
+        released_minor_version = DjVersion.parse(version_str)
         if released_minor_version > current_minor_version:
             newer_versions.add(released_minor_version)
 
@@ -109,14 +116,14 @@ VITAL_BUT_UNKNOWN = [
 
 
 class GitHubManager:
-    def __init__(self, base_dj_version: Version, needed_dj_versions: list[Version]):
+    def __init__(self, base_dj_version: DjVersion, needed_dj_versions: list[DjVersion]):
         self.github = Github(GITHUB_TOKEN)
         self.repo = self.github.get_repo(GITHUB_REPO)
 
         self.base_dj_version = base_dj_version
         self.needed_dj_versions = needed_dj_versions
         # (major+minor) Version and description
-        self.existing_issues: dict[Version, Issue] = {}
+        self.existing_issues: dict[DjVersion, Issue] = {}
 
         # Load all requirements from our requirements files and preload their
         # package information like a cache:
@@ -157,7 +164,7 @@ class GitHubManager:
         )
         for issue in issues:
             issue_version_str = issue.title.split(" ")[-1]
-            issue_version = Version.parse(issue_version_str)
+            issue_version = DjVersion.parse(issue_version_str)
             if self.base_dj_version > issue_version:
                 issue.edit(state="closed")
                 print(f"Closed issue {issue.title} (ID: [{issue.id}]({issue.url}))")
@@ -165,7 +172,7 @@ class GitHubManager:
                 self.existing_issues[issue_version] = issue
 
     def get_compatibility(
-        self, package_name: str, package_info: dict, needed_dj_version: Version
+        self, package_name: str, package_info: dict, needed_dj_version: DjVersion
     ):
         """
         Verify compatibility via setup.py classifiers. If Django is not in the
@@ -187,12 +194,12 @@ class GitHubManager:
             return "", "❓"
 
         # Check classifiers if it includes Django
-        supported_dj_versions: list[Version] = []
+        supported_dj_versions: list[DjVersion] = []
         for classifier in package_info["info"]["classifiers"]:
             # Usually in the form of "Framework :: Django :: 3.2"
             tokens = classifier.split(" ")
             if len(tokens) >= 5 and tokens[2].lower() == "django":
-                version = Version.parse(tokens[4])
+                version = DjVersion.parse(tokens[4])
                 if len(version) == 2:
                     supported_dj_versions.append(version)
 
@@ -224,7 +231,7 @@ class GitHubManager:
         except StopIteration:
             return "{}"
 
-    def generate_markdown(self, needed_dj_version: Version):
+    def generate_markdown(self, needed_dj_version: DjVersion):
         requirements = f"{needed_dj_version} requirements tables\n\n"
         for _file in self.requirements_files:
             requirements += _TABLE_HEADER.format_map(
@@ -240,7 +247,7 @@ class GitHubManager:
                 )
         return requirements
 
-    def create_or_edit_issue(self, needed_dj_version: Version, description: str):
+    def create_or_edit_issue(self, needed_dj_version: DjVersion, description: str):
         if issue := self.existing_issues.get(needed_dj_version):
             issue.edit(body=description)
         else:

From 1a962b5ad9ccc34e9334dec967320e20c375f86e Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 9 Nov 2021 11:52:54 +0000
Subject: [PATCH 1761/2840] Refactor function to list django versions

---
 scripts/create_django_issue.py | 33 ++++++++++++++++-----------------
 1 file changed, 16 insertions(+), 17 deletions(-)

diff --git a/scripts/create_django_issue.py b/scripts/create_django_issue.py
index e0bb47a0c..bbb25f26b 100644
--- a/scripts/create_django_issue.py
+++ b/scripts/create_django_issue.py
@@ -9,15 +9,13 @@ to keep up to date.
 from __future__ import annotations
 
 import os
-from typing import NamedTuple, Sequence, TYPE_CHECKING
-
-import requests
 import sys
 from pathlib import Path
+from typing import TYPE_CHECKING, Any, Iterable, NamedTuple
 
+import requests
 from github import Github
 
-
 if TYPE_CHECKING:
     from github.Issue import Issue
 
@@ -34,6 +32,7 @@ class DjVersion(NamedTuple):
 
     Only keeps track on (major, minor) versions, excluding patches and pre-releases.
     """
+
     major: int
     minor: int
 
@@ -49,6 +48,7 @@ class DjVersion(NamedTuple):
 
 
 def get_package_info(package: str) -> dict:
+    """Get package metadata using PyPI API."""
     # "django" converts to "Django" on redirect
     r = requests.get(f"https://pypi.org/pypi/{package}/json", allow_redirects=True)
     if not r.ok:
@@ -57,17 +57,18 @@ def get_package_info(package: str) -> dict:
     return r.json()
 
 
-def get_package_versions(package_info: dict, reverse=True, *, include_pre=False):
-    # Mostly used for the Django check really... to get the latest
-    # package version, you could simple do get_package_info()["info"]["version"]
-    releases: Sequence[str] = package_info["releases"].keys()
-    if not include_pre:
-        releases = [r for r in releases if r.replace(".", "").isdigit()]
-    return sorted(releases, reverse=reverse)
+def get_django_versions() -> Iterable[DjVersion]:
+    """List all django versions."""
+    django_package_info: dict[str, Any] = get_package_info("django")
+    releases = django_package_info["releases"].keys()
+    for release_str in releases:
+        if release_str.replace(".", "").isdigit():
+            # Exclude pre-releases with non-numeric characters in version
+            yield DjVersion.parse(release_str)
 
 
 def get_name_and_version(requirements_line: str) -> tuple[str, ...]:
-    """Get the name a verion of a package from a line in the requirement file."""
+    """Get the name a version of a package from a line in the requirement file."""
     full_name, version = requirements_line.split(" ", 1)[0].split("==")
     name_without_extras = full_name.split("[", 1)[0]
     return name_without_extras, version
@@ -92,12 +93,10 @@ def get_all_latest_django_versions() -> tuple[DjVersion, list[DjVersion]]:
     _, current_version_str = get_name_and_version(line)
     # Get a tuple of (major, minor) - ignoring patch version
     current_minor_version = DjVersion.parse(current_version_str)
-    all_django_versions = get_package_versions(get_package_info("django"))
     newer_versions: set[DjVersion] = set()
-    for version_str in all_django_versions:
-        released_minor_version = DjVersion.parse(version_str)
-        if released_minor_version > current_minor_version:
-            newer_versions.add(released_minor_version)
+    for django_version in get_django_versions():
+        if django_version > current_minor_version:
+            newer_versions.add(django_version)
 
     return current_minor_version, sorted(newer_versions, reverse=True)
 

From 955134f27d1e276e6cd4a2f38350658052a2c9b6 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 9 Nov 2021 11:53:02 +0000
Subject: [PATCH 1762/2840] Run isort

---
 scripts/update_changelog.py    | 3 ++-
 scripts/update_contributors.py | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/scripts/update_changelog.py b/scripts/update_changelog.py
index 85e19d169..feec91774 100644
--- a/scripts/update_changelog.py
+++ b/scripts/update_changelog.py
@@ -1,8 +1,9 @@
+import datetime as dt
 import os
 from pathlib import Path
+
 from github import Github
 from jinja2 import Template
-import datetime as dt
 
 CURRENT_FILE = Path(__file__)
 ROOT = CURRENT_FILE.parents[1]
diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py
index b125ef151..62acb8f9f 100644
--- a/scripts/update_contributors.py
+++ b/scripts/update_contributors.py
@@ -1,5 +1,6 @@
 import json
 from pathlib import Path
+
 from github import Github
 from github.NamedUser import NamedUser
 from jinja2 import Template

From 6f5dac8e5c2855eb142b936575a5af0e3de6da6c Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 9 Nov 2021 12:07:25 +0000
Subject: [PATCH 1763/2840] Change workflow schedule

---
 .github/workflows/django-issue-checker.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/django-issue-checker.yml b/.github/workflows/django-issue-checker.yml
index 6b1b0e700..9866578c7 100644
--- a/.github/workflows/django-issue-checker.yml
+++ b/.github/workflows/django-issue-checker.yml
@@ -4,9 +4,8 @@
 name: Django Issue Checker
 
 on:
-  # Every day at midnight
   schedule:
-  - cron: "0 3 * * *"
+  - cron: "28 5 * * *"
   # Manual trigger
   workflow_dispatch:
 

From c5f4193e1c5c43ae63481b552fc1a25145e3982e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 9 Nov 2021 14:08:17 -0800
Subject: [PATCH 1764/2840] Update jinja2 from 3.0.2 to 3.0.3

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

diff --git a/requirements.txt b/requirements.txt
index 8e1123925..64b1b2e63 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,4 +21,4 @@ pyyaml==6.0
 # Scripting
 # ------------------------------------------------------------------------------
 PyGithub==1.55
-jinja2==3.0.2
+jinja2==3.0.3

From 3679cb37e5d8e726b3e9a65f7d901814b3d99cf9 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 10 Nov 2021 00:05:56 +0000
Subject: [PATCH 1765/2840] 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 d09272168..9aae466c7 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.10.0
+    rev: 5.10.1
     hooks:
       - id: isort
 

From fd18aa68a1b1edd279ce304f5be086e842533654 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 10 Nov 2021 02:15:09 +0000
Subject: [PATCH 1766/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5af364fb1..bd627ca63 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-11-09]
+### Changed
+- refactor: remove user API methods parameter ([#3385](https://github.com/cookiecutter/cookiecutter-django/pull/3385))
+- Get GitHub repo from environment ([#3387](https://github.com/cookiecutter/cookiecutter-django/pull/3387))
+### Updated
+- Update celery to 5.2.0 ([#3384](https://github.com/cookiecutter/cookiecutter-django/pull/3384))
+- Update isort to 5.10.1 ([#3386](https://github.com/cookiecutter/cookiecutter-django/pull/3386))
+
 ## [2021-11-08]
 ### Changed
 - Update docker and non-docker configs to Debian 11 (bullseye) ([#3372](https://github.com/cookiecutter/cookiecutter-django/pull/3372))

From d08dfa32ab9a983078020df3de54eef7c050bcdd Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 10 Nov 2021 19:06:23 +0000
Subject: [PATCH 1767/2840] Add print statements to describe progress

---
 scripts/create_django_issue.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/scripts/create_django_issue.py b/scripts/create_django_issue.py
index bbb25f26b..ef3d52b1c 100644
--- a/scripts/create_django_issue.py
+++ b/scripts/create_django_issue.py
@@ -80,6 +80,7 @@ def get_all_latest_django_versions() -> tuple[DjVersion, list[DjVersion]]:
 
     Depends on Django versions having higher major version or minor version.
     """
+    print("Fetching all Django versions from PyPI")
     base_txt = REQUIREMENTS_DIR / "base.txt"
     with base_txt.open() as f:
         for line in f.readlines():
@@ -138,6 +139,7 @@ class GitHubManager:
         self.load_existing_issues()
 
     def load_requirements(self):
+        print("Reading requirements")
         for requirements_file in self.requirements_files:
             with (REQUIREMENTS_DIR / f"{requirements_file}.txt").open() as f:
                 for line in f.readlines():
@@ -150,6 +152,7 @@ class GitHubManager:
 
     def load_existing_issues(self):
         """Closes the issue if the base Django version is greater than needed"""
+        print("Load existing issues from GitHub")
         qualifiers = {
             "repo": GITHUB_REPO,
             "state": "open",
@@ -161,6 +164,7 @@ class GitHubManager:
                 "[Django Update]", "created", "desc", **qualifiers
             )
         )
+        print(f"Found {len(issues)} issues matching search")
         for issue in issues:
             issue_version_str = issue.title.split(" ")[-1]
             issue_version = DjVersion.parse(issue_version_str)
@@ -248,15 +252,19 @@ class GitHubManager:
 
     def create_or_edit_issue(self, needed_dj_version: DjVersion, description: str):
         if issue := self.existing_issues.get(needed_dj_version):
+            print(f"Editing issue #{issue.number} for Django {needed_dj_version}")
             issue.edit(body=description)
         else:
+            print(f"Creating new issue for Django {needed_dj_version}")
             self.repo.create_issue(
                 f"[Update Django] Django {needed_dj_version}", description
             )
 
     def generate(self):
         for version in self.needed_dj_versions:
+            print(f"Handling GitHub issue for Django {version}")
             md_content = self.generate_markdown(version)
+            print(f"Generated markdown:\n\n{md_content}")
             self.create_or_edit_issue(version, md_content)
 
 

From bc34320416a50964ad7b6b78b0e41bdf4bad5042 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 10 Nov 2021 12:18:51 -0800
Subject: [PATCH 1768/2840] Update sphinx from 4.2.0 to 4.3.0

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

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 498f43dba..aef3c6410 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1 +1 @@
-sphinx==4.2.0
+sphinx==4.3.0

From 826016e571fcda97d00e65c55243185a87c97465 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 10 Nov 2021 12:18:51 -0800
Subject: [PATCH 1769/2840] Update sphinx from 4.2.0 to 4.3.0

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

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 8f61f4cd1..620175de8 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -23,7 +23,7 @@ djangorestframework-stubs==1.4.0  # https://github.com/typeddjango/djangorestfra
 
 # Documentation
 # ------------------------------------------------------------------------------
-sphinx==4.2.0  # https://github.com/sphinx-doc/sphinx
+sphinx==4.3.0  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From dc382d02ef7cf214de4eda8e4894f3018dcbdc1e Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 11 Nov 2021 02:14:50 +0000
Subject: [PATCH 1770/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd627ca63..8348e114c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-11-10]
+### Changed
+- Update sphinx to 4.3.0 ([#3392](https://github.com/cookiecutter/cookiecutter-django/pull/3392))
+### Updated
+- Auto-update pre-commit hooks ([#3389](https://github.com/cookiecutter/cookiecutter-django/pull/3389))
+- Update jinja2 to 3.0.3 ([#3388](https://github.com/cookiecutter/cookiecutter-django/pull/3388))
+
 ## [2021-11-09]
 ### Changed
 - refactor: remove user API methods parameter ([#3385](https://github.com/cookiecutter/cookiecutter-django/pull/3385))

From 89959dc43926943d97d8ed08bcab71e979ed2283 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 10 Nov 2021 23:33:54 -0800
Subject: [PATCH 1771/2840] Update coverage from 6.1.1 to 6.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 620175de8..107fa68d3 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==4.0.1  # https://github.com/PyCQA/flake8
 flake8-isort==4.1.1  # https://github.com/gforcada/flake8-isort
-coverage==6.1.1  # https://github.com/nedbat/coveragepy
+coverage==6.1.2  # https://github.com/nedbat/coveragepy
 black==21.9b0  # https://github.com/psf/black
 pylint-django==2.4.4  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 01158c1f343777a8f7c99b878ee96ed4a8fa701f Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Thu, 11 Nov 2021 11:56:41 +0000
Subject: [PATCH 1772/2840] Avoid false positives in issues search results

---
 scripts/create_django_issue.py | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/scripts/create_django_issue.py b/scripts/create_django_issue.py
index ef3d52b1c..4b270b701 100644
--- a/scripts/create_django_issue.py
+++ b/scripts/create_django_issue.py
@@ -9,6 +9,7 @@ to keep up to date.
 from __future__ import annotations
 
 import os
+import re
 import sys
 from pathlib import Path
 from typing import TYPE_CHECKING, Any, Iterable, NamedTuple
@@ -155,6 +156,7 @@ class GitHubManager:
         print("Load existing issues from GitHub")
         qualifiers = {
             "repo": GITHUB_REPO,
+            "author": "app/github-actions",
             "state": "open",
             "is": "issue",
             "in": "title",
@@ -166,8 +168,10 @@ class GitHubManager:
         )
         print(f"Found {len(issues)} issues matching search")
         for issue in issues:
-            issue_version_str = issue.title.split(" ")[-1]
-            issue_version = DjVersion.parse(issue_version_str)
+            matches = re.match(r"\[Update Django] Django (\d+.\d+)$", issue.title)
+            if not matches:
+                continue
+            issue_version = DjVersion.parse(matches.group(1))
             if self.base_dj_version > issue_version:
                 issue.edit(state="closed")
                 print(f"Closed issue {issue.title} (ID: [{issue.id}]({issue.url}))")

From e7ea358496a46916d105c9f721e4f5ee7e4b696a Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 11 Nov 2021 19:12:23 +0000
Subject: [PATCH 1773/2840] Better job names on CI

(cherry picked from commit 4373830c705a392b411d533f0e3776c51914eb8b)
---
 .github/workflows/ci.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cd1389c0d..169af5277 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,6 +15,7 @@ jobs:
           - py39
           - black-template
 
+    name: "tox env ${{ matrix.tox-env }}"
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
@@ -38,6 +39,7 @@ jobs:
           - name: Extended
             args: "use_celery=y use_drf=y js_task_runner=Gulp"
 
+    name: "${{ matrix.script.name }} Docker"
     env:
       DOCKER_BUILDKIT: 1
       COMPOSE_DOCKER_CLI_BUILD: 1
@@ -59,6 +61,7 @@ jobs:
           - name: With Celery
             args: "use_celery=y use_compressor=y"
 
+    name: "${{ matrix.script.name }} Bare metal"
     services:
       redis:
         image: redis:5.0

From 954718cd83f4794afd08e5d2fa88b33525abf51e Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 11 Nov 2021 19:21:16 +0000
Subject: [PATCH 1774/2840] Build local docker images on CI

---
 tests/test_docker.sh | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/tests/test_docker.sh b/tests/test_docker.sh
index 001ef06d0..8d25a8e26 100755
--- a/tests/test_docker.sh
+++ b/tests/test_docker.sh
@@ -24,6 +24,9 @@ git init
 git add .
 pre-commit run --show-diff-on-failure -a
 
+# make sure all images build
+docker-compose -f local.yml build
+
 # run the project's type checks
 docker-compose -f local.yml run django mypy my_awesome_project
 

From ab81e122d17d1bb3b1f3ba7dd553578d1d21c242 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 11 Nov 2021 21:07:29 +0000
Subject: [PATCH 1775/2840] Fix navigation on mobile

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

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
index e8c6d0afe..4c485ace8 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -54,7 +54,7 @@
 
     <div class="mb-1">
       <nav class="navbar navbar-expand-md navbar-light bg-light">
-        <button class="navbar-toggler navbar-toggler-right" type="button" data-toggle="collapse" data-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+        <button class="navbar-toggler navbar-toggler-right" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
           <span class="navbar-toggler-icon"></span>
         </button>
         <a class="navbar-brand" href="{% url 'home' %}">{% endraw %}{{ cookiecutter.project_name }}{% raw %}</a>

From 90088116ff7361e8d12ade35c4bb03c875fa2bb5 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 11 Nov 2021 21:08:44 +0000
Subject: [PATCH 1776/2840] Add fluid container to fix horizontal padding

---
 .../templates/base.html                       | 60 ++++++++++---------
 1 file changed, 31 insertions(+), 29 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
index 4c485ace8..f9b66a1c2 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -54,39 +54,41 @@
 
     <div class="mb-1">
       <nav class="navbar navbar-expand-md navbar-light bg-light">
-        <button class="navbar-toggler navbar-toggler-right" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-          <span class="navbar-toggler-icon"></span>
-        </button>
-        <a class="navbar-brand" href="{% url 'home' %}">{% endraw %}{{ cookiecutter.project_name }}{% raw %}</a>
+        <div class="container-fluid">
+          <button class="navbar-toggler navbar-toggler-right" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
+            <span class="navbar-toggler-icon"></span>
+          </button>
+          <a class="navbar-brand" href="{% url 'home' %}">{% endraw %}{{ cookiecutter.project_name }}{% raw %}</a>
 
-        <div class="collapse navbar-collapse" id="navbarSupportedContent">
-          <ul class="navbar-nav mr-auto">
-            <li class="nav-item active">
-              <a class="nav-link" href="{% url 'home' %}">Home <span class="visually-hidden">(current)</span></a>
-            </li>
-            <li class="nav-item">
-              <a class="nav-link" href="{% url 'about' %}">About</a>
-            </li>
-            {% 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  %}">{% translate "My Profile" %}</a>
+          <div class="collapse navbar-collapse" id="navbarSupportedContent">
+            <ul class="navbar-nav mr-auto">
+              <li class="nav-item active">
+                <a class="nav-link" href="{% url 'home' %}">Home <span class="visually-hidden">(current)</span></a>
               </li>
               <li class="nav-item">
-                {# URL provided by django-allauth/account/urls.py #}
-                <a class="nav-link" href="{% url 'account_logout' %}">{% translate "Sign Out" %}</a>
+                <a class="nav-link" href="{% url 'about' %}">About</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' %}">{% 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' %}">{% translate "Sign In" %}</a>
-              </li>
-            {% endif %}
-          </ul>
+              {% 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  %}">{% 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' %}">{% 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' %}">{% 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' %}">{% translate "Sign In" %}</a>
+                </li>
+              {% endif %}
+            </ul>
+          </div>
         </div>
       </nav>
 

From 1aded6fafeb956d494260f2e6ba4ddfc13b283d7 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 11 Nov 2021 23:01:14 +0000
Subject: [PATCH 1777/2840] Fix alerts for messages

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

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
index f9b66a1c2..133a0dccc 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -97,9 +97,12 @@
     <div class="container">
 
       {% if messages %}
-          {% for message in messages %}
-              <div class="alert {% if message.tags %}alert-{{ message.tags }}{% endif %}">{{ message }}<button type="button" class="close" data-dismiss="alert" aria-label="Close"><span aria-hidden="true">&times;</span></button></div>
-          {% endfor %}
+        {% for message in messages %}
+          <div class="alert alert-dismissible {% if message.tags %}alert-{{ message.tags }}{% endif %}">
+            {{ message }}
+            <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
+          </div>
+        {% endfor %}
       {% endif %}
 
       {% block content %}

From 41520bcb4d0edb2b8f8853f629717f82aff9b7b3 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 12 Nov 2021 02:14:46 +0000
Subject: [PATCH 1778/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8348e114c..e353b6acd 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-11-11]
+### Changed
+- Build all images on CI ([#3394](https://github.com/cookiecutter/cookiecutter-django/pull/3394))
+### Updated
+- Update coverage to 6.1.2 ([#3393](https://github.com/cookiecutter/cookiecutter-django/pull/3393))
+
 ## [2021-11-10]
 ### Changed
 - Update sphinx to 4.3.0 ([#3392](https://github.com/cookiecutter/cookiecutter-django/pull/3392))

From d0c3c3435f0df589eae8e65ed32a6e2c988d6a99 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 12 Nov 2021 10:13:10 -0800
Subject: [PATCH 1779/2840] Update crispy-bootstrap5 from 0.5 to 0.6

---
 {{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 26b82f7f3..d174b012b 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -34,7 +34,7 @@ django-environ==0.8.1  # https://github.com/joke2k/django-environ
 django-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.45.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.13.0  # https://github.com/django-crispy-forms/django-crispy-forms
-crispy-bootstrap5==0.5  # https://github.com/django-crispy-forms/crispy-bootstrap5
+crispy-bootstrap5==0.6  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==2.4.1  # https://github.com/django-compressor/django-compressor
 {%- endif %}

From cfe6a60f0edf67071670ac3d60528147ac6b6ca2 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 12 Nov 2021 10:41:42 -0800
Subject: [PATCH 1780/2840] Update requests from 2.25.1 to 2.26.0

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

diff --git a/requirements.txt b/requirements.txt
index bc0a4de8b..4a3ec1919 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -22,4 +22,4 @@ pyyaml==6.0
 # ------------------------------------------------------------------------------
 PyGithub==1.55
 jinja2==3.0.3
-requests==2.25.1
+requests==2.26.0

From 8cf57ca1872508874c50da0493dc22df6827066c Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 12 Nov 2021 19:44:26 +0000
Subject: [PATCH 1781/2840] Update Bootstrap version in README

---
 README.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.rst b/README.rst
index 085890439..60f036cf9 100644
--- a/README.rst
+++ b/README.rst
@@ -44,7 +44,7 @@ Features
 * For Django 3.1
 * Works with Python 3.9
 * Renders Django projects with 100% starting test coverage
-* Twitter Bootstrap_ v4 (`maintained Foundation fork`_ also available)
+* Twitter Bootstrap_ v5 (`maintained Foundation fork`_ also available)
 * 12-Factor_ based settings via django-environ_
 * Secure by default. We believe in SSL.
 * Optimized development and production settings

From edfbb61c78c7ee6b6840385dfe88aab213276803 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 13 Nov 2021 02:16:41 +0000
Subject: [PATCH 1782/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e353b6acd..6e5e17797 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-11-12]
+### Changed
+- Add Django major/minor release table maker in GitHub issues ([#3288](https://github.com/cookiecutter/cookiecutter-django/pull/3288))
+- Upgrade to Bootstrap 5 ([#3276](https://github.com/cookiecutter/cookiecutter-django/pull/3276))
+### Updated
+- Update requests to 2.26.0 ([#3397](https://github.com/cookiecutter/cookiecutter-django/pull/3397))
+- Update crispy-bootstrap5 to 0.6 ([#3396](https://github.com/cookiecutter/cookiecutter-django/pull/3396))
+
 ## [2021-11-11]
 ### Changed
 - Build all images on CI ([#3394](https://github.com/cookiecutter/cookiecutter-django/pull/3394))

From 901911cba8178a223cb9c48366d67589de264402 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 13 Nov 2021 12:33:16 +0000
Subject: [PATCH 1783/2840] Update node version in package.json

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

diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json
index b50268d42..ed3f724e1 100644
--- a/{{cookiecutter.project_slug}}/package.json
+++ b/{{cookiecutter.project_slug}}/package.json
@@ -23,7 +23,7 @@
     {%- endif %}
   },
   "engines": {
-    "node": ">=8"
+    "node": "10"
   },
   "browserslist": [
     "last 2 versions"

From 2efddb997462eebfacfdbb16956931f3f20df904 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sun, 14 Nov 2021 02:15:15 +0000
Subject: [PATCH 1784/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6e5e17797..83dc110d6 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-11-13]
+### Fixed
+- Fix incorrect node version in `package.json` ([#3399](https://github.com/cookiecutter/cookiecutter-django/pull/3399))
+
 ## [2021-11-12]
 ### Changed
 - Add Django major/minor release table maker in GitHub issues ([#3288](https://github.com/cookiecutter/cookiecutter-django/pull/3288))

From bd2beb7baa595f8c7d83dc191c54071d6591bf3a Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sun, 14 Nov 2021 13:33:40 +0000
Subject: [PATCH 1785/2840] Update question template

---
 .github/ISSUE_TEMPLATE/question.md | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 9d609eb98..2ba657d5c 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -1,11 +1,11 @@
 ---
 name: Question
-about: Please consider asking your question on StackOverflow or Slack
+about: Please ask your question on StackOverflow, Discord or GitHub Discussions.
 labels: question
 ---
 
-First, make sure to examine [the docs](https://cookiecutter-django.readthedocs.io/en/latest/). 
+First, make sure to examine [the docs](https://cookiecutter-django.readthedocs.io/en/latest/). If that doesn't help, we recommend one of these 3 main channels:
 
-If that doesn't help, post a question on [StackOverflow](https://stackoverflow.com/questions/tagged/cookiecutter-django) tagged with `cookiecutter-django`, you might get more visibility there than on our issue tracker. 
-
-Finally, feel free to join [Slack](https://join.slack.com/t/cookie-cutter/shared_invite/enQtNzI0Mzg5NjE5Nzk5LTRlYWI2YTZhYmQ4YmU1Y2Q2NmE1ZjkwOGM0NDQyNTIwY2M4ZTgyNDVkNjMxMDdhZGI5ZGE5YmJjM2M3ODJlY2U) and ask around.
+- If your issue is related to Django + something else but was generated with cookiecutter-django, the best is to post a question on [StackOverflow](https://stackoverflow.com/questions/tagged/cookiecutter-django) tagged with `cookiecutter-django`, you would get more visibility from other communities as well. 
+- Join us on [Discord](https://discord.gg/bTfDa6Zz) and ask around.
+- Start [a discussion](https://github.com/cookiecutter/cookiecutter-django/discussions) on our project's GitHub.

From 8778cfccc1a7a3ff17f374e79386c7bf47cf6aef Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sun, 14 Nov 2021 18:38:09 +0000
Subject: [PATCH 1786/2840] Upgrade Python runtime for Heroku

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

From 5e99c7b54dd392a4cd3560f8798e57dd7315649c Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 15 Nov 2021 11:38:43 +0000
Subject: [PATCH 1787/2840] Fix wayback machine URL in docs

Fix #3223
---
 docs/developing-locally.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index 38df50be3..88a71b30b 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -87,7 +87,7 @@ or if you're running asynchronously: ::
 .. _Redis: https://redis.io/download
 .. _CookieCutter: https://github.com/cookiecutter/cookiecutter
 .. _createdb: https://www.postgresql.org/docs/current/static/app-createdb.html
-.. _initial PostgreSQL set up: http://web.archive.org/web/20190303010033/http://suite.opengeo.org/docs/latest/dataadmin/pgGettingStarted/firstconnect.html
+.. _initial PostgreSQL set up: https://web.archive.org/web/20190303010033/http://suite.opengeo.org/docs/latest/dataadmin/pgGettingStarted/firstconnect.html
 .. _postgres documentation: https://www.postgresql.org/docs/current/static/auth-pg-hba-conf.html
 .. _pre-commit: https://pre-commit.com/
 .. _direnv: https://direnv.net/

From 0d6d1744e3e7410cfe3184b036aab24d638dfa68 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 15 Nov 2021 09:06:22 -0800
Subject: [PATCH 1788/2840] Update django-allauth from 0.45.0 to 0.46.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 d174b012b..3309b44e2 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -32,7 +32,7 @@ uvicorn[standard]==0.15.0  # https://github.com/encode/uvicorn
 django==3.1.13  # pyup: < 3.2  # https://www.djangoproject.com/
 django-environ==0.8.1  # https://github.com/joke2k/django-environ
 django-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
-django-allauth==0.45.0  # https://github.com/pennersr/django-allauth
+django-allauth==0.46.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.13.0  # https://github.com/django-crispy-forms/django-crispy-forms
 crispy-bootstrap5==0.6  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.use_compressor == "y" %}

From f8897bfdff9681a28bc07b3361ab51bddb71a27c Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 15 Nov 2021 17:17:26 +0000
Subject: [PATCH 1789/2840] Add spaces in markdown columns formatting to make
 it easier to edit

---
 scripts/create_django_issue.py | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/scripts/create_django_issue.py b/scripts/create_django_issue.py
index 4b270b701..9c6799500 100644
--- a/scripts/create_django_issue.py
+++ b/scripts/create_django_issue.py
@@ -249,8 +249,11 @@ class GitHubManager:
                     package_name, info, needed_dj_version
                 )
                 requirements += (
-                    f"|{self._get_md_home_page_url(info).format(package_name)}"
-                    f"|{version}|{compat_version}|{icon}|\n"
+                    f"| {self._get_md_home_page_url(info).format(package_name)} "
+                    f"| {version} "
+                    f"| {compat_version} "
+                    f"| {icon} "
+                    f"|\n"
                 )
         return requirements
 

From 69b2c2ad61aa01e3f3e2ed310d1ad9a9508f935d Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 16 Nov 2021 02:14:34 +0000
Subject: [PATCH 1790/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 83dc110d6..98251fc21 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-11-15]
+### Updated
+- Update django-allauth to 0.46.0 ([#3407](https://github.com/cookiecutter/cookiecutter-django/pull/3407))
+
 ## [2021-11-13]
 ### Fixed
 - Fix incorrect node version in `package.json` ([#3399](https://github.com/cookiecutter/cookiecutter-django/pull/3399))

From dbaf09a5e1f987cd904d734963d7754c2f3b731c Mon Sep 17 00:00:00 2001
From: Chao Yang Wu <peteeelol@gmail.com>
Date: Tue, 16 Nov 2021 16:57:08 +0800
Subject: [PATCH 1791/2840] Fix ungraceful Celery workers shutdown in container
 (#3405)

---
 .../compose/production/django/celery/beat/start                 | 2 +-
 .../compose/production/django/celery/flower/start               | 2 +-
 .../compose/production/django/celery/worker/start               | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start b/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
index 20b93123a..42ddca910 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
+++ b/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
@@ -5,4 +5,4 @@ set -o pipefail
 set -o nounset
 
 
-celery -A config.celery_app beat -l INFO
+exec celery -A config.celery_app beat -l INFO
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start b/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start
index bd3c9f2fd..4180d6778 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start
+++ b/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start
@@ -4,7 +4,7 @@ set -o errexit
 set -o nounset
 
 
-celery \
+exec celery \
     -A config.celery_app \
     -b "${CELERY_BROKER_URL}" \
     flower \
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/worker/start b/{{cookiecutter.project_slug}}/compose/production/django/celery/worker/start
index 38fb77f35..af0c8f7b5 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/celery/worker/start
+++ b/{{cookiecutter.project_slug}}/compose/production/django/celery/worker/start
@@ -5,4 +5,4 @@ set -o pipefail
 set -o nounset
 
 
-celery -A config.celery_app worker -l INFO
+exec celery -A config.celery_app worker -l INFO

From f2ab3bd3bc75652047cb3acd2366ee2108334483 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 16 Nov 2021 08:57:42 +0000
Subject: [PATCH 1792/2840] 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 2be85ae76..c886c4c19 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1167,5 +1167,10 @@
     "name": "Diego Montes",
     "github_login": "d57montes",
     "twitter_username": ""
+  },
+  {
+    "name": "Chao Yang Wu",
+    "github_login": "goatwu1993",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index e2d855bc4..cce697f96 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -390,6 +390,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Chao Yang Wu</td>
+    <td>
+      <a href="https://github.com/goatwu1993">goatwu1993</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Charlie Macfarlane Brodie</td>
     <td>

From a20efdff7043c7338e61234d4a9b070201c59100 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 16 Nov 2021 04:28:28 -0500
Subject: [PATCH 1793/2840] Update black to 21.10b0 (#3408)

---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 4a3ec1919..ca3c335de 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-black==21.9b0
+black==21.10b0
 isort==5.10.1
 flake8==4.0.1
 flake8-isort==4.1.1
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 107fa68d3..b1864cc42 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -31,7 +31,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 flake8==4.0.1  # https://github.com/PyCQA/flake8
 flake8-isort==4.1.1  # https://github.com/gforcada/flake8-isort
 coverage==6.1.2  # https://github.com/nedbat/coveragepy
-black==21.9b0  # https://github.com/psf/black
+black==21.10b0  # 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 a4cb1ba2e97dda7dbaba3fb4a497c120c4c9ea06 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 16 Nov 2021 04:58:29 -0500
Subject: [PATCH 1794/2840] Update django-coverage-plugin to 2.0.2 (#3409)

---
 {{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 b1864cc42..70dec3d5c 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -44,5 +44,5 @@ factory-boy==3.2.1  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==3.2.2  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.1.5  # https://github.com/django-extensions/django-extensions
-django-coverage-plugin==2.0.1  # https://github.com/nedbat/django_coverage_plugin
+django-coverage-plugin==2.0.2  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.4.0  # https://github.com/pytest-dev/pytest-django

From fdeb8d0adb494d3cfd5a4c17d72da4af678c7d2d Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 16 Nov 2021 05:02:24 -0500
Subject: [PATCH 1795/2840] Update redis to 4.0.0 (#3406)

---
 {{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 3309b44e2..29feccf8a 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -12,7 +12,7 @@ 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 %}
-redis==3.5.3  # https://github.com/andymccurdy/redis-py
+redis==4.0.0  # https://github.com/andymccurdy/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}

From d4bcfeb342daa867c99c0fd224055c6202a7802c Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 16 Nov 2021 05:07:03 -0500
Subject: [PATCH 1796/2840] Update psycopg2 to 2.9.2 (#3410)

---
 {{cookiecutter.project_slug}}/requirements/local.txt      | 2 +-
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 70dec3d5c..35a4acc78 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -3,7 +3,7 @@
 Werkzeug==2.0.2 # https://github.com/pallets/werkzeug
 ipdb==0.13.9  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
-psycopg2==2.9.1  # https://github.com/psycopg/psycopg2
+psycopg2==2.9.2  # https://github.com/psycopg/psycopg2
 {%- else %}
 psycopg2-binary==2.9.1  # https://github.com/psycopg/psycopg2
 {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 2553aa3e0..8e262b00c 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -3,7 +3,7 @@
 -r base.txt
 
 gunicorn==20.1.0  # https://github.com/benoitc/gunicorn
-psycopg2==2.9.1  # https://github.com/psycopg/psycopg2
+psycopg2==2.9.2  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}

From 96e7503f1fe17557c367692b344223211e6e024b Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 16 Nov 2021 05:19:26 -0500
Subject: [PATCH 1797/2840] Update psycopg2-binary to 2.9.2 (#3411)

---
 {{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 35a4acc78..5383b07cb 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -5,7 +5,7 @@ ipdb==0.13.9  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.9.2  # https://github.com/psycopg/psycopg2
 {%- else %}
-psycopg2-binary==2.9.1  # https://github.com/psycopg/psycopg2
+psycopg2-binary==2.9.2  # https://github.com/psycopg/psycopg2
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %}
 watchgod==0.7  # https://github.com/samuelcolvin/watchgod

From cdc85cf4f6aa3c1b9c4561e2d95c2806c7ff5fd1 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 16 Nov 2021 12:54:05 +0000
Subject: [PATCH 1798/2840] Add type hints to update changelog script

---
 scripts/update_changelog.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/scripts/update_changelog.py b/scripts/update_changelog.py
index 55b4d416a..5ec5d25ac 100644
--- a/scripts/update_changelog.py
+++ b/scripts/update_changelog.py
@@ -1,8 +1,10 @@
 import datetime as dt
 import os
 from pathlib import Path
+from typing import Iterable
 
 from github import Github
+import github.PullRequest
 from jinja2 import Template
 
 CURRENT_FILE = Path(__file__)
@@ -39,7 +41,7 @@ def main() -> None:
     file_path.write_text(updated_content)
 
 
-def iter_pulls():
+def iter_pulls() -> Iterable[github.PullRequest.PullRequest]:
     """Fetch merged pull requests at the date we're interested in."""
     repo = Github(login_or_token=GITHUB_TOKEN).get_repo(GITHUB_REPO)
     recent_pulls = repo.get_pulls(
@@ -50,7 +52,9 @@ def iter_pulls():
             yield pull
 
 
-def group_pulls_by_change_type(pull_requests_list):
+def group_pulls_by_change_type(
+    pull_requests_list: list[github.PullRequest.PullRequest],
+) -> dict[str, list[github.PullRequest.PullRequest]]:
     """Group pull request by change type."""
     grouped_pulls = {
         "Changed": [],
@@ -69,7 +73,7 @@ def group_pulls_by_change_type(pull_requests_list):
     return grouped_pulls
 
 
-def generate_md(grouped_pulls):
+def generate_md(grouped_pulls: dict[str, list[github.PullRequest.PullRequest]]) -> str:
     """Generate markdown file from Jinja template."""
     changelog_template = ROOT / ".github" / "changelog-template.md"
     template = Template(changelog_template.read_text(), autoescape=True)

From ca14c3db566f9d5cc72806fe5a4e4c3ad79ed492 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 16 Nov 2021 19:47:39 +0000
Subject: [PATCH 1799/2840] Bump Python runtime for Heroku

---
 {{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 febc1b8cf..425359e69 100644
--- a/{{cookiecutter.project_slug}}/runtime.txt
+++ b/{{cookiecutter.project_slug}}/runtime.txt
@@ -1 +1 @@
-python-3.9.8
+python-3.9.9

From 9f359939a9c0f6342b97e2e5705d45829f70da78 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 16 Nov 2021 20:29:43 +0000
Subject: [PATCH 1800/2840] Upgrade JS dependencies and upgrade to node 16
 (#3400)

---
 .github/workflows/ci.yml                      |  7 ++++-
 docs/developing-locally.rst                   | 20 +++++++++++--
 docs/live-reloading-and-sass-compilation.rst  | 24 ----------------
 tests/test_bare.sh                            | 10 +++++++
 .../compose/local/node/Dockerfile             |  2 +-
 .../compose/production/django/Dockerfile      |  2 +-
 {{cookiecutter.project_slug}}/gulpfile.js     |  2 +-
 {{cookiecutter.project_slug}}/package.json    | 28 ++++++++++---------
 .../templates/base.html                       |  4 +--
 9 files changed, 54 insertions(+), 45 deletions(-)
 delete mode 100644 docs/live-reloading-and-sass-compilation.rst

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 169af5277..cb3a96609 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -60,6 +60,8 @@ jobs:
         script:
           - name: With Celery
             args: "use_celery=y use_compressor=y"
+          - name: With Gulp
+            args: "js_task_runner=Gulp custom_bootstrap_compilation=y"
 
     name: "${{ matrix.script.name }} Bare metal"
     services:
@@ -83,6 +85,9 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.9"
+      - uses: actions/setup-node@v2
+        with:
+          node-version: "16"
       - name: Bare Metal ${{ matrix.script.name }}
         run: sh tests/test_bare.sh ${{ matrix.script.args }}
diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index 88a71b30b..a9a54a03b 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -154,8 +154,24 @@ To run Celery locally, make sure redis-server is installed (instructions are ava
 Sass Compilation & Live Reloading
 ---------------------------------
 
-If you’d like to take advantage of live reloading and Sass compilation you can do so with a little
-bit of preparation, see :ref:`sass-compilation-live-reload`.
+If you've opted for Gulp as JS task runner, the project comes configured with `Sass`_ compilation and `live reloading`_. As you change you Sass/JS source files, the task runner will automatically rebuild the corresponding CSS and JS assets and reload them in your browser without refreshing the page.
+
+#. Make sure that `Node.js`_ v16 is installed on your machine.
+#. In the project root, install the JS dependencies with::
+
+    $ npm install
+
+#. Now - with your virtualenv activated - start the application by running::
+
+    $ npm run dev
+
+   The app will now run with live reloading enabled, applying front-end changes dynamically.
+
+.. note:: The task will start 2 processes in parallel: the static assets build loop on one side, and the Django server on the other. You don NOT need to run Django as your would normally with ``manage.py runserver``.
+
+.. _Node.js: http://nodejs.org/download/
+.. _Sass: https://sass-lang.com/
+.. _live reloading: https://browsersync.io
 
 Summary
 -------
diff --git a/docs/live-reloading-and-sass-compilation.rst b/docs/live-reloading-and-sass-compilation.rst
deleted file mode 100644
index a55b4fd8c..000000000
--- a/docs/live-reloading-and-sass-compilation.rst
+++ /dev/null
@@ -1,24 +0,0 @@
-.. _sass-compilation-live-reload:
-
-Sass Compilation & Live Reloading
-=================================
-
-If you'd like to take advantage of `live reload`_ and Sass compilation:
-
-- Make sure that nodejs_ is installed. Then in the project root run::
-
-    $ npm install
-
-.. _nodejs: http://nodejs.org/download/
-
-- Now you just need::
-
-    $ npm run dev
-
-The base app will now run as it would with the usual ``manage.py runserver`` but with live reloading and Sass compilation enabled.
-When changing your Sass files, they will be automatically recompiled and change will be reflected in your browser without refreshing.
-
-To get live reloading to work you'll probably need to install an `appropriate browser extension`_
-
-.. _live reload: http://livereload.com/
-.. _appropriate browser extension: http://livereload.com/extensions/
diff --git a/tests/test_bare.sh b/tests/test_bare.sh
index 1f52d91b6..53162f914 100755
--- a/tests/test_bare.sh
+++ b/tests/test_bare.sh
@@ -35,3 +35,13 @@ pre-commit run --show-diff-on-failure -a
 
 # run the project's tests
 pytest
+
+if [ -f "package.json" ]
+then
+    npm install
+    if [ -f "gulpfile.js" ]
+    then
+        npm run build
+    fi
+fi
+
diff --git a/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile
index f9976e206..8062fa689 100644
--- a/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:10-stretch-slim
+FROM node:16-bullseye-slim
 
 WORKDIR /app
 
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index fa969f1c8..1dd47a2f7 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -1,7 +1,7 @@
 ARG PYTHON_VERSION=3.9-slim-bullseye
 
 {% if cookiecutter.js_task_runner == 'Gulp' -%}
-FROM node:10-stretch-slim as client-builder
+FROM node:16-bullseye-slim as client-builder
 
 ARG APP_HOME=/app
 WORKDIR ${APP_HOME}
diff --git a/{{cookiecutter.project_slug}}/gulpfile.js b/{{cookiecutter.project_slug}}/gulpfile.js
index 06d2cde16..387a137af 100644
--- a/{{cookiecutter.project_slug}}/gulpfile.js
+++ b/{{cookiecutter.project_slug}}/gulpfile.js
@@ -19,7 +19,7 @@ const plumber = require('gulp-plumber')
 const postcss = require('gulp-postcss')
 const reload = browserSync.reload
 const rename = require('gulp-rename')
-const sass = require('gulp-sass')
+const sass = require('gulp-sass')(require('sass'))
 const spawn = require('child_process').spawn
 const uglify = require('gulp-uglify-es').default
 
diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json
index ed3f724e1..ac868d95f 100644
--- a/{{cookiecutter.project_slug}}/package.json
+++ b/{{cookiecutter.project_slug}}/package.json
@@ -5,25 +5,27 @@
   "devDependencies": {
     {% if cookiecutter.js_task_runner == 'Gulp' -%}
     {% if cookiecutter.custom_bootstrap_compilation == 'y' -%}
-    "bootstrap": "5.1.1",
+    "bootstrap": "^5.1.3",
     "gulp-concat": "^2.6.1",
-    "@popperjs/core": "2.9.2",
+    "@popperjs/core": "^2.10.2",
     {% endif -%}
-    "autoprefixer": "^9.4.7",
-    "browser-sync": "^2.14.0",
-    "cssnano": "^4.1.10",
-    "gulp": "^4.0.0",
-    "gulp-imagemin": "^5.0.3",
+    "autoprefixer": "^10.4.0",
+    "browser-sync": "^2.27.7",
+    "cssnano": "^5.0.11",
+    "gulp": "^4.0.2",
+    "gulp-imagemin": "^7.1.0",
     "gulp-plumber": "^1.2.1",
-    "gulp-postcss": "^8.0.0",
-    "gulp-rename": "^1.2.2",
-    "gulp-sass": "^4.0.2",
-    "gulp-uglify-es": "^1.0.4",
-    "pixrem": "^5.0.0"
+    "gulp-postcss": "^9.0.1",
+    "gulp-rename": "^2.0.0",
+    "gulp-sass": "^5.0.0",
+    "gulp-uglify-es": "^3.0.0",
+    "pixrem": "^5.0.0",
+    "postcss": "^8.3.11",
+    "sass": "^1.43.4"
     {%- endif %}
   },
   "engines": {
-    "node": "10"
+    "node": "16"
   },
   "browserslist": [
     "last 2 versions"
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
index 133a0dccc..408696b2d 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -13,7 +13,7 @@
     {% block css %}
     {%- endraw %}{% if cookiecutter.custom_bootstrap_compilation == "n" %}{% raw %}
     <!-- Latest compiled and minified Bootstrap CSS -->
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.1/css/bootstrap.min.css" integrity="sha512-6KY5s6UI5J7SVYuZB4S/CZMyPylqyyNZco376NM2Z8Sb8OxEdp02e1jkKk/wZxIEmjQ6DRCEBhni+gpr9c4tvA==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.3/css/bootstrap.min.css" integrity="sha512-GQGU0fMMi238uA+a/bdWJfpUGKUkBdgfFdgBm72SUQ6BeyWjoY/ton0tEjH+OSH9iP4Dfh+7HM0I9f5eR0L/4w==" crossorigin="anonymous" referrerpolicy="no-referrer" />
     {%- endraw %}{% endif %}{% raw %}
 
     <!-- Your stuff: Third-party CSS libraries go here -->
@@ -37,7 +37,7 @@
       {%- endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %}
       {%- endraw %}{% else %}{% raw %}
       <!-- Bootstrap JS -->
-      <script defer src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.1/js/bootstrap.min.js" integrity="sha512-ewfXo9Gq53e1q1+WDTjaHAGZ8UvCWq0eXONhwDuIoaH8xz2r96uoAYaQCm1oQhnBfRXrvJztNXFsTloJfgbL5Q==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+      <script defer src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.3/js/bootstrap.min.js" integrity="sha512-OvBgP9A2JBgiRad/mM36mkzXSXaJE9BEIENnVEmeZdITvwT09xnxLtT4twkCa8m/loMbPHsvPl0T8lRGVBwjlQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
       <!-- Your stuff: Third-party javascript libraries go here -->
       {%- endraw %}{% endif %}{% raw %}
 

From 0c2d0b08a0a6d8d0bd830a911cec718291d8824d Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 16 Nov 2021 22:36:09 +0000
Subject: [PATCH 1801/2840] Fix Django Trove classifier

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

diff --git a/setup.py b/setup.py
index e0f334b8e..f8899cde3 100644
--- a/setup.py
+++ b/setup.py
@@ -34,7 +34,7 @@ setup(
     classifiers=[
         "Development Status :: 4 - Beta",
         "Environment :: Console",
-        "Framework :: Django :: 3.0",
+        "Framework :: Django :: 3.1",
         "Intended Audience :: Developers",
         "Natural Language :: English",
         "License :: OSI Approved :: BSD License",

From c8ae156e8eeaf84431d603421d31304a04bf38bd Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 17 Nov 2021 02:14:40 +0000
Subject: [PATCH 1802/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98251fc21..c8f2ee033 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,18 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## [2021-11-16]
+### Changed
+- Upgrade JS dependencies and upgrade to node 16 ([#3400](https://github.com/cookiecutter/cookiecutter-django/pull/3400))
+### Fixed
+- Fix ungraceful Celery workers shutdown in container ([#3405](https://github.com/cookiecutter/cookiecutter-django/pull/3405))
+### Updated
+- Update psycopg2-binary to 2.9.2 ([#3411](https://github.com/cookiecutter/cookiecutter-django/pull/3411))
+- Update psycopg2 to 2.9.2 ([#3410](https://github.com/cookiecutter/cookiecutter-django/pull/3410))
+- Update redis to 4.0.0 ([#3406](https://github.com/cookiecutter/cookiecutter-django/pull/3406))
+- Update django-coverage-plugin to 2.0.2 ([#3409](https://github.com/cookiecutter/cookiecutter-django/pull/3409))
+- Update black to 21.10b0 ([#3408](https://github.com/cookiecutter/cookiecutter-django/pull/3408))
+
 ## [2021-11-15]
 ### Updated
 - Update django-allauth to 0.46.0 ([#3407](https://github.com/cookiecutter/cookiecutter-django/pull/3407))

From 98d9a3b169799680d68b138decf04f4ada6a8164 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 17 Nov 2021 03:51:53 -0500
Subject: [PATCH 1803/2840] Update black to 21.11b0 (#3414)

---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index ca3c335de..2ad130df9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-black==21.10b0
+black==21.11b0
 isort==5.10.1
 flake8==4.0.1
 flake8-isort==4.1.1
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 5383b07cb..991b90c29 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -31,7 +31,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 flake8==4.0.1  # https://github.com/PyCQA/flake8
 flake8-isort==4.1.1  # https://github.com/gforcada/flake8-isort
 coverage==6.1.2  # https://github.com/nedbat/coveragepy
-black==21.10b0  # https://github.com/psf/black
+black==21.11b0  # 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 f84fef3229df9b97de4ed601ad1212614ebecef4 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 17 Nov 2021 11:43:29 -0500
Subject: [PATCH 1804/2840] Update sentry-sdk to 1.5.0 (#3417)

---
 {{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 8e262b00c..84aa20263 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.2  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.4.3  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.5.0  # 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 b8f61dd558d2ec84c1d8bf0309e2daa29e5cf793 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 18 Nov 2021 02:14:31 +0000
Subject: [PATCH 1805/2840] Update Changelog

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c8f2ee033..4f5d125bd 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-11-17]
+### Updated
+- Update sentry-sdk to 1.5.0 ([#3417](https://github.com/cookiecutter/cookiecutter-django/pull/3417))
+- Update black to 21.11b0 ([#3414](https://github.com/cookiecutter/cookiecutter-django/pull/3414))
+
 ## [2021-11-16]
 ### Changed
 - Upgrade JS dependencies and upgrade to node 16 ([#3400](https://github.com/cookiecutter/cookiecutter-django/pull/3400))

From f49141d333f2966244bc9fbec29ff8ce9fdf14f4 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Thu, 18 Nov 2021 09:21:04 +0000
Subject: [PATCH 1806/2840] Bump version 3.1.13 -> 3.1.13-01

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

diff --git a/setup.py b/setup.py
index f8899cde3..b1be8f7a4 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.13"
+version = "3.1.13-01"
 
 if sys.argv[-1] == "tag":
     os.system(f'git tag -a {version} -m "version {version}"')

From 183ca2088a38f11e811697e733be5037bcba7f7e Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 18 Nov 2021 09:36:42 +0000
Subject: [PATCH 1807/2840] Switch template to calendar versioning & automate
 releases (#3415)

---
 .github/changelog-template.md          |   1 -
 .github/release-drafter.yml            |  29 -------
 .github/workflows/draft-release.yml    |  14 ----
 .github/workflows/update-changelog.yml |  15 ++--
 requirements.txt                       |   1 +
 scripts/update_changelog.py            | 108 ++++++++++++++++++++-----
 setup.py                               |  14 +---
 7 files changed, 100 insertions(+), 82 deletions(-)
 delete mode 100644 .github/release-drafter.yml
 delete mode 100644 .github/workflows/draft-release.yml

diff --git a/.github/changelog-template.md b/.github/changelog-template.md
index 2c0c512f7..50aab38e1 100644
--- a/.github/changelog-template.md
+++ b/.github/changelog-template.md
@@ -1,4 +1,3 @@
-## [{{merge_date.strftime('%Y-%m-%d')}}]
 {%- for change_type, pulls in grouped_pulls.items() %}
 {%- if pulls %}
 ### {{ change_type }}
diff --git a/.github/release-drafter.yml b/.github/release-drafter.yml
deleted file mode 100644
index 734a541af..000000000
--- a/.github/release-drafter.yml
+++ /dev/null
@@ -1,29 +0,0 @@
-categories:
-  - title: 'Breaking Changes'
-    labels:
-      - 'breaking'
-  - title: 'Major Changes'
-    labels:
-      - 'major'
-  - title: 'Minor Changes'
-    labels:
-      - 'enhancement'
-  - title: 'Bugfixes'
-    labels:
-      - 'bug'
-  - title: 'Removals'
-    labels:
-      - 'removed'
-  - title: 'Documentation updates'
-    labels:
-      - 'docs'
-
-exclude-labels:
-  - 'skip-changelog'
-  - 'update'
-  - 'project infrastructure'
-
-template: |
-  ## Changes
-
-  $CHANGES
diff --git a/.github/workflows/draft-release.yml b/.github/workflows/draft-release.yml
deleted file mode 100644
index 6c2d6620d..000000000
--- a/.github/workflows/draft-release.yml
+++ /dev/null
@@ -1,14 +0,0 @@
-name: Release Drafter
-
-on:
-  push:
-    branches:
-      - master
-
-jobs:
-  release_notes:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: release-drafter/release-drafter@v5
-        env:
-          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index 9b6111424..5fa53ceab 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -8,7 +8,10 @@ on:
   workflow_dispatch:
 
 jobs:
-  build:
+  release:
+    # Disables this workflow from running in a repository that is not part of the indicated organization/user
+    if: github.repository_owner == 'cookiecutter'
+
     runs-on: ubuntu-latest
 
     steps:
@@ -22,13 +25,11 @@ jobs:
       run: |
         python -m pip install --upgrade pip
         pip install -r requirements.txt
+    - name: Set git details
+      run: |
+        git config --global user.name "github-actions"
+        git config --global user.email "action@github.com"
     - name: Update list
       run: python scripts/update_changelog.py
       env:
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-
-    - name: Commit changes
-      uses: stefanzweifel/git-auto-commit-action@v4.12.0
-      with:
-        commit_message: Update Changelog
-        file_pattern: CHANGELOG.md
diff --git a/requirements.txt b/requirements.txt
index 2ad130df9..4e7e9bfdc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,5 +21,6 @@ pyyaml==6.0
 # Scripting
 # ------------------------------------------------------------------------------
 PyGithub==1.55
+gitpython==3.1.24
 jinja2==3.0.3
 requests==2.26.0
diff --git a/scripts/update_changelog.py b/scripts/update_changelog.py
index 5ec5d25ac..1ec9bde95 100644
--- a/scripts/update_changelog.py
+++ b/scripts/update_changelog.py
@@ -1,26 +1,31 @@
 import datetime as dt
 import os
+import re
 from pathlib import Path
 from typing import Iterable
 
-from github import Github
+import git
 import github.PullRequest
+import github.Repository
+from github import Github
 from jinja2 import Template
 
 CURRENT_FILE = Path(__file__)
 ROOT = CURRENT_FILE.parents[1]
-GITHUB_TOKEN = os.getenv("GITHUB_TOKEN", None)
-GITHUB_REPO = os.getenv("GITHUB_REPOSITORY", None)
-
-# Generate changelog for PRs merged yesterday
-MERGED_DATE = dt.date.today() - dt.timedelta(days=1)
+GITHUB_TOKEN = os.getenv("GITHUB_TOKEN")
+GITHUB_REPO = os.getenv("GITHUB_REPOSITORY")
+GIT_BRANCH = os.getenv("GITHUB_REF_NAME")
 
 
 def main() -> None:
     """
     Script entry point.
     """
-    merged_pulls = list(iter_pulls())
+    # Generate changelog for PRs merged yesterday
+    merged_date = dt.date.today() - dt.timedelta(days=1)
+    repo = Github(login_or_token=GITHUB_TOKEN).get_repo(GITHUB_REPO)
+    merged_pulls = list(iter_pulls(repo, merged_date))
+    print(f"Merged pull requests: {merged_pulls}")
     if not merged_pulls:
         print("Nothing was merged, existing.")
         return
@@ -29,26 +34,44 @@ def main() -> None:
     grouped_pulls = group_pulls_by_change_type(merged_pulls)
 
     # Generate portion of markdown
-    rendered_content = generate_md(grouped_pulls)
+    release_changes_summary = generate_md(grouped_pulls)
+    print(f"Summary of changes: {release_changes_summary}")
 
     # Update CHANGELOG.md file
-    file_path = ROOT / "CHANGELOG.md"
-    old_content = file_path.read_text()
-    updated_content = old_content.replace(
-        "<!-- GENERATOR_PLACEHOLDER -->",
-        f"<!-- GENERATOR_PLACEHOLDER -->\n\n{rendered_content}",
+    release = f"{merged_date:%Y.%m.%d}"
+    changelog_path = ROOT / "CHANGELOG.md"
+    write_changelog(changelog_path, release, release_changes_summary)
+    print(f"Wrote {changelog_path}")
+
+    # Update version
+    setup_py_path = ROOT / "setup.py"
+    update_version(setup_py_path, release)
+    print(f"Updated version in {setup_py_path}")
+
+    # Commit changes, create tag and push
+    update_git_repo([changelog_path, setup_py_path], release)
+
+    # Create GitHub release
+    github_release = repo.create_git_release(
+        tag=release,
+        name=release,
+        message=release_changes_summary,
     )
-    file_path.write_text(updated_content)
+    print(f"Created release on GitHub {github_release}")
 
 
-def iter_pulls() -> Iterable[github.PullRequest.PullRequest]:
+def iter_pulls(
+    repo: github.Repository.Repository,
+    merged_date: dt.date,
+) -> Iterable[github.PullRequest.PullRequest]:
     """Fetch merged pull requests at the date we're interested in."""
-    repo = Github(login_or_token=GITHUB_TOKEN).get_repo(GITHUB_REPO)
     recent_pulls = repo.get_pulls(
-        state="closed", sort="updated", direction="desc"
+        state="closed",
+        sort="updated",
+        direction="desc",
     ).get_page(0)
     for pull in recent_pulls:
-        if pull.merged and pull.merged_at.date() == MERGED_DATE:
+        if pull.merged and pull.merged_at.date() == merged_date:
             yield pull
 
 
@@ -77,7 +100,50 @@ def generate_md(grouped_pulls: dict[str, list[github.PullRequest.PullRequest]])
     """Generate markdown file from Jinja template."""
     changelog_template = ROOT / ".github" / "changelog-template.md"
     template = Template(changelog_template.read_text(), autoescape=True)
-    return template.render(merge_date=MERGED_DATE, grouped_pulls=grouped_pulls)
+    return template.render(grouped_pulls=grouped_pulls)
+
+
+def write_changelog(file_path: Path, release: str, content: str) -> None:
+    """Write Release details to the changelog file."""
+    content = f"## {release}\n{content}"
+    old_content = file_path.read_text()
+    updated_content = old_content.replace(
+        "<!-- GENERATOR_PLACEHOLDER -->",
+        f"<!-- GENERATOR_PLACEHOLDER -->\n\n{content}",
+    )
+    file_path.write_text(updated_content)
+
+
+def update_version(file_path: Path, release: str) -> None:
+    """Update template version in setup.py."""
+    old_content = file_path.read_text()
+    updated_content = re.sub(
+        r'\nversion = "\d+\.\d+\.\d+"\n',
+        f'\nversion = "{release}"\n',
+        old_content,
+    )
+    file_path.write_text(updated_content)
+
+
+def update_git_repo(paths: list[Path], release: str) -> None:
+    """Commit, tag changes in git repo and push to origin."""
+    repo = git.Repo(ROOT)
+    for path in paths:
+        repo.git.add(path)
+    message = f"Release {release}"
+
+    user = repo.git.config("--get", "user.name")
+    email = repo.git.config("--get", "user.email")
+
+    repo.git.commit(
+        m=message,
+        author=f"{user} <{email}>",
+    )
+    repo.git.tag("-a", release, m=message)
+    server = f"https://{GITHUB_TOKEN}@github.com/{GITHUB_REPO}.git"
+    print(f"Pushing changes to {GIT_BRANCH} branch of {GITHUB_REPO}")
+    repo.git.push(server, GIT_BRANCH)
+    repo.git.push("--tags", server, GIT_BRANCH)
 
 
 if __name__ == "__main__":
@@ -85,4 +151,8 @@ if __name__ == "__main__":
         raise RuntimeError(
             "No github repo, please set the environment variable GITHUB_REPOSITORY"
         )
+    if GIT_BRANCH is None:
+        raise RuntimeError(
+            "No git branch set, please set the GITHUB_REF_NAME environment variable"
+        )
     main()
diff --git a/setup.py b/setup.py
index b1be8f7a4..9b85150fa 100644
--- a/setup.py
+++ b/setup.py
@@ -1,21 +1,11 @@
 #!/usr/bin/env python
-
-import os
-import sys
-
 try:
     from setuptools import setup
 except ImportError:
     from distutils.core import setup
 
-# 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.13-01"
-
-if sys.argv[-1] == "tag":
-    os.system(f'git tag -a {version} -m "version {version}"')
-    os.system("git push --tags")
-    sys.exit()
+# We use calendar versioning
+version = "2021.11.17"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 177c0df0a633e72a6d044480dc0a4fc981865ccf Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 18 Nov 2021 04:50:59 -0500
Subject: [PATCH 1808/2840] Update redis to 4.0.1 (#3416)

---
 {{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 29feccf8a..aab079070 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -12,7 +12,7 @@ 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 %}
-redis==4.0.0  # https://github.com/andymccurdy/redis-py
+redis==4.0.1  # https://github.com/andymccurdy/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}

From 57cbf8c2a8cc195bbe160fa0540173df7f36d94f Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 18 Nov 2021 04:54:24 -0500
Subject: [PATCH 1809/2840] Update black to 21.11b1 (#3421)

---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 4e7e9bfdc..84c3f4657 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-black==21.11b0
+black==21.11b1
 isort==5.10.1
 flake8==4.0.1
 flake8-isort==4.1.1
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 991b90c29..7770d48e7 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -31,7 +31,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 flake8==4.0.1  # https://github.com/PyCQA/flake8
 flake8-isort==4.1.1  # https://github.com/gforcada/flake8-isort
 coverage==6.1.2  # https://github.com/nedbat/coveragepy
-black==21.11b0  # https://github.com/psf/black
+black==21.11b1  # 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 99a8e35dbba44cac6fdfe73021c02a1e42fb07a5 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 19 Nov 2021 02:15:50 +0000
Subject: [PATCH 1810/2840] Release 2021.11.18

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4f5d125bd..1430cd6eb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2021.11.18
+
+### Changed
+- Switch template to calendar versioning &amp; automate releases ([#3415](https://github.com/cookiecutter/cookiecutter-django/pull/3415))
+### Updated
+- Update black to 21.11b1 ([#3421](https://github.com/cookiecutter/cookiecutter-django/pull/3421))
+- Update redis to 4.0.1 ([#3416](https://github.com/cookiecutter/cookiecutter-django/pull/3416))
+
 ## [2021-11-17]
 ### Updated
 - Update sentry-sdk to 1.5.0 ([#3417](https://github.com/cookiecutter/cookiecutter-django/pull/3417))
diff --git a/setup.py b/setup.py
index 9b85150fa..69f2a2034 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.11.17"
+version = "2021.11.18"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 0cacdd7ccac73a34f17a24209568ff66f38ae51e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 19 Nov 2021 11:55:43 +0000
Subject: [PATCH 1811/2840] Auto-update pre-commit hooks (#3420)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 {{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 9aae466c7..19d245d0e 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.10b0
+    rev: 21.11b1
     hooks:
       - id: black
 

From f8bc0cde4b3069386df19d4539fc5fc74721439b Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 19 Nov 2021 03:56:07 -0800
Subject: [PATCH 1812/2840] Update celery from 5.2.0 to 5.2.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 aab079070..f73c1cd5b 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -17,7 +17,7 @@ redis==4.0.1  # https://github.com/andymccurdy/redis-py
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
-celery==5.2.0  # pyup: < 6.0  # https://github.com/celery/celery
+celery==5.2.1  # 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==1.0.0  # https://github.com/mher/flower

From 57b7623225f489497438fb297b2db6d585340a04 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Fri, 19 Nov 2021 21:49:13 +0000
Subject: [PATCH 1813/2840] Build all branches

---
 .github/workflows/ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index cb3a96609..8b506eeec 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,7 +2,6 @@ name: CI
 
 on:
   push:
-    branches: [ master ]
   pull_request:
 
 jobs:

From b0dbee3c17c90caab166c90e75b83846aa03a981 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Fri, 19 Nov 2021 21:52:04 +0000
Subject: [PATCH 1814/2840] Quote Python versions

---
 .github/workflows/ci.yml                    | 4 ++--
 .github/workflows/django-issue-checker.yml  | 2 +-
 .github/workflows/pre-commit-autoupdate.yml | 2 +-
 .github/workflows/update-changelog.yml      | 2 +-
 .github/workflows/update-contributors.yml   | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8b506eeec..ff54e3d19 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.9"
       - name: Install dependencies
         run: |
           python -m pip install -U pip
@@ -47,7 +47,7 @@ jobs:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.9"
       - name: Docker ${{ matrix.script.name }}
         run: sh tests/test_docker.sh ${{ matrix.script.args }}
 
diff --git a/.github/workflows/django-issue-checker.yml b/.github/workflows/django-issue-checker.yml
index 9866578c7..8fc91cf28 100644
--- a/.github/workflows/django-issue-checker.yml
+++ b/.github/workflows/django-issue-checker.yml
@@ -17,7 +17,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2.2.2
       with:
-        python-version: 3.9
+        python-version: "3.9"
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml
index 5c16f7484..dbc61de5f 100644
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -16,7 +16,7 @@ jobs:
     - uses: actions/checkout@v2
     - uses: actions/setup-python@v2
       with:
-        python-version: 3.9
+        python-version: "3.9"
 
     - name: Install pre-commit
       run: pip install pre-commit
diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index 5fa53ceab..3cfcc26b9 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -20,7 +20,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: 3.9
+        python-version: "3.9"
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 88f08d679..3835428cf 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -15,7 +15,7 @@ jobs:
     - name: Set up Python
       uses: actions/setup-python@v2
       with:
-        python-version: 3.9
+        python-version: "3.9"
     - name: Install dependencies
       run: |
         python -m pip install --upgrade pip

From 401b4a6f23471f59d2ff5aa76d324a082643964c Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Fri, 19 Nov 2021 21:53:51 +0000
Subject: [PATCH 1815/2840] Reference official actions using major version only

---
 .github/workflows/django-issue-checker.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/django-issue-checker.yml b/.github/workflows/django-issue-checker.yml
index 8fc91cf28..ce2ad5d68 100644
--- a/.github/workflows/django-issue-checker.yml
+++ b/.github/workflows/django-issue-checker.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2.2.2
+    - uses: actions/setup-python@v2
       with:
         python-version: "3.9"
     - name: Install dependencies

From 6542067138c4428db3d22e0d690949d2cede2cf4 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Fri, 19 Nov 2021 22:06:56 +0000
Subject: [PATCH 1816/2840] Auto-format YAML in the .github folder

---
 .github/FUNDING.yml                         |  2 +-
 .github/workflows/django-issue-checker.yml  | 27 ++++----
 .github/workflows/issue-manager.yml         | 72 ++++++++++-----------
 .github/workflows/pre-commit-autoupdate.yml | 39 ++++++-----
 .github/workflows/update-changelog.yml      | 34 +++++-----
 .github/workflows/update-contributors.yml   | 32 ++++-----
 6 files changed, 102 insertions(+), 104 deletions(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index ced9c732b..53a486671 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -9,4 +9,4 @@ community_bridge: # Replace with a single Community Bridge project-name e.g., cl
 liberapay: # Replace with a single Liberapay username
 issuehunt: # Replace with a single IssueHunt username
 otechie: # Replace with a single Otechie username
-custom: ['https://www.patreon.com/browniebroke']
+custom: ["https://www.patreon.com/browniebroke"]
diff --git a/.github/workflows/django-issue-checker.yml b/.github/workflows/django-issue-checker.yml
index ce2ad5d68..ced0111ac 100644
--- a/.github/workflows/django-issue-checker.yml
+++ b/.github/workflows/django-issue-checker.yml
@@ -5,24 +5,23 @@ name: Django Issue Checker
 
 on:
   schedule:
-  - cron: "28 5 * * *"
+    - cron: "28 5 * * *"
   # Manual trigger
   workflow_dispatch:
 
-
 jobs:
   issue-manager:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
-      with:
-        python-version: "3.9"
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements.txt
-    - name: Create Django Major Issue
-      run: python scripts/create_django_issue.py
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: "3.9"
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+      - name: Create Django Major Issue
+        run: python scripts/create_django_issue.py
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/issue-manager.yml b/.github/workflows/issue-manager.yml
index 6e272f75f..7a0e8a549 100644
--- a/.github/workflows/issue-manager.yml
+++ b/.github/workflows/issue-manager.yml
@@ -15,7 +15,7 @@ name: Issue Manager
 on:
   # Every day at midnight
   schedule:
-  - cron: "0 0 * * *"
+    - cron: "0 0 * * *"
   # Manual trigger
   workflow_dispatch:
 
@@ -23,40 +23,40 @@ jobs:
   issue-manager:
     runs-on: ubuntu-latest
     steps:
-    - uses: tiangolo/issue-manager@0.4.0
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
+      - uses: tiangolo/issue-manager@0.4.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
 
-        config: >
-          {
-            "answered": {
-              "delay": 864000,
-              "message": "Assuming the original issue was solved, it will be automatically closed now.",
-              "users": [
-               "pydanny",
-               "audreyr",
-               "luzfcb",
-               "theskumar",
-               "jayfk",
-               "burhan",
-               "webyneter",
-               "browniebroke",
-               "sfdye"
-              ]
-            },
-            "waiting": {
-              "delay": 864000,
-              "message": "Automatically closing. To re-open, please provide the additional information requested.",
-              "users": [
-                "pydanny",
-                "audreyr",
-                "luzfcb",
-                "theskumar",
-                "jayfk",
-                "burhan",
-                "webyneter",
-                "browniebroke",
-                "sfdye"
-              ]
+          config: >
+            {
+              "answered": {
+                "delay": 864000,
+                "message": "Assuming the original issue was solved, it will be automatically closed now.",
+                "users": [
+                 "pydanny",
+                 "audreyr",
+                 "luzfcb",
+                 "theskumar",
+                 "jayfk",
+                 "burhan",
+                 "webyneter",
+                 "browniebroke",
+                 "sfdye"
+                ]
+              },
+              "waiting": {
+                "delay": 864000,
+                "message": "Automatically closing. To re-open, please provide the additional information requested.",
+                "users": [
+                  "pydanny",
+                  "audreyr",
+                  "luzfcb",
+                  "theskumar",
+                  "jayfk",
+                  "burhan",
+                  "webyneter",
+                  "browniebroke",
+                  "sfdye"
+                ]
+              }
             }
-          }
diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml
index dbc61de5f..dd3c4dd68 100644
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -1,36 +1,35 @@
 # Run pre-commit autoupdate every day at midnight
 # and create a pull request if any changes
 
-
 name: Pre-commit auto-update
 
 on:
   schedule:
-  - cron: "0 0 * * *"
+    - cron: "0 0 * * *"
   workflow_dispatch: # to trigger manually
 
 jobs:
   auto-update:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
-    - uses: actions/setup-python@v2
-      with:
-        python-version: "3.9"
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: "3.9"
 
-    - name: Install pre-commit
-      run: pip install pre-commit
+      - name: Install pre-commit
+        run: pip install pre-commit
 
-    - name: Run pre-commit autoupdate
-      working-directory: "{{cookiecutter.project_slug}}"
-      run: pre-commit autoupdate
+      - name: Run pre-commit autoupdate
+        working-directory: "{{cookiecutter.project_slug}}"
+        run: pre-commit autoupdate
 
-    - name: Create Pull Request
-      uses: peter-evans/create-pull-request@v3.11.0
-      with:
-        token: ${{ secrets.GITHUB_TOKEN }}
-        branch: update/pre-commit-autoupdate
-        title: Auto-update pre-commit hooks
-        commit-message: Auto-update pre-commit hooks
-        body: Update versions of tools in pre-commit configs to latest version
-        labels: update
+      - name: Create Pull Request
+        uses: peter-evans/create-pull-request@v3.11.0
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+          branch: update/pre-commit-autoupdate
+          title: Auto-update pre-commit hooks
+          commit-message: Auto-update pre-commit hooks
+          body: Update versions of tools in pre-commit configs to latest version
+          labels: update
diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index 3cfcc26b9..593ee1500 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -15,21 +15,21 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
 
-    - name: Set up Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: "3.9"
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements.txt
-    - name: Set git details
-      run: |
-        git config --global user.name "github-actions"
-        git config --global user.email "action@github.com"
-    - name: Update list
-      run: python scripts/update_changelog.py
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: "3.9"
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+      - name: Set git details
+        run: |
+          git config --global user.name "github-actions"
+          git config --global user.email "action@github.com"
+      - name: Update list
+        run: python scripts/update_changelog.py
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 3835428cf..0f3508dc6 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -10,21 +10,21 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2
+      - uses: actions/checkout@v2
 
-    - name: Set up Python
-      uses: actions/setup-python@v2
-      with:
-        python-version: "3.9"
-    - name: Install dependencies
-      run: |
-        python -m pip install --upgrade pip
-        pip install -r requirements.txt
-    - name: Update list
-      run: python scripts/update_contributors.py
+      - name: Set up Python
+        uses: actions/setup-python@v2
+        with:
+          python-version: "3.9"
+      - name: Install dependencies
+        run: |
+          python -m pip install --upgrade pip
+          pip install -r requirements.txt
+      - name: Update list
+        run: python scripts/update_contributors.py
 
-    - name: Commit changes
-      uses: stefanzweifel/git-auto-commit-action@v4.12.0
-      with:
-        commit_message: Update Contributors
-        file_pattern: CONTRIBUTORS.md .github/contributors.json
+      - name: Commit changes
+        uses: stefanzweifel/git-auto-commit-action@v4.12.0
+        with:
+          commit_message: Update Contributors
+          file_pattern: CONTRIBUTORS.md .github/contributors.json

From 9547b172e5bb8e408bd9ff949a2c2762814d92a3 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 20 Nov 2021 00:13:01 +0000
Subject: [PATCH 1817/2840] Update repos for pre-commit hooks (#3424)

* Update repos for pre-commit hooks

Some of them have moved places

* Adjust formatting
---
 .../.pre-commit-config.yaml                     | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index 19d245d0e..22c6d07db 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -1,4 +1,4 @@
-exclude: 'docs|node_modules|migrations|.git|.tox'
+exclude: "docs|node_modules|migrations|.git|.tox"
 default_stages: [commit]
 fail_fast: true
 
@@ -15,21 +15,20 @@ repos:
     hooks:
       - id: black
 
-  - repo: https://github.com/timothycrosley/isort
+  - repo: https://github.com/PyCQA/isort
     rev: 5.10.1
     hooks:
       - id: isort
 
-  - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.9.2
+  - repo: https://github.com/PyCQA/flake8
+    rev: 4.0.1
     hooks:
       - id: flake8
-        args: ['--config=setup.cfg']
+        args: ["--config=setup.cfg"]
         additional_dependencies: [flake8-isort]
 
-
 # sets up .pre-commit-ci.yaml to ensure pre-commit dependencies stay up to date
 ci:
-    autoupdate_schedule: weekly
-    skip: []
-    submodules: false
+  autoupdate_schedule: weekly
+  skip: []
+  submodules: false

From 5dc3bbc074dd864f688f0fb875313be8fa764956 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 20 Nov 2021 02:16:15 +0000
Subject: [PATCH 1818/2840] Release 2021.11.19

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1430cd6eb..d7ade3ec1 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.11.19
+
+### Updated
+- Update celery to 5.2.1 ([#3423](https://github.com/cookiecutter/cookiecutter-django/pull/3423))
+- Auto-update pre-commit hooks ([#3420](https://github.com/cookiecutter/cookiecutter-django/pull/3420))
+
 ## 2021.11.18
 
 ### Changed
diff --git a/setup.py b/setup.py
index 69f2a2034..783d9218c 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.11.18"
+version = "2021.11.19"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From dfbce8afdf5b10981e796a5b4cbce6038eca3c6f Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sat, 20 Nov 2021 10:47:37 +0000
Subject: [PATCH 1819/2840] Don't run scheduled workflow on forks

---
 .github/workflows/django-issue-checker.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/django-issue-checker.yml b/.github/workflows/django-issue-checker.yml
index ced0111ac..e071968ff 100644
--- a/.github/workflows/django-issue-checker.yml
+++ b/.github/workflows/django-issue-checker.yml
@@ -11,6 +11,9 @@ on:
 
 jobs:
   issue-manager:
+    # Disables this workflow from running in a repository that is not part of the indicated organization/user
+    if: github.repository_owner == 'cookiecutter'
+
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2

From d00e84ebef794ace836ac980ace0a23b08231524 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sat, 20 Nov 2021 12:10:00 +0000
Subject: [PATCH 1820/2840] Fix parsing of edited status in Django issue script

---
 scripts/create_django_issue.py | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/scripts/create_django_issue.py b/scripts/create_django_issue.py
index 9c6799500..7341fb42e 100644
--- a/scripts/create_django_issue.py
+++ b/scripts/create_django_issue.py
@@ -193,7 +193,9 @@ class GitHubManager:
         # updated packages, or known releases that will happen but haven't yet
         if issue := self.existing_issues.get(needed_dj_version):
             if index := issue.body.find(package_name):
-                name, _current, prev_compat, ok = issue.body[index:].split("|", 4)[:4]
+                name, _current, prev_compat, ok = [
+                    s.strip() for s in issue.body[index:].split("|", 4)[:4]
+                ]
                 if ok in ("✅", "❓", "🕒"):
                     return prev_compat, ok
 
@@ -272,7 +274,7 @@ class GitHubManager:
             print(f"Handling GitHub issue for Django {version}")
             md_content = self.generate_markdown(version)
             print(f"Generated markdown:\n\n{md_content}")
-            self.create_or_edit_issue(version, md_content)
+            # self.create_or_edit_issue(version, md_content)
 
 
 def main() -> None:

From 6ca4cc9ca2500a8e346cead2679bed059d95a2dd Mon Sep 17 00:00:00 2001
From: mpoli <polimarco@gmail.com>
Date: Sat, 20 Nov 2021 13:58:57 -0300
Subject: [PATCH 1821/2840] Bump pre-commit/action to 2.0.3 (#3426)

---
 {{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 1e17068ee..dcc419958 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -32,7 +32,7 @@ jobs:
       # Getting only staged files can be tricky in case a new PR is opened
       # since the action is run on a branch in detached head state
       - name: Install and Run Pre-commit 
-        uses: pre-commit/action@v2.0.0
+        uses: pre-commit/action@v2.0.3
 
   # With no caching at all the entire ci process takes 4m 30s to complete!
   pytest:

From acd9912be63901ade8da46af72816ed036b3647b Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 20 Nov 2021 16:59:30 +0000
Subject: [PATCH 1822/2840] 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 c886c4c19..dcdaa78e8 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1172,5 +1172,10 @@
     "name": "Chao Yang Wu",
     "github_login": "goatwu1993",
     "twitter_username": ""
+  },
+  {
+    "name": "mpoli",
+    "github_login": "mpoli",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index cce697f96..b99cdbb7b 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1279,6 +1279,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>mpoli</td>
+    <td>
+      <a href="https://github.com/mpoli">mpoli</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Nico Stefani</td>
     <td>

From 00fb3fad8ca919d30e0a07b4f4617d3f297e8145 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sun, 21 Nov 2021 02:16:08 +0000
Subject: [PATCH 1823/2840] Release 2021.11.20

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d7ade3ec1..a340f9854 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2021.11.20
+
+### Fixed
+- Update repos for pre-commit hooks ([#3424](https://github.com/cookiecutter/cookiecutter-django/pull/3424))
+### Updated
+- Bump pre-commit/action to 2.0.3 ([#3426](https://github.com/cookiecutter/cookiecutter-django/pull/3426))
+
 ## 2021.11.19
 
 ### Updated
diff --git a/setup.py b/setup.py
index 783d9218c..b544012d1 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.11.19"
+version = "2021.11.20"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From c17331640a769198d6e5951ff0bc7fb993d462e6 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sun, 21 Nov 2021 17:48:42 +0000
Subject: [PATCH 1824/2840] Update comments in Dependabot file

---
 .github/dependabot.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index f0b70dd0e..5cb5a142b 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,9 +1,9 @@
 # Config for Dependabot updates. See Documentation here:
-# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+# https://docs.github.com/code-security/supply-chain-security/keeping-your-dependencies-updated-automatically/configuration-options-for-dependency-updates
 
 version: 2
 updates:
-  # Update Github actions in workflows
+  # Update GitHub actions in workflows
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:

From da74187c589198875212d961a5055da5e64a5f91 Mon Sep 17 00:00:00 2001
From: Zach Borboa <zachborboa@gmail.com>
Date: Mon, 22 Nov 2021 04:26:08 -0500
Subject: [PATCH 1825/2840] Clean up whitespace (#3430)

---
 {{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 dcc419958..0d23f183a 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -31,7 +31,7 @@ jobs:
       # Run all pre-commit hooks on all the files.
       # Getting only staged files can be tricky in case a new PR is opened
       # since the action is run on a branch in detached head state
-      - name: Install and Run Pre-commit 
+      - name: Install and Run Pre-commit
         uses: pre-commit/action@v2.0.3
 
   # With no caching at all the entire ci process takes 4m 30s to complete!

From 9b5e3474d964f908e87b0f1907a497b0e577cc97 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Mon, 22 Nov 2021 09:26:38 +0000
Subject: [PATCH 1826/2840] 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 dcdaa78e8..4afa50a44 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1177,5 +1177,10 @@
     "name": "mpoli",
     "github_login": "mpoli",
     "twitter_username": ""
+  },
+  {
+    "name": "Zach Borboa",
+    "github_login": "zachborboa",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index b99cdbb7b..0bdfea386 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1664,6 +1664,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Zach Borboa</td>
+    <td>
+      <a href="https://github.com/zachborboa">zachborboa</a>
+    </td>
+    <td></td>
+  </tr>
 </table>
 
 ### Special Thanks

From 145d65aeff50aaaba12466fc819aa3eb044d367a Mon Sep 17 00:00:00 2001
From: mpoli <poli@closedgap.com>
Date: Mon, 22 Nov 2021 06:26:46 -0300
Subject: [PATCH 1827/2840] Bump Postgres to 13.5 12.9 11.14 10.19; add 14.1
 (#3428)

---
 README.rst                            | 11 ++++++-----
 cookiecutter.json                     |  9 +++++----
 docs/project-generation-options.rst   |  9 +++++----
 tests/test_cookiecutter_generation.py |  9 +++++----
 4 files changed, 21 insertions(+), 17 deletions(-)

diff --git a/README.rst b/README.rst
index 60f036cf9..70e0dce16 100644
--- a/README.rst
+++ b/README.rst
@@ -97,7 +97,7 @@ Constraints
 -----------
 
 * Only maintained 3rd party libraries are used.
-* Uses PostgreSQL everywhere (10.16 - 13.2)
+* Uses PostgreSQL everywhere (10.19 - 14.1)
 * Environment variables for configuration (This won't work with Apache/mod_wsgi).
 
 Support this Project!
@@ -178,10 +178,11 @@ Answer the prompts with your own desired options_. For example::
     use_heroku [n]: y
     use_compressor [n]: y
     Select postgresql_version:
-    1 - 13.2
-    2 - 12.6
-    3 - 11.11
-    4 - 10.16
+    1 - 14.1
+    2 - 13.5
+    3 - 12.9
+    4 - 11.14
+    5 - 10.19
     Choose from 1, 2, 3, 4, 5 [1]: 1
     Select js_task_runner:
     1 - None
diff --git a/cookiecutter.json b/cookiecutter.json
index 0f9a2c769..b24a3846d 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -18,10 +18,11 @@
   "use_pycharm": "n",
   "use_docker": "n",
   "postgresql_version": [
-    "13.2",
-    "12.6",
-    "11.11",
-    "10.16"
+    "14.1",
+    "13.5",
+    "12.9",
+    "11.14",
+    "10.19"
   ],
   "js_task_runner": [
     "None",
diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index a2573b94d..971bcf380 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -49,10 +49,11 @@ use_docker:
 postgresql_version:
     Select a PostgreSQL_ version to use. The choices are:
 
-    1. 13.2
-    2. 12.6
-    3. 11.11
-    4. 10.16
+    1. 14.1
+    2. 13.5
+    3. 12.9
+    4. 11.14
+    5. 10.19
 
 js_task_runner:
     Select a JavaScript task runner. The choices are:
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 0e36e83ac..bb9ba69f2 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -37,10 +37,11 @@ SUPPORTED_COMBINATIONS = [
     {"use_pycharm": "n"},
     {"use_docker": "y"},
     {"use_docker": "n"},
-    {"postgresql_version": "13.2"},
-    {"postgresql_version": "12.6"},
-    {"postgresql_version": "11.11"},
-    {"postgresql_version": "10.16"},
+    {"postgresql_version": "14.1"},
+    {"postgresql_version": "13.5"},
+    {"postgresql_version": "12.9"},
+    {"postgresql_version": "11.14"},
+    {"postgresql_version": "10.19"},
     {"cloud_provider": "AWS", "use_whitenoise": "y"},
     {"cloud_provider": "AWS", "use_whitenoise": "n"},
     {"cloud_provider": "GCP", "use_whitenoise": "y"},

From efdda66d2f12d5a25aa22327ebbfaea185e98ccc Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 22 Nov 2021 08:53:31 -0500
Subject: [PATCH 1828/2840] Update redis to 4.0.2 (#3431)

---
 {{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 f73c1cd5b..b8b2068b4 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -12,7 +12,7 @@ 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 %}
-redis==4.0.1  # https://github.com/andymccurdy/redis-py
+redis==4.0.2  # https://github.com/andymccurdy/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}

From 0fc1f6804f212748dee4c3ddc54a47c6be3916bd Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Mon, 22 Nov 2021 19:26:09 +0530
Subject: [PATCH 1829/2840] Removed unnecessary custom context processor
 exposing the DEBUG Template Context Variable (#3042)

---
 {{cookiecutter.project_slug}}/config/settings/base.py     | 1 -
 .../utils/context_processors.py                           | 8 --------
 2 files changed, 9 deletions(-)
 delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/context_processors.py

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index bbe45a395..e0d7fcb08 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -199,7 +199,6 @@ TEMPLATES = [
                 "django.template.context_processors.static",
                 "django.template.context_processors.tz",
                 "django.contrib.messages.context_processors.messages",
-                "{{ cookiecutter.project_slug }}.utils.context_processors.settings_context",
             ],
         },
     }
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/context_processors.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/context_processors.py
deleted file mode 100644
index 3c5351418..000000000
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/context_processors.py
+++ /dev/null
@@ -1,8 +0,0 @@
-from django.conf import settings
-
-
-def settings_context(_request):
-    """Settings available by default to the templates context."""
-    # Note: we intentionally do NOT expose the entire settings
-    # to prevent accidental leaking of sensitive information
-    return {"DEBUG": settings.DEBUG}

From fda7b9e2cc55b238447684c75ed668611385dba7 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 22 Nov 2021 21:31:29 +0000
Subject: [PATCH 1830/2840] Set docs theme to sphinx-rtd-theme

---
 docs/conf.py          | 2 +-
 docs/requirements.txt | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/conf.py b/docs/conf.py
index 469aa12d4..8c4b28160 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -92,7 +92,7 @@ pygments_style = "sphinx"
 
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
-html_theme = "default"
+html_theme = "sphinx_rtd_theme"
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the
diff --git a/docs/requirements.txt b/docs/requirements.txt
index aef3c6410..2408fcf19 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1 +1,2 @@
 sphinx==4.3.0
+sphinx-rtd-theme==1.0.0

From 23de88cc59be9052611f80dea82abfc417eb77a7 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 23 Nov 2021 02:14:20 +0000
Subject: [PATCH 1831/2840] Release 2021.11.22

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a340f9854..ac696e404 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2021.11.22
+
+### Changed
+- Removed unnecessary custom context processor exposing the DEBUG Template Context Variable ([#3042](https://github.com/cookiecutter/cookiecutter-django/pull/3042))
+- Clean up trailing whitespace ([#3430](https://github.com/cookiecutter/cookiecutter-django/pull/3430))
+### Updated
+- Update redis to 4.0.2 ([#3431](https://github.com/cookiecutter/cookiecutter-django/pull/3431))
+- Bump Postgres to 13.5 12.9 11.14 10.19; add 14.1 ([#3428](https://github.com/cookiecutter/cookiecutter-django/pull/3428))
+
 ## 2021.11.20
 
 ### Fixed
diff --git a/setup.py b/setup.py
index b544012d1..f01aa0ce1 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.11.20"
+version = "2021.11.22"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 315ead02e4a24f4bd213141c0a61c79508bf1eca Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 24 Nov 2021 08:05:53 +0000
Subject: [PATCH 1832/2840] Upgrade to Django 3.2 (#3425)

* Upgrade to Django 3.2

* Set DEFAULT_AUTO_FIELD setting

* Use auto AppConfig discovery for users app
---
 README.rst                                        |  2 +-
 setup.py                                          |  2 +-
 .../config/settings/base.py                       |  4 +++-
 .../requirements/base.txt                         |  2 +-
 .../users/migrations/0001_initial.py              | 15 ++++++++++-----
 5 files changed, 16 insertions(+), 9 deletions(-)

diff --git a/README.rst b/README.rst
index 70e0dce16..e990d5f17 100644
--- a/README.rst
+++ b/README.rst
@@ -41,7 +41,7 @@ production-ready Django projects quickly.
 Features
 ---------
 
-* For Django 3.1
+* For Django 3.2
 * Works with Python 3.9
 * Renders Django projects with 100% starting test coverage
 * Twitter Bootstrap_ v5 (`maintained Foundation fork`_ also available)
diff --git a/setup.py b/setup.py
index f01aa0ce1..9cefe2325 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ setup(
     classifiers=[
         "Development Status :: 4 - Beta",
         "Environment :: Console",
-        "Framework :: Django :: 3.1",
+        "Framework :: Django :: 3.2",
         "Intended Audience :: Developers",
         "Natural Language :: English",
         "License :: OSI Approved :: BSD License",
diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index e0d7fcb08..80003e147 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -48,6 +48,8 @@ DATABASES = {
 }
 {%- endif %}
 DATABASES["default"]["ATOMIC_REQUESTS"] = True
+# https://docs.djangoproject.com/en/stable/ref/settings/#std:setting-DEFAULT_AUTO_FIELD
+DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"
 
 # URLS
 # ------------------------------------------------------------------------------
@@ -86,7 +88,7 @@ THIRD_PARTY_APPS = [
 ]
 
 LOCAL_APPS = [
-    "{{ cookiecutter.project_slug }}.users.apps.UsersConfig",
+    "{{ cookiecutter.project_slug }}.users",
     # Your stuff: custom apps go here
 ]
 # https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps
diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index b8b2068b4..2d041dbff 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,7 +29,7 @@ uvicorn[standard]==0.15.0  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.1.13  # pyup: < 3.2  # https://www.djangoproject.com/
+django==3.2.9  # pyup: < 4.0  # https://www.djangoproject.com/
 django-environ==0.8.1  # https://github.com/joke2k/django-environ
 django-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.46.0  # https://github.com/pennersr/django-allauth
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py
index ef2c2d941..4c4d6954c 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py
@@ -1,3 +1,4 @@
+# Generated by Django 3.2.9 on 2021-11-20 11:23
 import django.contrib.auth.models
 import django.contrib.auth.validators
 from django.db import migrations, models
@@ -8,7 +9,9 @@ class Migration(migrations.Migration):
 
     initial = True
 
-    dependencies = [("auth", "0008_alter_user_username_max_length")]
+    dependencies = [
+        ("auth", "0012_alter_user_first_name_max_length"),
+    ]
 
     operations = [
         migrations.CreateModel(
@@ -16,7 +19,7 @@ class Migration(migrations.Migration):
             fields=[
                 (
                     "id",
-                    models.AutoField(
+                    models.BigAutoField(
                         auto_created=True,
                         primary_key=True,
                         serialize=False,
@@ -111,10 +114,12 @@ class Migration(migrations.Migration):
                 ),
             ],
             options={
-                "verbose_name_plural": "users",
                 "verbose_name": "user",
+                "verbose_name_plural": "users",
                 "abstract": False,
             },
-            managers=[("objects", django.contrib.auth.models.UserManager())],
-        )
+            managers=[
+                ("objects", django.contrib.auth.models.UserManager()),
+            ],
+        ),
     ]

From 9255ffc14e956a7472f6e9d25ab6632e8b0f6f7a Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Wed, 24 Nov 2021 16:12:24 +0000
Subject: [PATCH 1833/2840] Cache python dependencies on CI

---
 .github/workflows/ci.yml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ff54e3d19..dc415beeb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -20,6 +20,7 @@ jobs:
       - uses: actions/setup-python@v2
         with:
           python-version: "3.9"
+          cache: pip
       - name: Install dependencies
         run: |
           python -m pip install -U pip
@@ -48,6 +49,7 @@ jobs:
       - uses: actions/setup-python@v2
         with:
           python-version: "3.9"
+          cache: pip
       - name: Docker ${{ matrix.script.name }}
         run: sh tests/test_docker.sh ${{ matrix.script.args }}
 
@@ -85,6 +87,8 @@ jobs:
       - uses: actions/setup-python@v2
         with:
           python-version: "3.9"
+          cache: pip
+          cache-dependency-path: '**/requirements*.txt'
       - uses: actions/setup-node@v2
         with:
           node-version: "16"

From 6219aa4549c277d7a7ecf8b0c46ccd0c197ad048 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 24 Nov 2021 18:12:22 +0000
Subject: [PATCH 1834/2840] Small formatting fixes to Deploy to PythonAnywhere
 page (#3432)

* Remove Jinja tags in Deploy to PythonAnywhere documentation

* Tweak formatting for deploy on PythonAnywhere documentation page
---
 docs/deployment-on-pythonanywhere.rst | 25 ++++++++++++-------------
 1 file changed, 12 insertions(+), 13 deletions(-)

diff --git a/docs/deployment-on-pythonanywhere.rst b/docs/deployment-on-pythonanywhere.rst
index 67da158ba..af1809c79 100644
--- a/docs/deployment-on-pythonanywhere.rst
+++ b/docs/deployment-on-pythonanywhere.rst
@@ -15,7 +15,7 @@ Full instructions follow, but here's a high-level view.
 
 2. Set your config variables in the *postactivate* script
 
-3. Run the *manage.py* ``migrate`` and ``collectstatic`` {%- if cookiecutter.use_compressor == "y" %}and ``compress`` {%- endif %}commands
+3. Run the *manage.py* ``migrate`` and ``collectstatic`` commands. If you've opted for django-compressor, also run ``compress``
 
 4. Add an entry to the PythonAnywhere *Web tab*
 
@@ -25,7 +25,6 @@ Full instructions follow, but here's a high-level view.
 Once you've been through this one-off config, future deployments are much simpler: just ``git pull`` and then hit the "Reload" button :)
 
 
-
 Getting your code and dependencies installed on PythonAnywhere
 --------------------------------------------------------------
 
@@ -39,7 +38,6 @@ Make sure your project is fully committed and pushed up to Bitbucket or Github o
     pip install -r requirements/production.txt  # may take a few minutes
 
 
-
 Setting environment variables in the console
 --------------------------------------------
 
@@ -57,7 +55,7 @@ Set environment variables via the virtualenv "postactivate" script (this will se
 
     vi $VIRTUAL_ENV/bin/postactivate
 
-**TIP:** *If you don't like vi, you can also edit this file via the PythonAnywhere "Files" menu; look in the ".virtualenvs" folder*.
+.. note:: If you don't like vi, you can also edit this file via the PythonAnywhere "Files" menu; look in the ".virtualenvs" folder.
 
 Add these exports
 
@@ -75,7 +73,7 @@ Add these exports
     export DJANGO_AWS_STORAGE_BUCKET_NAME=
     export DATABASE_URL='<see below>'
 
-**NOTE:** *The AWS details are not required if you're using whitenoise or the built-in pythonanywhere static files service, but you do need to set them to blank, as above.*
+.. note:: The AWS details are not required if you're using whitenoise or the built-in pythonanywhere static files service, but you do need to set them to blank, as above.
 
 
 Database setup:
@@ -109,7 +107,8 @@ Now run the migration, and collectstatic:
     source $VIRTUAL_ENV/bin/postactivate
     python manage.py migrate
     python manage.py collectstatic
-    {%- if cookiecutter.use_compressor == "y" %}python manage.py compress {%- endif %}
+    # if using django-compressor:
+    python manage.py compress
     # and, optionally
     python manage.py createsuperuser
 
@@ -120,7 +119,7 @@ Configure the PythonAnywhere Web Tab
 
 Go to the PythonAnywhere **Web tab**, hit **Add new web app**, and choose **Manual Config**, and then the version of Python you used for your virtualenv.
 
-**NOTE:** *If you're using a custom domain (not on \*.pythonanywhere.com), then you'll need to set up a CNAME with your domain registrar.*
+.. note:: If you're using a custom domain (not on \*.pythonanywhere.com), then you'll need to set up a CNAME with your domain registrar.
 
 When you're redirected back to the web app config screen, set the **path to your virtualenv**.  If you used virtualenvwrapper as above, you can just enter its name.
 
@@ -153,15 +152,14 @@ Click through to the **WSGI configuration file** link (near the top) and edit th
 Back on the Web tab, hit **Reload**, and your app should be live!
 
 
-**NOTE:** *you may see security warnings until you set up your SSL certificates. If you
-want to suppress them temporarily, set DJANGO_SECURE_SSL_REDIRECT to blank.  Follow
-the instructions here to get SSL set up: https://help.pythonanywhere.com/pages/SSLOwnDomains/*
+.. note:: You may see security warnings until you set up your SSL certificates. If you want to suppress them temporarily, set ``DJANGO_SECURE_SSL_REDIRECT`` to blank. Follow the instructions `here <https://help.pythonanywhere.com/pages/HTTPSSetup>`_ to get SSL set up.
+
 
 
 Optional: static files
 ----------------------
 
-If you want to use the PythonAnywhere static files service instead of using whitenoise or S3, you'll find its configuration section on the Web tab.  Essentially you'll need an entry to match your ``STATIC_URL`` and ``STATIC_ROOT`` settings.  There's more info here: https://help.pythonanywhere.com/pages/DjangoStaticFiles
+If you want to use the PythonAnywhere static files service instead of using whitenoise or S3, you'll find its configuration section on the Web tab.  Essentially you'll need an entry to match your ``STATIC_URL`` and ``STATIC_ROOT`` settings.  There's more info `here <https://help.pythonanywhere.com/pages/DjangoStaticFiles>`_.
 
 
 Future deployments
@@ -176,8 +174,9 @@ For subsequent deployments, the procedure is much simpler.  In a Bash console:
     git pull
     python manage.py migrate
     python manage.py collectstatic
-    {%- if cookiecutter.use_compressor == "y" %}python manage.py compress {%- endif %}
+    # if using django-compressor:
+    python manage.py compress
 
 And then go to the Web tab and hit **Reload**
 
-**TIP:** *if you're really keen, you can set up git-push based deployments:  https://blog.pythonanywhere.com/87/*
+.. note:: If you're really keen, you can set up git-push based deployments:  https://blog.pythonanywhere.com/87/

From 8b4493365ceac72ad8fbbb485c1e74ba84678b59 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Wed, 24 Nov 2021 21:09:42 +0000
Subject: [PATCH 1835/2840] Fix Sphinx warning

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

diff --git a/docs/deployment-on-pythonanywhere.rst b/docs/deployment-on-pythonanywhere.rst
index af1809c79..8e6abb511 100644
--- a/docs/deployment-on-pythonanywhere.rst
+++ b/docs/deployment-on-pythonanywhere.rst
@@ -152,14 +152,14 @@ Click through to the **WSGI configuration file** link (near the top) and edit th
 Back on the Web tab, hit **Reload**, and your app should be live!
 
 
-.. note:: You may see security warnings until you set up your SSL certificates. If you want to suppress them temporarily, set ``DJANGO_SECURE_SSL_REDIRECT`` to blank. Follow the instructions `here <https://help.pythonanywhere.com/pages/HTTPSSetup>`_ to get SSL set up.
+.. note:: You may see security warnings until you set up your SSL certificates. If you want to suppress them temporarily, set ``DJANGO_SECURE_SSL_REDIRECT`` to blank. Follow `these instructions <https://help.pythonanywhere.com/pages/HTTPSSetup>`_ to get SSL set up.
 
 
 
 Optional: static files
 ----------------------
 
-If you want to use the PythonAnywhere static files service instead of using whitenoise or S3, you'll find its configuration section on the Web tab.  Essentially you'll need an entry to match your ``STATIC_URL`` and ``STATIC_ROOT`` settings.  There's more info `here <https://help.pythonanywhere.com/pages/DjangoStaticFiles>`_.
+If you want to use the PythonAnywhere static files service instead of using whitenoise or S3, you'll find its configuration section on the Web tab.  Essentially you'll need an entry to match your ``STATIC_URL`` and ``STATIC_ROOT`` settings.  There's more info `in this article <https://help.pythonanywhere.com/pages/DjangoStaticFiles>`_.
 
 
 Future deployments

From f234a0b69e68397b3c08b0c3ff97c06213c19867 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Wed, 24 Nov 2021 21:10:26 +0000
Subject: [PATCH 1836/2840] Clarify assumption with Mailgun on Heroku page

Fix #2565
---
 docs/deployment-on-heroku.rst | 29 ++++++++++++++++++-----------
 docs/mailgun.rst              |  2 +-
 2 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/docs/deployment-on-heroku.rst b/docs/deployment-on-heroku.rst
index 0681a50ca..709296121 100644
--- a/docs/deployment-on-heroku.rst
+++ b/docs/deployment-on-heroku.rst
@@ -3,8 +3,8 @@ Deployment on Heroku
 
 .. index:: Heroku
 
-Commands to run
----------------
+Script
+------
 
 Run these commands to deploy the project to Heroku:
 
@@ -20,6 +20,7 @@ Run these commands to deploy the project to Heroku:
 
     heroku addons:create heroku-redis:hobby-dev
 
+    # Assuming you chose Mailgun as mail service (see below for others)
     heroku addons:create mailgun:starter
 
     heroku config:set PYTHONHASHSEED=random
@@ -53,11 +54,25 @@ Run these commands to deploy the project to Heroku:
 
     heroku open
 
+Notes
+-----
+
+Email Service
++++++++++++++
+
+The script above assumes that you've chose Mailgun as email service. If you want to use another one, check the `documentation for django-anymail <https://anymail.readthedocs.io>`_ to know which environment variables to set. Heroku provides other `add-ons for emails <https://elements.heroku.com/addons#email-sms>`_ (e.g. Sendgrid) which can be configured with a similar one line command.
 
 .. warning::
 
     .. include:: mailgun.rst
 
+Heroku & Docker
++++++++++++++++
+
+Although Heroku has some sort of `Docker support`_, it's not supported by cookiecutter-django.
+We invite you to follow Heroku documentation about it.
+
+.. _Docker support: https://devcenter.heroku.com/articles/build-docker-images-heroku-yml
 
 Optional actions
 ----------------
@@ -110,12 +125,4 @@ which runs Gulp in cookiecutter-django.
 
 If things don't work, please refer to the Heroku docs.
 
-.. _multiple buildpacks: https://devcenter.heroku.com/articles/using-multiple-buildpacks-for-an-app
-
-About Heroku & Docker
----------------------
-
-Although Heroku has some sort of `Docker support`_, it's not supported by cookiecutter-django.
-We invite you to follow Heroku documentation about it.
-
-.. _Docker support: https://devcenter.heroku.com/articles/build-docker-images-heroku-yml
+.. _multiple buildpacks: https://devcenter.heroku.com/articles/using-multiple-buildpacks-for-an-app
\ No newline at end of file
diff --git a/docs/mailgun.rst b/docs/mailgun.rst
index 1f34e3c86..b5f49b625 100644
--- a/docs/mailgun.rst
+++ b/docs/mailgun.rst
@@ -1,7 +1,7 @@
 If your email server used to send email isn't configured properly (Mailgun by default),
 attempting to send an email will cause an Internal Server Error.
 
-By default, django-allauth is setup to `have emails verifications mandatory`_,
+By default, ``django-allauth`` is setup to `have emails verifications mandatory`_,
 which means it'll send a verification email when an unverified user tries to
 log-in or when someone tries to sign-up.
 

From f8a975a3c384f010551dda02c6e58f64e2bda2b4 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 25 Nov 2021 02:15:48 +0000
Subject: [PATCH 1837/2840] Release 2021.11.24

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac696e404..61962ce7f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2021.11.24
+
+### Changed
+- Cache Python dependencies on our CI ([#3434](https://github.com/cookiecutter/cookiecutter-django/pull/3434))
+- Small formatting fixes to Deploy to PythonAnywhere page ([#3432](https://github.com/cookiecutter/cookiecutter-django/pull/3432))
+### Updated
+- Upgrade to Django 3.2 ([#3425](https://github.com/cookiecutter/cookiecutter-django/pull/3425))
+
 ## 2021.11.22
 
 ### Changed
diff --git a/setup.py b/setup.py
index 9cefe2325..130888f60 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.11.22"
+version = "2021.11.24"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 3c2313b4189ef1dc5a401d904101194daf6bddf0 Mon Sep 17 00:00:00 2001
From: Timm Simpkins <poduck@gmail.com>
Date: Thu, 25 Nov 2021 10:55:03 -0500
Subject: [PATCH 1838/2840] Make `django` depend on `redis` in local Docker
 (#3265)

Co-authored-by: Timm Simpkins <timm@talova.com>
Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
---
 {{cookiecutter.project_slug}}/local.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index 8cce827c1..89c087821 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -13,6 +13,9 @@ services:
     container_name: django
     depends_on:
       - postgres
+      {%- if cookiecutter.use_celery == 'y' %}
+      - redis
+      {%- endif %}
       {%- if cookiecutter.use_mailhog == 'y' %}
       - mailhog
       {%- endif %}

From e422cbc0842629ea033ca8b30981bd4a0cbe441e Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 25 Nov 2021 15:55:36 +0000
Subject: [PATCH 1839/2840] 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 4afa50a44..a66814452 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1182,5 +1182,10 @@
     "name": "Zach Borboa",
     "github_login": "zachborboa",
     "twitter_username": ""
+  },
+  {
+    "name": "Timm Simpkins",
+    "github_login": "PoDuck",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 0bdfea386..789f62cde 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1538,6 +1538,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Timm Simpkins</td>
+    <td>
+      <a href="https://github.com/PoDuck">PoDuck</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Tom Atkins</td>
     <td>

From 0790929e7e07cd773e63ceee57774794e8afcd47 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Thu, 25 Nov 2021 23:40:33 +0530
Subject: [PATCH 1840/2840] Add an assertion to fix mypy type error (#3150)

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
---
 .../{{cookiecutter.project_slug}}/users/views.py             | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
index c7b846c08..baa04a0d4 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
@@ -25,7 +25,10 @@ class UserUpdateView(LoginRequiredMixin, SuccessMessageMixin, UpdateView):
     success_message = _("Information successfully updated")
 
     def get_success_url(self):
-        return self.request.user.get_absolute_url()  # type: ignore [union-attr]
+        assert (
+            self.request.user.is_authenticated
+        )  # for mypy to know that the user is authenticated
+        return self.request.user.get_absolute_url()
 
     def get_object(self):
         return self.request.user

From 15f403c02cbf6436d177fa1e95ed75dc0fc7dd0f Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 26 Nov 2021 02:14:02 +0000
Subject: [PATCH 1841/2840] Release 2021.11.25

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61962ce7f..781a0aa38 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.11.25
+
+### Changed
+- Add an assertion to fix mypy type error ([#3150](https://github.com/cookiecutter/cookiecutter-django/pull/3150))
+- Make `django` depend on `redis` in local Docker  ([#3265](https://github.com/cookiecutter/cookiecutter-django/pull/3265))
+
 ## 2021.11.24
 
 ### Changed
diff --git a/setup.py b/setup.py
index 130888f60..b413933c7 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.11.24"
+version = "2021.11.25"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 407a7d8bbcca4f487911e58ed99b768dbbb26e8f Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 26 Nov 2021 15:41:50 +0000
Subject: [PATCH 1842/2840] Setup pre-commit for the template files (#3433)

---
 .github/ISSUE_TEMPLATE/bug.md         |  8 ++++----
 .github/ISSUE_TEMPLATE/question.md    |  2 +-
 .github/PULL_REQUEST_TEMPLATE.md      |  6 +++---
 .github/workflows/ci.yml              | 24 +++++++++++++---------
 .pre-commit-config.yaml               | 29 +++++++++++++++++++++++++++
 CHANGELOG.md                          |  6 +++---
 docs/conf.py                          |  6 ++----
 docs/deployment-on-heroku.rst         |  2 +-
 docs/developing-locally-docker.rst    | 12 +++++------
 hooks/post_gen_project.py             |  7 ++++---
 hooks/pre_gen_project.py              | 11 ++++++----
 scripts/__init__.py                   |  1 -
 scripts/update_changelog.py           |  2 +-
 setup.cfg                             |  7 +++++++
 setup.py                              |  5 ++++-
 tests/test_cookiecutter_generation.py |  2 +-
 16 files changed, 87 insertions(+), 43 deletions(-)
 create mode 100644 .pre-commit-config.yaml
 create mode 100644 setup.cfg

diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index 304e9b34c..e984493d8 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -12,11 +12,11 @@ labels: bug
 
 <!-- To assist you best, please include commands that you've run, options you've selected and any relevant logs -->
 
-* Host system configuration: 
+* Host system configuration:
     * Version of cookiecutter CLI (get it with `cookiecutter --version`):
     * OS name and version:
 
-      On Linux, run 
+      On Linux, run
       ```bash
       lsb_release -a 2> /dev/null || cat /etc/redhat-release 2> /dev/null || cat /etc/*-release 2> /dev/null || cat /etc/issue 2> /dev/null
       ```
@@ -25,7 +25,7 @@ labels: bug
       ```bash
       sw_vers
       ```
-      
+
       On Windows, via CMD, run
       ```
       systeminfo | findstr /B /C:"OS Name" /C:"OS Version"
@@ -34,7 +34,7 @@ labels: bug
 
       ```bash
       # Insert here the OS name and version
-      
+
       ```
 
     * Python version, run `python3 -V`:
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 2ba657d5c..e39803fa9 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -6,6 +6,6 @@ labels: question
 
 First, make sure to examine [the docs](https://cookiecutter-django.readthedocs.io/en/latest/). If that doesn't help, we recommend one of these 3 main channels:
 
-- If your issue is related to Django + something else but was generated with cookiecutter-django, the best is to post a question on [StackOverflow](https://stackoverflow.com/questions/tagged/cookiecutter-django) tagged with `cookiecutter-django`, you would get more visibility from other communities as well. 
+- If your issue is related to Django + something else but was generated with cookiecutter-django, the best is to post a question on [StackOverflow](https://stackoverflow.com/questions/tagged/cookiecutter-django) tagged with `cookiecutter-django`, you would get more visibility from other communities as well.
 - Join us on [Discord](https://discord.gg/bTfDa6Zz) and ask around.
 - Start [a discussion](https://github.com/cookiecutter/cookiecutter-django/discussions) on our project's GitHub.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 5559e62ff..eb7134a8c 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -12,7 +12,7 @@ Checklist:
 
 ## Rationale
 
-<!-- 
-Why does this project need the change you're proposing? 
-If this pull request fixes an open issue, don't forget to link it with `Fix #NNNN` 
+<!--
+Why does this project need the change you're proposing?
+If this pull request fixes an open issue, don't forget to link it with `Fix #NNNN`
 -->
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index dc415beeb..85c4cedc8 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -5,16 +5,20 @@ on:
   pull_request:
 
 jobs:
+  lint:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: actions/setup-python@v2
+        with:
+          python-version: "3.9"
+          cache: pip
+      - name: Run pre-commit
+        uses: pre-commit/action@v2.0.3
+
   tox:
     runs-on: ubuntu-latest
-    strategy:
-      fail-fast: false
-      matrix:
-        tox-env:
-          - py39
-          - black-template
-
-    name: "tox env ${{ matrix.tox-env }}"
+    name: "Test with tox"
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
@@ -25,8 +29,8 @@ jobs:
         run: |
           python -m pip install -U pip
           python -m pip install -U tox
-      - name: Tox ${{ matrix.tox-env }}
-        run: tox -e ${{ matrix.tox-env }}
+      - name: Run tox
+        run: tox -e py39
 
   docker:
     runs-on: ubuntu-latest
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
new file mode 100644
index 000000000..c9fcab24a
--- /dev/null
+++ b/.pre-commit-config.yaml
@@ -0,0 +1,29 @@
+exclude: "{{cookiecutter.project_slug}}"
+default_stages: [commit]
+
+repos:
+  - repo: https://github.com/pre-commit/pre-commit-hooks
+    rev: v4.0.1
+    hooks:
+      - id: trailing-whitespace
+      - id: check-yaml
+
+  - repo: https://github.com/psf/black
+    rev: 21.11b1
+    hooks:
+      - id: black
+
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.10.1
+    hooks:
+      - id: isort
+
+  - repo: https://github.com/PyCQA/flake8
+    rev: 4.0.1
+    hooks:
+      - id: flake8
+
+ci:
+  autoupdate_schedule: weekly
+  skip: []
+  submodules: false
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 781a0aa38..941150001 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1066,7 +1066,7 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 ### Removed
 - Remove the user list view (@browniebroke)
 
-### Fixed 
+### Fixed
 - Static storage default ACL (@browniebroke)
 
 ## [2019-05-17]
@@ -1102,7 +1102,7 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 ## [2019-03-11]
 ### Changed
 - Sentry integration from Raven to Sentry-SDK (@gfabricio)
-- Made Redis config conditional on Celery locally (@demestav) 
+- Made Redis config conditional on Celery locally (@demestav)
 
 ## [2019-03-11]
 ### Added
@@ -1171,7 +1171,7 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 ### Changed
 - Test commands to use pytest (@jcass77)
 
-### Removed 
+### Removed
 - Some hacks leftovers from Bootstrap v4 beta in `project.js` (@hendrikschneider)
 
 ## [2018-07-12]
diff --git a/docs/conf.py b/docs/conf.py
index 8c4b28160..f55bcb819 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -7,10 +7,7 @@
 #
 # All configuration values have a default; values that are commented out
 # serve to show the default.
-
 from datetime import datetime
-import os
-import sys
 
 now = datetime.now()
 
@@ -242,7 +239,8 @@ texinfo_documents = [
         "Cookiecutter Django documentation",
         "Daniel Roy Greenfeld",
         "Cookiecutter Django",
-        "A Cookiecutter template for creating production-ready Django projects quickly.",
+        "A Cookiecutter template for creating production-ready "
+        "Django projects quickly.",
         "Miscellaneous",
     )
 ]
diff --git a/docs/deployment-on-heroku.rst b/docs/deployment-on-heroku.rst
index 709296121..bab5881cd 100644
--- a/docs/deployment-on-heroku.rst
+++ b/docs/deployment-on-heroku.rst
@@ -10,7 +10,7 @@ Run these commands to deploy the project to Heroku:
 
 .. code-block:: bash
 
-    heroku create --buildpack heroku/python 
+    heroku create --buildpack heroku/python
 
     heroku addons:create heroku-postgresql:hobby-dev
     # On Windows use double quotes for the time zone, e.g.
diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index 72999be31..17e47bfb4 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -216,17 +216,17 @@ Increasingly it is becoming necessary to develop software in a secure environmen
 In order to create a secure environment, we need to have a trusted SSL certficate installed in our Docker application.
 
 #.  **Let's Encrypt**
-    
-    The official line from Let’s Encrypt is: 
 
-    [For local development section] ... The best option: Generate your own certificate, either self-signed or signed by a local root, and trust it in your operating system’s trust store. Then use that certificate in your local web server. See below for details. 
+    The official line from Let’s Encrypt is:
+
+    [For local development section] ... The best option: Generate your own certificate, either self-signed or signed by a local root, and trust it in your operating system’s trust store. Then use that certificate in your local web server. See below for details.
 
     See `letsencrypt.org - certificates-for-localhost`_
 
     .. _`letsencrypt.org - certificates-for-localhost`: https://letsencrypt.org/docs/certificates-for-localhost/
 
 #.  **mkcert: Valid Https Certificates For Localhost**
-    
+
     `mkcert`_ is a simple by design tool that hides all the arcane knowledge required to generate valid TLS certificates. It works for any hostname or IP, including localhost. It supports macOS, Linux, and Windows, and Firefox, Chrome and Java. It even works on mobile devices with a couple manual steps.
 
     See https://blog.filippo.io/mkcert-valid-https-certificates-for-localhost/
@@ -261,11 +261,11 @@ local.yml
       restart: always
       depends_on:
         - django
-    
+
     ...
 
 #. 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.
 
    ::
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index ede14c324..3ad0e9e5d 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -5,7 +5,8 @@ NOTE:
     can potentially be run in Python 2.x environment
     (at least so we presume in `pre_gen_project.py`).
 
-TODO: ? restrict Cookiecutter Django project initialization to Python 3.x environments only
+TODO: restrict Cookiecutter Django project initialization to
+      Python 3.x environments only
 """
 from __future__ import print_function
 
@@ -164,8 +165,8 @@ def set_flag(file_path, flag, value=None, formatted=None, *args, **kwargs):
         random_string = generate_random_string(*args, **kwargs)
         if random_string is None:
             print(
-                "We couldn't find a secure pseudo-random number generator on your system. "
-                "Please, make sure to manually {} later.".format(flag)
+                "We couldn't find a secure pseudo-random number generator on your "
+                "system. Please, make sure to manually {} later.".format(flag)
             )
             random_string = flag
         if formatted is not None:
diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py
index 70c29557c..3fd4131c8 100644
--- a/hooks/pre_gen_project.py
+++ b/hooks/pre_gen_project.py
@@ -4,7 +4,8 @@ NOTE:
     as the whole Cookiecutter Django project initialization
     can potentially be run in Python 2.x environment.
 
-TODO: ? restrict Cookiecutter Django project initialization to Python 3.x environments only
+TODO: restrict Cookiecutter Django project initialization
+      to Python 3.x environments only
 """
 from __future__ import print_function
 
@@ -39,7 +40,7 @@ if "{{ cookiecutter.use_docker }}".lower() == "n":
         )
         yes_options, no_options = frozenset(["y"]), frozenset(["n"])
         while True:
-            choice = raw_input().lower()
+            choice = raw_input().lower()  # noqa: F821
             if choice in yes_options:
                 break
 
@@ -65,7 +66,8 @@ if (
     and "{{ cookiecutter.cloud_provider }}" == "None"
 ):
     print(
-        "You should either use Whitenoise or select a Cloud Provider to serve static files"
+        "You should either use Whitenoise or select a "
+        "Cloud Provider to serve static files"
     )
     sys.exit(1)
 
@@ -77,6 +79,7 @@ if (
     and "{{ cookiecutter.mail_service }}" == "Amazon SES"
 ):
     print(
-        "You should either use AWS or select a different Mail Service for sending emails."
+        "You should either use AWS or select a different "
+        "Mail Service for sending emails."
     )
     sys.exit(1)
diff --git a/scripts/__init__.py b/scripts/__init__.py
index 8b1378917..e69de29bb 100644
--- a/scripts/__init__.py
+++ b/scripts/__init__.py
@@ -1 +0,0 @@
-
diff --git a/scripts/update_changelog.py b/scripts/update_changelog.py
index 1ec9bde95..c3c834eef 100644
--- a/scripts/update_changelog.py
+++ b/scripts/update_changelog.py
@@ -85,7 +85,7 @@ def group_pulls_by_change_type(
         "Updated": [],
     }
     for pull in pull_requests_list:
-        label_names = {l.name for l in pull.labels}
+        label_names = {label.name for label in pull.labels}
         if "update" in label_names:
             group_name = "Updated"
         elif "bug" in label_names:
diff --git a/setup.cfg b/setup.cfg
new file mode 100644
index 000000000..dd8f1ef3c
--- /dev/null
+++ b/setup.cfg
@@ -0,0 +1,7 @@
+[flake8]
+exclude = docs
+max-line-length = 88
+
+[isort]
+profile = black
+known_first_party = tests,scripts,hooks
diff --git a/setup.py b/setup.py
index b413933c7..d4b7e9a12 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,10 @@ with open("README.rst") as readme_file:
 setup(
     name="cookiecutter-django",
     version=version,
-    description="A Cookiecutter template for creating production-ready Django projects quickly.",
+    description=(
+        "A Cookiecutter template for creating production-ready "
+        "Django projects quickly."
+    ),
     long_description=long_description,
     author="Daniel Roy Greenfeld",
     author_email="pydanny@gmail.com",
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index bb9ba69f2..dd4fc34e4 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -2,10 +2,10 @@ import os
 import re
 
 import pytest
-from cookiecutter.exceptions import FailedHookException
 import sh
 import yaml
 from binaryornot.check import is_binary
+from cookiecutter.exceptions import FailedHookException
 
 PATTERN = r"{{(\s?cookiecutter)[.](.*?)}}"
 RE_OBJ = re.compile(PATTERN)

From b77f79389142c13f823e91d0e2112c78abe4b0e3 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 27 Nov 2021 02:15:10 +0000
Subject: [PATCH 1843/2840] Release 2021.11.26

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 941150001..59b9fe1d4 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.11.26
+
+### Changed
+- Setup pre-commit for the template files ([#3433](https://github.com/cookiecutter/cookiecutter-django/pull/3433))
+
 ## 2021.11.25
 
 ### Changed
diff --git a/setup.py b/setup.py
index d4b7e9a12..6674527d0 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.11.25"
+version = "2021.11.26"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From bde61865ca4215555f647f2d59f49b805abe9975 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 27 Nov 2021 05:57:38 -0500
Subject: [PATCH 1844/2840] Update coverage from 6.1.2 to 6.2 (#3437)

---
 {{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 7770d48e7..46ee0774d 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==4.0.1  # https://github.com/PyCQA/flake8
 flake8-isort==4.1.1  # https://github.com/gforcada/flake8-isort
-coverage==6.1.2  # https://github.com/nedbat/coveragepy
+coverage==6.2  # https://github.com/nedbat/coveragepy
 black==21.11b1  # https://github.com/psf/black
 pylint-django==2.4.4  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 1e91d6671d742eb8484f302ae86f2cc25db05fba Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sun, 28 Nov 2021 02:14:34 +0000
Subject: [PATCH 1845/2840] Release 2021.11.27

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 59b9fe1d4..a25aa62e8 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.11.27
+
+### Updated
+- Update coverage to 6.2 ([#3437](https://github.com/cookiecutter/cookiecutter-django/pull/3437))
+
 ## 2021.11.26
 
 ### Changed
diff --git a/setup.py b/setup.py
index 6674527d0..d28c6c2af 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.11.26"
+version = "2021.11.27"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 0db415ad3be1d5ab066f6febb57c321d94a6bd2b Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 29 Nov 2021 11:16:05 +0000
Subject: [PATCH 1846/2840] Fix pre-commit config (#3435)

---
 {{cookiecutter.project_slug}}/.gitignore               |  4 ++--
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml  |  3 +--
 {{cookiecutter.project_slug}}/Procfile                 |  4 ++--
 .../migrations/0004_alter_options_ordering_domain.py   | 10 +++++++---
 4 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore
index 613e8beab..424c8cdc4 100644
--- a/{{cookiecutter.project_slug}}/.gitignore
+++ b/{{cookiecutter.project_slug}}/.gitignore
@@ -327,13 +327,13 @@ Session.vim
 tags
 
 ### Project template
-{% if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'n' %}
+{%- if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'n' %}
 MailHog
 {%- endif %}
 {{ cookiecutter.project_slug }}/media/
 
 .pytest_cache/
 
-{% if cookiecutter.use_docker == 'y' %}
+{%- if cookiecutter.use_docker == 'y' %}
 .ipython/
 {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index 22c6d07db..e2cdf71fe 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -1,6 +1,5 @@
-exclude: "docs|node_modules|migrations|.git|.tox"
+exclude: "^docs/|/migrations/"
 default_stages: [commit]
-fail_fast: true
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
diff --git a/{{cookiecutter.project_slug}}/Procfile b/{{cookiecutter.project_slug}}/Procfile
index 274108d14..2f2fbe927 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 %}
 web: gunicorn config.wsgi:application
 {%- endif %}
-{% if cookiecutter.use_celery == "y" -%}
+{%- if cookiecutter.use_celery == "y" %}
 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 %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0004_alter_options_ordering_domain.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0004_alter_options_ordering_domain.py
index 00c9a74d3..f7118ca81 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0004_alter_options_ordering_domain.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0004_alter_options_ordering_domain.py
@@ -6,12 +6,16 @@ from django.db import migrations
 class Migration(migrations.Migration):
 
     dependencies = [
-        ('sites', '0003_set_site_domain_and_name'),
+        ("sites", "0003_set_site_domain_and_name"),
     ]
 
     operations = [
         migrations.AlterModelOptions(
-            name='site',
-            options={'ordering': ['domain'], 'verbose_name': 'site', 'verbose_name_plural': 'sites'},
+            name="site",
+            options={
+                "ordering": ["domain"],
+                "verbose_name": "site",
+                "verbose_name_plural": "sites",
+            },
         ),
     ]

From 4a578df625c61df967a0fb28062ed4d05b99a562 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 29 Nov 2021 07:08:41 -0500
Subject: [PATCH 1847/2840] Update sphinx to 4.3.1 (#3438)

---
 docs/requirements.txt                                | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 2408fcf19..9d324374d 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,2 +1,2 @@
-sphinx==4.3.0
+sphinx==4.3.1
 sphinx-rtd-theme==1.0.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 46ee0774d..924073fcb 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -23,7 +23,7 @@ djangorestframework-stubs==1.4.0  # https://github.com/typeddjango/djangorestfra
 
 # Documentation
 # ------------------------------------------------------------------------------
-sphinx==4.3.0  # https://github.com/sphinx-doc/sphinx
+sphinx==4.3.1  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From bc97458d41763707c52a9c5b974df37db238d4c5 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 30 Nov 2021 02:07:58 +0000
Subject: [PATCH 1848/2840] Release 2021.11.29

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a25aa62e8..4d69238a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2021.11.29
+
+### Fixed
+- Fix pre-commit config ([#3435](https://github.com/cookiecutter/cookiecutter-django/pull/3435))
+### Updated
+- Update sphinx to 4.3.1 ([#3438](https://github.com/cookiecutter/cookiecutter-django/pull/3438))
+
 ## 2021.11.27
 
 ### Updated
diff --git a/setup.py b/setup.py
index d28c6c2af..e4eafedd7 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.11.27"
+version = "2021.11.29"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 70329ecb01615b775f241713e9e2750000473c43 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 30 Nov 2021 06:13:53 -0500
Subject: [PATCH 1849/2840] Update django-stubs to 1.9.0 (#3439)

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
---
 {{cookiecutter.project_slug}}/requirements/local.txt           | 2 +-
 .../{{cookiecutter.project_slug}}/users/tests/test_views.py    | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 924073fcb..33277c3eb 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -14,7 +14,7 @@ watchgod==0.7  # https://github.com/samuelcolvin/watchgod
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.910  # https://github.com/python/mypy
-django-stubs==1.8.0  # https://github.com/typeddjango/django-stubs
+django-stubs==1.9.0  # https://github.com/typeddjango/django-stubs
 pytest==6.2.5  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
index 413a653d7..7170bfae7 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
@@ -4,7 +4,7 @@ from django.contrib import messages
 from django.contrib.auth.models import AnonymousUser
 from django.contrib.messages.middleware import MessageMiddleware
 from django.contrib.sessions.middleware import SessionMiddleware
-from django.http import HttpRequest
+from django.http import HttpRequest, HttpResponseRedirect
 from django.test import RequestFactory
 from django.urls import reverse
 
@@ -97,5 +97,6 @@ class TestUserDetailView:
         response = user_detail_view(request, username=user.username)
         login_url = reverse(settings.LOGIN_URL)
 
+        assert isinstance(response, HttpResponseRedirect)
         assert response.status_code == 302
         assert response.url == f"{login_url}?next=/fake-url/"

From c92cf7fb4d9d68987346d821f6aaa0972f7972f7 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 30 Nov 2021 17:55:40 -0500
Subject: [PATCH 1850/2840] Update django-redis to 5.1.0 (#3440)

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
---
 {{cookiecutter.project_slug}}/requirements/base.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 2d041dbff..c819e9418 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -12,7 +12,7 @@ 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 %}
-redis==4.0.2  # https://github.com/andymccurdy/redis-py
+redis==3.5.3  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}
@@ -38,7 +38,7 @@ crispy-bootstrap5==0.6  # https://github.com/django-crispy-forms/crispy-bootstra
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==2.4.1  # https://github.com/django-compressor/django-compressor
 {%- endif %}
-django-redis==5.0.0  # https://github.com/jazzband/django-redis
+django-redis==5.1.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

From 7b040bbeff90342b4b4f5e558916adb786b766a2 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 1 Dec 2021 02:18:09 +0000
Subject: [PATCH 1851/2840] Release 2021.11.30

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4d69238a1..f94411e42 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.11.30
+
+### Updated
+- Update django-redis to 5.1.0 ([#3440](https://github.com/cookiecutter/cookiecutter-django/pull/3440))
+- Update django-stubs to 1.9.0 ([#3439](https://github.com/cookiecutter/cookiecutter-django/pull/3439))
+
 ## 2021.11.29
 
 ### Fixed
diff --git a/setup.py b/setup.py
index e4eafedd7..9ffb1d3e9 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.11.29"
+version = "2021.11.30"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 252035985c8d4e33bbdca45d197a50bd40231d79 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 1 Dec 2021 04:07:04 -0500
Subject: [PATCH 1852/2840] Update pre-commit to 2.16.0 (#3442)

* Update pre-commit from 2.15.0 to 2.16.0

* Update pre-commit from 2.15.0 to 2.16.0
---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 84c3f4657..c4edf3bc0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ black==21.11b1
 isort==5.10.1
 flake8==4.0.1
 flake8-isort==4.1.1
-pre-commit==2.15.0
+pre-commit==2.16.0
 
 # Testing
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 33277c3eb..13d212d01 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -36,7 +36,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.15.0  # https://github.com/pre-commit/pre-commit
+pre-commit==2.16.0  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From ff4b45c4a14a801815d4a6a42b0d19311538a4ec Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 2 Dec 2021 02:15:43 +0000
Subject: [PATCH 1853/2840] Release 2021.12.01

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f94411e42..598d29d30 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.12.01
+
+### Updated
+- Update pre-commit to 2.16.0 ([#3442](https://github.com/cookiecutter/cookiecutter-django/pull/3442))
+
 ## 2021.11.30
 
 ### Updated
diff --git a/setup.py b/setup.py
index 9ffb1d3e9..276b0a4db 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.11.30"
+version = "2021.12.01"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From ed6fbce0413569b18f36547ae0e223e97bf3a65b Mon Sep 17 00:00:00 2001
From: mpoli <poli@closedgap.com>
Date: Sat, 4 Dec 2021 10:31:46 -0300
Subject: [PATCH 1854/2840] Removed mention of Foundation fork from readme
 (#3445)

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
---
 README.rst | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/README.rst b/README.rst
index e990d5f17..799bdeafb 100644
--- a/README.rst
+++ b/README.rst
@@ -44,7 +44,7 @@ Features
 * For Django 3.2
 * Works with Python 3.9
 * Renders Django projects with 100% starting test coverage
-* Twitter Bootstrap_ v5 (`maintained Foundation fork`_ also available)
+* Twitter Bootstrap_ v5
 * 12-Factor_ based settings via django-environ_
 * Secure by default. We believe in SSL.
 * Optimized development and production settings
@@ -61,9 +61,6 @@ Features
 * Customizable PostgreSQL version
 * Default integration with pre-commit_ for identifying simple issues before submission to code review
 
-.. _`maintained Foundation fork`: https://github.com/Parbhat/cookiecutter-django-foundation
-
-
 Optional Integrations
 ---------------------
 

From fbf7d1196a0648b249fe97a6da6b64123aba925d Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 4 Dec 2021 08:32:02 -0500
Subject: [PATCH 1855/2840] Update pytest-django to 4.5.1 (#3443)

---
 {{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 13d212d01..9e467e331 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -45,4 +45,4 @@ factory-boy==3.2.1  # https://github.com/FactoryBoy/factory_boy
 django-debug-toolbar==3.2.2  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.1.5  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==2.0.2  # https://github.com/nedbat/django_coverage_plugin
-pytest-django==4.4.0  # https://github.com/pytest-dev/pytest-django
+pytest-django==4.5.1  # https://github.com/pytest-dev/pytest-django

From 351315fcdac7c9bf7db48c9576ff0d6b345750d6 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sat, 4 Dec 2021 13:41:49 +0000
Subject: [PATCH 1856/2840] Fix PyUp case in README

Closes #3366

Co-Authored-By: 0sahilahmed <57229974+0sahilahmed@users.noreply.github.com>
Co-Authored-By: NarongSaron
---
 README.rst | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/README.rst b/README.rst
index 799bdeafb..994cc83f4 100644
--- a/README.rst
+++ b/README.rst
@@ -120,8 +120,8 @@ Projects that provide financial support to the maintainers:
 
 Two Scoops of Django 3.x is the best ice cream-themed Django reference in the universe!
 
-pyup
-~~~~~~~~~~~~~~~~~~
+PyUp
+~~~~
 
 .. image:: https://pyup.io/static/images/logo.png
    :name: pyup
@@ -129,7 +129,7 @@ pyup
    :alt: pyup
    :target: https://pyup.io/
 
-Pyup brings you automated security and dependency updates used by Google and other organizations. Free for open source projects!
+PyUp brings you automated security and dependency updates used by Google and other organizations. Free for open source projects!
 
 Usage
 ------
@@ -241,12 +241,12 @@ For Readers of Two Scoops of Django
 
 You may notice that some elements of this project do not exactly match what we describe in chapter 3. The reason for that is this project, amongst other things, serves as a test bed for trying out new ideas and concepts. Sometimes they work, sometimes they don't, but the end result is that it won't necessarily match precisely what is described in the book I co-authored.
 
-For pyup.io Users
------------------
+For PyUp Users
+--------------
 
-If you are using `pyup.io`_ to keep your dependencies updated and secure, use the code *cookiecutter* during checkout to get 15% off every month.
+If you are using `PyUp`_ to keep your dependencies updated and secure, use the code *cookiecutter* during checkout to get 15% off every month.
 
-.. _`pyup.io`: https://pyup.io
+.. _`PyUp`: https://pyup.io
 
 "Your Stuff"
 -------------

From 8242ea7dd66babe1c07300dae35ceceef5148611 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 4 Dec 2021 13:50:20 +0000
Subject: [PATCH 1857/2840] Fix link

---
 README.rst | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/README.rst b/README.rst
index 994cc83f4..c998f4396 100644
--- a/README.rst
+++ b/README.rst
@@ -244,9 +244,7 @@ You may notice that some elements of this project do not exactly match what we d
 For PyUp Users
 --------------
 
-If you are using `PyUp`_ to keep your dependencies updated and secure, use the code *cookiecutter* during checkout to get 15% off every month.
-
-.. _`PyUp`: https://pyup.io
+If you are using `PyUp <https://pyup.io>`_ to keep your dependencies updated and secure, use the code *cookiecutter* during checkout to get 15% off every month.
 
 "Your Stuff"
 -------------

From 5ef345bd3a5c180db29d5c52b60b66d042251488 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sat, 4 Dec 2021 13:52:41 +0000
Subject: [PATCH 1858/2840] Update Slack link to Discord

---
 README.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index c998f4396..cc48d4d88 100644
--- a/README.rst
+++ b/README.rst
@@ -230,11 +230,11 @@ Community
 
 * Have questions? **Before you ask questions anywhere else**, please post your question on `Stack Overflow`_ under the *cookiecutter-django* tag. We check there periodically for questions.
 * If you think you found a bug or want to request a feature, please open an issue_.
-* For anything else, you can chat with us on `Slack`_.
+* For anything else, you can chat with us on `Discord`_.
 
 .. _`Stack Overflow`: http://stackoverflow.com/questions/tagged/cookiecutter-django
 .. _`issue`: https://github.com/cookiecutter/cookiecutter-django/issues
-.. _`Slack`: https://join.slack.com/t/cookie-cutter/shared_invite/enQtNzI0Mzg5NjE5Nzk5LTRlYWI2YTZhYmQ4YmU1Y2Q2NmE1ZjkwOGM0NDQyNTIwY2M4ZTgyNDVkNjMxMDdhZGI5ZGE5YmJjM2M3ODJlY2U
+.. _`Discord`: https://discord.gg/bTfDa6Zz
 
 For Readers of Two Scoops of Django
 --------------------------------------------

From d9c699d060c044cad1f3e9ebebe022519a643361 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sun, 5 Dec 2021 02:18:59 +0000
Subject: [PATCH 1859/2840] Release 2021.12.04

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 598d29d30..792fde78b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2021.12.04
+
+### Changed
+- Removed mention of Foundation fork from readme ([#3445](https://github.com/cookiecutter/cookiecutter-django/pull/3445))
+### Updated
+- Update pytest-django to 4.5.1 ([#3443](https://github.com/cookiecutter/cookiecutter-django/pull/3443))
+
 ## 2021.12.01
 
 ### Updated
diff --git a/setup.py b/setup.py
index 276b0a4db..f8998e3c9 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.12.01"
+version = "2021.12.04"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From b704b371d8927c68be128f0509d84ef56eb3d539 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 6 Dec 2021 05:01:23 -0500
Subject: [PATCH 1860/2840] Update django-cors-headers to 3.10.1 (#3447)

---
 {{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 c819e9418..81606a4e7 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -42,5 +42,5 @@ django-redis==5.1.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.10.0 # https://github.com/adamchainz/django-cors-headers
+django-cors-headers==3.10.1 # https://github.com/adamchainz/django-cors-headers
 {%- endif %}

From 167ccb1d932ea737a48769e82af6b5be1b6967a8 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 6 Dec 2021 05:02:05 -0500
Subject: [PATCH 1861/2840] Update black to 21.12b0 (#3448)

---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index c4edf3bc0..411f198d8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-black==21.11b1
+black==21.12b0
 isort==5.10.1
 flake8==4.0.1
 flake8-isort==4.1.1
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 9e467e331..2de2d5c86 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -31,7 +31,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 flake8==4.0.1  # https://github.com/PyCQA/flake8
 flake8-isort==4.1.1  # https://github.com/gforcada/flake8-isort
 coverage==6.2  # https://github.com/nedbat/coveragepy
-black==21.11b1  # https://github.com/psf/black
+black==21.12b0  # 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 201cddbc997e74ca1a134bb801c578d0ba41998e Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 6 Dec 2021 10:02:51 +0000
Subject: [PATCH 1862/2840] Auto-update pre-commit hooks (#3449)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 {{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 e2cdf71fe..4d70f12c9 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/psf/black
-    rev: 21.11b1
+    rev: 21.12b0
     hooks:
       - id: black
 

From a253ad9d5a408bda5623d7d2af1a35df04b878db Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 6 Dec 2021 10:07:26 +0000
Subject: [PATCH 1863/2840] Fix Discord links

Fix #3446
---
 README.rst | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/README.rst b/README.rst
index cc48d4d88..211157ec7 100644
--- a/README.rst
+++ b/README.rst
@@ -14,7 +14,7 @@ Cookiecutter Django
     :alt: Updates
 
 .. image:: https://img.shields.io/badge/Discord-cookiecutter-5865F2?style=flat&logo=discord&logoColor=white
-    :target: https://discord.gg/bTfDa6Zz
+    :target: https://discord.gg/9BrxzPKuEW
     :alt: Join our Discord
 
 .. image:: https://www.codetriage.com/cookiecutter/cookiecutter-django/badges/users.svg
@@ -234,7 +234,7 @@ Community
 
 .. _`Stack Overflow`: http://stackoverflow.com/questions/tagged/cookiecutter-django
 .. _`issue`: https://github.com/cookiecutter/cookiecutter-django/issues
-.. _`Discord`: https://discord.gg/bTfDa6Zz
+.. _`Discord`: https://discord.gg/9BrxzPKuEW
 
 For Readers of Two Scoops of Django
 --------------------------------------------

From 4a63cecebcfa7522ce6ca0b8cdec5ef5d2e5193a Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 6 Dec 2021 11:50:50 +0000
Subject: [PATCH 1864/2840] Disable a few workflows on forks

---
 .github/workflows/django-issue-checker.yml  | 2 +-
 .github/workflows/pre-commit-autoupdate.yml | 3 +++
 .github/workflows/update-changelog.yml      | 1 -
 .github/workflows/update-contributors.yml   | 4 +++-
 4 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/django-issue-checker.yml b/.github/workflows/django-issue-checker.yml
index e071968ff..1118e1b23 100644
--- a/.github/workflows/django-issue-checker.yml
+++ b/.github/workflows/django-issue-checker.yml
@@ -10,7 +10,7 @@ on:
   workflow_dispatch:
 
 jobs:
-  issue-manager:
+  issue-checker:
     # Disables this workflow from running in a repository that is not part of the indicated organization/user
     if: github.repository_owner == 'cookiecutter'
 
diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml
index dd3c4dd68..c8fa35b51 100644
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -10,6 +10,9 @@ on:
 
 jobs:
   auto-update:
+    # Disables this workflow from running in a repository that is not part of the indicated organization/user
+    if: github.repository_owner == 'cookiecutter'
+
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index 593ee1500..00065c05b 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -13,7 +13,6 @@ jobs:
     if: github.repository_owner == 'cookiecutter'
 
     runs-on: ubuntu-latest
-
     steps:
       - uses: actions/checkout@v2
 
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 0f3508dc6..2e6e65b86 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -7,8 +7,10 @@ on:
 
 jobs:
   build:
-    runs-on: ubuntu-latest
+    # Disables this workflow from running in a repository that is not part of the indicated organization/user
+    if: github.repository_owner == 'cookiecutter'
 
+    runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
 

From 031f4efbd023868d468a8331e049ab25de6bb3b5 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 6 Dec 2021 11:58:02 +0000
Subject: [PATCH 1865/2840] Simplify config for issue-manager.yml

---
 .github/workflows/issue-manager.yml | 46 +++++------------------------
 1 file changed, 8 insertions(+), 38 deletions(-)

diff --git a/.github/workflows/issue-manager.yml b/.github/workflows/issue-manager.yml
index 7a0e8a549..8ae6cafa0 100644
--- a/.github/workflows/issue-manager.yml
+++ b/.github/workflows/issue-manager.yml
@@ -1,21 +1,12 @@
-# Automatically close issues that have a keyword mark (an HTML comment)
-# in the last comment in the issue, by a group of predefined users, after a custom delay.
+# Automatically close issues or pull requests that have a label, after a custom delay, if no one replies.
 # https://github.com/tiangolo/issue-manager
 
-# Default config:
-# <!-- issue-manager: answered -->
-# Wait 10 days and comment: "Assuming the original issue was solved, it will be automatically closed now"
-
-# Extra config:
-# '<!-- issue-manager: waiting -->'
-# Wait 10 days and comment: "Automatically closing. To re-open, please provide the additional information requested"
-
 name: Issue Manager
 
 on:
-  # Every day at midnight
+  # Every day
   schedule:
-    - cron: "0 0 * * *"
+    - cron: "12 0 * * *"
   # Manual trigger
   workflow_dispatch:
 
@@ -30,33 +21,12 @@ jobs:
           config: >
             {
               "answered": {
-                "delay": 864000,
-                "message": "Assuming the original issue was solved, it will be automatically closed now.",
-                "users": [
-                 "pydanny",
-                 "audreyr",
-                 "luzfcb",
-                 "theskumar",
-                 "jayfk",
-                 "burhan",
-                 "webyneter",
-                 "browniebroke",
-                 "sfdye"
-                ]
+                "message": "Assuming the question was answered, this will be automatically closed now."
+              },
+              "solved": {
+                "message": "Assuming the original issue was solved, it will be automatically closed now."
               },
               "waiting": {
-                "delay": 864000,
-                "message": "Automatically closing. To re-open, please provide the additional information requested.",
-                "users": [
-                  "pydanny",
-                  "audreyr",
-                  "luzfcb",
-                  "theskumar",
-                  "jayfk",
-                  "burhan",
-                  "webyneter",
-                  "browniebroke",
-                  "sfdye"
-                ]
+                "message": "Automatically closing after waiting for additional info. To re-open, please provide the additional information requested."
               }
             }

From 5916b880975b2f5e662bb3c54422dcfb8c4e82f2 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 6 Dec 2021 12:01:31 +0000
Subject: [PATCH 1866/2840] Disable issue-manager workflow on forks

---
 .github/workflows/issue-manager.yml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/issue-manager.yml b/.github/workflows/issue-manager.yml
index 8ae6cafa0..b275c4f4e 100644
--- a/.github/workflows/issue-manager.yml
+++ b/.github/workflows/issue-manager.yml
@@ -12,12 +12,14 @@ on:
 
 jobs:
   issue-manager:
+    # Disables this workflow from running in a repository that is not part of the indicated organization/user
+    if: github.repository_owner == 'cookiecutter'
+
     runs-on: ubuntu-latest
     steps:
       - uses: tiangolo/issue-manager@0.4.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
-
           config: >
             {
               "answered": {

From 6282d09a1b8868b4fefc029d8aa502c7bc8e5e5c Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 7 Dec 2021 02:18:53 +0000
Subject: [PATCH 1867/2840] Release 2021.12.06

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 792fde78b..a75e03346 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2021.12.06
+
+### Updated
+- Auto-update pre-commit hooks ([#3449](https://github.com/cookiecutter/cookiecutter-django/pull/3449))
+- Update black to 21.12b0 ([#3448](https://github.com/cookiecutter/cookiecutter-django/pull/3448))
+- Update django-cors-headers to 3.10.1 ([#3447](https://github.com/cookiecutter/cookiecutter-django/pull/3447))
+
 ## 2021.12.04
 
 ### Changed
diff --git a/setup.py b/setup.py
index f8998e3c9..e0a969479 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.12.04"
+version = "2021.12.06"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 163975120da00848497c3bc9133cac52f33fb66d Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 7 Dec 2021 06:19:18 -0500
Subject: [PATCH 1868/2840] Update django to 3.2.10 (#3451)

---
 {{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 81606a4e7..31030b9cb 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,7 +29,7 @@ uvicorn[standard]==0.15.0  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.2.9  # pyup: < 4.0  # https://www.djangoproject.com/
+django==3.2.10  # pyup: < 4.0  # https://www.djangoproject.com/
 django-environ==0.8.1  # https://github.com/joke2k/django-environ
 django-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.46.0  # https://github.com/pennersr/django-allauth

From 035eede6703f05fa4fe585cffbffd941f558a230 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 7 Dec 2021 19:05:59 +0000
Subject: [PATCH 1869/2840] Configure Dependabot for npm packages at the
 template level (#3436)

---
 .github/dependabot.yml                     |  8 ++++++++
 hooks/post_gen_project.py                  | 13 +++++++++++++
 {{cookiecutter.project_slug}}/package.json |  6 ------
 3 files changed, 21 insertions(+), 6 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 5cb5a142b..8922cd450 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -10,3 +10,11 @@ updates:
       interval: "daily"
     labels:
       - "update"
+
+  # Update npm packages
+  - package-ecosystem: "npm"
+    directory: "{{cookiecutter.project_slug}}/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "update"
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index 3ad0e9e5d..d04970d34 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -10,6 +10,7 @@ TODO: restrict Cookiecutter Django project initialization to
 """
 from __future__ import print_function
 
+import json
 import os
 import random
 import shutil
@@ -95,6 +96,16 @@ def remove_packagejson_file():
         os.remove(file_name)
 
 
+def remove_bootstrap_packages():
+    with open("package.json", mode="r") as fd:
+        content = json.load(fd)
+    for package_name in ["bootstrap", "gulp-concat", "@popperjs/core"]:
+        content["devDependencies"].pop(package_name)
+    with open("package.json", mode="w") as fd:
+        json.dump(content, fd, ensure_ascii=False, indent=2)
+        fd.write("\n")
+
+
 def remove_celery_files():
     file_names = [
         os.path.join("config", "celery_app.py"),
@@ -381,6 +392,8 @@ def main():
         remove_packagejson_file()
         if "{{ cookiecutter.use_docker }}".lower() == "y":
             remove_node_dockerfile()
+    elif "{{ cookiecutter.custom_bootstrap_compilation }}" == "n":
+        remove_bootstrap_packages()
 
     if "{{ cookiecutter.cloud_provider}}".lower() == "none":
         print(
diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json
index ac868d95f..bff0a34af 100644
--- a/{{cookiecutter.project_slug}}/package.json
+++ b/{{cookiecutter.project_slug}}/package.json
@@ -3,12 +3,9 @@
   "version": "{{ cookiecutter.version }}",
   "dependencies": {},
   "devDependencies": {
-    {% if cookiecutter.js_task_runner == 'Gulp' -%}
-    {% if cookiecutter.custom_bootstrap_compilation == 'y' -%}
     "bootstrap": "^5.1.3",
     "gulp-concat": "^2.6.1",
     "@popperjs/core": "^2.10.2",
-    {% endif -%}
     "autoprefixer": "^10.4.0",
     "browser-sync": "^2.27.7",
     "cssnano": "^5.0.11",
@@ -22,7 +19,6 @@
     "pixrem": "^5.0.0",
     "postcss": "^8.3.11",
     "sass": "^1.43.4"
-    {%- endif %}
   },
   "engines": {
     "node": "16"
@@ -31,9 +27,7 @@
     "last 2 versions"
   ],
   "scripts": {
-    {% if cookiecutter.js_task_runner == 'Gulp' -%}
     "dev": "gulp",
     "build": "gulp generate-assets"
-    {%- endif %}
   }
 }

From ea18a8f54ef5638c25b26b6f2ed781bbf23c2f6b Mon Sep 17 00:00:00 2001
From: mpoli <poli@closedgap.com>
Date: Tue, 7 Dec 2021 16:47:43 -0300
Subject: [PATCH 1870/2840] Add docker, pip and npm to GitHub's Dependabot
 (#3401)

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
---
 .../.github/dependabot.yml                    | 90 ++++++++++++++++++-
 1 file changed, 89 insertions(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/.github/dependabot.yml b/{{cookiecutter.project_slug}}/.github/dependabot.yml
index 8e8ac8663..cdc365435 100644
--- a/{{cookiecutter.project_slug}}/.github/dependabot.yml
+++ b/{{cookiecutter.project_slug}}/.github/dependabot.yml
@@ -1,7 +1,95 @@
+# Config for Dependabot updates. See Documentation here:
+# https://help.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
 version: 2
 updates:
-  # Update Github actions in workflows
+  # Update GitHub actions in workflows
   - package-ecosystem: "github-actions"
     directory: "/"
+    # Check for updates to GitHub Actions every weekday
     schedule:
       interval: "daily"
+
+{%- if cookiecutter.use_docker == 'y' %}
+
+  # Enable version updates for Docker
+  # We need to specify each Dockerfile in a separate entry because Dependabot doesn't 
+  # support wildcards or recursively checking subdirectories. Check this issue for updates:
+  # https://github.com/dependabot/dependabot-core/issues/2178
+  - package-ecosystem: "docker"
+    # Look for a `Dockerfile` in the `compose/local/django` directory
+    directory: "compose/local/django/"
+    # Check for updates to GitHub Actions every weekday
+    schedule:
+      interval: "daily"
+
+  # Enable version updates for Docker
+  - package-ecosystem: "docker"
+    # Look for a `Dockerfile` in the `compose/local/docs` directory
+    directory: "compose/local/docs/"
+    # Check for updates to GitHub Actions every weekday
+    schedule:
+      interval: "daily"
+
+  # Enable version updates for Docker
+  - package-ecosystem: "docker"
+    # Look for a `Dockerfile` in the `compose/local/node` directory
+    directory: "compose/local/node/"
+    # Check for updates to GitHub Actions every weekday
+    schedule:
+      interval: "daily"
+  
+  # Enable version updates for Docker
+  - package-ecosystem: "docker"
+    # Look for a `Dockerfile` in the `compose/production/aws` directory
+    directory: "compose/production/aws/"
+    # Check for updates to GitHub Actions every weekday
+    schedule:
+      interval: "daily"
+
+  # Enable version updates for Docker
+  - package-ecosystem: "docker"
+    # Look for a `Dockerfile` in the `compose/production/django` directory
+    directory: "compose/production/django/"
+    # Check for updates to GitHub Actions every weekday
+    schedule:
+      interval: "daily"
+
+  # Enable version updates for Docker
+  - package-ecosystem: "docker"
+    # Look for a `Dockerfile` in the `compose/production/postgres` directory
+    directory: "compose/production/postgres/"
+    # Check for updates to GitHub Actions every weekday
+    schedule:
+      interval: "daily"
+
+  # Enable version updates for Docker
+  - package-ecosystem: "docker"
+    # Look for a `Dockerfile` in the `compose/production/traefik` directory
+    directory: "compose/production/traefik/"
+    # Check for updates to GitHub Actions every weekday
+    schedule:
+      interval: "daily"
+
+{%- endif %}
+
+  # Enable version updates for Python/Pip - Production
+  - package-ecosystem: "pip"
+    # Look for a `requirements.txt` in the `root` directory
+    # also 'setup.cfg', 'runtime.txt' and 'requirements/*.txt'
+    directory: "/"
+    # Check for updates to GitHub Actions every weekday
+    schedule:
+      interval: "daily"
+
+{%- if cookiecutter.js_task_runner != "None" %}
+
+  # Enable version updates for javascript/npm
+  - package-ecosystem: "npm"
+    # Look for a `packages.json' in the `root` directory
+    directory: "/"
+    # Check for updates to GitHub Actions every weekday
+    schedule:
+      interval: "daily"
+
+{%- endif %}

From 87d2bac7a2a8262037f42a029d9a053fbfa5bf53 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 8 Dec 2021 02:17:35 +0000
Subject: [PATCH 1871/2840] Release 2021.12.07

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a75e03346..6f14cc4f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2021.12.07
+
+### Changed
+- Add docker, pip and npm to GitHub&#39;s Dependabot ([#3401](https://github.com/cookiecutter/cookiecutter-django/pull/3401))
+- Configure Dependabot for npm packages at the template level ([#3436](https://github.com/cookiecutter/cookiecutter-django/pull/3436))
+### Updated
+- Update django to 3.2.10 ([#3451](https://github.com/cookiecutter/cookiecutter-django/pull/3451))
+
 ## 2021.12.06
 
 ### Updated
diff --git a/setup.py b/setup.py
index e0a969479..40f6f313f 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.12.06"
+version = "2021.12.07"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 2c82876599486c6fc646cac2d229242e75e7579a Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 8 Dec 2021 08:18:40 -0500
Subject: [PATCH 1872/2840] Update argon2-cffi to 21.2.0 (#3453)

---
 {{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 31030b9cb..9c013586e 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==21.1.0  # https://github.com/hynek/argon2_cffi
+argon2-cffi==21.2.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==5.3.0  # https://github.com/evansd/whitenoise
 {%- endif %}

From 5fd9b9ab8c464a5aeded325de02bca91035b0a80 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 8 Dec 2021 18:05:19 +0000
Subject: [PATCH 1873/2840] Reword introduction in documentation (#3452)

---
 docs/index.rst                      | 9 +++++----
 docs/project-generation-options.rst | 6 ++++++
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/docs/index.rst b/docs/index.rst
index f62184643..dae641d10 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -1,13 +1,14 @@
 .. cookiecutter-django documentation master file.
 
 Welcome to Cookiecutter Django's documentation!
-====================================================================
+===============================================
 
-A Cookiecutter_ template for Django.
+Powered by Cookiecutter_, Cookiecutter Django is a project template for jumpstarting production-ready Django projects. The template offers a number of generation options, we invite you to check the :ref:`dedicated page <template-options>` to learn more about each of them.
 
 .. _cookiecutter: https://github.com/cookiecutter/cookiecutter
 
-Contents:
+Contents
+--------
 
 .. toctree::
    :maxdepth: 2
@@ -28,7 +29,7 @@ Contents:
    troubleshooting
 
 Indices and tables
-==================
+------------------
 
 * :ref:`genindex`
 * :ref:`search`
diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index 971bcf380..26fb79d2f 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -1,6 +1,12 @@
+.. _template-options:
+
 Project Generation Options
 ==========================
 
+This page describes all the template options that will be prompted by the `cookiecutter CLI`_ prior to generating your project.
+
+.. _cookiecutter CLI: https://github.com/cookiecutter/cookiecutter
+
 project_name:
     Your project's human-readable name, capitals and spaces allowed.
 

From c4aa645094a5097f94483159cff5d712a3c139da Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Wed, 8 Dec 2021 18:18:36 +0000
Subject: [PATCH 1874/2840] Auto-update pre-commit hooks for template

---
 .github/workflows/pre-commit-autoupdate.yml | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml
index c8fa35b51..d253eb086 100644
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -5,7 +5,7 @@ name: Pre-commit auto-update
 
 on:
   schedule:
-    - cron: "0 0 * * *"
+    - cron: "15 2 * * *"
   workflow_dispatch: # to trigger manually
 
 jobs:
@@ -23,7 +23,10 @@ jobs:
       - name: Install pre-commit
         run: pip install pre-commit
 
-      - name: Run pre-commit autoupdate
+      - name: Autoupdate template
+        run: pre-commit autoupdate
+
+      - name: Autoupdate generated projects
         working-directory: "{{cookiecutter.project_slug}}"
         run: pre-commit autoupdate
 

From 997da7cc7ad1bf8f433f281495ce4df168f0220e Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 8 Dec 2021 19:33:28 +0000
Subject: [PATCH 1875/2840] Create or update issue

---
 scripts/create_django_issue.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/create_django_issue.py b/scripts/create_django_issue.py
index 7341fb42e..ea85db6c2 100644
--- a/scripts/create_django_issue.py
+++ b/scripts/create_django_issue.py
@@ -274,7 +274,7 @@ class GitHubManager:
             print(f"Handling GitHub issue for Django {version}")
             md_content = self.generate_markdown(version)
             print(f"Generated markdown:\n\n{md_content}")
-            # self.create_or_edit_issue(version, md_content)
+            self.create_or_edit_issue(version, md_content)
 
 
 def main() -> None:

From c58da17dd6165d29729c9ac8b1a4030a18ce77a7 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 9 Dec 2021 02:17:18 +0000
Subject: [PATCH 1876/2840] Release 2021.12.08

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f14cc4f6..ab56f0cfd 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2021.12.08
+
+### Changed
+- Reword introduction in documentation ([#3452](https://github.com/cookiecutter/cookiecutter-django/pull/3452))
+### Updated
+- Update argon2-cffi to 21.2.0 ([#3453](https://github.com/cookiecutter/cookiecutter-django/pull/3453))
+
 ## 2021.12.07
 
 ### Changed
diff --git a/setup.py b/setup.py
index 40f6f313f..7b925e11f 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.12.07"
+version = "2021.12.08"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From e564c71f21ec9316243313252b3cdace95046ae0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 9 Dec 2021 09:23:07 +0000
Subject: [PATCH 1877/2840] Auto-update pre-commit hooks (#3457)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index c9fcab24a..95197c558 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/psf/black
-    rev: 21.11b1
+    rev: 21.12b0
     hooks:
       - id: black
 

From 9c74f2076c76fbba7bc5fe9d7722c5f2129f64ea Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 10 Dec 2021 02:14:52 +0000
Subject: [PATCH 1878/2840] Release 2021.12.09

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab56f0cfd..bd0eaf72a 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.12.09
+
+### Updated
+- Auto-update pre-commit hooks ([#3457](https://github.com/cookiecutter/cookiecutter-django/pull/3457))
+
 ## 2021.12.08
 
 ### Changed
diff --git a/setup.py b/setup.py
index 7b925e11f..4285368a9 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.12.08"
+version = "2021.12.09"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 953ed5503d00d3d89b6291f8a05d401de3ab08af Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Fri, 10 Dec 2021 19:30:41 +0000
Subject: [PATCH 1879/2840] Update Issue Manager triggers

---
 .github/workflows/issue-manager.yml | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/issue-manager.yml b/.github/workflows/issue-manager.yml
index b275c4f4e..a6e074137 100644
--- a/.github/workflows/issue-manager.yml
+++ b/.github/workflows/issue-manager.yml
@@ -1,13 +1,19 @@
 # Automatically close issues or pull requests that have a label, after a custom delay, if no one replies.
 # https://github.com/tiangolo/issue-manager
-
 name: Issue Manager
 
 on:
-  # Every day
   schedule:
     - cron: "12 0 * * *"
-  # Manual trigger
+  issue_comment:
+    types:
+      - created
+  issues:
+    types:
+      - labeled
+  pull_request_target:
+    types:
+      - labeled
   workflow_dispatch:
 
 jobs:

From db2b052515070c2845a21f7354782c8905462a44 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Fri, 10 Dec 2021 20:18:50 +0000
Subject: [PATCH 1880/2840] Add a note regarding Redis on PythonAnywhere

Fix #3124
---
 docs/deployment-on-pythonanywhere.rst | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/docs/deployment-on-pythonanywhere.rst b/docs/deployment-on-pythonanywhere.rst
index 8e6abb511..f7bff12a4 100644
--- a/docs/deployment-on-pythonanywhere.rst
+++ b/docs/deployment-on-pythonanywhere.rst
@@ -71,13 +71,14 @@ Add these exports
     export DJANGO_AWS_ACCESS_KEY_ID=
     export DJANGO_AWS_SECRET_ACCESS_KEY=
     export DJANGO_AWS_STORAGE_BUCKET_NAME=
-    export DATABASE_URL='<see below>'
+    export DATABASE_URL='<see Database setup section below>'
+    export REDIS_URL='<see Redis section below>'
 
 .. note:: The AWS details are not required if you're using whitenoise or the built-in pythonanywhere static files service, but you do need to set them to blank, as above.
 
 
-Database setup:
----------------
+Database setup
+--------------
 
 Go to the PythonAnywhere **Databases tab** and configure your database.
 
@@ -113,6 +114,13 @@ Now run the migration, and collectstatic:
     python manage.py createsuperuser
 
 
+Redis
+-----
+
+PythonAnywhere does NOT `offer a built-in solution <https://www.pythonanywhere.com/forums/topic/1666/>`_ for Redis, however the production setup from Cookiecutter Django uses Redis as cache and requires one.
+
+We recommend to signup to a separate service offering hosted Redis (e.g. `Redislab <https://redis.com/>`_) and use the URL they provide.
+
 
 Configure the PythonAnywhere Web Tab
 ------------------------------------

From eb0b438fbabda20e28e9c2964f43c48f3ba9774d Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 13 Dec 2021 15:46:54 -0500
Subject: [PATCH 1881/2840] Update django-allauth to 0.47.0 (#3459)

---
 {{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 9c013586e..8cfe8c2f1 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -32,7 +32,7 @@ uvicorn[standard]==0.15.0  # https://github.com/encode/uvicorn
 django==3.2.10  # pyup: < 4.0  # https://www.djangoproject.com/
 django-environ==0.8.1  # https://github.com/joke2k/django-environ
 django-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
-django-allauth==0.46.0  # https://github.com/pennersr/django-allauth
+django-allauth==0.47.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.13.0  # https://github.com/django-crispy-forms/django-crispy-forms
 crispy-bootstrap5==0.6  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.use_compressor == "y" %}

From 0fac9fe28b5923bfeb7a680b0675ef4a4f37b93a Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 13 Dec 2021 15:47:14 -0500
Subject: [PATCH 1882/2840] Update argon2-cffi to 21.3.0 (#3464)

---
 {{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 8cfe8c2f1..c3f557612 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==21.2.0  # https://github.com/hynek/argon2_cffi
+argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==5.3.0  # https://github.com/evansd/whitenoise
 {%- endif %}

From dc937d4932d2958c300bed2f0ffe9bf3e0f6c7a3 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 13 Dec 2021 15:48:13 -0500
Subject: [PATCH 1883/2840] Update django-debug-toolbar to 3.2.3 (#3466)

---
 {{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 2de2d5c86..32b160625 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -42,7 +42,7 @@ pre-commit==2.16.0  # https://github.com/pre-commit/pre-commit
 # ------------------------------------------------------------------------------
 factory-boy==3.2.1  # https://github.com/FactoryBoy/factory_boy
 
-django-debug-toolbar==3.2.2  # https://github.com/jazzband/django-debug-toolbar
+django-debug-toolbar==3.2.3  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.1.5  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==2.0.2  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.5.1  # https://github.com/pytest-dev/pytest-django

From 52db8e64027f01447518d3e15d96ce5a864fca62 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 13 Dec 2021 15:48:56 -0500
Subject: [PATCH 1884/2840] Update sentry-sdk to 1.5.1 (#3467)

---
 {{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 84aa20263..8e622ea94 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.2  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.5.0  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.5.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 c99feb4db78d0db1dbb0ae9af1f84f333988fd70 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 13 Dec 2021 15:50:17 -0500
Subject: [PATCH 1885/2840] Update djangorestframework to 3.13.0 (#3468)

---
 {{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 c3f557612..e966cf201 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -41,6 +41,6 @@ django-compressor==2.4.1  # https://github.com/django-compressor/django-compress
 django-redis==5.1.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
+djangorestframework==3.13.0  # https://github.com/encode/django-rest-framework
 django-cors-headers==3.10.1 # https://github.com/adamchainz/django-cors-headers
 {%- endif %}

From 3ffa15d735256210aea2e50d5951724c1c829a87 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 14 Dec 2021 02:18:21 +0000
Subject: [PATCH 1886/2840] Release 2021.12.13

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bd0eaf72a..b0bbaa939 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2021.12.13
+
+### Updated
+- Update djangorestframework to 3.13.0 ([#3468](https://github.com/cookiecutter/cookiecutter-django/pull/3468))
+- Update sentry-sdk to 1.5.1 ([#3467](https://github.com/cookiecutter/cookiecutter-django/pull/3467))
+- Update django-debug-toolbar to 3.2.3 ([#3466](https://github.com/cookiecutter/cookiecutter-django/pull/3466))
+- Update argon2-cffi to 21.3.0 ([#3464](https://github.com/cookiecutter/cookiecutter-django/pull/3464))
+- Update django-allauth to 0.47.0 ([#3459](https://github.com/cookiecutter/cookiecutter-django/pull/3459))
+
 ## 2021.12.09
 
 ### Updated
diff --git a/setup.py b/setup.py
index 4285368a9..199198b44 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.12.09"
+version = "2021.12.13"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 2a1ea27ba198503371666b82d82316b55cfc8319 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 14 Dec 2021 08:59:56 +0000
Subject: [PATCH 1887/2840] Bump peter-evans/create-pull-request from 3.11.0 to
 3.12.0 (#3469)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.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 d253eb086..e92816101 100644
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -31,7 +31,7 @@ jobs:
         run: pre-commit autoupdate
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3.11.0
+        uses: peter-evans/create-pull-request@v3.12.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: update/pre-commit-autoupdate

From 40cc35df89adc847715ebd01689945494b18d5d1 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 14 Dec 2021 09:20:31 +0000
Subject: [PATCH 1888/2840] Update rcssmin & django-compressor (#3470)

Co-authored-by: pyup-bot <github-bot@pyup.io>
---
 {{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 e966cf201..358d5b6ba 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -3,9 +3,9 @@ python-slugify==5.0.2  # https://github.com/un33k/python-slugify
 Pillow==8.4.0  # 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
+rcssmin==1.1.0 --install-option="--without-c-extensions"  # https://github.com/ndparker/rcssmin
 {%- else %}
-rcssmin==1.0.6  # https://github.com/ndparker/rcssmin
+rcssmin==1.1.0  # https://github.com/ndparker/rcssmin
 {%- endif %}
 {%- endif %}
 argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
@@ -36,7 +36,7 @@ django-allauth==0.47.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.13.0  # https://github.com/django-crispy-forms/django-crispy-forms
 crispy-bootstrap5==0.6  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.use_compressor == "y" %}
-django-compressor==2.4.1  # https://github.com/django-compressor/django-compressor
+django-compressor==3.0  # https://github.com/django-compressor/django-compressor
 {%- endif %}
 django-redis==5.1.0  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == "y" %}

From ac74f6a52108ec1f56d6b0b75a965eebfce4b589 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 14 Dec 2021 04:29:28 -0500
Subject: [PATCH 1889/2840] Update pytest-django to 4.5.2 (#3471)

---
 {{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 32b160625..6030b2224 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -45,4 +45,4 @@ factory-boy==3.2.1  # https://github.com/FactoryBoy/factory_boy
 django-debug-toolbar==3.2.3  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.1.5  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==2.0.2  # https://github.com/nedbat/django_coverage_plugin
-pytest-django==4.5.1  # https://github.com/pytest-dev/pytest-django
+pytest-django==4.5.2  # https://github.com/pytest-dev/pytest-django

From 46dec7b093b59f08293278b1bfb4aa5cf9cd0b88 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 15 Dec 2021 02:16:49 +0000
Subject: [PATCH 1890/2840] Release 2021.12.14

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0bbaa939..3510cd776 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2021.12.14
+
+### Changed
+- Update rcssmin &amp; django-compressor ([#3470](https://github.com/cookiecutter/cookiecutter-django/pull/3470))
+### Updated
+- Update pytest-django to 4.5.2 ([#3471](https://github.com/cookiecutter/cookiecutter-django/pull/3471))
+- Bump peter-evans/create-pull-request from 3.11.0 to 3.12.0 ([#3469](https://github.com/cookiecutter/cookiecutter-django/pull/3469))
+
 ## 2021.12.13
 
 ### Updated
diff --git a/setup.py b/setup.py
index 199198b44..7aabd6ee1 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.12.13"
+version = "2021.12.14"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 1aa384ea171e2948eaf2b111118844d79ca0cf22 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 15 Dec 2021 13:08:20 -0500
Subject: [PATCH 1891/2840] Update djangorestframework to 3.13.1 (#3472)

---
 {{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 358d5b6ba..2a856be0c 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -41,6 +41,6 @@ django-compressor==3.0  # https://github.com/django-compressor/django-compressor
 django-redis==5.1.0  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == "y" %}
 # Django REST Framework
-djangorestframework==3.13.0  # https://github.com/encode/django-rest-framework
+djangorestframework==3.13.1  # https://github.com/encode/django-rest-framework
 django-cors-headers==3.10.1 # https://github.com/adamchainz/django-cors-headers
 {%- endif %}

From f125511c1cdf6c23796360175c355f9de1cf0b87 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 15 Dec 2021 19:35:38 -0500
Subject: [PATCH 1892/2840] Update django-debug-toolbar from 3.2.3 to 3.2.4
 (#3473)

---
 {{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 6030b2224..4e64fd25f 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -42,7 +42,7 @@ pre-commit==2.16.0  # https://github.com/pre-commit/pre-commit
 # ------------------------------------------------------------------------------
 factory-boy==3.2.1  # https://github.com/FactoryBoy/factory_boy
 
-django-debug-toolbar==3.2.3  # https://github.com/jazzband/django-debug-toolbar
+django-debug-toolbar==3.2.4  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.1.5  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==2.0.2  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.5.2  # https://github.com/pytest-dev/pytest-django

From 4ba33fa3537f9682b2294d98450b5785a6df1244 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 16 Dec 2021 02:16:34 +0000
Subject: [PATCH 1893/2840] Release 2021.12.15

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3510cd776..76a798879 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.12.15
+
+### Updated
+- Update djangorestframework to 3.13.1 ([#3472](https://github.com/cookiecutter/cookiecutter-django/pull/3472))
+
 ## 2021.12.14
 
 ### Changed
diff --git a/setup.py b/setup.py
index 7aabd6ee1..69d9a1c03 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.12.14"
+version = "2021.12.15"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From ce1c76e34e60395b3d012f9037e138651159459e Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 16 Dec 2021 11:07:47 +0000
Subject: [PATCH 1894/2840] Fix carriage return in `.gitignore` on Windows
 (#3456)

---
 .github/workflows/ci.yml              | 26 +++++++++++++++----------
 hooks/post_gen_project.py             | 13 +++----------
 tests/__init__.py                     |  0
 tests/test_cookiecutter_generation.py | 14 +++++++++++---
 tests/test_hooks.py                   | 28 +++++++++++++++++++++++++++
 5 files changed, 58 insertions(+), 23 deletions(-)
 create mode 100644 tests/__init__.py
 create mode 100644 tests/test_hooks.py

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 85c4cedc8..238062e1f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -16,9 +16,17 @@ jobs:
       - name: Run pre-commit
         uses: pre-commit/action@v2.0.3
 
-  tox:
-    runs-on: ubuntu-latest
-    name: "Test with tox"
+  tests:
+    strategy:
+      fail-fast: false
+      matrix:
+        os:
+          - ubuntu-latest
+          - windows-latest
+          - macOS-latest
+
+    name: "Run tests"
+    runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
       - uses: actions/setup-python@v2
@@ -26,14 +34,11 @@ jobs:
           python-version: "3.9"
           cache: pip
       - name: Install dependencies
-        run: |
-          python -m pip install -U pip
-          python -m pip install -U tox
-      - name: Run tox
-        run: tox -e py39
+        run: pip install -r requirements.txt
+      - name: Run tests
+        run: pytest tests
 
   docker:
-    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
@@ -44,6 +49,7 @@ jobs:
             args: "use_celery=y use_drf=y js_task_runner=Gulp"
 
     name: "${{ matrix.script.name }} Docker"
+    runs-on: ubuntu-latest
     env:
       DOCKER_BUILDKIT: 1
       COMPOSE_DOCKER_CLI_BUILD: 1
@@ -58,7 +64,6 @@ jobs:
         run: sh tests/test_docker.sh ${{ matrix.script.args }}
 
   bare:
-    runs-on: ubuntu-latest
     strategy:
       fail-fast: false
       matrix:
@@ -68,6 +73,7 @@ jobs:
           - name: With Gulp
             args: "js_task_runner=Gulp custom_bootstrap_compilation=y"
 
+    runs-on: ubuntu-latest
     name: "${{ matrix.script.name }} Bare metal"
     services:
       redis:
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index d04970d34..61b75949a 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -139,13 +139,6 @@ def remove_dotgithub_folder():
     shutil.rmtree(".github")
 
 
-def append_to_project_gitignore(path):
-    gitignore_file_path = ".gitignore"
-    with open(gitignore_file_path, "a") as gitignore_file:
-        gitignore_file.write(path)
-        gitignore_file.write(os.linesep)
-
-
 def generate_random_string(
     length, using_digits=False, using_ascii_letters=False, using_punctuation=False
 ):
@@ -260,10 +253,10 @@ def set_celery_flower_password(file_path, value=None):
     return celery_flower_password
 
 
-def append_to_gitignore_file(s):
+def append_to_gitignore_file(ignored_line):
     with open(".gitignore", "a") as gitignore_file:
-        gitignore_file.write(s)
-        gitignore_file.write(os.linesep)
+        gitignore_file.write(ignored_line)
+        gitignore_file.write("\n")
 
 
 def set_flags_in_envs(postgres_user, celery_flower_user, debug=False):
diff --git a/tests/__init__.py b/tests/__init__.py
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index dd4fc34e4..56ae4a64f 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -1,14 +1,20 @@
 import os
 import re
+import sys
 
 import pytest
-import sh
+
+try:
+    import sh
+except (ImportError, ModuleNotFoundError):
+    sh = None  # sh doesn't support Windows
 import yaml
 from binaryornot.check import is_binary
 from cookiecutter.exceptions import FailedHookException
 
 PATTERN = r"{{(\s?cookiecutter)[.](.*?)}}"
 RE_OBJ = re.compile(PATTERN)
+IS_WINDOWS = sys.platform.startswith("win")
 
 
 @pytest.fixture
@@ -111,7 +117,7 @@ UNSUPPORTED_COMBINATIONS = [
 
 
 def _fixture_id(ctx):
-    """Helper to get a user friendly test name from the parametrized context."""
+    """Helper to get a user-friendly test name from the parametrized context."""
     return "-".join(f"{key}:{value}" for key, value in ctx.items())
 
 
@@ -151,6 +157,7 @@ def test_project_generation(cookies, context, context_override):
     check_paths(paths)
 
 
+@pytest.mark.skipif(IS_WINDOWS, reason="sh doesn't support windows")
 @pytest.mark.parametrize("context_override", SUPPORTED_COMBINATIONS, ids=_fixture_id)
 def test_flake8_passes(cookies, context_override):
     """Generated project should pass flake8."""
@@ -162,6 +169,7 @@ def test_flake8_passes(cookies, context_override):
         pytest.fail(e.stdout.decode())
 
 
+@pytest.mark.skipif(IS_WINDOWS, reason="sh doesn't support windows")
 @pytest.mark.parametrize("context_override", SUPPORTED_COMBINATIONS, ids=_fixture_id)
 def test_black_passes(cookies, context_override):
     """Generated project should pass black."""
@@ -265,7 +273,7 @@ def test_github_invokes_linter_and_pytest(
 
 @pytest.mark.parametrize("slug", ["project slug", "Project_Slug"])
 def test_invalid_slug(cookies, context, slug):
-    """Invalid slug should failed pre-generation hook."""
+    """Invalid slug should fail pre-generation hook."""
     context.update({"project_slug": slug})
 
     result = cookies.bake(extra_context=context)
diff --git a/tests/test_hooks.py b/tests/test_hooks.py
new file mode 100644
index 000000000..7ca752722
--- /dev/null
+++ b/tests/test_hooks.py
@@ -0,0 +1,28 @@
+"""Unit tests for the hooks"""
+import os
+from pathlib import Path
+
+import pytest
+
+from hooks.post_gen_project import append_to_gitignore_file
+
+
+@pytest.fixture()
+def working_directory(tmp_path):
+    prev_cwd = Path.cwd()
+    os.chdir(tmp_path)
+    try:
+        yield tmp_path
+    finally:
+        os.chdir(prev_cwd)
+
+
+def test_append_to_gitignore_file(working_directory):
+    gitignore_file = working_directory / ".gitignore"
+    gitignore_file.write_text("node_modules/\n")
+    append_to_gitignore_file(".envs/*")
+    linesep = os.linesep.encode()
+    assert (
+        gitignore_file.read_bytes() == b"node_modules/" + linesep + b".envs/*" + linesep
+    )
+    assert gitignore_file.read_text() == "node_modules/\n.envs/*\n"

From 05d383fbda261a5ab0399575db03ecc9246f909c Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 17 Dec 2021 02:18:49 +0000
Subject: [PATCH 1895/2840] Release 2021.12.16

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 76a798879..2bfa73ec3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2021.12.16
+
+### Fixed
+- Fix carriage return in `.gitignore` on Windows ([#3456](https://github.com/cookiecutter/cookiecutter-django/pull/3456))
+### Updated
+- Update django-debug-toolbar to 3.2.4 ([#3473](https://github.com/cookiecutter/cookiecutter-django/pull/3473))
+
 ## 2021.12.15
 
 ### Updated
diff --git a/setup.py b/setup.py
index 69d9a1c03..8e661fedb 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.12.15"
+version = "2021.12.16"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 79bd3e7f144e963de179ca0b92c2e9b410eb087d Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 17 Dec 2021 17:53:43 +0000
Subject: [PATCH 1896/2840] Fix BrowserSync config on non-Docker setup (#3461)

---
 {{cookiecutter.project_slug}}/gulpfile.js | 38 +++++++++++------------
 1 file changed, 19 insertions(+), 19 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/gulpfile.js b/{{cookiecutter.project_slug}}/gulpfile.js
index 387a137af..82d66fc8d 100644
--- a/{{cookiecutter.project_slug}}/gulpfile.js
+++ b/{{cookiecutter.project_slug}}/gulpfile.js
@@ -133,31 +133,31 @@ function runServer(cb) {
 
 // Browser sync server for live reload
 function initBrowserSync() {
-    browserSync.init(
-      [
-        `${paths.css}/*.css`,
-        `${paths.js}/*.js`,
-        `${paths.templates}/*.html`
-      ], {
-        // https://www.browsersync.io/docs/options/#option-proxy
+  browserSync.init(
+    [
+      `${paths.css}/*.css`,
+      `${paths.js}/*.js`,
+      `${paths.templates}/*.html`
+    ], {
+      // https://www.browsersync.io/docs/options/#option-proxy
+      proxy:  {
         {%- if cookiecutter.use_docker == 'n' %}
-        proxy: 'localhost:8000'
+        proxy: '127.0.0.1:8000',
         {%- else %}
-        proxy:  {
-          target: 'django:8000',
-          proxyReq: [
-            function(proxyReq, req) {
-              // Assign proxy "host" header same as current request at Browsersync server
-              proxyReq.setHeader('Host', req.headers.host)
-            }
-          ]
-        },
         // https://www.browsersync.io/docs/options/#option-open
         // Disable as it doesn't work from inside a container
-        open: false
+        open: false,
+        target: 'django:8000',
         {%- endif %}
+        proxyReq: [
+          function(proxyReq, req) {
+            // Assign proxy "host" header same as current request at Browsersync server
+            proxyReq.setHeader('Host', req.headers.host)
+          }
+        ]
       }
-    )
+    }
+  )
 }
 
 // Watch

From e5ffc03ab072bb9df93fe6ac7aa1d38de82254a2 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 18 Dec 2021 02:19:10 +0000
Subject: [PATCH 1897/2840] Release 2021.12.17

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bfa73ec3..9e1e654a6 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.12.17
+
+### Fixed
+- Fix BrowserSync config on non-Docker setup ([#3461](https://github.com/cookiecutter/cookiecutter-django/pull/3461))
+
 ## 2021.12.16
 
 ### Fixed
diff --git a/setup.py b/setup.py
index 8e661fedb..5f847f7be 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.12.16"
+version = "2021.12.17"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From d2184ae95206110aff9069f21a076276f204c54b Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 19 Dec 2021 09:31:55 -0500
Subject: [PATCH 1898/2840] Update sphinx to 4.3.2 (#3477)

---
 docs/requirements.txt                                | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 9d324374d..ed09babbb 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,2 +1,2 @@
-sphinx==4.3.1
+sphinx==4.3.2
 sphinx-rtd-theme==1.0.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 4e64fd25f..6fcf1fa69 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -23,7 +23,7 @@ djangorestframework-stubs==1.4.0  # https://github.com/typeddjango/djangorestfra
 
 # Documentation
 # ------------------------------------------------------------------------------
-sphinx==4.3.1  # https://github.com/sphinx-doc/sphinx
+sphinx==4.3.2  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From b9d95ad49523e19cba82802db580c6fff1045cd3 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 19 Dec 2021 09:34:04 -0500
Subject: [PATCH 1899/2840] Update django-compressor to 3.1 (#3476)

---
 {{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 2a856be0c..e28e4b553 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -36,7 +36,7 @@ django-allauth==0.47.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.13.0  # https://github.com/django-crispy-forms/django-crispy-forms
 crispy-bootstrap5==0.6  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.use_compressor == "y" %}
-django-compressor==3.0  # https://github.com/django-compressor/django-compressor
+django-compressor==3.1  # https://github.com/django-compressor/django-compressor
 {%- endif %}
 django-redis==5.1.0  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == "y" %}

From a1cae7d5df72c62a2a034acc566bee57b0e0e807 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 19 Dec 2021 13:50:29 -0500
Subject: [PATCH 1900/2840] Update mypy from 0.910 to 0.920 (#3478)

---
 {{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 6fcf1fa69..3489ef630 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.910  # https://github.com/python/mypy
+mypy==0.920  # https://github.com/python/mypy
 django-stubs==1.9.0  # https://github.com/typeddjango/django-stubs
 pytest==6.2.5  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar

From b2fafcb252a7efdd8225914c1cc340e3da2a290e Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Mon, 20 Dec 2021 02:19:02 +0000
Subject: [PATCH 1901/2840] Release 2021.12.19

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9e1e654a6..839094f8d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2021.12.19
+
+### Updated
+- Update mypy to 0.920 ([#3478](https://github.com/cookiecutter/cookiecutter-django/pull/3478))
+- Update django-compressor to 3.1 ([#3476](https://github.com/cookiecutter/cookiecutter-django/pull/3476))
+- Update sphinx to 4.3.2 ([#3477](https://github.com/cookiecutter/cookiecutter-django/pull/3477))
+
 ## 2021.12.17
 
 ### Fixed
diff --git a/setup.py b/setup.py
index 5f847f7be..0991cec86 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.12.17"
+version = "2021.12.19"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From df0b2cac3f957a13c206bbf344dd28aa17888efb Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 20 Dec 2021 09:39:23 +0000
Subject: [PATCH 1902/2840] Add a PyCharm run configuration for docker-compose
 (#3462)

Co-authored-by: Pavel Karateev <lancelote.du.lac@gmail.com>
---
 .editorconfig                                 |  2 +-
 hooks/post_gen_project.py                     |  4 ++++
 {{cookiecutter.project_slug}}/.editorconfig   |  2 +-
 .../docker_compose_up_django.xml              | 23 +++++++++++++++++++
 .../docker_compose_up_docs.xml                | 16 +++++++++++++
 5 files changed, 45 insertions(+), 2 deletions(-)
 create mode 100644 {{cookiecutter.project_slug}}/.idea/runConfigurations/docker_compose_up_django.xml
 create mode 100644 {{cookiecutter.project_slug}}/.idea/runConfigurations/docker_compose_up_docs.xml

diff --git a/.editorconfig b/.editorconfig
index 261407067..6a9a5c45d 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -12,7 +12,7 @@ trim_trailing_whitespace = true
 indent_style = space
 indent_size = 4
 
-[*.{html,css,scss,json,yml}]
+[*.{html,css,scss,json,yml,xml}]
 indent_style = space
 indent_size = 2
 
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index 61b75949a..50fcbea24 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -61,6 +61,10 @@ def remove_docker_files():
     file_names = ["local.yml", "production.yml", ".dockerignore"]
     for file_name in file_names:
         os.remove(file_name)
+    if "{{ cookiecutter.use_pycharm }}".lower() == "y":
+        file_names = ["docker_compose_up_django.xml", "docker_compose_up_docs.xml"]
+        for file_name in file_names:
+            os.remove(os.path.join(".idea", "runConfigurations", file_name))
 
 
 def remove_utility_files():
diff --git a/{{cookiecutter.project_slug}}/.editorconfig b/{{cookiecutter.project_slug}}/.editorconfig
index 261407067..6a9a5c45d 100644
--- a/{{cookiecutter.project_slug}}/.editorconfig
+++ b/{{cookiecutter.project_slug}}/.editorconfig
@@ -12,7 +12,7 @@ trim_trailing_whitespace = true
 indent_style = space
 indent_size = 4
 
-[*.{html,css,scss,json,yml}]
+[*.{html,css,scss,json,yml,xml}]
 indent_style = space
 indent_size = 2
 
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/docker_compose_up_django.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/docker_compose_up_django.xml
new file mode 100644
index 000000000..67f369a3c
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/docker_compose_up_django.xml
@@ -0,0 +1,23 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration name="docker-compose up django" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
+    <deployment type="docker-compose.yml">
+      <settings>
+        <option name="envFilePath" value=""/>
+        <option name="services">
+          <list>
+            <option value="django"/>
+            {%- if cookiecutter.use_celery == 'y' %}
+            <option value="celeryworker"/>
+            <option value="celerybeat"/>
+            {%- endif %}
+            {%- if cookiecutter.js_task_runner == 'Gulp' %}
+            <option value="node"/>
+            {%- endif %}
+          </list>
+        </option>
+        <option name="sourceFilePath" value="local.yml"/>
+      </settings>
+    </deployment>
+    <method v="2"/>
+  </configuration>
+</component>
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/docker_compose_up_docs.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/docker_compose_up_docs.xml
new file mode 100644
index 000000000..0f77b28df
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/docker_compose_up_docs.xml
@@ -0,0 +1,16 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration name="docker-compose up docs" type="docker-deploy" factoryName="docker-compose.yml" server-name="Docker">
+    <deployment type="docker-compose.yml">
+      <settings>
+        <option name="envFilePath" value=""/>
+        <option name="services">
+          <list>
+            <option value="docs"/>
+          </list>
+        </option>
+        <option name="sourceFilePath" value="local.yml"/>
+      </settings>
+    </deployment>
+    <method v="2"/>
+  </configuration>
+</component>

From acc6b1bf0062d93ce314375a07ca368294df7ced Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Mon, 20 Dec 2021 11:51:52 +0000
Subject: [PATCH 1903/2840] Update pull request template

---
 .github/PULL_REQUEST_TEMPLATE.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index eb7134a8c..10b66e266 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -7,7 +7,7 @@
 
 Checklist:
 
-- [ ] I've made sure that `tests/test_cookiecutter_generation.py` is updated accordingly (especially if adding or updating a template option)
+- [ ] I've made sure that tests are updated accordingly (especially if adding or updating a template option)
 - [ ] I've updated the documentation or confirm that my change doesn't require any updates
 
 ## Rationale

From c35779782c58985fc3342239a5d811dd725cd961 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 21 Dec 2021 02:19:35 +0000
Subject: [PATCH 1904/2840] Release 2021.12.20

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 839094f8d..53f993b3a 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.12.20
+
+### Changed
+- Add a PyCharm run configuration for docker-compose ([#3462](https://github.com/cookiecutter/cookiecutter-django/pull/3462))
+
 ## 2021.12.19
 
 ### Updated
diff --git a/setup.py b/setup.py
index 0991cec86..cae62d444 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.12.19"
+version = "2021.12.20"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 2186caf11d953e9183b30be0646995f1ab45e684 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 22 Dec 2021 08:14:00 +0000
Subject: [PATCH 1905/2840] Speed up CI tests on macOS (#3480)

---
 .github/workflows/ci.yml              | 4 ++++
 tests/test_bare.sh                    | 7 -------
 tests/test_cookiecutter_generation.py | 8 +++++---
 tests/test_docker.sh                  | 3 ---
 4 files changed, 9 insertions(+), 13 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 238062e1f..31c6fae7a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -60,6 +60,8 @@ jobs:
         with:
           python-version: "3.9"
           cache: pip
+      - name: Install dependencies
+        run: pip install -r requirements.txt
       - name: Docker ${{ matrix.script.name }}
         run: sh tests/test_docker.sh ${{ matrix.script.args }}
 
@@ -99,6 +101,8 @@ jobs:
           python-version: "3.9"
           cache: pip
           cache-dependency-path: '**/requirements*.txt'
+      - name: Install dependencies
+        run: pip install -r requirements.txt
       - uses: actions/setup-node@v2
         with:
           node-version: "16"
diff --git a/tests/test_bare.sh b/tests/test_bare.sh
index 53162f914..c3842bd93 100755
--- a/tests/test_bare.sh
+++ b/tests/test_bare.sh
@@ -6,13 +6,6 @@
 set -o errexit
 set -x
 
-# Install modern pip with new resolver:
-# https://blog.python.org/2020/11/pip-20-3-release-new-resolver.html
-pip install 'pip>=20.3'
-
-# install test requirements
-pip install -r requirements.txt
-
 # create a cache directory
 mkdir -p .cache/bare
 cd .cache/bare
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 56ae4a64f..49a0d2cc8 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -14,7 +14,11 @@ from cookiecutter.exceptions import FailedHookException
 
 PATTERN = r"{{(\s?cookiecutter)[.](.*?)}}"
 RE_OBJ = re.compile(PATTERN)
-IS_WINDOWS = sys.platform.startswith("win")
+
+if sys.platform.startswith("win"):
+    pytest.skip("sh doesn't support windows", allow_module_level=True)
+elif sys.platform.startswith("darwin") and os.getenv("CI"):
+    pytest.skip("skipping slow macOS tests on CI", allow_module_level=True)
 
 
 @pytest.fixture
@@ -157,7 +161,6 @@ def test_project_generation(cookies, context, context_override):
     check_paths(paths)
 
 
-@pytest.mark.skipif(IS_WINDOWS, reason="sh doesn't support windows")
 @pytest.mark.parametrize("context_override", SUPPORTED_COMBINATIONS, ids=_fixture_id)
 def test_flake8_passes(cookies, context_override):
     """Generated project should pass flake8."""
@@ -169,7 +172,6 @@ def test_flake8_passes(cookies, context_override):
         pytest.fail(e.stdout.decode())
 
 
-@pytest.mark.skipif(IS_WINDOWS, reason="sh doesn't support windows")
 @pytest.mark.parametrize("context_override", SUPPORTED_COMBINATIONS, ids=_fixture_id)
 def test_black_passes(cookies, context_override):
     """Generated project should pass black."""
diff --git a/tests/test_docker.sh b/tests/test_docker.sh
index 8d25a8e26..f554e866b 100755
--- a/tests/test_docker.sh
+++ b/tests/test_docker.sh
@@ -6,9 +6,6 @@
 set -o errexit
 set -x
 
-# install test requirements
-pip install -r requirements.txt
-
 # create a cache directory
 mkdir -p .cache/docker
 cd .cache/docker

From 088f2a50d6e2a055c534f61594b80ca6dbb319a3 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 22 Dec 2021 13:19:45 -0500
Subject: [PATCH 1906/2840] Update django-redis to 5.2.0 (#3485)

---
 {{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 e28e4b553..c58472cd1 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -38,7 +38,7 @@ crispy-bootstrap5==0.6  # https://github.com/django-crispy-forms/crispy-bootstra
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==3.1  # https://github.com/django-compressor/django-compressor
 {%- endif %}
-django-redis==5.1.0  # https://github.com/jazzband/django-redis
+django-redis==5.2.0  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == "y" %}
 # Django REST Framework
 djangorestframework==3.13.1  # https://github.com/encode/django-rest-framework

From 9a627b0f79c1cfede0d25a5dd60185a28197f039 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 22 Dec 2021 13:26:42 -0500
Subject: [PATCH 1907/2840] Update redis to 4.0.2 (#3486)

---
 {{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 c58472cd1..fc0adfdfe 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -12,7 +12,7 @@ argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==5.3.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==3.5.3  # https://github.com/redis/redis-py
+redis==4.0.2  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}

From edff41d1f335a919cb1f61c3a47ce980a876d3b3 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 22 Dec 2021 15:33:33 -0500
Subject: [PATCH 1908/2840] Update mypy from 0.920 to 0.930 (#3487)

---
 {{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 3489ef630..0ddf3496c 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.920  # https://github.com/python/mypy
+mypy==0.930  # https://github.com/python/mypy
 django-stubs==1.9.0  # https://github.com/typeddjango/django-stubs
 pytest==6.2.5  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar

From a93773ac393206c1b5d4dbab783d20663300f297 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 22 Dec 2021 21:52:45 +0000
Subject: [PATCH 1909/2840] Use built-in pip caching from actions/setup-python
 in generated project (#3481)

---
 .github/workflows/ci.yml                      |  5 ++-
 .../.github/workflows/ci.yml                  | 35 ++++++-------------
 2 files changed, 14 insertions(+), 26 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 31c6fae7a..0180184fa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -100,7 +100,10 @@ jobs:
         with:
           python-version: "3.9"
           cache: pip
-          cache-dependency-path: '**/requirements*.txt'
+          cache-dependency-path: |
+            requirements.txt
+            {{cookiecutter.project_slug}}/requirements/base.txt
+            {{cookiecutter.project_slug}}/requirements/local.txt
       - name: Install dependencies
         run: pip install -r requirements.txt
       - uses: actions/setup-node@v2
diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
index 0d23f183a..0b3ab4910 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -23,15 +23,13 @@ jobs:
       - name: Checkout Code Repository
         uses: actions/checkout@v2
 
-      - name: Set up Python 3.9
+      - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
+          python-version: "3.9"
+          cache: pip
 
-      # Run all pre-commit hooks on all the files.
-      # Getting only staged files can be tricky in case a new PR is opened
-      # since the action is run on a branch in detached head state
-      - name: Install and Run Pre-commit
+      - name: Run pre-commit
         uses: pre-commit/action@v2.0.3
 
   # With no caching at all the entire ci process takes 4m 30s to complete!
@@ -80,27 +78,14 @@ jobs:
         run:  docker-compose -f local.yml down
       {%- else %}
 
-      - name: Set up Python 3.9
+      - name: Set up Python
         uses: actions/setup-python@v2
         with:
-          python-version: 3.9
-
-      - name: Get pip cache dir
-        id: pip-cache-location
-        run: |
-          echo "::set-output name=dir::$(pip cache dir)"
-      {%- raw %}
-
-      - name: Cache pip Project Dependencies
-        uses: actions/cache@v2
-        with:
-          # Get the location of pip cache dir
-          path: ${{ steps.pip-cache-location.outputs.dir }}
-          # Look to see if there is a cache hit for the corresponding requirements file
-          key: ${{ runner.os }}-pip-${{ hashFiles('**/local.txt') }}
-          restore-keys: |
-            ${{ runner.os }}-pip-
-      {%- endraw %}
+          python-version: "3.9"
+          cache: pip
+          cache-dependency-path: |
+            requirements/base.txt
+            requirements/local.txt
 
       - name: Install Dependencies
         run: |

From 9a4a975e164b3d35e470d990a2b8a431c691c76c Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 23 Dec 2021 02:18:22 +0000
Subject: [PATCH 1910/2840] Release 2021.12.22

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53f993b3a..26201185c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2021.12.22
+
+### Changed
+- Use built-in pip caching from actions/setup-python in generated project ([#3481](https://github.com/cookiecutter/cookiecutter-django/pull/3481))
+- Speed up CI tests on macOS ([#3480](https://github.com/cookiecutter/cookiecutter-django/pull/3480))
+### Updated
+- Update mypy to 0.930 ([#3487](https://github.com/cookiecutter/cookiecutter-django/pull/3487))
+- Update redis to 4.0.2 ([#3486](https://github.com/cookiecutter/cookiecutter-django/pull/3486))
+- Update django-redis to 5.2.0 ([#3485](https://github.com/cookiecutter/cookiecutter-django/pull/3485))
+
 ## 2021.12.20
 
 ### Changed
diff --git a/setup.py b/setup.py
index cae62d444..f94739961 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.12.20"
+version = "2021.12.22"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 867bb9d5dcc43908b6953c87c7c3663f5127ddd2 Mon Sep 17 00:00:00 2001
From: Douglas <douglas.carvalho@edu.unipar.br>
Date: Fri, 24 Dec 2021 07:09:57 -0300
Subject: [PATCH 1911/2840] Added Django's current language to the lang
 attribute of the html tag (#3174)

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
---
 .../{{cookiecutter.project_slug}}/templates/base.html          | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
index 408696b2d..88ebd8e02 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -1,5 +1,6 @@
 {% raw %}{% load static i18n {% endraw %}{% if cookiecutter.use_compressor == "y" %}compress{% endif %}{% raw %}%}<!DOCTYPE html>
-<html lang="en">
+{% get_current_language as LANGUAGE_CODE %}
+<html lang="{{ LANGUAGE_CODE }}">
   <head>
     <meta charset="utf-8">
     <meta http-equiv="x-ua-compatible" content="ie=edge">

From 36d55304d3174d2a0ea520c42a67ad18c0dc8967 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 24 Dec 2021 10:10:28 +0000
Subject: [PATCH 1912/2840] 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 a66814452..8166a15e2 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1187,5 +1187,10 @@
     "name": "Timm Simpkins",
     "github_login": "PoDuck",
     "twitter_username": ""
+  },
+  {
+    "name": "Douglas",
+    "github_login": "douglascdev",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 789f62cde..a1aac41e3 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -635,6 +635,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Douglas</td>
+    <td>
+      <a href="https://github.com/douglascdev">douglascdev</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Duda Nogueira</td>
     <td>

From 5dc3079b54c5641d8c887f6c899b806a3db5a91b Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 24 Dec 2021 05:41:06 -0500
Subject: [PATCH 1913/2840] Update uvicorn to 0.16.0 (#3454)

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
---
 {{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 fc0adfdfe..083e88d45 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -24,7 +24,7 @@ flower==1.0.0  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn[standard]==0.15.0  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.16.0  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django

From 0d8a91ebfeb08579bac7f200847016558086d6a5 Mon Sep 17 00:00:00 2001
From: Arnav Choudhury <arnav13@gmail.com>
Date: Fri, 24 Dec 2021 17:25:47 +0530
Subject: [PATCH 1914/2840] Making docs image 40% smaller and also making
 python version upgrades easier for multi-stage builds. (#2836)

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
---
 .../compose/local/docs/Dockerfile             | 67 +++++++++++++------
 1 file changed, 48 insertions(+), 19 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
index 215cca61b..0a673cad8 100644
--- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
@@ -1,28 +1,57 @@
-FROM python:3.9-slim-bullseye
+ARG PYTHON_VERSION=3.9-slim-bullseye
+
+# define an alias for the specfic python version used in this file.
+FROM python:${PYTHON_VERSION} as python
+
+
+# Python build stage
+FROM python as python-build-stage
 
-ENV PYTHONUNBUFFERED 1
 ENV PYTHONDONTWRITEBYTECODE 1
 
-RUN apt-get update \
-    # dependencies for building Python packages
-    && apt-get install -y build-essential \
-    # psycopg2 dependencies
-    && apt-get install -y libpq-dev \
-    # Translations dependencies
-    && apt-get install -y gettext \
-    # Uncomment below lines to enable Sphinx output to latex and pdf
-    # && apt-get install -y texlive-latex-recommended \
-    # && apt-get install -y texlive-fonts-recommended \
-    # && apt-get install -y texlive-latex-extra \
-    # && apt-get install -y latexmk \
-    # cleaning up unused files
-    && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
-    && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install --no-install-recommends -y \
+  # dependencies for building Python packages
+  build-essential \
+  # psycopg2 dependencies
+  libpq-dev \
+  # cleaning up unused files
+  && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+  && rm -rf /var/lib/apt/lists/*
 
 # Requirements are installed here to ensure they will be cached.
 COPY ./requirements /requirements
-# All imports needed for autodoc.
-RUN pip install -r /requirements/local.txt -r /requirements/production.txt
+
+# create python dependency wheels
+RUN pip wheel --no-cache-dir --no-deps --wheel-dir /usr/src/app/wheels  \
+  -r /requirements/local.txt -r /requirements/production.txt \
+  && rm -rf /requirements
+
+
+# Python 'run' stage
+FROM python as python-run-stage
+
+ARG BUILD_ENVIRONMENT
+ENV PYTHONUNBUFFERED 1
+ENV PYTHONDONTWRITEBYTECODE 1
+
+RUN apt-get update && apt-get install --no-install-recommends -y \
+  # Translations dependencies
+  gettext \
+  # Uncomment below lines to enable Sphinx output to latex and pdf
+  # texlive-latex-recommended \
+  # texlive-fonts-recommended \
+  # texlive-latex-extra \
+  # latexmk \
+  # cleaning up unused files
+  && apt-get purge -y --auto-remove -o APT::AutoRemove::RecommendsImportant=false \
+  && rm -rf /var/lib/apt/lists/*
+
+# copy python dependency wheels from python-build-stage
+COPY --from=python-build-stage /usr/src/app/wheels /wheels
+
+# use wheels to install python dependencies
+RUN pip install --no-cache /wheels/* \
+  && rm -rf /wheels
 
 COPY ./compose/local/docs/start /start-docs
 RUN sed -i 's/\r$//g' /start-docs

From 39e12c74282542344033783c139e64e5af3e5115 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Fri, 24 Dec 2021 13:35:47 +0000
Subject: [PATCH 1915/2840] Fix proxy option for Browser Sync

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

diff --git a/{{cookiecutter.project_slug}}/gulpfile.js b/{{cookiecutter.project_slug}}/gulpfile.js
index 82d66fc8d..013e8c8d6 100644
--- a/{{cookiecutter.project_slug}}/gulpfile.js
+++ b/{{cookiecutter.project_slug}}/gulpfile.js
@@ -142,7 +142,7 @@ function initBrowserSync() {
       // https://www.browsersync.io/docs/options/#option-proxy
       proxy:  {
         {%- if cookiecutter.use_docker == 'n' %}
-        proxy: '127.0.0.1:8000',
+        target: '127.0.0.1:8000',
         {%- else %}
         // https://www.browsersync.io/docs/options/#option-open
         // Disable as it doesn't work from inside a container

From 29490910b01e90cd4b261c33397f544d131cde9b Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Fri, 24 Dec 2021 12:08:37 -0500
Subject: [PATCH 1916/2840] Remove pylint-django from VITAL_BUT_UNKNOWN (#3490)

Ref https://github.com/PyCQA/pylint-django/pull/337
---
 scripts/create_django_issue.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/scripts/create_django_issue.py b/scripts/create_django_issue.py
index ea85db6c2..0ebd082fc 100644
--- a/scripts/create_django_issue.py
+++ b/scripts/create_django_issue.py
@@ -112,7 +112,6 @@ _TABLE_HEADER = """
 """
 VITAL_BUT_UNKNOWN = [
     "django-environ",  # not updated often
-    "pylint-django",  # classifier not included in setup.py
 ]
 
 

From fcb26de73342e4ebbfc01f96925f51cdf95e1fe9 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Fri, 24 Dec 2021 14:13:43 -0500
Subject: [PATCH 1917/2840] Fix docs not building (#3491)

---
 {{cookiecutter.project_slug}}/compose/local/docs/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
index 0a673cad8..422f55dd9 100644
--- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
@@ -35,6 +35,8 @@ ENV PYTHONUNBUFFERED 1
 ENV PYTHONDONTWRITEBYTECODE 1
 
 RUN apt-get update && apt-get install --no-install-recommends -y \
+  # To run the Makefile
+  make \
   # Translations dependencies
   gettext \
   # Uncomment below lines to enable Sphinx output to latex and pdf

From d0d6ebd8923cdbab3ca793df7143099b450042f1 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 24 Dec 2021 19:35:09 +0000
Subject: [PATCH 1918/2840] Simplify `TEMPLATES` settings with `APP_DIRS=True`
 (#3488)

---
 tests/test_bare.sh                                  |  3 +++
 tests/test_docker.sh                                |  3 +++
 .../config/settings/base.py                         | 10 +++-------
 .../config/settings/production.py                   | 13 -------------
 .../config/settings/test.py                         | 12 ------------
 5 files changed, 9 insertions(+), 32 deletions(-)

diff --git a/tests/test_bare.sh b/tests/test_bare.sh
index c3842bd93..83487e2ef 100755
--- a/tests/test_bare.sh
+++ b/tests/test_bare.sh
@@ -29,6 +29,9 @@ pre-commit run --show-diff-on-failure -a
 # run the project's tests
 pytest
 
+# Make sure the check doesn't raise any warnings
+python manage.py check --fail-level WARNING
+
 if [ -f "package.json" ]
 then
     npm install
diff --git a/tests/test_docker.sh b/tests/test_docker.sh
index f554e866b..850d7b70c 100755
--- a/tests/test_docker.sh
+++ b/tests/test_docker.sh
@@ -35,3 +35,6 @@ docker-compose -f local.yml run django python manage.py makemigrations --dry-run
 
 # Test support for translations
 docker-compose -f local.yml run django python manage.py makemessages --all
+
+# Make sure the check doesn't raise any warnings
+docker-compose -f local.yml run django python manage.py check --fail-level WARNING
diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 80003e147..46e13e9ec 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -182,15 +182,11 @@ TEMPLATES = [
     {
         # https://docs.djangoproject.com/en/dev/ref/settings/#std:setting-TEMPLATES-BACKEND
         "BACKEND": "django.template.backends.django.DjangoTemplates",
-        # https://docs.djangoproject.com/en/dev/ref/settings/#template-dirs
+        # https://docs.djangoproject.com/en/dev/ref/settings/#dirs
         "DIRS": [str(APPS_DIR / "templates")],
+        # https://docs.djangoproject.com/en/dev/ref/settings/#app-dirs
+        "APP_DIRS": True,
         "OPTIONS": {
-            # https://docs.djangoproject.com/en/dev/ref/settings/#template-loaders
-            # https://docs.djangoproject.com/en/dev/ref/templates/api/#loader-types
-            "loaders": [
-                "django.template.loaders.filesystem.Loader",
-                "django.template.loaders.app_directories.Loader",
-            ],
             # https://docs.djangoproject.com/en/dev/ref/settings/#template-context-processors
             "context_processors": [
                 "django.template.context_processors.debug",
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index a9e38b07a..77cf1efd7 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -123,19 +123,6 @@ DEFAULT_FILE_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.MediaRootGo
 MEDIA_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/media/"
 {%- endif %}
 
-# TEMPLATES
-# ------------------------------------------------------------------------------
-# https://docs.djangoproject.com/en/dev/ref/settings/#templates
-TEMPLATES[-1]["OPTIONS"]["loaders"] = [  # type: ignore[index] # noqa F405
-    (
-        "django.template.loaders.cached.Loader",
-        [
-            "django.template.loaders.filesystem.Loader",
-            "django.template.loaders.app_directories.Loader",
-        ],
-    )
-]
-
 # EMAIL
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#default-from-email
diff --git a/{{cookiecutter.project_slug}}/config/settings/test.py b/{{cookiecutter.project_slug}}/config/settings/test.py
index 222597ad9..78fb6cc66 100644
--- a/{{cookiecutter.project_slug}}/config/settings/test.py
+++ b/{{cookiecutter.project_slug}}/config/settings/test.py
@@ -20,18 +20,6 @@ TEST_RUNNER = "django.test.runner.DiscoverRunner"
 # https://docs.djangoproject.com/en/dev/ref/settings/#password-hashers
 PASSWORD_HASHERS = ["django.contrib.auth.hashers.MD5PasswordHasher"]
 
-# TEMPLATES
-# ------------------------------------------------------------------------------
-TEMPLATES[-1]["OPTIONS"]["loaders"] = [  # type: ignore[index] # noqa F405
-    (
-        "django.template.loaders.cached.Loader",
-        [
-            "django.template.loaders.filesystem.Loader",
-            "django.template.loaders.app_directories.Loader",
-        ],
-    )
-]
-
 # EMAIL
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#email-backend

From 37e724e976c22a8b840a5683bc470421043c10eb Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 25 Dec 2021 02:18:10 +0000
Subject: [PATCH 1919/2840] Release 2021.12.24

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 26201185c..53755fb83 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.12.24
+
+### Changed
+- Simplify `TEMPLATES` settings with `APP_DIRS=True` ([#3488](https://github.com/cookiecutter/cookiecutter-django/pull/3488))
+- Fix docs not building ([#3491](https://github.com/cookiecutter/cookiecutter-django/pull/3491))
+- Remove pylint-django from VITAL_BUT_UNKNOWN ([#3490](https://github.com/cookiecutter/cookiecutter-django/pull/3490))
+- Making docs image 40% smaller and also making python version upgrades easier for multi-stage builds. ([#2836](https://github.com/cookiecutter/cookiecutter-django/pull/2836))
+- Added Django&#39;s current language to the lang attribute of the html tag ([#3174](https://github.com/cookiecutter/cookiecutter-django/pull/3174))
+### Updated
+- Update uvicorn to 0.16.0 ([#3454](https://github.com/cookiecutter/cookiecutter-django/pull/3454))
+
 ## 2021.12.22
 
 ### Changed
diff --git a/setup.py b/setup.py
index f94739961..14f1cbb2c 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.12.22"
+version = "2021.12.24"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 1a31a2a35bbb4c5ffe987d465eaed7a635133ff6 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 25 Dec 2021 16:54:45 +0000
Subject: [PATCH 1920/2840] Auto-update pre-commit hooks (#3493)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                               | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 95197c558..63add8bf5 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -3,7 +3,7 @@ default_stages: [commit]
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.1.0
     hooks:
       - id: trailing-whitespace
       - id: check-yaml
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index 4d70f12c9..301f8b74f 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -3,7 +3,7 @@ default_stages: [commit]
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.0.1
+    rev: v4.1.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer

From 95981c055ab0c7d3d4e4e2803c7d7e07cc97b159 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Sat, 25 Dec 2021 12:00:00 -0500
Subject: [PATCH 1921/2840] Automatically add Django version label to issue
 (#3492)

---
 scripts/create_django_issue.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/create_django_issue.py b/scripts/create_django_issue.py
index 0ebd082fc..daee8fe16 100644
--- a/scripts/create_django_issue.py
+++ b/scripts/create_django_issue.py
@@ -264,9 +264,10 @@ class GitHubManager:
             issue.edit(body=description)
         else:
             print(f"Creating new issue for Django {needed_dj_version}")
-            self.repo.create_issue(
+            issue = self.repo.create_issue(
                 f"[Update Django] Django {needed_dj_version}", description
             )
+            issue.add_to_labels(f"django{needed_dj_version}")
 
     def generate(self):
         for version in self.needed_dj_versions:

From ee14304dcfa3ee62cb2cef0cd61cdf91add3613a Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sun, 26 Dec 2021 02:20:24 +0000
Subject: [PATCH 1922/2840] Release 2021.12.25

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53755fb83..5a02a67d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2021.12.25
+
+### Changed
+- Automatically add Django version label to issue ([#3492](https://github.com/cookiecutter/cookiecutter-django/pull/3492))
+### Updated
+- Auto-update pre-commit hooks ([#3493](https://github.com/cookiecutter/cookiecutter-django/pull/3493))
+
 ## 2021.12.24
 
 ### Changed
diff --git a/setup.py b/setup.py
index 14f1cbb2c..cd981f049 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.12.24"
+version = "2021.12.25"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From e9ee4a930e4c2b4e19ea5a3250ebdea0d3166c0a Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Sun, 26 Dec 2021 11:04:33 -0500
Subject: [PATCH 1923/2840] Fix docs compose (again) (#3494)

---
 {{cookiecutter.project_slug}}/compose/local/docs/Dockerfile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
index 422f55dd9..6f1bb8b5e 100644
--- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
@@ -37,6 +37,8 @@ ENV PYTHONDONTWRITEBYTECODE 1
 RUN apt-get update && apt-get install --no-install-recommends -y \
   # To run the Makefile
   make \
+  # psycopg2 dependencies
+  libpq-dev \
   # Translations dependencies
   gettext \
   # Uncomment below lines to enable Sphinx output to latex and pdf

From bc0fda3e0c14845036f29daedd0a56d898b93f78 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 26 Dec 2021 11:39:26 -0500
Subject: [PATCH 1924/2840] Update redis to 4.1.0 (#3495)

---
 {{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 083e88d45..043ef93ba 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -12,7 +12,7 @@ argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==5.3.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==4.0.2  # https://github.com/redis/redis-py
+redis==4.1.0  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}

From d5e8ecce75dd4fc3f2f1fb19d1894f0e979f7398 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 26 Dec 2021 11:40:01 -0500
Subject: [PATCH 1925/2840] Update celery to 5.2.2 (#3496)

---
 {{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 043ef93ba..882370265 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -17,7 +17,7 @@ redis==4.1.0  # https://github.com/redis/redis-py
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
-celery==5.2.1  # pyup: < 6.0  # https://github.com/celery/celery
+celery==5.2.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==1.0.0  # https://github.com/mher/flower

From c007f46dbe2fbf6963033cab3649ce05c1f4d480 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Mon, 27 Dec 2021 02:20:27 +0000
Subject: [PATCH 1926/2840] Release 2021.12.26

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5a02a67d7..dc5b8a03d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2021.12.26
+
+### Fixed
+- Fix missing psycopg2 dependency in docs Docker image ([#3494](https://github.com/cookiecutter/cookiecutter-django/pull/3494))
+### Updated
+- Update celery to 5.2.2 ([#3496](https://github.com/cookiecutter/cookiecutter-django/pull/3496))
+- Update redis to 4.1.0 ([#3495](https://github.com/cookiecutter/cookiecutter-django/pull/3495))
+
 ## 2021.12.25
 
 ### Changed
diff --git a/setup.py b/setup.py
index cd981f049..3f63bc613 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.12.25"
+version = "2021.12.26"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 785df85c4d14849d7ad0655b028ba50fd8c9186f Mon Sep 17 00:00:00 2001
From: Will Gordon <wgordon@redhat.com>
Date: Mon, 27 Dec 2021 06:37:33 -0500
Subject: [PATCH 1927/2840] Hides 'sign up' elements when
 ACCOUNT_ALLOW_REGISTRATION is disabled (#1914)

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
---
 .../config/settings/base.py                   |  1 +
 .../templates/account/login.html              | 36 ++++++++++++-------
 .../templates/base.html                       | 10 +++---
 .../users/context_processors.py               |  8 +++++
 4 files changed, 39 insertions(+), 16 deletions(-)
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/context_processors.py

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 46e13e9ec..021dd7491 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -197,6 +197,7 @@ TEMPLATES = [
                 "django.template.context_processors.static",
                 "django.template.context_processors.tz",
                 "django.contrib.messages.context_processors.messages",
+                "{{cookiecutter.project_slug}}.users.context_processors.allauth_settings",
             ],
         },
     }
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 8c7b5ae60..25a292eda 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/login.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/login.html
@@ -13,25 +13,37 @@
 {% get_providers as socialaccount_providers %}
 
 {% if socialaccount_providers %}
-<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:{% endblocktranslate %}</p>
+  <p>
+    {% translate "Please sign in with one of your existing third party accounts:" %}
+    {% if ACCOUNT_ALLOW_REGISTRATION %}
+      {% blocktranslate trimmed %}
+        Or, <a href="{{ signup_url }}">sign up</a>
+        for a {{ site_name }} account and sign in below:
+      {% endblocktranslate %}
+    {% endif %}
+  </p>
 
-<div class="socialaccount_ballot">
+  <div class="socialaccount_ballot">
 
-  <ul class="socialaccount_providers">
-    {% include "socialaccount/snippets/provider_list.html" with process="login" %}
-  </ul>
+    <ul class="socialaccount_providers">
+      {% include "socialaccount/snippets/provider_list.html" with process="login" %}
+    </ul>
 
-  <div class="login-or">{% translate 'or' %}</div>
+    <div class="login-or">{% translate "or" %}</div>
 
-</div>
+  </div>
 
-{% include "socialaccount/snippets/login_extra.html" %}
+  {% include "socialaccount/snippets/login_extra.html" %}
 
 {% else %}
-<p>{% blocktranslate %}If you have not created an account yet, then please
-<a href="{{ signup_url }}">sign up</a> first.{% endblocktranslate %}</p>
+  {% if ACCOUNT_ALLOW_REGISTRATION %}
+    <p>
+      {% blocktranslate trimmed %}
+        If you have not created an account yet, then please
+        <a href="{{ signup_url }}">sign up</a> first.
+      {% endblocktranslate %}
+    </p>
+  {% endif %}
 {% endif %}
 
 <form class="login" method="POST" action="{% url 'account_login' %}">
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
index 88ebd8e02..9089e3f8d 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -79,10 +79,12 @@
                   <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' %}">{% translate "Sign Up" %}</a>
-                </li>
+                {% if ACCOUNT_ALLOW_REGISTRATION %}
+              <li class="nav-item">
+                {# URL provided by django-allauth/account/urls.py #}
+                <a id="sign-up-link" class="nav-link" href="{% url 'account_signup' %}">{% translate "Sign Up" %}</a>
+              </li>
+              {% endif %}
                 <li class="nav-item">
                   {# URL provided by django-allauth/account/urls.py #}
                   <a id="log-in-link" class="nav-link" href="{% url 'account_login' %}">{% translate "Sign In" %}</a>
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/context_processors.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/context_processors.py
new file mode 100644
index 000000000..e2633aecd
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/context_processors.py
@@ -0,0 +1,8 @@
+from django.conf import settings
+
+
+def allauth_settings(request):
+    """Expose some settings from django-allauth in templates."""
+    return {
+        "ACCOUNT_ALLOW_REGISTRATION": settings.ACCOUNT_ALLOW_REGISTRATION,
+    }

From 469e2889813255c393763883f90c9aec12f8e937 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Mon, 27 Dec 2021 11:38:06 +0000
Subject: [PATCH 1928/2840] 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 8166a15e2..5b677a50c 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1192,5 +1192,10 @@
     "name": "Douglas",
     "github_login": "douglascdev",
     "twitter_username": ""
+  },
+  {
+    "name": "Will Gordon",
+    "github_login": "wgordon17",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index a1aac41e3..4f5362814 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1643,6 +1643,13 @@ Listed in alphabetical order.
     </td>
     <td>g01dhand</td>
   </tr>
+  <tr>
+    <td>Will Gordon</td>
+    <td>
+      <a href="https://github.com/wgordon17">wgordon17</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>William Archinal</td>
     <td>

From a94e2354c4e1f6b8ed956f3c239e91d84b09d276 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 28 Dec 2021 02:18:31 +0000
Subject: [PATCH 1929/2840] Release 2021.12.27

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dc5b8a03d..3f0bd048a 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.12.27
+
+### Changed
+- Hides &#39;sign up&#39; elements when ACCOUNT_ALLOW_REGISTRATION is disabled ([#1914](https://github.com/cookiecutter/cookiecutter-django/pull/1914))
+
 ## 2021.12.26
 
 ### Fixed
diff --git a/setup.py b/setup.py
index 3f63bc613..b36677d77 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.12.26"
+version = "2021.12.27"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 2adcf9f5d4200cef992b510172efade9fd24b7db Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 28 Dec 2021 15:35:56 +0000
Subject: [PATCH 1930/2840] Build the HTML for the documentation as part of the
 CI (#3498)

---
 tests/test_bare.sh   | 2 ++
 tests/test_docker.sh | 3 +++
 2 files changed, 5 insertions(+)

diff --git a/tests/test_bare.sh b/tests/test_bare.sh
index 83487e2ef..75a0f31fd 100755
--- a/tests/test_bare.sh
+++ b/tests/test_bare.sh
@@ -41,3 +41,5 @@ then
     fi
 fi
 
+# Generate the HTML for the documentation
+cd docs && make html
\ No newline at end of file
diff --git a/tests/test_docker.sh b/tests/test_docker.sh
index 850d7b70c..45e817dfd 100755
--- a/tests/test_docker.sh
+++ b/tests/test_docker.sh
@@ -38,3 +38,6 @@ docker-compose -f local.yml run django python manage.py makemessages --all
 
 # Make sure the check doesn't raise any warnings
 docker-compose -f local.yml run django python manage.py check --fail-level WARNING
+
+# Generate the HTML for the documentation
+docker-compose -f local.yml run docs make html
\ No newline at end of file

From 775b367c7f0514badfbb2a01c82a05efc094e0ab Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 29 Dec 2021 02:18:08 +0000
Subject: [PATCH 1931/2840] Release 2021.12.28

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3f0bd048a..acd45d342 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.12.28
+
+### Changed
+- Build the HTML for the documentation as part of the CI ([#3498](https://github.com/cookiecutter/cookiecutter-django/pull/3498))
+
 ## 2021.12.27
 
 ### Changed
diff --git a/setup.py b/setup.py
index b36677d77..0ee1a0563 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.12.27"
+version = "2021.12.28"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 7695f4ff129a0aede29ccfe1fa068f425e6084b2 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 29 Dec 2021 13:41:36 -0500
Subject: [PATCH 1932/2840] Update tox from 3.24.4 to 3.24.5 (#3501)

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

diff --git a/requirements.txt b/requirements.txt
index 411f198d8..318bf57fb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==2.16.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.24.4
+tox==3.24.5
 pytest==6.2.5
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From 9ea5904e36fe35f92b5f4ed0d9cd7abf79deaa10 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 29 Dec 2021 13:42:09 -0500
Subject: [PATCH 1933/2840] Update celery from 5.2.2 to 5.2.3 (#3502)

---
 {{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 882370265..69d2d6f91 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -17,7 +17,7 @@ redis==4.1.0  # https://github.com/redis/redis-py
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
-celery==5.2.2  # pyup: < 6.0  # https://github.com/celery/celery
+celery==5.2.3  # 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==1.0.0  # https://github.com/mher/flower

From c4b716bd8995cb165cbab950f741c1967819451e Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 29 Dec 2021 13:42:46 -0500
Subject: [PATCH 1934/2840] Update psycopg2 to 2.9.3 (#3503)

* Update psycopg2 from 2.9.2 to 2.9.3

* Update psycopg2 from 2.9.2 to 2.9.3
---
 {{cookiecutter.project_slug}}/requirements/local.txt      | 2 +-
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 0ddf3496c..a45b7c984 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -3,7 +3,7 @@
 Werkzeug==2.0.2 # https://github.com/pallets/werkzeug
 ipdb==0.13.9  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
-psycopg2==2.9.2  # https://github.com/psycopg/psycopg2
+psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 {%- else %}
 psycopg2-binary==2.9.2  # https://github.com/psycopg/psycopg2
 {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 8e622ea94..e7ca7fb28 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -3,7 +3,7 @@
 -r base.txt
 
 gunicorn==20.1.0  # https://github.com/benoitc/gunicorn
-psycopg2==2.9.2  # https://github.com/psycopg/psycopg2
+psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}

From 0fc9686803a6f7f09a7eeb6aa8a14a0b58a4f136 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 29 Dec 2021 13:43:16 -0500
Subject: [PATCH 1935/2840] Update psycopg2-binary from 2.9.2 to 2.9.3 (#3504)

---
 {{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 a45b7c984..d4875a52e 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -5,7 +5,7 @@ ipdb==0.13.9  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 {%- else %}
-psycopg2-binary==2.9.2  # https://github.com/psycopg/psycopg2
+psycopg2-binary==2.9.3  # https://github.com/psycopg/psycopg2
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %}
 watchgod==0.7  # https://github.com/samuelcolvin/watchgod

From cf94dd4d1414e5d86f1acbc1f3fe0a94f6f167e0 Mon Sep 17 00:00:00 2001
From: mpoli <poli@closedgap.com>
Date: Wed, 29 Dec 2021 15:44:39 -0300
Subject: [PATCH 1936/2840] Add project.css and project.min.css to .gitignore
 (#3500)

* Add project.css and project.min.css to .gitignore
when js_task_runner == ' Gulp'. These files are generated automatically in this configuration
and as such, mess up git commit periodically.

* Add vendor.js and *.min.js to .gitignore

More runtime generated files should be ignored to version control.

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/.gitignore | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore
index 424c8cdc4..d48356fa1 100644
--- a/{{cookiecutter.project_slug}}/.gitignore
+++ b/{{cookiecutter.project_slug}}/.gitignore
@@ -337,3 +337,10 @@ MailHog
 {%- if cookiecutter.use_docker == 'y' %}
 .ipython/
 {%- endif %}
+
+{%- if cookiecutter.js_task_runner == 'Gulp' %}
+project.css
+project.min.css
+vendors.js
+*.min.js
+{%- endif %}

From f7d81880868f19ef5d25188ba7b1906f04e08f85 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 30 Dec 2021 02:17:43 +0000
Subject: [PATCH 1937/2840] Release 2021.12.29

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index acd45d342..216476f52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2021.12.29
+
+### Fixed
+- Add generated files to `.gitignore` when selecting Gulp ([#3500](https://github.com/cookiecutter/cookiecutter-django/pull/3500))
+### Updated
+- Update psycopg2-binary to 2.9.3 ([#3504](https://github.com/cookiecutter/cookiecutter-django/pull/3504))
+- Update psycopg2 to 2.9.3 ([#3503](https://github.com/cookiecutter/cookiecutter-django/pull/3503))
+- Update celery to 5.2.3 ([#3502](https://github.com/cookiecutter/cookiecutter-django/pull/3502))
+- Update tox to 3.24.5 ([#3501](https://github.com/cookiecutter/cookiecutter-django/pull/3501))
+
 ## 2021.12.28
 
 ### Changed
diff --git a/setup.py b/setup.py
index 0ee1a0563..89fde748f 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.12.28"
+version = "2021.12.29"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 5ae29f4b0651482d8e8e3b6bee87a08c86dfd094 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 3 Jan 2022 13:01:05 -0500
Subject: [PATCH 1938/2840] Update pylint-django to 2.5.0 (#3505)

---
 {{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 d4875a52e..c13f3ecd4 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -32,7 +32,7 @@ flake8==4.0.1  # https://github.com/PyCQA/flake8
 flake8-isort==4.1.1  # https://github.com/gforcada/flake8-isort
 coverage==6.2  # https://github.com/nedbat/coveragepy
 black==21.12b0  # https://github.com/psf/black
-pylint-django==2.4.4  # https://github.com/PyCQA/pylint-django
+pylint-django==2.5.0  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}

From 57b62be1e4332603d62ddd3a1a6552548f18defb Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 3 Jan 2022 13:01:40 -0500
Subject: [PATCH 1939/2840] Update pillow to 9.0.0 (#3508)

---
 {{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 69d2d6f91..02b7fe7ea 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,6 +1,6 @@
 pytz==2021.3  # https://github.com/stub42/pytz
 python-slugify==5.0.2  # https://github.com/un33k/python-slugify
-Pillow==8.4.0  # https://github.com/python-pillow/Pillow
+Pillow==9.0.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
 {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %}
 rcssmin==1.1.0 --install-option="--without-c-extensions"  # https://github.com/ndparker/rcssmin

From 8f481be3cbfabc621eb7cacde190859b85977209 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 3 Jan 2022 17:42:30 -0500
Subject: [PATCH 1940/2840] Update requests to 2.27.0 (#3509)

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

diff --git a/requirements.txt b/requirements.txt
index 318bf57fb..d0e4e6c81 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -23,4 +23,4 @@ pyyaml==6.0
 PyGithub==1.55
 gitpython==3.1.24
 jinja2==3.0.3
-requests==2.26.0
+requests==2.27.0

From 103dd82ea2e50eb6def9bff52ea8c6fba5ac0939 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 3 Jan 2022 22:43:53 +0000
Subject: [PATCH 1941/2840] Convert top level RST files to Markdown (#3489)

---
 CONTRIBUTING.md                          |  42 +++
 CONTRIBUTING.rst                         |  54 ----
 README.md                                | 225 ++++++++++++++++
 README.rst                               | 321 -----------------------
 {{cookiecutter.project_slug}}/README.md  | 143 ++++++++++
 {{cookiecutter.project_slug}}/README.rst | 175 ------------
 6 files changed, 410 insertions(+), 550 deletions(-)
 create mode 100644 CONTRIBUTING.md
 delete mode 100644 CONTRIBUTING.rst
 create mode 100644 README.md
 delete mode 100644 README.rst
 create mode 100644 {{cookiecutter.project_slug}}/README.md
 delete mode 100644 {{cookiecutter.project_slug}}/README.rst

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 000000000..a9d5b088f
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,42 @@
+# How to Contribute
+
+Always happy to get issues identified and pull requests!
+
+## Getting your pull request merged in
+
+1.  Keep it small. The smaller the pull request, the more likely we are to accept.
+2.  Pull requests that fix a current issue get priority for review.
+
+## Testing
+
+### Installation
+
+Please install [tox](https://tox.readthedocs.io/en/latest/), which is a generic virtualenv management and test command line tool.
+
+[tox](https://tox.readthedocs.io/en/latest/) is available for download from [PyPI](https://pypi.python.org/pypi) via [pip](https://pypi.python.org/pypi/pip/):
+
+    $ pip install tox
+
+It will automatically create a fresh virtual environment and install our test dependencies,
+such as [pytest-cookies](https://pypi.python.org/pypi/pytest-cookies/) and [flake8](https://pypi.python.org/pypi/flake8/).
+
+### Run the Tests
+
+Tox uses pytest under the hood, hence it supports the same syntax for selecting tests.
+
+For further information please consult the [pytest usage docs](https://pytest.org/latest/usage.html#specifying-tests-selecting-tests).
+
+To run all tests using various versions of python in virtualenvs defined in tox.ini, just run tox.:
+
+    $ tox
+
+It is possible to test with a specific version of python. To do this, the command
+is:
+
+    $ tox -e py39
+
+This will run pytest with the python3.9 interpreter, for example.
+
+To run a particular test with tox for against your current Python version:
+
+    $ tox -e py -- -k test_default_configuration
diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
deleted file mode 100644
index d4412b7f0..000000000
--- a/CONTRIBUTING.rst
+++ /dev/null
@@ -1,54 +0,0 @@
-How to Contribute
-=================
-
-Always happy to get issues identified and pull requests!
-
-Getting your pull request merged in
-------------------------------------
-
-#. Keep it small. The smaller the pull request the more likely I'll pull it in.
-#. Pull requests that fix a current issue get priority for review.
-
-Testing
--------
-
-Installation
-~~~~~~~~~~~~
-
-Please install `tox`_, which is a generic virtualenv management and test command line tool.
-
-`tox`_ is available for download from `PyPI`_ via `pip`_::
-
-    $ pip install tox
-
-It will automatically create a fresh virtual environment and install our test dependencies,
-such as `pytest-cookies`_ and `flake8`_.
-
-Run the Tests
-~~~~~~~~~~~~~
-
-Tox uses py.test under the hood, hence it supports the same syntax for selecting tests.
-
-For further information please consult the `pytest usage docs`_.
-
-To run all tests using various versions of python in virtualenvs defined in tox.ini, just run tox.::
-
-    $ tox
-
-It is possible to test with a specific version of python. To do this, the command
-is::
-
-    $ tox -e py39
-
-This will run py.test with the python3.9 interpreter, for example.
-
-To run a particular test with tox for against your current Python version::
-
-    $ tox -e py -- -k test_default_configuration
-
-.. _`pytest usage docs`: https://pytest.org/latest/usage.html#specifying-tests-selecting-tests
-.. _`tox`: https://tox.readthedocs.io/en/latest/
-.. _`pip`: https://pypi.python.org/pypi/pip/
-.. _`pytest-cookies`: https://pypi.python.org/pypi/pytest-cookies/
-.. _`flake8`: https://pypi.python.org/pypi/flake8/
-.. _`PyPI`: https://pypi.python.org/pypi
diff --git a/README.md b/README.md
new file mode 100644
index 000000000..6e88c9548
--- /dev/null
+++ b/README.md
@@ -0,0 +1,225 @@
+# Cookiecutter Django
+
+[![Build Status](https://img.shields.io/github/workflow/status/cookiecutter/cookiecutter-django/CI/master)](https://github.com/cookiecutter/cookiecutter-django/actions?query=workflow%3ACI)
+[![Documentation Status](https://readthedocs.org/projects/cookiecutter-django/badge/?version=latest)](https://cookiecutter-django.readthedocs.io/en/latest/?badge=latest)
+[![Updates](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/shield.svg)](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/)
+[![Join our Discord](https://img.shields.io/badge/Discord-cookiecutter-5865F2?style=flat&logo=discord&logoColor=white)](https://discord.gg/9BrxzPKuEW)
+[![Code Helpers Badge](https://www.codetriage.com/cookiecutter/cookiecutter-django/badges/users.svg)](https://www.codetriage.com/cookiecutter/cookiecutter-django)
+[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)
+
+Powered by [Cookiecutter](https://github.com/cookiecutter/cookiecutter), Cookiecutter Django is a framework for jumpstarting
+production-ready Django projects quickly.
+
+-   Documentation: <https://cookiecutter-django.readthedocs.io/en/latest/>
+-   See [Troubleshooting](https://cookiecutter-django.readthedocs.io/en/latest/troubleshooting.html) for common errors and obstacles
+-   If you have problems with Cookiecutter Django, please open [issues](https://github.com/cookiecutter/cookiecutter-django/issues/new) don't send
+    emails to the maintainers.
+
+## Features
+
+-   For Django 3.2
+-   Works with Python 3.9
+-   Renders Django projects with 100% starting test coverage
+-   Twitter [Bootstrap](https://github.com/twbs/bootstrap) v5
+-   [12-Factor](http://12factor.net/) based settings via [django-environ](https://github.com/joke2k/django-environ)
+-   Secure by default. We believe in SSL.
+-   Optimized development and production settings
+-   Registration via [django-allauth](https://github.com/pennersr/django-allauth)
+-   Comes with custom user model ready to go
+-   Optional basic ASGI setup for Websockets
+-   Optional custom static build using Gulp and livereload
+-   Send emails via [Anymail](https://github.com/anymail/django-anymail) (using [Mailgun](http://www.mailgun.com/) by default or Amazon SES if AWS is selected cloud provider, but switchable)
+-   Media storage using Amazon S3 or Google Cloud Storage
+-   Docker support using [docker-compose](https://github.com/docker/compose) for development and production (using [Traefik](https://traefik.io/) with [LetsEncrypt](https://letsencrypt.org/) support)
+-   [Procfile](https://devcenter.heroku.com/articles/procfile) for deploying to Heroku
+-   Instructions for deploying to [PythonAnywhere](https://www.pythonanywhere.com/)
+-   Run tests with unittest or pytest
+-   Customizable PostgreSQL version
+-   Default integration with [pre-commit](https://github.com/pre-commit/pre-commit) for identifying simple issues before submission to code review
+
+## Optional Integrations
+
+*These features can be enabled during initial project setup.*
+
+-   Serve static files from Amazon S3, Google Cloud Storage or [Whitenoise](https://whitenoise.readthedocs.io/)
+-   Configuration for [Celery](http://www.celeryproject.org/) and [Flower](https://github.com/mher/flower) (the latter in Docker setup only)
+-   Integration with [MailHog](https://github.com/mailhog/MailHog) for local email testing
+-   Integration with [Sentry](https://sentry.io/welcome/) for error logging
+
+## Constraints
+
+-   Only maintained 3rd party libraries are used.
+-   Uses PostgreSQL everywhere (10.19 - 14.1)
+-   Environment variables for configuration (This won't work with Apache/mod_wsgi).
+
+## Support this Project!
+
+This project is run by volunteers. Please support them in their efforts to maintain and improve Cookiecutter Django:
+
+-   Daniel Roy Greenfeld, Project Lead ([GitHub](https://github.com/pydanny), [Patreon](https://www.patreon.com/danielroygreenfeld)): expertise in Django and AWS ELB.
+-   Nikita Shupeyko, Core Developer ([GitHub](https://github.com/webyneter)): expertise in Python/Django, hands-on DevOps and frontend experience.
+
+Projects that provide financial support to the maintainers:
+
+------------------------------------------------------------------------
+
+[![Two Scoops of Django](https://cdn.shopify.com/s/files/1/0304/6901/products/Two-Scoops-of-Django-3-Alpha-Cover_540x_26507b15-e489-470b-8a97-02773dd498d1_1080x.jpg){#Two Scoops of Django 3.x .align-center}](https://www.feldroy.com/products//two-scoops-of-django-3-x)
+
+Two Scoops of Django 3.x is the best ice cream-themed Django reference in the universe!
+
+### PyUp
+
+[![pyup](https://pyup.io/static/images/logo.png){#pyup .align-center}](https://pyup.io/)
+
+PyUp brings you automated security and dependency updates used by Google and other organizations. Free for open source projects!
+
+## Usage
+
+Let's pretend you want to create a Django project called "redditclone". Rather than using `startproject`
+and then editing the results to include your name, email, and various configuration issues that always get forgotten until the worst possible moment, get [cookiecutter](https://github.com/cookiecutter/cookiecutter) to do all the work.
+
+First, get Cookiecutter. Trust me, it's awesome:
+
+    $ pip install "cookiecutter>=1.7.0"
+
+Now run it against this repo:
+
+    $ cookiecutter https://github.com/cookiecutter/cookiecutter-django
+
+You'll be prompted for some values. Provide them, then a Django project will be created for you.
+
+**Warning**: After this point, change 'Daniel Greenfeld', 'pydanny', etc to your own information.
+
+Answer the prompts with your own desired [options](http://cookiecutter-django.readthedocs.io/en/latest/project-generation-options.html). For example:
+
+    Cloning into 'cookiecutter-django'...
+    remote: Counting objects: 550, done.
+    remote: Compressing objects: 100% (310/310), done.
+    remote: Total 550 (delta 283), reused 479 (delta 222)
+    Receiving objects: 100% (550/550), 127.66 KiB | 58 KiB/s, done.
+    Resolving deltas: 100% (283/283), done.
+    project_name [Project Name]: Reddit Clone
+    project_slug [reddit_clone]: reddit
+    author_name [Daniel Roy Greenfeld]: Daniel Greenfeld
+    email [you@example.com]: pydanny@gmail.com
+    description [Behold My Awesome Project!]: A reddit clone.
+    domain_name [example.com]: myreddit.com
+    version [0.1.0]: 0.0.1
+    timezone [UTC]: America/Los_Angeles
+    use_whitenoise [n]: n
+    use_celery [n]: y
+    use_mailhog [n]: n
+    use_sentry [n]: y
+    use_pycharm [n]: y
+    windows [n]: n
+    use_docker [n]: n
+    use_heroku [n]: y
+    use_compressor [n]: y
+    Select postgresql_version:
+    1 - 14.1
+    2 - 13.5
+    3 - 12.9
+    4 - 11.14
+    5 - 10.19
+    Choose from 1, 2, 3, 4, 5 [1]: 1
+    Select js_task_runner:
+    1 - None
+    2 - Gulp
+    Choose from 1, 2 [1]: 1
+    Select cloud_provider:
+    1 - AWS
+    2 - GCP
+    3 - None
+    Choose from 1, 2, 3 [1]: 1
+    custom_bootstrap_compilation [n]: n
+    Select open_source_license:
+    1 - MIT
+    2 - BSD
+    3 - GPLv3
+    4 - Apache Software License 2.0
+    5 - Not open source
+    Choose from 1, 2, 3, 4, 5 [1]: 1
+    keep_local_envs_in_vcs [y]: y
+    debug[n]: n
+
+Enter the project and take a look around:
+
+    $ cd reddit/
+    $ ls
+
+Create a git repo and push it there:
+
+    $ git init
+    $ git add .
+    $ git commit -m "first awesome commit"
+    $ git remote add origin git@github.com:pydanny/redditclone.git
+    $ git push -u origin master
+
+Now take a look at your repo. Don't forget to carefully look at the generated README. Awesome, right?
+
+For local development, see the following:
+
+-   [Developing locally](http://cookiecutter-django.readthedocs.io/en/latest/developing-locally.html)
+-   [Developing locally using docker](http://cookiecutter-django.readthedocs.io/en/latest/developing-locally-docker.html)
+
+## Community
+
+-   Have questions? **Before you ask questions anywhere else**, please post your question on [Stack Overflow](http://stackoverflow.com/questions/tagged/cookiecutter-django) under the *cookiecutter-django* tag. We check there periodically for questions.
+-   If you think you found a bug or want to request a feature, please open an [issue](https://github.com/cookiecutter/cookiecutter-django/issues).
+-   For anything else, you can chat with us on [Discord](https://discord.gg/9BrxzPKuEW).
+
+## For Readers of Two Scoops of Django
+
+You may notice that some elements of this project do not exactly match what we describe in chapter 3. The reason for that is this project, amongst other things, serves as a test bed for trying out new ideas and concepts. Sometimes they work, sometimes they don't, but the end result is that it won't necessarily match precisely what is described in the book I co-authored.
+
+## For PyUp Users
+
+If you are using [PyUp](https://pyup.io) to keep your dependencies updated and secure, use the code *cookiecutter* during checkout to get 15% off every month.
+
+## "Your Stuff"
+
+Scattered throughout the Python and HTML of this project are places marked with "your stuff". This is where third-party libraries are to be integrated with your project.
+
+## Releases
+
+Need a stable release? You can find them at <https://github.com/cookiecutter/cookiecutter-django/releases>
+
+## Not Exactly What You Want?
+
+This is what I want. *It might not be what you want.* Don't worry, you have options:
+
+### Fork This
+
+If you have differences in your preferred setup, I encourage you to fork this to create your own version.
+Once you have your fork working, let me know and I'll add it to a '*Similar Cookiecutter Templates*' list here.
+It's up to you whether to rename your fork.
+
+If you do rename your fork, I encourage you to submit it to the following places:
+
+-   [cookiecutter](https://github.com/cookiecutter/cookiecutter) so it gets listed in the README as a template.
+-   The cookiecutter [grid](https://www.djangopackages.com/grids/g/cookiecutters/) on Django Packages.
+
+### Submit a Pull Request
+
+We accept pull requests if they're small, atomic, and make our own project development
+experience better.
+
+## Articles
+
+-   [Using cookiecutter-django with Google Cloud Storage](https://ahhda.github.io/cloud/gce/django/2019/03/12/using-django-cookiecutter-cloud-storage.html) - Mar. 12, 2019
+-   [cookiecutter-django with Nginx, Route 53 and ELB](https://msaizar.com/blog/cookiecutter-django-nginx-route-53-and-elb/) - Feb. 12, 2018
+-   [cookiecutter-django and Amazon RDS](https://msaizar.com/blog/cookiecutter-django-and-amazon-rds/) - Feb. 7, 2018
+-   [Using Cookiecutter to Jumpstart a Django Project on Windows with PyCharm](https://joshuahunter.com/posts/using-cookiecutter-to-jumpstart-a-django-project-on-windows-with-pycharm/) - May 19, 2017
+-   [Exploring with Cookiecutter](http://www.snowboardingcoder.com/django/2016/12/03/exploring-with-cookiecutter/) - Dec. 3, 2016
+-   [Introduction to Cookiecutter-Django](http://krzysztofzuraw.com/blog/2016/django-cookiecutter.html) - Feb. 19, 2016
+-   [Django and GitLab - Running Continuous Integration and tests with your FREE account](http://dezoito.github.io/2016/05/11/django-gitlab-continuous-integration-phantomjs.html) - May. 11, 2016
+-   [Development and Deployment of Cookiecutter-Django on Fedora](https://realpython.com/blog/python/development-and-deployment-of-cookiecutter-django-on-fedora/) - Jan. 18, 2016
+-   [Development and Deployment of Cookiecutter-Django via Docker](https://realpython.com/blog/python/development-and-deployment-of-cookiecutter-django-via-docker/) - Dec. 29, 2015
+-   [How to create a Django Application using Cookiecutter and Django 1.8](https://www.swapps.io/blog/how-to-create-a-django-application-using-cookiecutter-and-django-1-8/) - Sept. 12, 2015
+
+Have a blog or online publication? Write about your cookiecutter-django tips and tricks, then send us a pull request with the link.
+
+## Code of Conduct
+
+Everyone interacting in the Cookiecutter project's codebases, issue trackers, chat
+rooms, and mailing lists is expected to follow the [PyPA Code of Conduct](https://www.pypa.io/en/latest/code-of-conduct/).
diff --git a/README.rst b/README.rst
deleted file mode 100644
index 211157ec7..000000000
--- a/README.rst
+++ /dev/null
@@ -1,321 +0,0 @@
-Cookiecutter Django
-===================
-
-.. image:: https://img.shields.io/github/workflow/status/cookiecutter/cookiecutter-django/CI/master
-    :target: https://github.com/cookiecutter/cookiecutter-django/actions?query=workflow%3ACI
-    :alt: Build Status
-
-.. image:: https://readthedocs.org/projects/cookiecutter-django/badge/?version=latest
-    :target: https://cookiecutter-django.readthedocs.io/en/latest/?badge=latest
-    :alt: Documentation Status
-
-.. image:: https://pyup.io/repos/github/cookiecutter/cookiecutter-django/shield.svg
-    :target: https://pyup.io/repos/github/cookiecutter/cookiecutter-django/
-    :alt: Updates
-
-.. image:: https://img.shields.io/badge/Discord-cookiecutter-5865F2?style=flat&logo=discord&logoColor=white
-    :target: https://discord.gg/9BrxzPKuEW
-    :alt: Join our Discord
-
-.. image:: https://www.codetriage.com/cookiecutter/cookiecutter-django/badges/users.svg
-    :target: https://www.codetriage.com/cookiecutter/cookiecutter-django
-    :alt: Code Helpers Badge
-
-.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
-    :target: https://github.com/ambv/black
-    :alt: Code style: black
-
-Powered by Cookiecutter_, Cookiecutter Django is a framework for jumpstarting
-production-ready Django projects quickly.
-
-* Documentation: https://cookiecutter-django.readthedocs.io/en/latest/
-* See Troubleshooting_ for common errors and obstacles
-* If you have problems with Cookiecutter Django, please open issues_ don't send
-  emails to the maintainers.
-
-.. _Troubleshooting: https://cookiecutter-django.readthedocs.io/en/latest/troubleshooting.html
-
-.. _528: https://github.com/cookiecutter/cookiecutter-django/issues/528#issuecomment-212650373
-.. _issues: https://github.com/cookiecutter/cookiecutter-django/issues/new
-
-Features
----------
-
-* For Django 3.2
-* Works with Python 3.9
-* Renders Django projects with 100% starting test coverage
-* Twitter Bootstrap_ v5
-* 12-Factor_ based settings via django-environ_
-* Secure by default. We believe in SSL.
-* Optimized development and production settings
-* Registration via django-allauth_
-* Comes with custom user model ready to go
-* Optional basic ASGI setup for Websockets
-* Optional custom static build using Gulp and livereload
-* Send emails via Anymail_ (using Mailgun_ by default or Amazon SES if AWS is selected cloud provider, but switchable)
-* Media storage using Amazon S3 or Google Cloud Storage
-* Docker support using docker-compose_ for development and production (using Traefik_ with LetsEncrypt_ support)
-* Procfile_ for deploying to Heroku
-* Instructions for deploying to PythonAnywhere_
-* Run tests with unittest or pytest
-* Customizable PostgreSQL version
-* Default integration with pre-commit_ for identifying simple issues before submission to code review
-
-Optional Integrations
----------------------
-
-*These features can be enabled during initial project setup.*
-
-* Serve static files from Amazon S3, Google Cloud Storage or Whitenoise_
-* Configuration for Celery_ and Flower_ (the latter in Docker setup only)
-* Integration with MailHog_ for local email testing
-* Integration with Sentry_ for error logging
-
-.. _Bootstrap: https://github.com/twbs/bootstrap
-.. _django-environ: https://github.com/joke2k/django-environ
-.. _12-Factor: http://12factor.net/
-.. _django-allauth: https://github.com/pennersr/django-allauth
-.. _django-avatar: https://github.com/grantmcconnaughey/django-avatar
-.. _Procfile: https://devcenter.heroku.com/articles/procfile
-.. _Mailgun: http://www.mailgun.com/
-.. _Whitenoise: https://whitenoise.readthedocs.io/
-.. _Celery: http://www.celeryproject.org/
-.. _Flower: https://github.com/mher/flower
-.. _Anymail: https://github.com/anymail/django-anymail
-.. _MailHog: https://github.com/mailhog/MailHog
-.. _Sentry: https://sentry.io/welcome/
-.. _docker-compose: https://github.com/docker/compose
-.. _PythonAnywhere: https://www.pythonanywhere.com/
-.. _Traefik: https://traefik.io/
-.. _LetsEncrypt: https://letsencrypt.org/
-.. _pre-commit: https://github.com/pre-commit/pre-commit
-
-Constraints
------------
-
-* Only maintained 3rd party libraries are used.
-* Uses PostgreSQL everywhere (10.19 - 14.1)
-* Environment variables for configuration (This won't work with Apache/mod_wsgi).
-
-Support this Project!
-----------------------
-
-This project is run by volunteers. Please support them in their efforts to maintain and improve Cookiecutter Django:
-
-* Daniel Roy Greenfeld, Project Lead (`GitHub <https://github.com/pydanny>`_, `Patreon <https://www.patreon.com/danielroygreenfeld>`_): expertise in Django and AWS ELB.
-
-* Nikita Shupeyko, Core Developer (`GitHub <https://github.com/webyneter>`_): expertise in Python/Django, hands-on DevOps and frontend experience.
-
-Projects that provide financial support to the maintainers:
-
-
-
-~~~~~~~~~~~~~~~~~~~~~~~~~
-
-.. image:: https://cdn.shopify.com/s/files/1/0304/6901/products/Two-Scoops-of-Django-3-Alpha-Cover_540x_26507b15-e489-470b-8a97-02773dd498d1_1080x.jpg
-   :name: Two Scoops of Django 3.x
-   :align: center
-   :alt: Two Scoops of Django
-   :target: https://www.feldroy.com/products//two-scoops-of-django-3-x
-
-Two Scoops of Django 3.x is the best ice cream-themed Django reference in the universe!
-
-PyUp
-~~~~
-
-.. image:: https://pyup.io/static/images/logo.png
-   :name: pyup
-   :align: center
-   :alt: pyup
-   :target: https://pyup.io/
-
-PyUp brings you automated security and dependency updates used by Google and other organizations. Free for open source projects!
-
-Usage
-------
-
-Let's pretend you want to create a Django project called "redditclone". Rather than using ``startproject``
-and then editing the results to include your name, email, and various configuration issues that always get forgotten until the worst possible moment, get cookiecutter_ to do all the work.
-
-First, get Cookiecutter. Trust me, it's awesome::
-
-    $ pip install "cookiecutter>=1.7.0"
-
-Now run it against this repo::
-
-    $ cookiecutter https://github.com/cookiecutter/cookiecutter-django
-
-You'll be prompted for some values. Provide them, then a Django project will be created for you.
-
-**Warning**: After this point, change 'Daniel Greenfeld', 'pydanny', etc to your own information.
-
-Answer the prompts with your own desired options_. For example::
-
-    Cloning into 'cookiecutter-django'...
-    remote: Counting objects: 550, done.
-    remote: Compressing objects: 100% (310/310), done.
-    remote: Total 550 (delta 283), reused 479 (delta 222)
-    Receiving objects: 100% (550/550), 127.66 KiB | 58 KiB/s, done.
-    Resolving deltas: 100% (283/283), done.
-    project_name [Project Name]: Reddit Clone
-    project_slug [reddit_clone]: reddit
-    author_name [Daniel Roy Greenfeld]: Daniel Greenfeld
-    email [you@example.com]: pydanny@gmail.com
-    description [Behold My Awesome Project!]: A reddit clone.
-    domain_name [example.com]: myreddit.com
-    version [0.1.0]: 0.0.1
-    timezone [UTC]: America/Los_Angeles
-    use_whitenoise [n]: n
-    use_celery [n]: y
-    use_mailhog [n]: n
-    use_sentry [n]: y
-    use_pycharm [n]: y
-    windows [n]: n
-    use_docker [n]: n
-    use_heroku [n]: y
-    use_compressor [n]: y
-    Select postgresql_version:
-    1 - 14.1
-    2 - 13.5
-    3 - 12.9
-    4 - 11.14
-    5 - 10.19
-    Choose from 1, 2, 3, 4, 5 [1]: 1
-    Select js_task_runner:
-    1 - None
-    2 - Gulp
-    Choose from 1, 2 [1]: 1
-    Select cloud_provider:
-    1 - AWS
-    2 - GCP
-    3 - None
-    Choose from 1, 2, 3 [1]: 1
-    custom_bootstrap_compilation [n]: n
-    Select open_source_license:
-    1 - MIT
-    2 - BSD
-    3 - GPLv3
-    4 - Apache Software License 2.0
-    5 - Not open source
-    Choose from 1, 2, 3, 4, 5 [1]: 1
-    keep_local_envs_in_vcs [y]: y
-    debug[n]: n
-
-Enter the project and take a look around::
-
-    $ cd reddit/
-    $ ls
-
-Create a git repo and push it there::
-
-    $ git init
-    $ git add .
-    $ git commit -m "first awesome commit"
-    $ git remote add origin git@github.com:pydanny/redditclone.git
-    $ git push -u origin master
-
-Now take a look at your repo. Don't forget to carefully look at the generated README. Awesome, right?
-
-For local development, see the following:
-
-* `Developing locally`_
-* `Developing locally using docker`_
-
-.. _options: http://cookiecutter-django.readthedocs.io/en/latest/project-generation-options.html
-.. _`Developing locally`: http://cookiecutter-django.readthedocs.io/en/latest/developing-locally.html
-.. _`Developing locally using docker`: http://cookiecutter-django.readthedocs.io/en/latest/developing-locally-docker.html
-
-Community
------------
-
-* Have questions? **Before you ask questions anywhere else**, please post your question on `Stack Overflow`_ under the *cookiecutter-django* tag. We check there periodically for questions.
-* If you think you found a bug or want to request a feature, please open an issue_.
-* For anything else, you can chat with us on `Discord`_.
-
-.. _`Stack Overflow`: http://stackoverflow.com/questions/tagged/cookiecutter-django
-.. _`issue`: https://github.com/cookiecutter/cookiecutter-django/issues
-.. _`Discord`: https://discord.gg/9BrxzPKuEW
-
-For Readers of Two Scoops of Django
---------------------------------------------
-
-You may notice that some elements of this project do not exactly match what we describe in chapter 3. The reason for that is this project, amongst other things, serves as a test bed for trying out new ideas and concepts. Sometimes they work, sometimes they don't, but the end result is that it won't necessarily match precisely what is described in the book I co-authored.
-
-For PyUp Users
---------------
-
-If you are using `PyUp <https://pyup.io>`_ to keep your dependencies updated and secure, use the code *cookiecutter* during checkout to get 15% off every month.
-
-"Your Stuff"
--------------
-
-Scattered throughout the Python and HTML of this project are places marked with "your stuff". This is where third-party libraries are to be integrated with your project.
-
-Releases
---------
-
-Need a stable release? You can find them at https://github.com/cookiecutter/cookiecutter-django/releases
-
-
-Not Exactly What You Want?
----------------------------
-
-This is what I want. *It might not be what you want.* Don't worry, you have options:
-
-Fork This
-~~~~~~~~~~
-
-If you have differences in your preferred setup, I encourage you to fork this to create your own version.
-Once you have your fork working, let me know and I'll add it to a '*Similar Cookiecutter Templates*' list here.
-It's up to you whether or not to rename your fork.
-
-If you do rename your fork, I encourage you to submit it to the following places:
-
-* cookiecutter_ so it gets listed in the README as a template.
-* The cookiecutter grid_ on Django Packages.
-
-.. _cookiecutter: https://github.com/cookiecutter/cookiecutter
-.. _grid: https://www.djangopackages.com/grids/g/cookiecutters/
-
-Submit a Pull Request
-~~~~~~~~~~~~~~~~~~~~~~
-
-We accept pull requests if they're small, atomic, and make our own project development
-experience better.
-
-Articles
----------
-
-* `Using cookiecutter-django with Google Cloud Storage`_ - Mar. 12, 2019
-* `cookiecutter-django with Nginx, Route 53 and ELB`_ - Feb. 12, 2018
-* `cookiecutter-django and Amazon RDS`_ - Feb. 7, 2018
-* `Using Cookiecutter to Jumpstart a Django Project on Windows with PyCharm`_ - May 19, 2017
-* `Exploring with Cookiecutter`_ - Dec. 3, 2016
-* `Introduction to Cookiecutter-Django`_ - Feb. 19, 2016
-* `Django and GitLab - Running Continuous Integration and tests with your FREE account`_ - May. 11, 2016
-* `Development and Deployment of Cookiecutter-Django on Fedora`_ - Jan. 18, 2016
-* `Development and Deployment of Cookiecutter-Django via Docker`_ - Dec. 29, 2015
-* `How to create a Django Application using Cookiecutter and Django 1.8`_ - Sept. 12, 2015
-
-Have a blog or online publication? Write about your cookiecutter-django tips and tricks, then send us a pull request with the link.
-
-.. _`Using cookiecutter-django with Google Cloud Storage`: https://ahhda.github.io/cloud/gce/django/2019/03/12/using-django-cookiecutter-cloud-storage.html
-.. _`cookiecutter-django with Nginx, Route 53 and ELB`: https://msaizar.com/blog/cookiecutter-django-nginx-route-53-and-elb/
-.. _`cookiecutter-django and Amazon RDS`: https://msaizar.com/blog/cookiecutter-django-and-amazon-rds/
-.. _`Exploring with Cookiecutter`: http://www.snowboardingcoder.com/django/2016/12/03/exploring-with-cookiecutter/
-.. _`Using Cookiecutter to Jumpstart a Django Project on Windows with PyCharm`: https://joshuahunter.com/posts/using-cookiecutter-to-jumpstart-a-django-project-on-windows-with-pycharm/
-
-.. _`Development and Deployment of Cookiecutter-Django via Docker`: https://realpython.com/blog/python/development-and-deployment-of-cookiecutter-django-via-docker/
-.. _`Development and Deployment of Cookiecutter-Django on Fedora`: https://realpython.com/blog/python/development-and-deployment-of-cookiecutter-django-on-fedora/
-.. _`How to create a Django Application using Cookiecutter and Django 1.8`: https://www.swapps.io/blog/how-to-create-a-django-application-using-cookiecutter-and-django-1-8/
-.. _`Introduction to Cookiecutter-Django`: http://krzysztofzuraw.com/blog/2016/django-cookiecutter.html
-.. _`Django and GitLab - Running Continuous Integration and tests with your FREE account`: http://dezoito.github.io/2016/05/11/django-gitlab-continuous-integration-phantomjs.html
-
-Code of Conduct
----------------
-
-Everyone interacting in the Cookiecutter project's codebases, issue trackers, chat
-rooms, and mailing lists is expected to follow the `PyPA Code of Conduct`_.
-
-
-.. _`PyPA Code of Conduct`: https://www.pypa.io/en/latest/code-of-conduct/
diff --git a/{{cookiecutter.project_slug}}/README.md b/{{cookiecutter.project_slug}}/README.md
new file mode 100644
index 000000000..371c5f932
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/README.md
@@ -0,0 +1,143 @@
+# {{cookiecutter.project_name}}
+
+{{ cookiecutter.description }}
+
+[![Built with Cookiecutter Django](https://img.shields.io/badge/built%20with-Cookiecutter%20Django-ff69b4.svg?logo=cookiecutter)](https://github.com/cookiecutter/cookiecutter-django/)
+[![Black code style](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)
+
+{%- if cookiecutter.open_source_license != "Not open source" %}
+
+License: {{cookiecutter.open_source_license}}
+{%- endif %}
+
+## Settings
+
+Moved to [settings](http://cookiecutter-django.readthedocs.io/en/latest/settings.html).
+
+## Basic Commands
+
+### Setting Up Your Users
+
+-   To create a **normal user account**, just go to Sign Up and fill out the form. Once you submit it, you'll see a "Verify Your E-mail Address" page. Go to your console to see a simulated email verification message. Copy the link into your browser. Now the user's email should be verified and ready to go.
+
+-   To create an **superuser account**, use this command:
+
+        $ python manage.py createsuperuser
+
+For convenience, you can keep your normal user logged in on Chrome and your superuser logged in on Firefox (or similar), so that you can see how the site behaves for both kinds of users.
+
+### Type checks
+
+Running type checks with mypy:
+
+    $ mypy {{cookiecutter.project_slug}}
+
+### Test coverage
+
+To run the tests, check your test coverage, and generate an HTML coverage report:
+
+    $ coverage run -m pytest
+    $ coverage html
+    $ open htmlcov/index.html
+
+#### Running tests with pytest
+
+    $ pytest
+
+### Live reloading and Sass CSS compilation
+
+Moved to [Live reloading and SASS compilation](http://cookiecutter-django.readthedocs.io/en/latest/live-reloading-and-sass-compilation.html).
+
+{%- if cookiecutter.use_celery == "y" %}
+
+### Celery
+
+This app comes with Celery.
+
+To run a celery worker:
+
+``` bash
+cd {{cookiecutter.project_slug}}
+celery -A config.celery_app worker -l info
+```
+
+Please note: For Celery's import magic to work, it is important *where* the celery commands are run. If you are in the same folder with *manage.py*, you should be right.
+
+{%- endif %}
+{%- if cookiecutter.use_mailhog == "y" %}
+
+### Email Server
+
+{%- if cookiecutter.use_docker == "y" %}
+
+In development, it is often nice to be able to see emails that are being sent from your application. For that reason local SMTP server [MailHog](https://github.com/mailhog/MailHog) with a web interface is available as docker container.
+
+Container mailhog will start automatically when you will run all docker containers.
+Please check [cookiecutter-django Docker documentation](http://cookiecutter-django.readthedocs.io/en/latest/deployment-with-docker.html) for more details how to start all containers.
+
+With MailHog running, to view messages that are sent by your application, open your browser and go to `http://127.0.0.1:8025`
+{%- else %}
+
+In development, it is often nice to be able to see emails that are being sent from your application. If you choose to use [MailHog](https://github.com/mailhog/MailHog) when generating the project a local SMTP server with a web interface will be available.
+
+1.  [Download the latest MailHog release](https://github.com/mailhog/MailHog/releases) for your OS.
+
+2.  Rename the build to `MailHog`.
+
+3.  Copy the file to the project root.
+
+4.  Make it executable:
+
+        $ chmod +x MailHog
+
+5.  Spin up another terminal window and start it there:
+
+        ./MailHog
+
+6.  Check out <http://127.0.0.1:8025/> to see how it goes.
+
+Now you have your own mail server running locally, ready to receive whatever you send it.
+
+{%- endif %}
+
+{%- endif %}
+{%- if cookiecutter.use_sentry == "y" %}
+
+### Sentry
+
+Sentry is an error logging aggregator service. You can sign up for a free account at <https://sentry.io/signup/?code=cookiecutter> or download and host it yourself.
+The system is set up with reasonable defaults, including 404 logging and integration with the WSGI application.
+
+You must set the DSN url in production.
+{%- endif %}
+
+## Deployment
+
+The following details how to deploy this application.
+{%- if cookiecutter.use_heroku.lower() == "y" %}
+
+### Heroku
+
+See detailed [cookiecutter-django Heroku documentation](http://cookiecutter-django.readthedocs.io/en/latest/deployment-on-heroku.html).
+
+{%- endif %}
+{%- if cookiecutter.use_docker.lower() == "y" %}
+
+### Docker
+
+See detailed [cookiecutter-django Docker documentation](http://cookiecutter-django.readthedocs.io/en/latest/deployment-with-docker.html).
+
+{%- endif %}
+{%- if cookiecutter.custom_bootstrap_compilation == "y" %}
+### Custom Bootstrap Compilation
+
+The generated CSS is set up with automatic Bootstrap recompilation with variables of your choice.
+Bootstrap v4 is installed using npm and customised by tweaking your variables in `static/sass/custom_bootstrap_vars`.
+
+You can find a list of available variables [in the bootstrap source](https://github.com/twbs/bootstrap/blob/v4-dev/scss/_variables.scss), or get explanations on them in the [Bootstrap docs](https://getbootstrap.com/docs/4.1/getting-started/theming/).
+
+{%- if cookiecutter.js_task_runner == "Gulp" %}
+Bootstrap's javascript as well as its dependencies is concatenated into a single file: `static/js/vendors.js`.
+{%- endif %}
+
+{%- endif %}
diff --git a/{{cookiecutter.project_slug}}/README.rst b/{{cookiecutter.project_slug}}/README.rst
deleted file mode 100644
index 3cad6f892..000000000
--- a/{{cookiecutter.project_slug}}/README.rst
+++ /dev/null
@@ -1,175 +0,0 @@
-{{cookiecutter.project_name}}
-{{ '=' * cookiecutter.project_name|length }}
-
-{{cookiecutter.description}}
-
-.. image:: https://img.shields.io/badge/built%20with-Cookiecutter%20Django-ff69b4.svg?logo=cookiecutter
-     :target: https://github.com/cookiecutter/cookiecutter-django/
-     :alt: Built with Cookiecutter Django
-.. image:: https://img.shields.io/badge/code%20style-black-000000.svg
-     :target: https://github.com/ambv/black
-     :alt: Black code style
-{%- if cookiecutter.open_source_license != "Not open source" %}
-
-:License: {{cookiecutter.open_source_license}}
-{%- endif %}
-
-Settings
---------
-
-Moved to settings_.
-
-.. _settings: http://cookiecutter-django.readthedocs.io/en/latest/settings.html
-
-Basic Commands
---------------
-
-Setting Up Your Users
-^^^^^^^^^^^^^^^^^^^^^
-
-* To create a **normal user account**, just go to Sign Up and fill out the form. Once you submit it, you'll see a "Verify Your E-mail Address" page. Go to your console to see a simulated email verification message. Copy the link into your browser. Now the user's email should be verified and ready to go.
-
-* To create an **superuser account**, use this command::
-
-    $ python manage.py createsuperuser
-
-For convenience, you can keep your normal user logged in on Chrome and your superuser logged in on Firefox (or similar), so that you can see how the site behaves for both kinds of users.
-
-Type checks
-^^^^^^^^^^^
-
-Running type checks with mypy:
-
-::
-
-  $ mypy {{cookiecutter.project_slug}}
-
-Test coverage
-^^^^^^^^^^^^^
-
-To run the tests, check your test coverage, and generate an HTML coverage report::
-
-    $ coverage run -m pytest
-    $ coverage html
-    $ open htmlcov/index.html
-
-Running tests with py.test
-~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-::
-
-  $ pytest
-
-Live reloading and Sass CSS compilation
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Moved to `Live reloading and SASS compilation`_.
-
-.. _`Live reloading and SASS compilation`: http://cookiecutter-django.readthedocs.io/en/latest/live-reloading-and-sass-compilation.html
-
-{%- if cookiecutter.use_celery == "y" %}
-
-Celery
-^^^^^^
-
-This app comes with Celery.
-
-To run a celery worker:
-
-.. code-block:: bash
-
-    cd {{cookiecutter.project_slug}}
-    celery -A config.celery_app worker -l info
-
-Please note: For Celery's import magic to work, it is important *where* the celery commands are run. If you are in the same folder with *manage.py*, you should be right.
-
-{%- endif %}
-{%- if cookiecutter.use_mailhog == "y" %}
-
-Email Server
-^^^^^^^^^^^^
-{%- if cookiecutter.use_docker == 'y' %}
-
-In development, it is often nice to be able to see emails that are being sent from your application. For that reason local SMTP server `MailHog`_ with a web interface is available as docker container.
-
-Container mailhog will start automatically when you will run all docker containers.
-Please check `cookiecutter-django Docker documentation`_ for more details how to start all containers.
-
-With MailHog running, to view messages that are sent by your application, open your browser and go to ``http://127.0.0.1:8025``
-{%- else %}
-
-In development, it is often nice to be able to see emails that are being sent from your application. If you choose to use `MailHog`_ when generating the project a local SMTP server with a web interface will be available.
-
-#. `Download the latest MailHog release`_ for your OS.
-
-#. Rename the build to ``MailHog``.
-
-#. Copy the file to the project root.
-
-#. Make it executable: ::
-
-    $ chmod +x MailHog
-
-#. Spin up another terminal window and start it there: ::
-
-    ./MailHog
-
-#. Check out `<http://127.0.0.1:8025/>`_ to see how it goes.
-
-Now you have your own mail server running locally, ready to receive whatever you send it.
-
-.. _`Download the latest MailHog release`: https://github.com/mailhog/MailHog/releases
-{%- endif %}
-
-.. _mailhog: https://github.com/mailhog/MailHog
-{%- endif %}
-{%- if cookiecutter.use_sentry == "y" %}
-
-Sentry
-^^^^^^
-
-Sentry is an error logging aggregator service. You can sign up for a free account at  https://sentry.io/signup/?code=cookiecutter  or download and host it yourself.
-The system is setup with reasonable defaults, including 404 logging and integration with the WSGI application.
-
-You must set the DSN url in production.
-{%- endif %}
-
-Deployment
-----------
-
-The following details how to deploy this application.
-{%- if cookiecutter.use_heroku.lower() == "y" %}
-
-Heroku
-^^^^^^
-
-See detailed `cookiecutter-django Heroku documentation`_.
-
-.. _`cookiecutter-django Heroku documentation`: http://cookiecutter-django.readthedocs.io/en/latest/deployment-on-heroku.html
-{%- endif %}
-{%- if cookiecutter.use_docker.lower() == "y" %}
-
-Docker
-^^^^^^
-
-See detailed `cookiecutter-django Docker documentation`_.
-
-.. _`cookiecutter-django Docker documentation`: http://cookiecutter-django.readthedocs.io/en/latest/deployment-with-docker.html
-{%- endif %}
-{%- if cookiecutter.custom_bootstrap_compilation == "y" %}
-Custom Bootstrap Compilation
-^^^^^^
-
-The generated CSS is set up with automatic Bootstrap recompilation with variables of your choice.
-Bootstrap v4 is installed using npm and customised by tweaking your variables in ``static/sass/custom_bootstrap_vars``.
-
-You can find a list of available variables `in the bootstrap source`_, or get explanations on them in the `Bootstrap docs`_.
-
-{%- if cookiecutter.js_task_runner == 'Gulp' %}
-Bootstrap's javascript as well as its dependencies is concatenated into a single file: ``static/js/vendors.js``.
-{%- endif %}
-
-.. _in the bootstrap source: https://github.com/twbs/bootstrap/blob/v4-dev/scss/_variables.scss
-.. _Bootstrap docs: https://getbootstrap.com/docs/4.1/getting-started/theming/
-
-{%- endif %}

From a808aca29ba6d0a58507858dec0a1c4cad9eaad6 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 4 Jan 2022 02:19:28 +0000
Subject: [PATCH 1942/2840] Release 2022.01.03

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 216476f52..98e8711d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.01.03
+
+### Changed
+- Convert top level RST files to Markdown ([#3489](https://github.com/cookiecutter/cookiecutter-django/pull/3489))
+### Updated
+- Update requests to 2.27.0 ([#3509](https://github.com/cookiecutter/cookiecutter-django/pull/3509))
+- Update pillow to 9.0.0 ([#3508](https://github.com/cookiecutter/cookiecutter-django/pull/3508))
+- Update pylint-django to 2.5.0 ([#3505](https://github.com/cookiecutter/cookiecutter-django/pull/3505))
+
 ## 2021.12.29
 
 ### Fixed
diff --git a/setup.py b/setup.py
index 89fde748f..557e8de27 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2021.12.29"
+version = "2022.01.03"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From ea9fcf840fc0b63efb968e7fcf432e40e6196d55 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 4 Jan 2022 04:57:54 -0800
Subject: [PATCH 1943/2840] Update django from 3.2.10 to 3.2.11

---
 {{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 02b7fe7ea..4dcd42605 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,7 +29,7 @@ uvicorn[standard]==0.16.0  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.2.10  # pyup: < 4.0  # https://www.djangoproject.com/
+django==3.2.11  # pyup: < 4.0  # https://www.djangoproject.com/
 django-environ==0.8.1  # https://github.com/joke2k/django-environ
 django-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.47.0  # https://github.com/pennersr/django-allauth

From 9e44a205c380032a7da196751fdb20e7d8ce41c2 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 4 Jan 2022 17:48:21 +0000
Subject: [PATCH 1944/2840] Double quote array expansions to avoid re-splitting
 elements.

If one argument includes spaces, the expansion will be wrong. Add double quotes to avoid that.

https://github.com/koalaman/shellcheck/wiki/SC2068
---
 tests/test_bare.sh   | 4 ++--
 tests/test_docker.sh | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/test_bare.sh b/tests/test_bare.sh
index 75a0f31fd..05da9328b 100755
--- a/tests/test_bare.sh
+++ b/tests/test_bare.sh
@@ -11,7 +11,7 @@ mkdir -p .cache/bare
 cd .cache/bare
 
 # create the project using the default settings in cookiecutter.json
-cookiecutter ../../ --no-input --overwrite-if-exists use_docker=n $@
+cookiecutter ../../ --no-input --overwrite-if-exists use_docker=n "$@"
 cd my_awesome_project
 
 # Install OS deps
@@ -42,4 +42,4 @@ then
 fi
 
 # Generate the HTML for the documentation
-cd docs && make html
\ No newline at end of file
+cd docs && make html
diff --git a/tests/test_docker.sh b/tests/test_docker.sh
index 45e817dfd..b3663bd2c 100755
--- a/tests/test_docker.sh
+++ b/tests/test_docker.sh
@@ -11,7 +11,7 @@ mkdir -p .cache/docker
 cd .cache/docker
 
 # create the project using the default settings in cookiecutter.json
-cookiecutter ../../ --no-input --overwrite-if-exists use_docker=y $@
+cookiecutter ../../ --no-input --overwrite-if-exists use_docker=y "$@"
 cd my_awesome_project
 
 # Lint by running pre-commit on all files
@@ -40,4 +40,4 @@ docker-compose -f local.yml run django python manage.py makemessages --all
 docker-compose -f local.yml run django python manage.py check --fail-level WARNING
 
 # Generate the HTML for the documentation
-docker-compose -f local.yml run docs make html
\ No newline at end of file
+docker-compose -f local.yml run docs make html

From e99120d87d63f6cd786e6d92703e398f57078b5f Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 4 Jan 2022 17:49:40 +0000
Subject: [PATCH 1945/2840] Fix typo and trailing whitespaces

---
 {{cookiecutter.project_slug}}/.github/dependabot.yml        | 4 ++--
 .../.idea/{{cookiecutter.project_slug}}.iml                 | 6 +++---
 .../{{cookiecutter.project_slug}}/templates/base.html       | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/.github/dependabot.yml b/{{cookiecutter.project_slug}}/.github/dependabot.yml
index cdc365435..cf88cf33b 100644
--- a/{{cookiecutter.project_slug}}/.github/dependabot.yml
+++ b/{{cookiecutter.project_slug}}/.github/dependabot.yml
@@ -13,7 +13,7 @@ updates:
 {%- if cookiecutter.use_docker == 'y' %}
 
   # Enable version updates for Docker
-  # We need to specify each Dockerfile in a separate entry because Dependabot doesn't 
+  # We need to specify each Dockerfile in a separate entry because Dependabot doesn't
   # support wildcards or recursively checking subdirectories. Check this issue for updates:
   # https://github.com/dependabot/dependabot-core/issues/2178
   - package-ecosystem: "docker"
@@ -38,7 +38,7 @@ updates:
     # Check for updates to GitHub Actions every weekday
     schedule:
       interval: "daily"
-  
+
   # Enable version updates for Docker
   - package-ecosystem: "docker"
     # Look for a `Dockerfile` in the `compose/production/aws` directory
diff --git a/{{cookiecutter.project_slug}}/.idea/{{cookiecutter.project_slug}}.iml b/{{cookiecutter.project_slug}}/.idea/{{cookiecutter.project_slug}}.iml
index d408765a5..289d9716a 100644
--- a/{{cookiecutter.project_slug}}/.idea/{{cookiecutter.project_slug}}.iml
+++ b/{{cookiecutter.project_slug}}/.idea/{{cookiecutter.project_slug}}.iml
@@ -14,11 +14,11 @@
   </component>
   <component name="NewModuleRootManager">
     {% if cookiecutter.js_task_runner != 'None' %}
-    <content url="file://$MODULE_DIR$"> 
+    <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/node_modules" />
     </content>
-    {% else %} 
-    <content url="file://$MODULE_DIR$" /> 
+    {% else %}
+    <content url="file://$MODULE_DIR$" />
     {% endif %}
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
index 9089e3f8d..e5087534d 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -119,7 +119,7 @@
     {% block inline_javascript %}
     {% comment %}
     Script tags with only code, no src (defer by default). To run
-    with a "defer" so that you run run inline code:
+    with a "defer" so that you run inline code:
     <script>
       window.addEventListener('DOMContentLoaded', () => {/* Run whatever you want */});
     </script>

From 6157607f3fc6bae516940eca0cacb78045224fbb Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 5 Jan 2022 02:20:10 +0000
Subject: [PATCH 1946/2840] Release 2022.01.04

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 98e8711d1..61f842419 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.01.04
+
+### Changed
+- Double quote array expansions to avoid re-splitting elements ([#3514](https://github.com/cookiecutter/cookiecutter-django/pull/3514))
+### Updated
+- Update django to 3.2.11 ([#3510](https://github.com/cookiecutter/cookiecutter-django/pull/3510))
+
 ## 2022.01.03
 
 ### Changed
diff --git a/setup.py b/setup.py
index 557e8de27..6e12e768b 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.01.03"
+version = "2022.01.04"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From ea73bbff7ed214984f71a98af9063c16045d9d66 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 5 Jan 2022 16:18:28 -0500
Subject: [PATCH 1947/2840] Update requests from 2.27.0 to 2.27.1 (#3516)

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

diff --git a/requirements.txt b/requirements.txt
index d0e4e6c81..fcaf1af55 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -23,4 +23,4 @@ pyyaml==6.0
 PyGithub==1.55
 gitpython==3.1.24
 jinja2==3.0.3
-requests==2.27.0
+requests==2.27.1

From 9b069a5558cca6a0207318060dddbd66917b700c Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 5 Jan 2022 21:19:19 +0000
Subject: [PATCH 1948/2840] Update references to Bootstrap from v4 to v5 in
 README (#3513)

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

diff --git a/{{cookiecutter.project_slug}}/README.md b/{{cookiecutter.project_slug}}/README.md
index 371c5f932..227e24c00 100644
--- a/{{cookiecutter.project_slug}}/README.md
+++ b/{{cookiecutter.project_slug}}/README.md
@@ -132,9 +132,9 @@ See detailed [cookiecutter-django Docker documentation](http://cookiecutter-djan
 ### Custom Bootstrap Compilation
 
 The generated CSS is set up with automatic Bootstrap recompilation with variables of your choice.
-Bootstrap v4 is installed using npm and customised by tweaking your variables in `static/sass/custom_bootstrap_vars`.
+Bootstrap v5 is installed using npm and customised by tweaking your variables in `static/sass/custom_bootstrap_vars`.
 
-You can find a list of available variables [in the bootstrap source](https://github.com/twbs/bootstrap/blob/v4-dev/scss/_variables.scss), or get explanations on them in the [Bootstrap docs](https://getbootstrap.com/docs/4.1/getting-started/theming/).
+You can find a list of available variables [in the bootstrap source](https://github.com/twbs/bootstrap/blob/main/scss/_variables.scss), or get explanations on them in the [Bootstrap docs](https://getbootstrap.com/docs/5.1/customize/sass/).
 
 {%- if cookiecutter.js_task_runner == "Gulp" %}
 Bootstrap's javascript as well as its dependencies is concatenated into a single file: `static/js/vendors.js`.

From e813e5866a71cec8bdb0171673053deffe1c0259 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 6 Jan 2022 02:23:12 +0000
Subject: [PATCH 1949/2840] Release 2022.01.05

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 61f842419..85ae1eedc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.01.05
+
+### Changed
+- Update references to Bootstrap from v4 to v5 in README ([#3513](https://github.com/cookiecutter/cookiecutter-django/pull/3513))
+### Updated
+- Update requests to 2.27.1 ([#3516](https://github.com/cookiecutter/cookiecutter-django/pull/3516))
+
 ## 2022.01.04
 
 ### Changed
diff --git a/setup.py b/setup.py
index 6e12e768b..8f8fe16d2 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.01.04"
+version = "2022.01.05"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From ee92b4ea428a6c588e9fcffbac1cb77628b4fb23 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 6 Jan 2022 10:28:33 +0000
Subject: [PATCH 1950/2840] Update output example in README (#3512)

---
 README.md | 55 +++++++++++++++++++++++++++++++++++++------------------
 1 file changed, 37 insertions(+), 18 deletions(-)

diff --git a/README.md b/README.md
index 6e88c9548..a5372eabc 100644
--- a/README.md
+++ b/README.md
@@ -98,23 +98,24 @@ Answer the prompts with your own desired [options](http://cookiecutter-django.re
     remote: Total 550 (delta 283), reused 479 (delta 222)
     Receiving objects: 100% (550/550), 127.66 KiB | 58 KiB/s, done.
     Resolving deltas: 100% (283/283), done.
-    project_name [Project Name]: Reddit Clone
+    project_name [My Awesome Project]: Reddit Clone
     project_slug [reddit_clone]: reddit
-    author_name [Daniel Roy Greenfeld]: Daniel Greenfeld
-    email [you@example.com]: pydanny@gmail.com
     description [Behold My Awesome Project!]: A reddit clone.
+    author_name [Daniel Roy Greenfeld]: Daniel Greenfeld
     domain_name [example.com]: myreddit.com
+    email [daniel-greenfeld@example.com]: pydanny@gmail.com
     version [0.1.0]: 0.0.1
+    Select open_source_license:
+    1 - MIT
+    2 - BSD
+    3 - GPLv3
+    4 - Apache Software License 2.0
+    5 - Not open source
+    Choose from 1, 2, 3, 4, 5 [1]: 1
     timezone [UTC]: America/Los_Angeles
-    use_whitenoise [n]: n
-    use_celery [n]: y
-    use_mailhog [n]: n
-    use_sentry [n]: y
-    use_pycharm [n]: y
     windows [n]: n
+    use_pycharm [n]: y
     use_docker [n]: n
-    use_heroku [n]: y
-    use_compressor [n]: y
     Select postgresql_version:
     1 - 14.1
     2 - 13.5
@@ -131,16 +132,34 @@ Answer the prompts with your own desired [options](http://cookiecutter-django.re
     2 - GCP
     3 - None
     Choose from 1, 2, 3 [1]: 1
+    Select mail_service:
+    1 - Mailgun
+    2 - Amazon SES
+    3 - Mailjet
+    4 - Mandrill
+    5 - Postmark
+    6 - Sendgrid
+    7 - SendinBlue
+    8 - SparkPost
+    9 - Other SMTP
+    Choose from 1, 2, 3, 4, 5, 6, 7, 8, 9 [1]: 1
+    use_async [n]: n
+    use_drf [n]: y
     custom_bootstrap_compilation [n]: n
-    Select open_source_license:
-    1 - MIT
-    2 - BSD
-    3 - GPLv3
-    4 - Apache Software License 2.0
-    5 - Not open source
-    Choose from 1, 2, 3, 4, 5 [1]: 1
+    use_compressor [n]: n
+    use_celery [n]: y
+    use_mailhog [n]: n
+    use_sentry [n]: y
+    use_whitenoise [n]: n
+    use_heroku [n]: y
+    Select ci_tool:
+    1 - None
+    2 - Travis
+    3 - Gitlab
+    4 - Github
+    Choose from 1, 2, 3, 4 [1]: 4
     keep_local_envs_in_vcs [y]: y
-    debug[n]: n
+    debug [n]: n
 
 Enter the project and take a look around:
 

From 4745805fd471f8d8693426bb50e745e4e500c27f Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 7 Jan 2022 02:22:44 +0000
Subject: [PATCH 1951/2840] Release 2022.01.06

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85ae1eedc..dd0434384 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 -->
 
+## 2022.01.06
+
+### Changed
+- Update output example in README ([#3512](https://github.com/cookiecutter/cookiecutter-django/pull/3512))
+
 ## 2022.01.05
 
 ### Changed
diff --git a/setup.py b/setup.py
index 8f8fe16d2..baba3d979 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.01.05"
+version = "2022.01.06"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 9a4636906238374a4f110b86ba5d3c841b697ba2 Mon Sep 17 00:00:00 2001
From: Bogdan Mateescu <52697314+mateesville93@users.noreply.github.com>
Date: Fri, 7 Jan 2022 12:02:26 +0200
Subject: [PATCH 1952/2840] Fix `open` option for `initBrowserSync` when using
 Docker (#3519)

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/gulpfile.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/gulpfile.js b/{{cookiecutter.project_slug}}/gulpfile.js
index 013e8c8d6..0f90be220 100644
--- a/{{cookiecutter.project_slug}}/gulpfile.js
+++ b/{{cookiecutter.project_slug}}/gulpfile.js
@@ -139,14 +139,16 @@ function initBrowserSync() {
       `${paths.js}/*.js`,
       `${paths.templates}/*.html`
     ], {
+      {%- if cookiecutter.use_docker == 'y' %}
+      // https://www.browsersync.io/docs/options/#option-open
+      // Disable as it doesn't work from inside a container
+      open: false,
+      {%- endif %}
       // https://www.browsersync.io/docs/options/#option-proxy
       proxy:  {
         {%- if cookiecutter.use_docker == 'n' %}
         target: '127.0.0.1:8000',
         {%- else %}
-        // https://www.browsersync.io/docs/options/#option-open
-        // Disable as it doesn't work from inside a container
-        open: false,
         target: 'django:8000',
         {%- endif %}
         proxyReq: [

From 5f8e45afc511f482069da1112a4e806f03808782 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 7 Jan 2022 10:02:54 +0000
Subject: [PATCH 1953/2840] 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 5b677a50c..6fd74677e 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1197,5 +1197,10 @@
     "name": "Will Gordon",
     "github_login": "wgordon17",
     "twitter_username": ""
+  },
+  {
+    "name": "Bogdan Mateescu",
+    "github_login": "mateesville93",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 4f5362814..cbeda8503 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -348,6 +348,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Bogdan Mateescu</td>
+    <td>
+      <a href="https://github.com/mateesville93">mateesville93</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Bouke Haarsma</td>
     <td>

From dcd36973fa82de74de389dcb7196494d16603ce1 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 7 Jan 2022 05:04:07 -0500
Subject: [PATCH 1954/2840] Update gitpython to 3.1.25 (#3518)

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

diff --git a/requirements.txt b/requirements.txt
index fcaf1af55..4ef925e99 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,6 +21,6 @@ pyyaml==6.0
 # Scripting
 # ------------------------------------------------------------------------------
 PyGithub==1.55
-gitpython==3.1.24
+gitpython==3.1.25
 jinja2==3.0.3
 requests==2.27.1

From bf42bba35e1e54000ea356149ebd459fa4a0e8e4 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 7 Jan 2022 14:58:36 -0500
Subject: [PATCH 1955/2840] Update mypy from 0.930 to 0.931 (#3521)

---
 {{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 c13f3ecd4..5d042653c 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.930  # https://github.com/python/mypy
+mypy==0.931  # https://github.com/python/mypy
 django-stubs==1.9.0  # https://github.com/typeddjango/django-stubs
 pytest==6.2.5  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar

From 528a40989fead6f927b9677730ee007e89bfbbff Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 7 Jan 2022 22:26:56 +0000
Subject: [PATCH 1956/2840] Fix cache dependency path for linter job in CI
 workflow (#3520)

* Fix cache dependency path for linter jon in CI workflow

* Reduce potential stylistic issues

* Reduce more potential stylistic issues
---
 {{cookiecutter.project_slug}}/.github/workflows/ci.yml   | 3 +++
 .../compose/production/django/start                      | 4 ++--
 .../config/settings/production.py                        | 9 +++++----
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
index 0b3ab4910..c24f4cb94 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -28,6 +28,9 @@ jobs:
         with:
           python-version: "3.9"
           cache: pip
+          cache-dependency-path: |
+            requirements/base.txt
+            requirements/local.txt
 
       - name: Run pre-commit
         uses: pre-commit/action@v2.0.3
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/start b/{{cookiecutter.project_slug}}/compose/production/django/start
index 1a41ed48d..8e324afe0 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/start
+++ b/{{cookiecutter.project_slug}}/compose/production/django/start
@@ -27,8 +27,8 @@ if compress_enabled; then
   python /app/manage.py compress
 fi
 {%- endif %}
-{% if cookiecutter.use_async == 'y' %}
+{%- if cookiecutter.use_async == 'y' %}
 /usr/local/bin/gunicorn config.asgi --bind 0.0.0.0:5000 --chdir=/app -k uvicorn.workers.UvicornWorker
-{% else %}
+{%- else %}
 /usr/local/bin/gunicorn config.wsgi --bind 0.0.0.0:5000 --chdir=/app
 {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 77cf1efd7..06eb8d492 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -2,11 +2,11 @@
 import logging
 
 import sentry_sdk
-from sentry_sdk.integrations.django import DjangoIntegration
-from sentry_sdk.integrations.logging import LoggingIntegration
 {%- if cookiecutter.use_celery == 'y' %}
 from sentry_sdk.integrations.celery import CeleryIntegration
-{% endif %}
+{%- endif %}
+from sentry_sdk.integrations.django import DjangoIntegration
+from sentry_sdk.integrations.logging import LoggingIntegration
 from sentry_sdk.integrations.redis import RedisIntegration
 
 {% endif -%}
@@ -127,7 +127,8 @@ MEDIA_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/media/"
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#default-from-email
 DEFAULT_FROM_EMAIL = env(
-    "DJANGO_DEFAULT_FROM_EMAIL", default="{{cookiecutter.project_name}} <noreply@{{cookiecutter.domain_name}}>"
+    "DJANGO_DEFAULT_FROM_EMAIL",
+    default="{{cookiecutter.project_name}} <noreply@{{cookiecutter.domain_name}}>",
 )
 # https://docs.djangoproject.com/en/dev/ref/settings/#server-email
 SERVER_EMAIL = env("DJANGO_SERVER_EMAIL", default=DEFAULT_FROM_EMAIL)

From ca8bc224c56e6661506300af066ec9aa0de2f51e Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 8 Jan 2022 02:19:41 +0000
Subject: [PATCH 1957/2840] Release 2022.01.07

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd0434384..d9d07507e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.01.07
+
+### Fixed
+- Fix cache dependency path for linter job in CI workflow ([#3520](https://github.com/cookiecutter/cookiecutter-django/pull/3520))
+- Fix `open` option for `initBrowserSync` when using Docker ([#3519](https://github.com/cookiecutter/cookiecutter-django/pull/3519))
+### Updated
+- Update mypy to 0.931 ([#3521](https://github.com/cookiecutter/cookiecutter-django/pull/3521))
+- Update gitpython to 3.1.25 ([#3518](https://github.com/cookiecutter/cookiecutter-django/pull/3518))
+
 ## 2022.01.06
 
 ### Changed
diff --git a/setup.py b/setup.py
index baba3d979..e86a2cf71 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.01.06"
+version = "2022.01.07"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 8962e288f4cd38f3c19aab6d71c1ef8d18b9c8f3 Mon Sep 17 00:00:00 2001
From: Fuzzwah <fuzzwah@github.com>
Date: Sun, 9 Jan 2022 20:01:58 +1100
Subject: [PATCH 1958/2840] fixed broken center align of image links (#3522)

---
 README.md | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/README.md b/README.md
index a5372eabc..555081316 100644
--- a/README.md
+++ b/README.md
@@ -63,13 +63,17 @@ Projects that provide financial support to the maintainers:
 
 ------------------------------------------------------------------------
 
-[![Two Scoops of Django](https://cdn.shopify.com/s/files/1/0304/6901/products/Two-Scoops-of-Django-3-Alpha-Cover_540x_26507b15-e489-470b-8a97-02773dd498d1_1080x.jpg){#Two Scoops of Django 3.x .align-center}](https://www.feldroy.com/products//two-scoops-of-django-3-x)
+<p align="center">
+  <a href="https://www.feldroy.com/products//two-scoops-of-django-3-x"><img src="https://cdn.shopify.com/s/files/1/0304/6901/products/Two-Scoops-of-Django-3-Alpha-Cover_540x_26507b15-e489-470b-8a97-02773dd498d1_1080x.jpg"></a>
+</p>
 
 Two Scoops of Django 3.x is the best ice cream-themed Django reference in the universe!
 
 ### PyUp
 
-[![pyup](https://pyup.io/static/images/logo.png){#pyup .align-center}](https://pyup.io/)
+<p align="center">
+  <a href="https://pyup.io/"><img src="https://pyup.io/static/images/logo.png"></a>
+</p>
 
 PyUp brings you automated security and dependency updates used by Google and other organizations. Free for open source projects!
 

From 5ecde2676440bcdf94a92361874a95ee78fb2104 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sun, 9 Jan 2022 09:02:29 +0000
Subject: [PATCH 1959/2840] 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 6fd74677e..b4f21eee5 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1202,5 +1202,10 @@
     "name": "Bogdan Mateescu",
     "github_login": "mateesville93",
     "twitter_username": ""
+  },
+  {
+    "name": "Fuzzwah",
+    "github_login": "Fuzzwah",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index cbeda8503..a856a474c 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -733,6 +733,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Fuzzwah</td>
+    <td>
+      <a href="https://github.com/Fuzzwah">Fuzzwah</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Gabriel Mejia</td>
     <td>

From b4479359145ac81cf23acd2102c05ff761ab48e8 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Mon, 10 Jan 2022 02:19:45 +0000
Subject: [PATCH 1960/2840] Release 2022.01.09

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d9d07507e..92f452a28 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 -->
 
+## 2022.01.09
+
+### Changed
+- Fix broken center align of image links in README  ([#3522](https://github.com/cookiecutter/cookiecutter-django/pull/3522))
+
 ## 2022.01.07
 
 ### Fixed
diff --git a/setup.py b/setup.py
index e86a2cf71..7a5538059 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.01.07"
+version = "2022.01.09"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 0288bf7d6854b943b3457ba92dd6b3d571ce4b76 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 10 Jan 2022 11:04:47 -0500
Subject: [PATCH 1961/2840] Update gitpython to 3.1.26 (#3524)

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

diff --git a/requirements.txt b/requirements.txt
index 4ef925e99..426091f9e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,6 +21,6 @@ pyyaml==6.0
 # Scripting
 # ------------------------------------------------------------------------------
 PyGithub==1.55
-gitpython==3.1.25
+gitpython==3.1.26
 jinja2==3.0.3
 requests==2.27.1

From 298f98bf739b2e5df62c8b727a3af0fa7ab4e637 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 10 Jan 2022 11:05:29 -0500
Subject: [PATCH 1962/2840] Update sentry-sdk to 1.5.2 (#3525)

---
 {{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 e7ca7fb28..859af6049 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.5.1  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.5.2  # 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 486c7b6bf790cb51027e6ff2e8176eaf236b13ed Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 10 Jan 2022 17:01:07 -0500
Subject: [PATCH 1963/2840] Update django-cors-headers to 3.11.0 (#3526)

---
 {{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 4dcd42605..edb5a85a8 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -42,5 +42,5 @@ django-redis==5.2.0  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == "y" %}
 # Django REST Framework
 djangorestframework==3.13.1  # https://github.com/encode/django-rest-framework
-django-cors-headers==3.10.1 # https://github.com/adamchainz/django-cors-headers
+django-cors-headers==3.11.0 # https://github.com/adamchainz/django-cors-headers
 {%- endif %}

From f4684773adcd6aeae2bd2dc94bb8bd55d15cab52 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 11 Jan 2022 02:19:57 +0000
Subject: [PATCH 1964/2840] Release 2022.01.10

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92f452a28..db067c815 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.01.10
+
+### Updated
+- Update django-cors-headers to 3.11.0 ([#3526](https://github.com/cookiecutter/cookiecutter-django/pull/3526))
+- Update sentry-sdk to 1.5.2 ([#3525](https://github.com/cookiecutter/cookiecutter-django/pull/3525))
+- Update gitpython to 3.1.26 ([#3524](https://github.com/cookiecutter/cookiecutter-django/pull/3524))
+
 ## 2022.01.09
 
 ### Changed
diff --git a/setup.py b/setup.py
index 7a5538059..2ac5a8367 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.01.09"
+version = "2022.01.10"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From b3fb4f9a0f77424e5eeb597f994a357644ed3663 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Jan 2022 07:59:50 +0000
Subject: [PATCH 1965/2840] Bump stefanzweifel/git-auto-commit-action from
 4.12.0 to 4.13.0 (#3527)

Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from 4.12.0 to 4.13.0.
- [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases)
- [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.12.0...v4.13.0)

---
updated-dependencies:
- dependency-name: stefanzweifel/git-auto-commit-action
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/update-contributors.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 2e6e65b86..509a99aa4 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -26,7 +26,7 @@ jobs:
         run: python scripts/update_contributors.py
 
       - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v4.12.0
+        uses: stefanzweifel/git-auto-commit-action@v4.13.0
         with:
           commit_message: Update Contributors
           file_pattern: CONTRIBUTORS.md .github/contributors.json

From 36c6e5e0c158182e62f77b3cb3bb65b2211cf78a Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 12 Jan 2022 08:55:33 +0000
Subject: [PATCH 1966/2840] Release 2022.01.11

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db067c815..86dbb2d1f 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 -->
 
+## 2022.01.11
+
+### Updated
+- Bump stefanzweifel/git-auto-commit-action from 4.12.0 to 4.13.0 ([#3527](https://github.com/cookiecutter/cookiecutter-django/pull/3527))
+
 ## 2022.01.10
 
 ### Updated
diff --git a/setup.py b/setup.py
index 2ac5a8367..706ede2cd 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.01.10"
+version = "2022.01.11"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 9f8820241fb75bed457a3b819116a66969106b92 Mon Sep 17 00:00:00 2001
From: mpoli <poli@closedgap.com>
Date: Thu, 13 Jan 2022 15:38:35 -0300
Subject: [PATCH 1967/2840] Add UserSignupForm and UserSocialSignupForm (#3515)

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 .../config/settings/base.py                   |  4 +++
 .../users/admin.py                            |  6 ++---
 .../users/forms.py                            | 27 +++++++++++++++++--
 .../users/models.py                           |  6 ++++-
 .../users/tests/test_forms.py                 | 10 +++----
 .../users/tests/test_views.py                 |  4 +--
 6 files changed, 44 insertions(+), 13 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 021dd7491..5177c92fa 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -306,8 +306,12 @@ ACCOUNT_EMAIL_REQUIRED = True
 ACCOUNT_EMAIL_VERIFICATION = "mandatory"
 # https://django-allauth.readthedocs.io/en/latest/configuration.html
 ACCOUNT_ADAPTER = "{{cookiecutter.project_slug}}.users.adapters.AccountAdapter"
+# https://django-allauth.readthedocs.io/en/latest/forms.html
+ACCOUNT_FORMS = {"signup": "{{cookiecutter.project_slug}}.users.forms.UserSignupForm"}
 # https://django-allauth.readthedocs.io/en/latest/configuration.html
 SOCIALACCOUNT_ADAPTER = "{{cookiecutter.project_slug}}.users.adapters.SocialAccountAdapter"
+# https://django-allauth.readthedocs.io/en/latest/forms.html
+SOCIALACCOUNT_FORMS = {"signup": "{{cookiecutter.project_slug}}.users.forms.UserSocialSignupForm"}
 {% if cookiecutter.use_compressor == 'y' -%}
 # django-compressor
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py
index 8e8e3eb2f..6675f483a 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py
@@ -3,7 +3,7 @@ from django.contrib.auth import admin as auth_admin
 from django.contrib.auth import get_user_model
 from django.utils.translation import gettext_lazy as _
 
-from {{ cookiecutter.project_slug }}.users.forms import UserChangeForm, UserCreationForm
+from {{ cookiecutter.project_slug }}.users.forms import UserAdminChangeForm, UserAdminCreationForm
 
 User = get_user_model()
 
@@ -11,8 +11,8 @@ User = get_user_model()
 @admin.register(User)
 class UserAdmin(auth_admin.UserAdmin):
 
-    form = UserChangeForm
-    add_form = UserCreationForm
+    form = UserAdminChangeForm
+    add_form = UserAdminCreationForm
     fieldsets = (
         (None, {"fields": ("username", "password")}),
         (_("Personal info"), {"fields": ("name", "email")}),
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
index 80cd97aed..6e1dd9d32 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
@@ -1,3 +1,5 @@
+from allauth.account.forms import SignupForm
+from allauth.socialaccount.forms import SignupForm as SocialSignupForm
 from django.contrib.auth import forms as admin_forms
 from django.contrib.auth import get_user_model
 from django.utils.translation import gettext_lazy as _
@@ -5,15 +7,36 @@ from django.utils.translation import gettext_lazy as _
 User = get_user_model()
 
 
-class UserChangeForm(admin_forms.UserChangeForm):
+class UserAdminChangeForm(admin_forms.UserChangeForm):
     class Meta(admin_forms.UserChangeForm.Meta):
         model = User
 
 
-class UserCreationForm(admin_forms.UserCreationForm):
+class UserAdminCreationForm(admin_forms.UserCreationForm):
+    """
+    Form for User Creation in the Admin Area.
+    To change user signup, see UserSignupForm and UserSocialSignupForm.
+    """
+
     class Meta(admin_forms.UserCreationForm.Meta):
         model = User
 
         error_messages = {
             "username": {"unique": _("This username has already been taken.")}
         }
+
+
+class UserSignupForm(SignupForm):
+    """
+    Form that will be rendered on a user sign up section/screen.
+    Default fields will be added automatically.
+    Check UserSocialSignupForm for accounts created from social.
+    """
+
+
+class UserSocialSignupForm(SocialSignupForm):
+    """
+    Renders the form when user has signed up using social accounts.
+    Default fields will be added automatically.
+    See UserSignupForm otherwise.
+    """
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
index 935eee9a2..1f6f61bc0 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
@@ -5,7 +5,11 @@ from django.utils.translation import gettext_lazy as _
 
 
 class User(AbstractUser):
-    """Default user for {{cookiecutter.project_name}}."""
+    """
+    Default custom user model for {{cookiecutter.project_name}}.
+    If adding fields that need to be filled at user signup,
+    check forms.SignupForm and forms.SocialSignupForms accordingly.
+    """
 
     #: First and last name do not cover name patterns around the globe
     name = CharField(_("Name of User"), blank=True, max_length=255)
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
index 35db91b4d..e51bb6bf2 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
@@ -4,20 +4,20 @@ Module for all Form Tests.
 import pytest
 from django.utils.translation import gettext_lazy as _
 
-from {{ cookiecutter.project_slug }}.users.forms import UserCreationForm
+from {{ cookiecutter.project_slug }}.users.forms import UserAdminCreationForm
 from {{ cookiecutter.project_slug }}.users.models import User
 
 pytestmark = pytest.mark.django_db
 
 
-class TestUserCreationForm:
+class TestUserAdminCreationForm:
     """
-    Test class for all tests related to the UserCreationForm
+    Test class for all tests related to the UserAdminCreationForm
     """
 
     def test_username_validation_error_msg(self, user: User):
         """
-        Tests UserCreation Form's unique validator functions correctly by testing:
+        Tests UserAdminCreation Form's unique validator functions correctly by testing:
             1) A new user with an existing username cannot be added.
             2) Only 1 error is raised by the UserCreation Form
             3) The desired error message is raised
@@ -25,7 +25,7 @@ class TestUserCreationForm:
 
         # The user already exists,
         # hence cannot be created.
-        form = UserCreationForm(
+        form = UserAdminCreationForm(
             {
                 "username": user.username,
                 "password1": user.password,
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
index 7170bfae7..944daca52 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
@@ -8,7 +8,7 @@ from django.http import HttpRequest, HttpResponseRedirect
 from django.test import RequestFactory
 from django.urls import reverse
 
-from {{ cookiecutter.project_slug }}.users.forms import UserChangeForm
+from {{ cookiecutter.project_slug }}.users.forms import UserAdminChangeForm
 from {{ cookiecutter.project_slug }}.users.models import User
 from {{ cookiecutter.project_slug }}.users.tests.factories import UserFactory
 from {{ cookiecutter.project_slug }}.users.views import (
@@ -62,7 +62,7 @@ class TestUserUpdateView:
         view.request = request
 
         # Initialize the form
-        form = UserChangeForm()
+        form = UserAdminChangeForm()
         form.cleaned_data = []
         view.form_valid(form)
 

From b58f0e726c4ee75f95e8a75eda39d9dd58faf327 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 13 Jan 2022 21:23:28 +0000
Subject: [PATCH 1968/2840] Fix out-of-sync sequence for Site ID (#3511)

---
 .../0003_set_site_domain_and_name.py          | 45 +++++++++++++++----
 1 file changed, 37 insertions(+), 8 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0003_set_site_domain_and_name.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0003_set_site_domain_and_name.py
index 8f4a8f997..080c734bb 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0003_set_site_domain_and_name.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/contrib/sites/migrations/0003_set_site_domain_and_name.py
@@ -7,23 +7,52 @@ from django.conf import settings
 from django.db import migrations
 
 
+def _update_or_create_site_with_sequence(site_model, connection, domain, name):
+    """Update or create the site with default ID and keep the DB sequence in sync."""
+    site, created = site_model.objects.update_or_create(
+        id=settings.SITE_ID,
+        defaults={
+            "domain": domain,
+            "name": name,
+        },
+    )
+    if created:
+        # We provided the ID explicitly when creating the Site entry, therefore the DB
+        # sequence to auto-generate them wasn't used and is now out of sync. If we
+        # don't do anything, we'll get a unique constraint violation the next time a
+        # site is created.
+        # To avoid this, we need to manually update DB sequence and make sure it's
+        # greater than the maximum value.
+        max_id = site_model.objects.order_by('-id').first().id
+        with connection.cursor() as cursor:
+            cursor.execute("SELECT last_value from django_site_id_seq")
+            (current_id,) = cursor.fetchone()
+            if current_id <= max_id:
+                cursor.execute(
+                    "alter sequence django_site_id_seq restart with %s",
+                    [max_id + 1],
+                )
+
+
 def update_site_forward(apps, schema_editor):
     """Set site domain and name."""
     Site = apps.get_model("sites", "Site")
-    Site.objects.update_or_create(
-        id=settings.SITE_ID,
-        defaults={
-            "domain": "{{cookiecutter.domain_name}}",
-            "name": "{{cookiecutter.project_name}}",
-        },
+    _update_or_create_site_with_sequence(
+        Site,
+        schema_editor.connection,
+        "{{cookiecutter.domain_name}}",
+        "{{cookiecutter.project_name}}",
     )
 
 
 def update_site_backward(apps, schema_editor):
     """Revert site domain and name to default."""
     Site = apps.get_model("sites", "Site")
-    Site.objects.update_or_create(
-        id=settings.SITE_ID, defaults={"domain": "example.com", "name": "example.com"}
+    _update_or_create_site_with_sequence(
+        Site,
+        schema_editor.connection,
+        "example.com",
+        "example.com",
     )
 
 

From ab8ca024329cfe48c22c99995803ddb0c3b2ee52 Mon Sep 17 00:00:00 2001
From: Thibault J <teeboo@gmail.com>
Date: Thu, 13 Jan 2022 22:26:47 +0100
Subject: [PATCH 1969/2840] Fix high CPU usage when running `runserver_plus` in
 Docker (#3531)

---
 {{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 5d042653c..082dc05df 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,6 +1,6 @@
 -r base.txt
 
-Werkzeug==2.0.2 # https://github.com/pallets/werkzeug
+Werkzeug[watchdog]==2.0.2 # https://github.com/pallets/werkzeug
 ipdb==0.13.9  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.9.3  # https://github.com/psycopg/psycopg2

From d78b01d7d8f022806be6b49940c53d994941c3bb Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 13 Jan 2022 21:27:20 +0000
Subject: [PATCH 1970/2840] 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 b4f21eee5..ec126d7c3 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1207,5 +1207,10 @@
     "name": "Fuzzwah",
     "github_login": "Fuzzwah",
     "twitter_username": ""
+  },
+  {
+    "name": "Thibault J.",
+    "github_login": "thibault",
+    "twitter_username": "thibault"
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index a856a474c..ccfbfb5d3 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1538,6 +1538,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Thibault J.</td>
+    <td>
+      <a href="https://github.com/thibault">thibault</a>
+    </td>
+    <td>thibault</td>
+  </tr>
   <tr>
     <td>Théo Segonds</td>
     <td>

From f6f087576e13990d1ede1e2f4987b2451bac1835 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 14 Jan 2022 02:20:27 +0000
Subject: [PATCH 1971/2840] Release 2022.01.13

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 86dbb2d1f..506ae56a6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.01.13
+
+### Changed
+- Add UserSignupForm and UserSocialSignupForm ([#3515](https://github.com/cookiecutter/cookiecutter-django/pull/3515))
+### Fixed
+- Fix high CPU usage when running `runserver_plus` in Docker ([#3531](https://github.com/cookiecutter/cookiecutter-django/pull/3531))
+- Fix out-of-sync sequence for Site ID ([#3511](https://github.com/cookiecutter/cookiecutter-django/pull/3511))
+
 ## 2022.01.11
 
 ### Updated
diff --git a/setup.py b/setup.py
index 706ede2cd..e91ffa3a3 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.01.11"
+version = "2022.01.13"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From b2686f3fe29056aa370ad1de379eb0659ffaa3a6 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 14 Jan 2022 07:53:05 +0000
Subject: [PATCH 1972/2840] Bump stefanzweifel/git-auto-commit-action from
 4.13.0 to 4.13.1 (#3532)

Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from 4.13.0 to 4.13.1.
- [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases)
- [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.13.0...v4.13.1)

---
updated-dependencies:
- dependency-name: stefanzweifel/git-auto-commit-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/update-contributors.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 509a99aa4..335159444 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -26,7 +26,7 @@ jobs:
         run: python scripts/update_contributors.py
 
       - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v4.13.0
+        uses: stefanzweifel/git-auto-commit-action@v4.13.1
         with:
           commit_message: Update Contributors
           file_pattern: CONTRIBUTORS.md .github/contributors.json

From eb59c1d5db0e32c03284bc99c43c18c8c0bd9226 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 14 Jan 2022 08:16:58 -0500
Subject: [PATCH 1973/2840] Update uvicorn to 0.17.0 (#3534)

---
 {{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 edb5a85a8..7e4bcf545 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -24,7 +24,7 @@ flower==1.0.0  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn[standard]==0.16.0  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.17.0  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django

From 759cc04bbcfe4b4be1eeaff4a02bce0229b79a0e Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 15 Jan 2022 02:19:42 +0000
Subject: [PATCH 1974/2840] Release 2022.01.14

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 506ae56a6..cf4ffefac 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 -->
 
+## 2022.01.14
+
+### Updated
+- Update uvicorn to 0.17.0 ([#3534](https://github.com/cookiecutter/cookiecutter-django/pull/3534))
+- Bump stefanzweifel/git-auto-commit-action from 4.13.0 to 4.13.1 ([#3532](https://github.com/cookiecutter/cookiecutter-django/pull/3532))
+
 ## 2022.01.13
 
 ### Changed
diff --git a/setup.py b/setup.py
index e91ffa3a3..28abc0d47 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.01.13"
+version = "2022.01.14"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 4f408810fc5ed4afacc735eb43abf5dce9a99f9e Mon Sep 17 00:00:00 2001
From: Pedro Campos <pcampos119104@gmail.com>
Date: Mon, 17 Jan 2022 05:53:56 -0300
Subject: [PATCH 1975/2840] Avoid docker image/volume collision by prefixing
 with project slug (#3528)

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 docs/developing-locally-docker.rst      |  8 +++++---
 {{cookiecutter.project_slug}}/local.yml | 26 ++++++++++++-------------
 2 files changed, 18 insertions(+), 16 deletions(-)

diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index 17e47bfb4..e0b522c8c 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -167,16 +167,18 @@ docker
 
 The ``container_name`` from the yml file can be used to check on containers with docker commands, for example: ::
 
-    $ docker logs worker
-    $ docker top worker
+    $ docker logs <project_slug>_local_celeryworker
+    $ docker top <project_slug>_local_celeryworker
 
 
+Notice that the ``container_name`` is generated dynamically using your project slug as a prefix
+
 Mailhog
 ~~~~~~~
 
 When developing locally you can go with MailHog_ for email testing provided ``use_mailhog`` was set to ``y`` on setup. To proceed,
 
-#. make sure ``mailhog`` container is up and running;
+#. make sure ``<project_slug>_local_mailhog`` container is up and running;
 
 #. open up ``http://127.0.0.1:8025``.
 
diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index 89c087821..5090c5cef 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -1,8 +1,8 @@
 version: '3'
 
 volumes:
-  local_postgres_data: {}
-  local_postgres_data_backups: {}
+  {{ cookiecutter.project_slug }}_local_postgres_data: {}
+  {{ cookiecutter.project_slug }}_local_postgres_data_backups: {}
 
 services:
   django:{% if cookiecutter.use_celery == 'y' %} &django{% endif %}
@@ -10,7 +10,7 @@ services:
       context: .
       dockerfile: ./compose/local/django/Dockerfile
     image: {{ cookiecutter.project_slug }}_local_django
-    container_name: django
+    container_name: {{ cookiecutter.project_slug }}_local_django
     depends_on:
       - postgres
       {%- if cookiecutter.use_celery == 'y' %}
@@ -33,16 +33,16 @@ services:
       context: .
       dockerfile: ./compose/production/postgres/Dockerfile
     image: {{ cookiecutter.project_slug }}_production_postgres
-    container_name: postgres
+    container_name: {{ cookiecutter.project_slug }}_local_postgres
     volumes:
-      - local_postgres_data:/var/lib/postgresql/data:Z
-      - local_postgres_data_backups:/backups:z
+      - {{ cookiecutter.project_slug }}_local_postgres_data:/var/lib/postgresql/data:Z
+      - {{ cookiecutter.project_slug }}_local_postgres_data_backups:/backups:z
     env_file:
       - ./.envs/.local/.postgres
 
   docs:
     image: {{ cookiecutter.project_slug }}_local_docs
-    container_name: docs
+    container_name: {{ cookiecutter.project_slug }}_local_docs
     build:
       context: .
       dockerfile: ./compose/local/docs/Dockerfile
@@ -59,7 +59,7 @@ services:
 
   mailhog:
     image: mailhog/mailhog:v1.0.0
-    container_name: mailhog
+    container_name: {{ cookiecutter.project_slug }}_local_mailhog
     ports:
       - "8025:8025"
 
@@ -68,12 +68,12 @@ services:
 
   redis:
     image: redis:6
-    container_name: redis
+    container_name: {{ cookiecutter.project_slug }}_local_redis
 
   celeryworker:
     <<: *django
     image: {{ cookiecutter.project_slug }}_local_celeryworker
-    container_name: celeryworker
+    container_name: {{ cookiecutter.project_slug }}_local_celeryworker
     depends_on:
       - redis
       - postgres
@@ -86,7 +86,7 @@ services:
   celerybeat:
     <<: *django
     image: {{ cookiecutter.project_slug }}_local_celerybeat
-    container_name: celerybeat
+    container_name: {{ cookiecutter.project_slug }}_local_celerybeat
     depends_on:
       - redis
       - postgres
@@ -99,7 +99,7 @@ services:
   flower:
     <<: *django
     image: {{ cookiecutter.project_slug }}_local_flower
-    container_name: flower
+    container_name: {{ cookiecutter.project_slug }}_local_flower
     ports:
       - "5555:5555"
     command: /start-flower
@@ -112,7 +112,7 @@ services:
       context: .
       dockerfile: ./compose/local/node/Dockerfile
     image: {{ cookiecutter.project_slug }}_local_node
-    container_name: node
+    container_name: {{ cookiecutter.project_slug }}_local_node
     depends_on:
       - django
     volumes:

From 543682f4b39a83baab7b2b2a6b4780cacfe4ea25 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Mon, 17 Jan 2022 08:54:38 +0000
Subject: [PATCH 1976/2840] 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 ec126d7c3..ab1575605 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1212,5 +1212,10 @@
     "name": "Thibault J.",
     "github_login": "thibault",
     "twitter_username": "thibault"
+  },
+  {
+    "name": "Pedro Campos",
+    "github_login": "pcampos119104",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index ccfbfb5d3..fe69a718a 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1349,6 +1349,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Pedro Campos</td>
+    <td>
+      <a href="https://github.com/pcampos119104">pcampos119104</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Peter Bittner</td>
     <td>

From f38c341f8e18cc25cbaee3e06e15ca8f455acad1 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 17 Jan 2022 04:07:45 -0500
Subject: [PATCH 1977/2840] Update sphinx to 4.4.0 (#3537)

---
 docs/requirements.txt                                | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index ed09babbb..d9286ce24 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,2 +1,2 @@
-sphinx==4.3.2
+sphinx==4.4.0
 sphinx-rtd-theme==1.0.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 082dc05df..04e4bedd6 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -23,7 +23,7 @@ djangorestframework-stubs==1.4.0  # https://github.com/typeddjango/djangorestfra
 
 # Documentation
 # ------------------------------------------------------------------------------
-sphinx==4.3.2  # https://github.com/sphinx-doc/sphinx
+sphinx==4.4.0  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From 8f93ed0ff5bc2a3953fac0b4a0877eb7189993d7 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 17 Jan 2022 10:42:12 -0500
Subject: [PATCH 1978/2840] Update redis to 4.1.1 (#3540)

---
 {{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 7e4bcf545..e371135cf 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -12,7 +12,7 @@ argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==5.3.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==4.1.0  # https://github.com/redis/redis-py
+redis==4.1.1  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}

From eeee6945824b97b4bdae243f6516c99af14d0221 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 18 Jan 2022 02:20:50 +0000
Subject: [PATCH 1979/2840] Release 2022.01.17

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cf4ffefac..d4935f596 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.01.17
+
+### Changed
+- Avoid docker image/volume collision by prefixing with project slug ([#3528](https://github.com/cookiecutter/cookiecutter-django/pull/3528))
+### Updated
+- Update redis to 4.1.1 ([#3540](https://github.com/cookiecutter/cookiecutter-django/pull/3540))
+- Update sphinx to 4.4.0 ([#3537](https://github.com/cookiecutter/cookiecutter-django/pull/3537))
+
 ## 2022.01.14
 
 ### Updated
diff --git a/setup.py b/setup.py
index 28abc0d47..20eb2288b 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.01.14"
+version = "2022.01.17"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 721b86723c09a7c8d99a61af949631a237038f26 Mon Sep 17 00:00:00 2001
From: Vikas Yadav <vikasyadavgood@gmail.com>
Date: Wed, 19 Jan 2022 23:44:36 +0530
Subject: [PATCH 1980/2840] Add swagger API documentation when DRF is enabled 
 (#3536)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Adds swagger api documentation when drf is enabled

Changes
* Integrate drf-spectacular module
* Added routes and tests for swagger-ui

* Removes swagger ui tests when drf is not enabled

* Changes url names and documentation title

* Apply suggestions from code review

Co-authored-by: Fábio C. Barrionuevo da Luz <bnafta@gmail.com>
Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>

* Fixes typos and linting issues

* Update domain in swagger description

Co-authored-by: Fábio C. Barrionuevo da Luz <bnafta@gmail.com>

Co-authored-by: Fábio C. Barrionuevo da Luz <bnafta@gmail.com>
Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 hooks/post_gen_project.py                        |  5 +++++
 .../config/settings/base.py                      | 13 +++++++++++++
 {{cookiecutter.project_slug}}/config/urls.py     |  7 +++++++
 .../requirements/base.txt                        |  2 ++
 .../users/tests/test_swagger_ui.py               | 16 ++++++++++++++++
 5 files changed, 43 insertions(+)
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger_ui.py

diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index 50fcbea24..b2dbb3421 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -327,6 +327,11 @@ def remove_drf_starter_files():
             "{{cookiecutter.project_slug}}", "users", "tests", "test_drf_views.py"
         )
     )
+    os.remove(
+        os.path.join(
+            "{{cookiecutter.project_slug}}", "users", "tests", "test_swagger_ui.py"
+        )
+    )
 
 
 def remove_storages_module():
diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 5177c92fa..1598373d3 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -84,6 +84,7 @@ THIRD_PARTY_APPS = [
     "rest_framework",
     "rest_framework.authtoken",
     "corsheaders",
+    "drf_spectacular",
 {%- endif %}
 ]
 
@@ -334,6 +335,18 @@ REST_FRAMEWORK = {
 # django-cors-headers - https://github.com/adamchainz/django-cors-headers#setup
 CORS_URLS_REGEX = r"^/api/.*$"
 
+# By Default swagger ui is available only to admin user. You can change permission classs to change that
+# See more configuration options at https://drf-spectacular.readthedocs.io/en/latest/settings.html#settings
+SPECTACULAR_SETTINGS = {
+    "TITLE": "{{ cookiecutter.project_name }} API",
+    "DESCRIPTION": "Documentation of API endpoiints of {{ cookiecutter.project_name }}",
+    "VERSION": "1.0.0",
+    "SERVE_PERMISSIONS": ["rest_framework.permissions.IsAdminUser"],
+    "SERVERS": [
+        {"url": "https://127.0.0.1:8000", "description": "Local Development server"},
+        {"url": "https://{{ cookiecutter.domain_name }}", "description": "Production server"},
+    ],
+}
 {%- endif %}
 # Your stuff...
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/config/urls.py b/{{cookiecutter.project_slug}}/config/urls.py
index 168d77a8b..ab42cc103 100644
--- a/{{cookiecutter.project_slug}}/config/urls.py
+++ b/{{cookiecutter.project_slug}}/config/urls.py
@@ -8,6 +8,7 @@ from django.urls import include, path
 from django.views import defaults as default_views
 from django.views.generic import TemplateView
 {%- if cookiecutter.use_drf == 'y' %}
+from drf_spectacular.views import SpectacularAPIView, SpectacularSwaggerView
 from rest_framework.authtoken.views import obtain_auth_token
 {%- endif %}
 
@@ -35,6 +36,12 @@ urlpatterns += [
     path("api/", include("config.api_router")),
     # DRF auth token
     path("auth-token/", obtain_auth_token),
+    path("api/schema/", SpectacularAPIView.as_view(), name="api-schema"),
+    path(
+        "api/docs/",
+        SpectacularSwaggerView.as_view(url_name="api-schema"),
+        name="api-docs",
+    ),
 ]
 {%- endif %}
 
diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index e371135cf..d9dbb83e3 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -43,4 +43,6 @@ django-redis==5.2.0  # https://github.com/jazzband/django-redis
 # Django REST Framework
 djangorestframework==3.13.1  # https://github.com/encode/django-rest-framework
 django-cors-headers==3.11.0 # https://github.com/adamchainz/django-cors-headers
+# DRF-spectacular for api documentation
+drf-spectacular==0.21.1
 {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger_ui.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger_ui.py
new file mode 100644
index 000000000..b0c24d91b
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger_ui.py
@@ -0,0 +1,16 @@
+import pytest
+from django.urls import reverse
+
+pytestmark = pytest.mark.django_db
+
+
+def test_swagger_accessible_by_admin(admin_client):
+    url = reverse("api-docs")
+    response = admin_client.get(url)
+    assert response.status_code == 200
+
+
+def test_swagger_ui_not_accessible_by_normal_user(client):
+    url = reverse("api-docs")
+    response = client.get(url)
+    assert response.status_code == 403

From dd48a790a1fdb5cfab337a8a148efd685217bae8 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 19 Jan 2022 18:15:15 +0000
Subject: [PATCH 1981/2840] 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 ab1575605..86ccf42a6 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1217,5 +1217,10 @@
     "name": "Pedro Campos",
     "github_login": "pcampos119104",
     "twitter_username": ""
+  },
+  {
+    "name": "Vikas Yadav",
+    "github_login": "vik-y",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index fe69a718a..4d1a505a9 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1636,6 +1636,13 @@ Listed in alphabetical order.
     </td>
     <td>highcenburg</td>
   </tr>
+  <tr>
+    <td>Vikas Yadav</td>
+    <td>
+      <a href="https://github.com/vik-y">vik-y</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Vitaly Babiy</td>
     <td>

From c36fa678d84b6a3fece2110dbe695c01abce7c2c Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 19 Jan 2022 13:25:40 -0500
Subject: [PATCH 1982/2840] Update pre-commit to 2.17.0 (#3541)

* Update pre-commit from 2.16.0 to 2.17.0

* Update pre-commit from 2.16.0 to 2.17.0
---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 426091f9e..763fe10e3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ black==21.12b0
 isort==5.10.1
 flake8==4.0.1
 flake8-isort==4.1.1
-pre-commit==2.16.0
+pre-commit==2.17.0
 
 # Testing
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 04e4bedd6..12d1e3007 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -36,7 +36,7 @@ pylint-django==2.5.0  # 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.16.0  # https://github.com/pre-commit/pre-commit
+pre-commit==2.17.0  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From fba2c37e7272b39baae4d152d29dfbb5b7be5448 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 20 Jan 2022 02:24:59 +0000
Subject: [PATCH 1983/2840] Release 2022.01.19

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d4935f596..9614f0eed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.01.19
+
+### Changed
+- Add swagger API documentation when DRF is enabled  ([#3536](https://github.com/cookiecutter/cookiecutter-django/pull/3536))
+### Updated
+- Update pre-commit to 2.17.0 ([#3541](https://github.com/cookiecutter/cookiecutter-django/pull/3541))
+
 ## 2022.01.17
 
 ### Changed
diff --git a/setup.py b/setup.py
index 20eb2288b..e4d65a2c2 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.01.17"
+version = "2022.01.19"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 09cb960400423d84ddc72dd6153b608e2ef7a395 Mon Sep 17 00:00:00 2001
From: Abdullah Adeel <64294045+mabdullahadeel@users.noreply.github.com>
Date: Fri, 21 Jan 2022 17:20:51 +0500
Subject: [PATCH 1984/2840] mysql support link (#3544)

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 README.md | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 555081316..3f5df1f01 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ production-ready Django projects quickly.
 ## Constraints
 
 -   Only maintained 3rd party libraries are used.
--   Uses PostgreSQL everywhere (10.19 - 14.1)
+-   Uses PostgreSQL everywhere: 10.19 - 14.1 ([MySQL fork](https://github.com/mabdullahadeel/cookiecutter-django-mysql) also available).
 -   Environment variables for configuration (This won't work with Apache/mod_wsgi).
 
 ## Support this Project!
@@ -203,6 +203,10 @@ If you are using [PyUp](https://pyup.io) to keep your dependencies updated and s
 
 Scattered throughout the Python and HTML of this project are places marked with "your stuff". This is where third-party libraries are to be integrated with your project.
 
+## For MySQL users
+To get full MySQL support in addition to the default Postgresql, you can use this fork of the cookiecutter-django:
+https://github.com/mabdullahadeel/cookiecutter-django-mysql
+
 ## Releases
 
 Need a stable release? You can find them at <https://github.com/cookiecutter/cookiecutter-django/releases>

From be13fbc02ca10d8f7a674186aae1cfa862021907 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 21 Jan 2022 12:21:25 +0000
Subject: [PATCH 1985/2840] 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 86ccf42a6..fba6ad11b 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1222,5 +1222,10 @@
     "name": "Vikas Yadav",
     "github_login": "vik-y",
     "twitter_username": ""
+  },
+  {
+    "name": "Abdullah Adeel",
+    "github_login": "mabdullahadeel",
+    "twitter_username": "abdadeel_"
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 4d1a505a9..e2668ce0c 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -131,6 +131,13 @@ Listed in alphabetical order.
     </td>
     <td>Qoyyuum</td>
   </tr>
+  <tr>
+    <td>Abdullah Adeel</td>
+    <td>
+      <a href="https://github.com/mabdullahadeel">mabdullahadeel</a>
+    </td>
+    <td>abdadeel_</td>
+  </tr>
   <tr>
     <td>Adam Bogdał</td>
     <td>

From de8ba098553e212f4d5a36f2c0f842949ca51a89 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 21 Jan 2022 07:55:17 -0500
Subject: [PATCH 1986/2840] Update django-anymail to 8.5 (#3542)

---
 .../requirements/production.txt                | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 859af6049..ec55e2486 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -22,21 +22,21 @@ django-storages[boto3]==1.12.3  # https://github.com/jschneier/django-storages
 django-storages[google]==1.12.3  # https://github.com/jschneier/django-storages
 {%- endif %}
 {%- if cookiecutter.mail_service == 'Mailgun' %}
-django-anymail[mailgun]==8.4  # https://github.com/anymail/django-anymail
+django-anymail[mailgun]==8.5  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
-django-anymail[amazon_ses]==8.4  # https://github.com/anymail/django-anymail
+django-anymail[amazon_ses]==8.5  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
-django-anymail[mailjet]==8.4  # https://github.com/anymail/django-anymail
+django-anymail[mailjet]==8.5  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
-django-anymail[mandrill]==8.4  # https://github.com/anymail/django-anymail
+django-anymail[mandrill]==8.5  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
-django-anymail[postmark]==8.4  # https://github.com/anymail/django-anymail
+django-anymail[postmark]==8.5  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
-django-anymail[sendgrid]==8.4  # https://github.com/anymail/django-anymail
+django-anymail[sendgrid]==8.5  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
-django-anymail[sendinblue]==8.4  # https://github.com/anymail/django-anymail
+django-anymail[sendinblue]==8.5  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
-django-anymail[sparkpost]==8.4  # https://github.com/anymail/django-anymail
+django-anymail[sparkpost]==8.5  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
-django-anymail==8.4  # https://github.com/anymail/django-anymail
+django-anymail==8.5  # https://github.com/anymail/django-anymail
 {%- endif %}

From 647b86ac898c5d84f886f78b7cdb1fa1738428ba Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 21 Jan 2022 07:55:45 -0500
Subject: [PATCH 1987/2840] Update sentry-sdk to 1.5.3 (#3543)

---
 {{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 ec55e2486..dc1ee8b5f 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.5.2  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.5.3  # 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 3014c046b2a216496f2cf874cacf7bac0ce563c2 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 22 Jan 2022 02:14:15 +0000
Subject: [PATCH 1988/2840] Release 2022.01.21

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9614f0eed..2c425280f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.01.21
+
+### Changed
+- mysql support link ([#3544](https://github.com/cookiecutter/cookiecutter-django/pull/3544))
+### Updated
+- Update sentry-sdk to 1.5.3 ([#3543](https://github.com/cookiecutter/cookiecutter-django/pull/3543))
+- Update django-anymail to 8.5 ([#3542](https://github.com/cookiecutter/cookiecutter-django/pull/3542))
+
 ## 2022.01.19
 
 ### Changed
diff --git a/setup.py b/setup.py
index e4d65a2c2..d01f09c28 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.01.19"
+version = "2022.01.21"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 7aa2c4d6db82cef911e2c519e2c67d547f700f8b Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 26 Jan 2022 18:04:37 -0500
Subject: [PATCH 1989/2840] Update uvicorn from 0.17.0 to 0.17.0.post1 (#3547)

---
 {{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 d9dbb83e3..8e8911df4 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -24,7 +24,7 @@ flower==1.0.0  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn[standard]==0.17.0  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.17.0.post1  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django

From ec8ecae0e4795839271a315bb6c6345b7fd9bbaa Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 26 Jan 2022 18:05:18 -0500
Subject: [PATCH 1990/2840] Update django-crispy-forms from 1.13.0 to 1.14.0
 (#3548)

---
 {{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 8e8911df4..cdb5d6dfa 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -33,7 +33,7 @@ django==3.2.11  # pyup: < 4.0  # https://www.djangoproject.com/
 django-environ==0.8.1  # https://github.com/joke2k/django-environ
 django-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.47.0  # https://github.com/pennersr/django-allauth
-django-crispy-forms==1.13.0  # https://github.com/django-crispy-forms/django-crispy-forms
+django-crispy-forms==1.14.0  # https://github.com/django-crispy-forms/django-crispy-forms
 crispy-bootstrap5==0.6  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==3.1  # https://github.com/django-compressor/django-compressor

From 27fc2ea1a11329c1d01b04c14c6a7032f168e818 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 26 Jan 2022 18:05:47 -0500
Subject: [PATCH 1991/2840] Update sentry-sdk from 1.5.3 to 1.5.4 (#3549)

---
 {{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 dc1ee8b5f..faefd1245 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.5.3  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.5.4  # 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 ff0521576e9ac70dd5bced59e3b1e22180b336d9 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 26 Jan 2022 18:06:34 -0500
Subject: [PATCH 1992/2840] Update coverage from 6.2 to 6.3 (#3550)

---
 {{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 12d1e3007..784d02349 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==4.0.1  # https://github.com/PyCQA/flake8
 flake8-isort==4.1.1  # https://github.com/gforcada/flake8-isort
-coverage==6.2  # https://github.com/nedbat/coveragepy
+coverage==6.3  # https://github.com/nedbat/coveragepy
 black==21.12b0  # https://github.com/psf/black
 pylint-django==2.5.0  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 9129bf12d0166f2709d3726d88dae93386a89ed2 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 27 Jan 2022 02:14:22 +0000
Subject: [PATCH 1993/2840] Release 2022.01.26

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2c425280f..e5c5b8f2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.01.26
+
+### Updated
+- Update coverage to 6.3 ([#3550](https://github.com/cookiecutter/cookiecutter-django/pull/3550))
+- Update sentry-sdk to 1.5.4 ([#3549](https://github.com/cookiecutter/cookiecutter-django/pull/3549))
+- Update django-crispy-forms to 1.14.0 ([#3548](https://github.com/cookiecutter/cookiecutter-django/pull/3548))
+- Update uvicorn to 0.17.0.post1 ([#3547](https://github.com/cookiecutter/cookiecutter-django/pull/3547))
+
 ## 2022.01.21
 
 ### Changed
diff --git a/setup.py b/setup.py
index d01f09c28..970797427 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.01.21"
+version = "2022.01.26"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 83a0e73df1a51a147fdda712ac8e5dcbeae92032 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 27 Jan 2022 15:28:38 -0500
Subject: [PATCH 1994/2840] Update redis from 4.1.1 to 4.1.2 (#3551)

---
 {{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 cdb5d6dfa..9c2c9b042 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -12,7 +12,7 @@ argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==5.3.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==4.1.1  # https://github.com/redis/redis-py
+redis==4.1.2  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}

From 5497d1f5962bc1887b6b1334fa30ca75847f6aa5 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 28 Jan 2022 02:15:15 +0000
Subject: [PATCH 1995/2840] Release 2022.01.27

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e5c5b8f2e..b2fb058b4 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 -->
 
+## 2022.01.27
+
+### Updated
+- Update redis to 4.1.2 ([#3551](https://github.com/cookiecutter/cookiecutter-django/pull/3551))
+
 ## 2022.01.26
 
 ### Updated
diff --git a/setup.py b/setup.py
index 970797427..cd7e7e9d4 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.01.26"
+version = "2022.01.27"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 76aa05b16707e7e13806d24e49d9c177389f4d8e Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 7 Feb 2022 09:32:43 -0500
Subject: [PATCH 1996/2840] Update django to 3.2.12 (#3559)

---
 {{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 9c2c9b042..f96a66d4a 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,7 +29,7 @@ uvicorn[standard]==0.17.0.post1  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.2.11  # pyup: < 4.0  # https://www.djangoproject.com/
+django==3.2.12  # pyup: < 4.0  # https://www.djangoproject.com/
 django-environ==0.8.1  # https://github.com/joke2k/django-environ
 django-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.47.0  # https://github.com/pennersr/django-allauth

From 522aafe91b75051bdff0fd34adea7661d7878bc7 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 7 Feb 2022 09:33:35 -0500
Subject: [PATCH 1997/2840] Update drf-spectacular to 0.21.2 (#3560)

---
 {{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 f96a66d4a..e36ccbb60 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -44,5 +44,5 @@ django-redis==5.2.0  # https://github.com/jazzband/django-redis
 djangorestframework==3.13.1  # https://github.com/encode/django-rest-framework
 django-cors-headers==3.11.0 # https://github.com/adamchainz/django-cors-headers
 # DRF-spectacular for api documentation
-drf-spectacular==0.21.1
+drf-spectacular==0.21.2
 {%- endif %}

From 3512e63cf2e8fd97f82bc9201a05f6b28c0c4ccc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 7 Feb 2022 14:33:52 +0000
Subject: [PATCH 1998/2840] Bump peter-evans/create-pull-request from 3.12.0 to
 3.12.1 (#3558)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.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 e92816101..98e2f592e 100644
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -31,7 +31,7 @@ jobs:
         run: pre-commit autoupdate
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3.12.0
+        uses: peter-evans/create-pull-request@v3.12.1
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: update/pre-commit-autoupdate

From b32caf4e2a4eb4ab30a18cbd4c6b2eb8f63e9399 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 7 Feb 2022 09:52:58 -0500
Subject: [PATCH 1999/2840] Update pillow to 9.0.1 (#3571)

---
 {{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 e36ccbb60..19dac6c65 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,6 +1,6 @@
 pytz==2021.3  # https://github.com/stub42/pytz
 python-slugify==5.0.2  # https://github.com/un33k/python-slugify
-Pillow==9.0.0  # https://github.com/python-pillow/Pillow
+Pillow==9.0.1  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
 {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %}
 rcssmin==1.1.0 --install-option="--without-c-extensions"  # https://github.com/ndparker/rcssmin

From 2417910bace1d324bd5017364606e1f64f3b470d Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 7 Feb 2022 09:53:48 -0500
Subject: [PATCH 2000/2840] Update coverage to 6.3.1 (#3561)

---
 {{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 784d02349..4ed5f6095 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==4.0.1  # https://github.com/PyCQA/flake8
 flake8-isort==4.1.1  # https://github.com/gforcada/flake8-isort
-coverage==6.3  # https://github.com/nedbat/coveragepy
+coverage==6.3.1  # https://github.com/nedbat/coveragepy
 black==21.12b0  # https://github.com/psf/black
 pylint-django==2.5.0  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 150e1d8bed62b2a5017366ae48c41ffe7ce7f304 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 7 Feb 2022 15:40:53 +0000
Subject: [PATCH 2001/2840] Update black to 22.1.0 (#3572)

Co-authored-by: pyup-bot <github-bot@pyup.io>
---
 .pre-commit-config.yaml                               | 2 +-
 requirements.txt                                      | 2 +-
 tests/test_cookiecutter_generation.py                 | 7 ++++++-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 {{cookiecutter.project_slug}}/config/settings/base.py | 5 ++++-
 {{cookiecutter.project_slug}}/requirements/local.txt  | 2 +-
 6 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 63add8bf5..7c9e6eca7 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/psf/black
-    rev: 21.12b0
+    rev: 22.1.0
     hooks:
       - id: black
 
diff --git a/requirements.txt b/requirements.txt
index 763fe10e3..c878932cf 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-black==21.12b0
+black==22.1.0
 isort==5.10.1
 flake8==4.0.1
 flake8-isort==4.1.1
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 49a0d2cc8..ada1809f3 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -179,7 +179,12 @@ def test_black_passes(cookies, context_override):
 
     try:
         sh.black(
-            "--check", "--diff", "--exclude", "migrations", _cwd=str(result.project)
+            "--check",
+            "--diff",
+            "--exclude",
+            "migrations",
+            ".",
+            _cwd=str(result.project),
         )
     except sh.ErrorReturnCode as e:
         pytest.fail(e.stdout.decode())
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index 301f8b74f..5ea57c56c 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/psf/black
-    rev: 21.12b0
+    rev: 22.1.0
     hooks:
       - id: black
 
diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 1598373d3..bbaff2300 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -44,7 +44,10 @@ LOCALE_PATHS = [str(ROOT_DIR / "locale")]
 DATABASES = {"default": env.db("DATABASE_URL")}
 {%- else %}
 DATABASES = {
-    "default": env.db("DATABASE_URL", default="postgres://{% if cookiecutter.windows == 'y' %}localhost{% endif %}/{{cookiecutter.project_slug}}"),
+    "default": env.db(
+        "DATABASE_URL",
+        default="postgres://{% if cookiecutter.windows == 'y' %}localhost{% endif %}/{{cookiecutter.project_slug}}",
+    ),
 }
 {%- endif %}
 DATABASES["default"]["ATOMIC_REQUESTS"] = True
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 4ed5f6095..deb7e0bd1 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -31,7 +31,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 flake8==4.0.1  # https://github.com/PyCQA/flake8
 flake8-isort==4.1.1  # https://github.com/gforcada/flake8-isort
 coverage==6.3.1  # https://github.com/nedbat/coveragepy
-black==21.12b0  # https://github.com/psf/black
+black==22.1.0  # https://github.com/psf/black
 pylint-django==2.5.0  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery

From aafa66bf7cbea4e1d30e1fae993fa80b3299e899 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 7 Feb 2022 12:19:52 -0500
Subject: [PATCH 2002/2840] Update pytest to 7.0.0 (#3567)

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
---
 pytest.ini                                    |  1 -
 requirements.txt                              |  2 +-
 tests/test_cookiecutter_generation.py         | 30 +++++++++----------
 .../requirements/local.txt                    |  2 +-
 4 files changed, 17 insertions(+), 18 deletions(-)

diff --git a/pytest.ini b/pytest.ini
index 03ca13891..52506f47d 100644
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,4 +1,3 @@
 [pytest]
 addopts = -v --tb=short
-python_paths = .
 norecursedirs = .tox .git */migrations/* */static/* docs venv */{{cookiecutter.project_slug}}/*
diff --git a/requirements.txt b/requirements.txt
index c878932cf..7dbf72254 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,7 +13,7 @@ pre-commit==2.17.0
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.24.5
-pytest==6.2.5
+pytest==7.0.0
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2
 pyyaml==6.0
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index ada1809f3..fc3ecf811 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -153,10 +153,10 @@ def test_project_generation(cookies, context, context_override):
     result = cookies.bake(extra_context={**context, **context_override})
     assert result.exit_code == 0
     assert result.exception is None
-    assert result.project.basename == context["project_slug"]
-    assert result.project.isdir()
+    assert result.project_path.name == context["project_slug"]
+    assert result.project_path.is_dir()
 
-    paths = build_files_list(str(result.project))
+    paths = build_files_list(str(result.project_path))
     assert paths
     check_paths(paths)
 
@@ -167,7 +167,7 @@ def test_flake8_passes(cookies, context_override):
     result = cookies.bake(extra_context=context_override)
 
     try:
-        sh.flake8(_cwd=str(result.project))
+        sh.flake8(_cwd=str(result.project_path))
     except sh.ErrorReturnCode as e:
         pytest.fail(e.stdout.decode())
 
@@ -184,7 +184,7 @@ def test_black_passes(cookies, context_override):
             "--exclude",
             "migrations",
             ".",
-            _cwd=str(result.project),
+            _cwd=str(result.project_path),
         )
     except sh.ErrorReturnCode as e:
         pytest.fail(e.stdout.decode())
@@ -203,10 +203,10 @@ def test_travis_invokes_pytest(cookies, context, use_docker, expected_test_scrip
 
     assert result.exit_code == 0
     assert result.exception is None
-    assert result.project.basename == context["project_slug"]
-    assert result.project.isdir()
+    assert result.project_path.name == context["project_slug"]
+    assert result.project_path.is_dir()
 
-    with open(f"{result.project}/.travis.yml", "r") as travis_yml:
+    with open(f"{result.project_path}/.travis.yml", "r") as travis_yml:
         try:
             yml = yaml.safe_load(travis_yml)["jobs"]["include"]
             assert yml[0]["script"] == ["flake8"]
@@ -230,10 +230,10 @@ def test_gitlab_invokes_flake8_and_pytest(
 
     assert result.exit_code == 0
     assert result.exception is None
-    assert result.project.basename == context["project_slug"]
-    assert result.project.isdir()
+    assert result.project_path.name == context["project_slug"]
+    assert result.project_path.is_dir()
 
-    with open(f"{result.project}/.gitlab-ci.yml", "r") as gitlab_yml:
+    with open(f"{result.project_path}/.gitlab-ci.yml", "r") as gitlab_yml:
         try:
             gitlab_config = yaml.safe_load(gitlab_yml)
             assert gitlab_config["flake8"]["script"] == ["flake8"]
@@ -257,10 +257,10 @@ def test_github_invokes_linter_and_pytest(
 
     assert result.exit_code == 0
     assert result.exception is None
-    assert result.project.basename == context["project_slug"]
-    assert result.project.isdir()
+    assert result.project_path.name == context["project_slug"]
+    assert result.project_path.is_dir()
 
-    with open(f"{result.project}/.github/workflows/ci.yml", "r") as github_yml:
+    with open(f"{result.project_path}/.github/workflows/ci.yml", "r") as github_yml:
         try:
             github_config = yaml.safe_load(github_yml)
             linter_present = False
@@ -311,6 +311,6 @@ 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:
+    with open(f"{result.project_path}/docs/index.rst", "r") as f:
         has_pycharm_docs = "pycharm/configuration" in f.read()
         assert has_pycharm_docs is pycharm_docs_exist
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index deb7e0bd1..3c0d7264d 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.931  # https://github.com/python/mypy
 django-stubs==1.9.0  # https://github.com/typeddjango/django-stubs
-pytest==6.2.5  # https://github.com/pytest-dev/pytest
+pytest==7.0.0  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
 djangorestframework-stubs==1.4.0  # https://github.com/typeddjango/djangorestframework-stubs

From 9594f754ae536ece7fe6c0b3e7c38b9125ffe906 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 7 Feb 2022 12:21:39 -0500
Subject: [PATCH 2003/2840] Update django-allauth to 0.48.0 (#3573)

---
 {{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 19dac6c65..2eb94b03f 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -32,7 +32,7 @@ uvicorn[standard]==0.17.0.post1  # https://github.com/encode/uvicorn
 django==3.2.12  # pyup: < 4.0  # https://www.djangoproject.com/
 django-environ==0.8.1  # https://github.com/joke2k/django-environ
 django-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
-django-allauth==0.47.0  # https://github.com/pennersr/django-allauth
+django-allauth==0.48.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.14.0  # https://github.com/django-crispy-forms/django-crispy-forms
 crispy-bootstrap5==0.6  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.use_compressor == "y" %}

From e93374dda4935160ee57021a503956a534497633 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 7 Feb 2022 12:45:33 -0500
Subject: [PATCH 2004/2840] Update uvicorn to 0.17.4 (#3574)

---
 {{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 2eb94b03f..30a90c207 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -24,7 +24,7 @@ flower==1.0.0  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn[standard]==0.17.0.post1  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.17.4  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django

From d8fdd3ddceb19958fa24849ad226fb8d056d3560 Mon Sep 17 00:00:00 2001
From: Jorge Valdez <valdez.a.jorge@gmail.com>
Date: Mon, 7 Feb 2022 12:23:55 -0600
Subject: [PATCH 2005/2840] Fix docker-compose config on Apple silicon (#3562)

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
---
 {{cookiecutter.project_slug}}/local.yml      | 2 ++
 {{cookiecutter.project_slug}}/production.yml | 1 +
 2 files changed, 3 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index 5090c5cef..78e390a81 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -11,6 +11,7 @@ services:
       dockerfile: ./compose/local/django/Dockerfile
     image: {{ cookiecutter.project_slug }}_local_django
     container_name: {{ cookiecutter.project_slug }}_local_django
+    platform: linux/x86_64
     depends_on:
       - postgres
       {%- if cookiecutter.use_celery == 'y' %}
@@ -43,6 +44,7 @@ services:
   docs:
     image: {{ cookiecutter.project_slug }}_local_docs
     container_name: {{ cookiecutter.project_slug }}_local_docs
+    platform: linux/x86_64
     build:
       context: .
       dockerfile: ./compose/local/docs/Dockerfile
diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index ea4292a0d..4c1d64c20 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -11,6 +11,7 @@ services:
       context: .
       dockerfile: ./compose/production/django/Dockerfile
     image: {{ cookiecutter.project_slug }}_production_django
+    platform: linux/x86_64
     depends_on:
       - postgres
       - redis

From dcc7e28dbcac22a495ad154577e85df34fd67457 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Mon, 7 Feb 2022 18:24:25 +0000
Subject: [PATCH 2006/2840] 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 fba6ad11b..a125078d6 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1227,5 +1227,10 @@
     "name": "Abdullah Adeel",
     "github_login": "mabdullahadeel",
     "twitter_username": "abdadeel_"
+  },
+  {
+    "name": "Jorge Valdez",
+    "github_login": "jorgeavaldez",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index e2668ce0c..60b439989 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -971,6 +971,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Jorge Valdez</td>
+    <td>
+      <a href="https://github.com/jorgeavaldez">jorgeavaldez</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Jules Cheron</td>
     <td>

From 531efb479d44da54eef05fbac42cb6fc9419a5ae Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 8 Feb 2022 02:15:16 +0000
Subject: [PATCH 2007/2840] Release 2022.02.07

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b2fb058b4..6c436621c 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 -->
 
+## 2022.02.07
+
+### Changed
+- Update black to 22.1.0 ([#3572](https://github.com/cookiecutter/cookiecutter-django/pull/3572))
+### Fixed
+- Fix docker-compose config on Apple silicon ([#3562](https://github.com/cookiecutter/cookiecutter-django/pull/3562))
+### Updated
+- Update uvicorn to 0.17.4 ([#3574](https://github.com/cookiecutter/cookiecutter-django/pull/3574))
+- Update django-allauth to 0.48.0 ([#3573](https://github.com/cookiecutter/cookiecutter-django/pull/3573))
+- Update pytest to 7.0.0 ([#3567](https://github.com/cookiecutter/cookiecutter-django/pull/3567))
+- Update coverage to 6.3.1 ([#3561](https://github.com/cookiecutter/cookiecutter-django/pull/3561))
+- Update pillow to 9.0.1 ([#3571](https://github.com/cookiecutter/cookiecutter-django/pull/3571))
+- Bump peter-evans/create-pull-request from 3.12.0 to 3.12.1 ([#3558](https://github.com/cookiecutter/cookiecutter-django/pull/3558))
+- Update drf-spectacular to 0.21.2 ([#3560](https://github.com/cookiecutter/cookiecutter-django/pull/3560))
+- Update django to 3.2.12 ([#3559](https://github.com/cookiecutter/cookiecutter-django/pull/3559))
+
 ## 2022.01.27
 
 ### Updated
diff --git a/setup.py b/setup.py
index cd7e7e9d4..054dc4940 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.01.27"
+version = "2022.02.07"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 925f7ff1a18dc4de1cf72d67369a5286b3768dce Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 8 Feb 2022 02:49:12 -0500
Subject: [PATCH 2008/2840] Update werkzeug from 2.0.2 to 2.0.3 (#3576)

---
 {{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 3c0d7264d..0183a1fcb 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,6 +1,6 @@
 -r base.txt
 
-Werkzeug[watchdog]==2.0.2 # https://github.com/pallets/werkzeug
+Werkzeug[watchdog]==2.0.3 # https://github.com/pallets/werkzeug
 ipdb==0.13.9  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.9.3  # https://github.com/psycopg/psycopg2

From 3c173b2f88f1939fe328a7cd910104dd6b663152 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 8 Feb 2022 08:00:20 -0500
Subject: [PATCH 2009/2840] Update redis to 4.1.3 (#3577)

---
 {{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 30a90c207..d0f565c7f 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -12,7 +12,7 @@ argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==5.3.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==4.1.2  # https://github.com/redis/redis-py
+redis==4.1.3  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}

From 0616d464db4d6d5527b22506b73e2e6a6d768c6a Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 8 Feb 2022 18:44:46 +0000
Subject: [PATCH 2010/2840] Fix Discord link

Fix #3578
---
 .github/ISSUE_TEMPLATE/question.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index e39803fa9..6f65315fa 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -7,5 +7,5 @@ labels: question
 First, make sure to examine [the docs](https://cookiecutter-django.readthedocs.io/en/latest/). If that doesn't help, we recommend one of these 3 main channels:
 
 - If your issue is related to Django + something else but was generated with cookiecutter-django, the best is to post a question on [StackOverflow](https://stackoverflow.com/questions/tagged/cookiecutter-django) tagged with `cookiecutter-django`, you would get more visibility from other communities as well.
-- Join us on [Discord](https://discord.gg/bTfDa6Zz) and ask around.
+- Join us on [Discord](https://discord.gg/9BrxzPKuEW) and ask around.
 - Start [a discussion](https://github.com/cookiecutter/cookiecutter-django/discussions) on our project's GitHub.

From 90e4c0e51d95abd3a7d5909b66bcda15e504b377 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 8 Feb 2022 18:55:13 +0000
Subject: [PATCH 2011/2840] Update Discord invite link to not expire

---
 .github/ISSUE_TEMPLATE/question.md | 2 +-
 README.md                          | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
index 6f65315fa..61f839cf6 100644
--- a/.github/ISSUE_TEMPLATE/question.md
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -7,5 +7,5 @@ labels: question
 First, make sure to examine [the docs](https://cookiecutter-django.readthedocs.io/en/latest/). If that doesn't help, we recommend one of these 3 main channels:
 
 - If your issue is related to Django + something else but was generated with cookiecutter-django, the best is to post a question on [StackOverflow](https://stackoverflow.com/questions/tagged/cookiecutter-django) tagged with `cookiecutter-django`, you would get more visibility from other communities as well.
-- Join us on [Discord](https://discord.gg/9BrxzPKuEW) and ask around.
+- Join us on [Discord](https://discord.gg/uFXweDQc5a) and ask around.
 - Start [a discussion](https://github.com/cookiecutter/cookiecutter-django/discussions) on our project's GitHub.
diff --git a/README.md b/README.md
index 3f5df1f01..fcffd75ca 100644
--- a/README.md
+++ b/README.md
@@ -3,7 +3,7 @@
 [![Build Status](https://img.shields.io/github/workflow/status/cookiecutter/cookiecutter-django/CI/master)](https://github.com/cookiecutter/cookiecutter-django/actions?query=workflow%3ACI)
 [![Documentation Status](https://readthedocs.org/projects/cookiecutter-django/badge/?version=latest)](https://cookiecutter-django.readthedocs.io/en/latest/?badge=latest)
 [![Updates](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/shield.svg)](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/)
-[![Join our Discord](https://img.shields.io/badge/Discord-cookiecutter-5865F2?style=flat&logo=discord&logoColor=white)](https://discord.gg/9BrxzPKuEW)
+[![Join our Discord](https://img.shields.io/badge/Discord-cookiecutter-5865F2?style=flat&logo=discord&logoColor=white)](https://discord.gg/uFXweDQc5a)
 [![Code Helpers Badge](https://www.codetriage.com/cookiecutter/cookiecutter-django/badges/users.svg)](https://www.codetriage.com/cookiecutter/cookiecutter-django)
 [![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)
 
@@ -189,7 +189,7 @@ For local development, see the following:
 
 -   Have questions? **Before you ask questions anywhere else**, please post your question on [Stack Overflow](http://stackoverflow.com/questions/tagged/cookiecutter-django) under the *cookiecutter-django* tag. We check there periodically for questions.
 -   If you think you found a bug or want to request a feature, please open an [issue](https://github.com/cookiecutter/cookiecutter-django/issues).
--   For anything else, you can chat with us on [Discord](https://discord.gg/9BrxzPKuEW).
+-   For anything else, you can chat with us on [Discord](https://discord.gg/uFXweDQc5a).
 
 ## For Readers of Two Scoops of Django
 

From c76b413d9164eba268a949221161e8ed4a1c4f29 Mon Sep 17 00:00:00 2001
From: Ryan Fitch <6692977+ryfi@users.noreply.github.com>
Date: Tue, 8 Feb 2022 11:36:36 -0800
Subject: [PATCH 2012/2840] Fixed some typos in drf-spectacular description and
 comments (#3579)

---
 {{cookiecutter.project_slug}}/config/settings/base.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index bbaff2300..816ae7c2a 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -338,11 +338,11 @@ REST_FRAMEWORK = {
 # django-cors-headers - https://github.com/adamchainz/django-cors-headers#setup
 CORS_URLS_REGEX = r"^/api/.*$"
 
-# By Default swagger ui is available only to admin user. You can change permission classs to change that
+# By Default swagger ui is available only to admin user(s). You can change permission classes to change that
 # See more configuration options at https://drf-spectacular.readthedocs.io/en/latest/settings.html#settings
 SPECTACULAR_SETTINGS = {
     "TITLE": "{{ cookiecutter.project_name }} API",
-    "DESCRIPTION": "Documentation of API endpoiints of {{ cookiecutter.project_name }}",
+    "DESCRIPTION": "Documentation of API endpoints of {{ cookiecutter.project_name }}",
     "VERSION": "1.0.0",
     "SERVE_PERMISSIONS": ["rest_framework.permissions.IsAdminUser"],
     "SERVERS": [

From 3f39f384d36aae8552f7736f6d774b0fc637404b Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 8 Feb 2022 19:37:05 +0000
Subject: [PATCH 2013/2840] 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 a125078d6..5bd4ca459 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1232,5 +1232,10 @@
     "name": "Jorge Valdez",
     "github_login": "jorgeavaldez",
     "twitter_username": ""
+  },
+  {
+    "name": "Ryan Fitch",
+    "github_login": "ryfi",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 60b439989..9bc476a5d 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1468,6 +1468,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Ryan Fitch</td>
+    <td>
+      <a href="https://github.com/ryfi">ryfi</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Sam Collins</td>
     <td>

From e34096e7ac772e11fb2d1b84ab95a5c2e9cff671 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 9 Feb 2022 02:17:43 +0000
Subject: [PATCH 2014/2840] Release 2022.02.08

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6c436621c..8397d4c51 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.02.08
+
+### Fixed
+- Fixed some typos in drf-spectacular description and comments ([#3579](https://github.com/cookiecutter/cookiecutter-django/pull/3579))
+### Updated
+- Update redis to 4.1.3 ([#3577](https://github.com/cookiecutter/cookiecutter-django/pull/3577))
+- Update werkzeug to 2.0.3 ([#3576](https://github.com/cookiecutter/cookiecutter-django/pull/3576))
+
 ## 2022.02.07
 
 ### Changed
diff --git a/setup.py b/setup.py
index 054dc4940..f1882dda1 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.02.07"
+version = "2022.02.08"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 2279841de7d7c435145d270560ec27aa921e97c8 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 10 Feb 2022 03:57:18 -0500
Subject: [PATCH 2015/2840] Update whitenoise to 6.0.0 (#3583)

---
 {{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 d0f565c7f..3dfa92c36 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -10,7 +10,7 @@ rcssmin==1.1.0  # https://github.com/ndparker/rcssmin
 {%- endif %}
 argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
-whitenoise==5.3.0  # https://github.com/evansd/whitenoise
+whitenoise==6.0.0  # https://github.com/evansd/whitenoise
 {%- endif %}
 redis==4.1.3  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}

From 0ea13d42886bb38415b4bfb8c21c6236171cd516 Mon Sep 17 00:00:00 2001
From: Jelmer <info@jelmert.nl>
Date: Thu, 10 Feb 2022 16:06:22 +0100
Subject: [PATCH 2016/2840] Fix GitLab CI error caused by Docker Compose's
 `platform` option (#3585)

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

diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
index 711bfc392..fb82ec5d5 100644
--- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml
+++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
@@ -22,7 +22,7 @@ flake8:
 pytest:
   stage: test
   {% if cookiecutter.use_docker == 'y' -%}
-  image: docker/compose:latest
+  image: docker/compose:1.29.2
   tags:
     - docker
   services:

From fb5021e124adb8e8e777aef7d89631242f6327e9 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 11 Feb 2022 02:16:15 +0000
Subject: [PATCH 2017/2840] Release 2022.02.10

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8397d4c51..0f60cd9bf 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.02.10
+
+### Fixed
+- Fix GitLab CI error caused by Docker Compose&#39;s `platform` option ([#3585](https://github.com/cookiecutter/cookiecutter-django/pull/3585))
+### Updated
+- Update whitenoise to 6.0.0 ([#3583](https://github.com/cookiecutter/cookiecutter-django/pull/3583))
+
 ## 2022.02.08
 
 ### Fixed
diff --git a/setup.py b/setup.py
index f1882dda1..a9f4982d3 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.02.08"
+version = "2022.02.10"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From a22076f72d0017d7d5144a88bac58d8d54b91287 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 11 Feb 2022 12:19:37 -0500
Subject: [PATCH 2018/2840] Update sentry-sdk to 1.5.5 (#3586)

---
 {{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 faefd1245..e9c61850a 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.5.4  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.5.5  # 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 53119d91eb5b78a641c5c0c2fb91b0458d854cfa Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 12 Feb 2022 02:19:08 +0000
Subject: [PATCH 2019/2840] Release 2022.02.11

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0f60cd9bf..954bfe184 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 -->
 
+## 2022.02.11
+
+### Updated
+- Update sentry-sdk to 1.5.5 ([#3586](https://github.com/cookiecutter/cookiecutter-django/pull/3586))
+
 ## 2022.02.10
 
 ### Fixed
diff --git a/setup.py b/setup.py
index a9f4982d3..e75aaea77 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.02.10"
+version = "2022.02.11"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 83c05858fd410f4d5688b6e4460a6edd9f1efa9d Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 12 Feb 2022 06:56:45 -0500
Subject: [PATCH 2020/2840] Update pytest to 7.0.1 (#3588)

* Update pytest from 7.0.0 to 7.0.1

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

diff --git a/requirements.txt b/requirements.txt
index 7dbf72254..baebe15dd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,7 +13,7 @@ pre-commit==2.17.0
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.24.5
-pytest==7.0.0
+pytest==7.0.1
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2
 pyyaml==6.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 0183a1fcb..09eedbdc1 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.931  # https://github.com/python/mypy
 django-stubs==1.9.0  # https://github.com/typeddjango/django-stubs
-pytest==7.0.0  # https://github.com/pytest-dev/pytest
+pytest==7.0.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
 djangorestframework-stubs==1.4.0  # https://github.com/typeddjango/djangorestframework-stubs

From 1d46454ee016c5b987abf68e3a3cb749a0083bac Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sun, 13 Feb 2022 02:16:55 +0000
Subject: [PATCH 2021/2840] Release 2022.02.12

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 954bfe184..06e2ce176 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 -->
 
+## 2022.02.12
+
+### Updated
+- Update pytest to 7.0.1 ([#3588](https://github.com/cookiecutter/cookiecutter-django/pull/3588))
+
 ## 2022.02.11
 
 ### Updated
diff --git a/setup.py b/setup.py
index e75aaea77..b70752941 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.02.11"
+version = "2022.02.12"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 85ee3c921a18c40e655dbdf15c2792e6740e5f50 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Sun, 13 Feb 2022 07:49:05 -0500
Subject: [PATCH 2022/2840] Change docs port to 9000 from 7000 (#3590)

Signed-off-by: Andrew-Chen-Wang <acwangpython@gmail.com>
---
 docs/document.rst                           | 4 ++--
 {{cookiecutter.project_slug}}/docs/Makefile | 8 ++++----
 {{cookiecutter.project_slug}}/docs/make.bat | 2 +-
 {{cookiecutter.project_slug}}/local.yml     | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/docs/document.rst b/docs/document.rst
index a30979094..974c66c69 100644
--- a/docs/document.rst
+++ b/docs/document.rst
@@ -13,7 +13,7 @@ If you set up your project to `develop locally with docker`_, run the following
 
     $ docker-compose -f local.yml up docs
 
-Navigate to port 7000 on your host to see the documentation. This will be opened automatically at `localhost`_ for local, non-docker development.
+Navigate to port 9000 on your host to see the documentation. This will be opened automatically at `localhost`_ for local, non-docker development.
 
 Note: using Docker for documentation sets up a temporary SQLite file by setting the environment variable ``DATABASE_URL=sqlite:///readthedocs.db`` in ``docs/conf.py`` to avoid a dependency on PostgreSQL.
 
@@ -36,7 +36,7 @@ To setup your documentation on `ReadTheDocs`_, you must
 
 Additionally, you can auto-build Pull Request previews, but `you must enable it`_.
 
-.. _localhost: http://localhost:7000/
+.. _localhost: http://localhost:9000/
 .. _Sphinx: https://www.sphinx-doc.org/en/master/index.html
 .. _develop locally: ./developing-locally.html
 .. _develop locally with docker: ./developing-locally-docker.html
diff --git a/{{cookiecutter.project_slug}}/docs/Makefile b/{{cookiecutter.project_slug}}/docs/Makefile
index 0c4f9f574..cf080e476 100644
--- a/{{cookiecutter.project_slug}}/docs/Makefile
+++ b/{{cookiecutter.project_slug}}/docs/Makefile
@@ -3,7 +3,7 @@
 
 # You can set these variables from the command line, and also
 # from the environment for the first two.
-SPHINXOPTS    ?= 
+SPHINXOPTS    ?=
 SPHINXBUILD   ?= sphinx-build
 SOURCEDIR     = .
 BUILDDIR      = ./_build
@@ -21,10 +21,10 @@ help:
 
 # Build, watch and serve docs with live reload
 livehtml:
-	sphinx-autobuild -b html 
+	sphinx-autobuild -b html
 	{%- if cookiecutter.use_docker == 'y' %} --host 0.0.0.0
-	{%- else %} --open-browser 
-	{%- endif %} --port 7000 --watch $(APP) -c . $(SOURCEDIR) $(BUILDDIR)/html
+	{%- else %} --open-browser
+	{%- endif %} --port 9000 --watch $(APP) -c . $(SOURCEDIR) $(BUILDDIR)/html
 
 # Outputs rst files from django application code
 apidocs:
diff --git a/{{cookiecutter.project_slug}}/docs/make.bat b/{{cookiecutter.project_slug}}/docs/make.bat
index b19f42c6a..6cd1129f0 100644
--- a/{{cookiecutter.project_slug}}/docs/make.bat
+++ b/{{cookiecutter.project_slug}}/docs/make.bat
@@ -32,7 +32,7 @@ if errorlevel 9009 (
 goto end
 
 :livehtml
-sphinx-autobuild -b html --open-browser -p 7000 --watch %APP% -c . %SOURCEDIR% %BUILDDIR%/html
+sphinx-autobuild -b html --open-browser -p 9000 --watch %APP% -c . %SOURCEDIR% %BUILDDIR%/html
 GOTO :EOF
 
 :apidocs
diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index 78e390a81..590445820 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -55,7 +55,7 @@ services:
       - ./config:/app/config:z
       - ./{{ cookiecutter.project_slug }}:/app/{{ cookiecutter.project_slug }}:z
     ports:
-      - "7000:7000"
+      - "9000:9000"
     command: /start-docs
   {%- if cookiecutter.use_mailhog == 'y' %}
 

From 61be357ded79a050abf22a966175869242e9a532 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Mon, 14 Feb 2022 02:12:49 +0000
Subject: [PATCH 2023/2840] Release 2022.02.13

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06e2ce176..29b66f2a5 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 -->
 
+## 2022.02.13
+
+### Changed
+- Change docs port from 7000 to 9000 ([#3590](https://github.com/cookiecutter/cookiecutter-django/pull/3590))
+
 ## 2022.02.12
 
 ### Updated
diff --git a/setup.py b/setup.py
index b70752941..e8faeabc6 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.02.12"
+version = "2022.02.13"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From ca5411af9ab6dc171e779c32bce5392cbee952da Mon Sep 17 00:00:00 2001
From: ghazi-git <ghazi-git@users.noreply.github.com>
Date: Tue, 15 Feb 2022 15:52:20 +0100
Subject: [PATCH 2024/2840] fix typo in servers settings for drf-spectacular

update the local dev server url to use http instead of https
---
 {{cookiecutter.project_slug}}/config/settings/base.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 816ae7c2a..ef3dfb9c0 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -346,7 +346,7 @@ SPECTACULAR_SETTINGS = {
     "VERSION": "1.0.0",
     "SERVE_PERMISSIONS": ["rest_framework.permissions.IsAdminUser"],
     "SERVERS": [
-        {"url": "https://127.0.0.1:8000", "description": "Local Development server"},
+        {"url": "http://127.0.0.1:8000", "description": "Local Development server"},
         {"url": "https://{{ cookiecutter.domain_name }}", "description": "Production server"},
     ],
 }

From abbbfea550d3c9f7261ec695541b2212be8be881 Mon Sep 17 00:00:00 2001
From: luzfcb <luzfcb@users.noreply.github.com>
Date: Tue, 15 Feb 2022 16:35:19 +0000
Subject: [PATCH 2025/2840] 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 5bd4ca459..393a9a4cc 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1237,5 +1237,10 @@
     "name": "Ryan Fitch",
     "github_login": "ryfi",
     "twitter_username": ""
+  },
+  {
+    "name": "ghazi-git",
+    "github_login": "ghazi-git",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 9bc476a5d..4cd8f513a 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -768,6 +768,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>ghazi-git</td>
+    <td>
+      <a href="https://github.com/ghazi-git">ghazi-git</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Gilbishkosma</td>
     <td>

From 30c2d9102025489ce5f9c7b38a3e49da1686bbbc Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 16 Feb 2022 02:18:17 +0000
Subject: [PATCH 2026/2840] Release 2022.02.15

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 29b66f2a5..68445b2f7 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 -->
 
+## 2022.02.15
+
+### Changed
+- Update the drf-spectacular local dev server url to use http instead of https ([#3591](https://github.com/cookiecutter/cookiecutter-django/pull/3591))
+
 ## 2022.02.13
 
 ### Changed
diff --git a/setup.py b/setup.py
index e8faeabc6..b4ff4a52b 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.02.13"
+version = "2022.02.15"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From c22f2c7e9ee9ce861175fbb433c07760d94cb5cf Mon Sep 17 00:00:00 2001
From: ghazi-git <ghazi-git@users.noreply.github.com>
Date: Wed, 16 Feb 2022 13:25:32 +0100
Subject: [PATCH 2027/2840] Fix Swagger schema API endpoint & add a test for it
 (#3592)

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 hooks/post_gen_project.py                                   | 2 +-
 {{cookiecutter.project_slug}}/config/settings/base.py       | 1 +
 .../users/tests/{test_swagger_ui.py => test_swagger.py}     | 6 ++++++
 3 files changed, 8 insertions(+), 1 deletion(-)
 rename {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/{test_swagger_ui.py => test_swagger.py} (70%)

diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index b2dbb3421..d784ba62b 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -329,7 +329,7 @@ def remove_drf_starter_files():
     )
     os.remove(
         os.path.join(
-            "{{cookiecutter.project_slug}}", "users", "tests", "test_swagger_ui.py"
+            "{{cookiecutter.project_slug}}", "users", "tests", "test_swagger.py"
         )
     )
 
diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index ef3dfb9c0..7165aa9da 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -333,6 +333,7 @@ REST_FRAMEWORK = {
         "rest_framework.authentication.TokenAuthentication",
     ),
     "DEFAULT_PERMISSION_CLASSES": ("rest_framework.permissions.IsAuthenticated",),
+    "DEFAULT_SCHEMA_CLASS": "drf_spectacular.openapi.AutoSchema",
 }
 
 # django-cors-headers - https://github.com/adamchainz/django-cors-headers#setup
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger_ui.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger.py
similarity index 70%
rename from {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger_ui.py
rename to {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger.py
index b0c24d91b..7f5b75844 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger_ui.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger.py
@@ -14,3 +14,9 @@ def test_swagger_ui_not_accessible_by_normal_user(client):
     url = reverse("api-docs")
     response = client.get(url)
     assert response.status_code == 403
+
+
+def test_api_schema_generated_successfully(admin_client):
+    url = reverse("api-schema")
+    response = admin_client.get(url)
+    assert response.status_code == 200

From d2f129e3447e4870f9bb84096981db7f89c8cd8a Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 17 Feb 2022 02:11:46 +0000
Subject: [PATCH 2028/2840] Release 2022.02.16

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 68445b2f7..c5bfcc473 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 -->
 
+## 2022.02.16
+
+### Fixed
+- Fix Swagger schema API endpoint &amp; add a test for it ([#3592](https://github.com/cookiecutter/cookiecutter-django/pull/3592))
+
 ## 2022.02.15
 
 ### Changed
diff --git a/setup.py b/setup.py
index b4ff4a52b..4be18dbfb 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.02.15"
+version = "2022.02.16"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 61f16e52243154d72463abea85d41c2eafadd273 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Cebrail=20Y=C4=B1lmaz?= <cebrailylmz02@gmail.com>
Date: Sun, 20 Feb 2022 16:21:06 +0300
Subject: [PATCH 2029/2840] Fix incorrect createdb instruction in documentation
 (#3606)

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 docs/developing-locally.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index a9a54a03b..3b86ff44e 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -42,7 +42,8 @@ First things first.
 
 #. Create a new PostgreSQL database using createdb_: ::
 
-    $ createdb <what you have entered as the project_slug at setup stage> -U postgres --password <password>
+    $ createdb --username=postgres <project_slug>
+   ``project_slug`` is what you have entered as the project_slug at the setup stage.
 
    .. note::
 

From ef72165b850036a4ed6cf3dcea502df52c60bd9e Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sun, 20 Feb 2022 13:21:34 +0000
Subject: [PATCH 2030/2840] 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 393a9a4cc..cbe2444ef 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1242,5 +1242,10 @@
     "name": "ghazi-git",
     "github_login": "ghazi-git",
     "twitter_username": ""
+  },
+  {
+    "name": "Cebrail Yılmaz",
+    "github_login": "b1sar",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 4cd8f513a..ca7d812dc 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -404,6 +404,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Cebrail Yılmaz</td>
+    <td>
+      <a href="https://github.com/b1sar">b1sar</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Chao Yang Wu</td>
     <td>

From 31294655db97d7ea715e9af38fcdabbc0eab0220 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Mon, 21 Feb 2022 02:14:51 +0000
Subject: [PATCH 2031/2840] Release 2022.02.20

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c5bfcc473..ec3e1fbe2 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 -->
 
+## 2022.02.20
+
+### Changed
+- Fix incorrect createdb instruction in documentation ([#3606](https://github.com/cookiecutter/cookiecutter-django/pull/3606))
+
 ## 2022.02.16
 
 ### Fixed
diff --git a/setup.py b/setup.py
index 4be18dbfb..0baccf4fb 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.02.16"
+version = "2022.02.20"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 4b5e7a19a68c8ecd48d2dc6ce99c1b7f254a694a Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 21 Feb 2022 16:36:54 -0500
Subject: [PATCH 2032/2840] Update redis from 4.1.3 to 4.1.4 (#3595)

---
 {{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 3dfa92c36..016034f68 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -12,7 +12,7 @@ argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==6.0.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==4.1.3  # https://github.com/redis/redis-py
+redis==4.1.4  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}

From 50662e01c8efa9359ec530a81321a0ef02cca44e Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 21 Feb 2022 16:37:07 -0500
Subject: [PATCH 2033/2840] Update uvicorn from 0.17.4 to 0.17.5 (#3596)

---
 {{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 016034f68..236df35cf 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -24,7 +24,7 @@ flower==1.0.0  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn[standard]==0.17.4  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.17.5  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django

From b9d8ce613246fec801aa241dcb12a1da309128d0 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 21 Feb 2022 16:40:46 -0500
Subject: [PATCH 2034/2840] Update python-slugify from 5.0.2 to 6.0.1 (#3599)

---
 {{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 236df35cf..2b2f71127 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,5 +1,5 @@
 pytz==2021.3  # https://github.com/stub42/pytz
-python-slugify==5.0.2  # https://github.com/un33k/python-slugify
+python-slugify==6.0.1  # https://github.com/un33k/python-slugify
 Pillow==9.0.1  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
 {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %}

From 19d486f0c5b66c481bb7f34560cb0c3fa588f7fc Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 21 Feb 2022 16:41:05 -0500
Subject: [PATCH 2035/2840] Update pylint-django from 2.5.0 to 2.5.2 (#3602)

---
 {{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 09eedbdc1..6634242e0 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -32,7 +32,7 @@ flake8==4.0.1  # https://github.com/PyCQA/flake8
 flake8-isort==4.1.1  # https://github.com/gforcada/flake8-isort
 coverage==6.3.1  # https://github.com/nedbat/coveragepy
 black==22.1.0  # https://github.com/psf/black
-pylint-django==2.5.0  # https://github.com/PyCQA/pylint-django
+pylint-django==2.5.2  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}

From cc0b17740dcdb698bbe1a4a6ff8b547058652abd Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 21 Feb 2022 16:41:52 -0500
Subject: [PATCH 2036/2840] Update gitpython from 3.1.26 to 3.1.27 (#3607)

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

diff --git a/requirements.txt b/requirements.txt
index baebe15dd..1e98d0f2a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,6 +21,6 @@ pyyaml==6.0
 # Scripting
 # ------------------------------------------------------------------------------
 PyGithub==1.55
-gitpython==3.1.26
+gitpython==3.1.27
 jinja2==3.0.3
 requests==2.27.1

From 28bc48d0f2f864d948c9a398198d088203e42db9 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 21 Feb 2022 16:42:24 -0500
Subject: [PATCH 2037/2840] Update coverage from 6.3.1 to 6.3.2 (#3610)

---
 {{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 6634242e0..781c67443 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==4.0.1  # https://github.com/PyCQA/flake8
 flake8-isort==4.1.1  # https://github.com/gforcada/flake8-isort
-coverage==6.3.1  # https://github.com/nedbat/coveragepy
+coverage==6.3.2  # https://github.com/nedbat/coveragepy
 black==22.1.0  # https://github.com/psf/black
 pylint-django==2.5.2  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 7e444e6aa4eaf9ee26f0e421255a4f471898bcdf Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 21 Feb 2022 22:50:19 +0000
Subject: [PATCH 2038/2840] Cancel previous CI runs on successive PR pushes
 with GitHub actions (#3575)

---
 .github/workflows/ci.yml                               | 6 +++++-
 {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 3 +++
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0180184fa..c8843b9fa 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,6 +4,10 @@ on:
   push:
   pull_request:
 
+concurrency:
+  group: ${{ github.head_ref || github.run_id }}
+  cancel-in-progress: true
+
 jobs:
   lint:
     runs-on: ubuntu-latest
@@ -75,8 +79,8 @@ jobs:
           - name: With Gulp
             args: "js_task_runner=Gulp custom_bootstrap_compilation=y"
 
-    runs-on: ubuntu-latest
     name: "${{ matrix.script.name }} Bare metal"
+    runs-on: ubuntu-latest
     services:
       redis:
         image: redis:5.0
diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
index c24f4cb94..6381a05d4 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -14,6 +14,9 @@ on:
     branches: [ "master", "main" ]
     paths-ignore: [ "docs/**" ]
 
+concurrency:
+  group: {% raw %}${{ github.head_ref || github.run_id }}{% endraw %}
+  cancel-in-progress: true
 
 jobs:
   linter:

From cfff2746cc31f9737a4d798bda72fc24f85e2596 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 22 Feb 2022 02:15:15 +0000
Subject: [PATCH 2039/2840] Release 2022.02.21

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ec3e1fbe2..2f1e14ea6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,18 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.02.21
+
+### Changed
+- Cancel previous CI runs on successive PR pushes with GitHub actions ([#3575](https://github.com/cookiecutter/cookiecutter-django/pull/3575))
+### Updated
+- Update coverage to 6.3.2 ([#3610](https://github.com/cookiecutter/cookiecutter-django/pull/3610))
+- Update gitpython to 3.1.27 ([#3607](https://github.com/cookiecutter/cookiecutter-django/pull/3607))
+- Update pylint-django to 2.5.2 ([#3602](https://github.com/cookiecutter/cookiecutter-django/pull/3602))
+- Update python-slugify to 6.0.1 ([#3599](https://github.com/cookiecutter/cookiecutter-django/pull/3599))
+- Update uvicorn to 0.17.5 ([#3596](https://github.com/cookiecutter/cookiecutter-django/pull/3596))
+- Update redis to 4.1.4 ([#3595](https://github.com/cookiecutter/cookiecutter-django/pull/3595))
+
 ## 2022.02.20
 
 ### Changed
diff --git a/setup.py b/setup.py
index 0baccf4fb..cab4fc873 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.02.20"
+version = "2022.02.21"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 36ef16849edbd6694356c41df42ef37d78948544 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 24 Feb 2022 14:06:15 -0500
Subject: [PATCH 2040/2840] Update python-slugify to 6.1.0 (#3612)

---
 {{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 2b2f71127..9b4fd89c6 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,5 +1,5 @@
 pytz==2021.3  # https://github.com/stub42/pytz
-python-slugify==6.0.1  # https://github.com/un33k/python-slugify
+python-slugify==6.1.0  # https://github.com/un33k/python-slugify
 Pillow==9.0.1  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
 {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %}

From 294b7b95bd6598b7fd94458653ba9f4777228835 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 24 Feb 2022 14:13:06 -0500
Subject: [PATCH 2041/2840] Update sentry-sdk to 1.5.6 (#3611)

---
 {{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 e9c61850a..d7852f99d 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.5.5  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.5.6  # 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 fe938d4d5437649252e5f36781a65cdc70586686 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 24 Feb 2022 16:13:46 -0500
Subject: [PATCH 2042/2840] Update django-allauth to 0.49.0 (#3613)

---
 {{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 9b4fd89c6..da5f58510 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -32,7 +32,7 @@ uvicorn[standard]==0.17.5  # https://github.com/encode/uvicorn
 django==3.2.12  # pyup: < 4.0  # https://www.djangoproject.com/
 django-environ==0.8.1  # https://github.com/joke2k/django-environ
 django-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
-django-allauth==0.48.0  # https://github.com/pennersr/django-allauth
+django-allauth==0.49.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.14.0  # https://github.com/django-crispy-forms/django-crispy-forms
 crispy-bootstrap5==0.6  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.use_compressor == "y" %}

From af7522dfc5921a8a97493bf8603d028345a0f25c Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 25 Feb 2022 02:18:52 +0000
Subject: [PATCH 2043/2840] Release 2022.02.24

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2f1e14ea6..e87e97acc 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.02.24
+
+### Updated
+- Update django-allauth to 0.49.0 ([#3613](https://github.com/cookiecutter/cookiecutter-django/pull/3613))
+- Update sentry-sdk to 1.5.6 ([#3611](https://github.com/cookiecutter/cookiecutter-django/pull/3611))
+- Update python-slugify to 6.1.0 ([#3612](https://github.com/cookiecutter/cookiecutter-django/pull/3612))
+
 ## 2022.02.21
 
 ### Changed
diff --git a/setup.py b/setup.py
index cab4fc873..e4b5e8f74 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.02.21"
+version = "2022.02.24"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 5646c81ea161c563b35ba06ab32f842c4f8aa7bb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 25 Feb 2022 20:32:43 +0000
Subject: [PATCH 2044/2840] Bump actions/setup-node from 2 to 3 (#3614)

* Bump actions/setup-node from 2 to 3.0.0

Bumps [actions/setup-node](https://github.com/actions/setup-node) from 2 to 3.0.0.
- [Release notes](https://github.com/actions/setup-node/releases)
- [Commits](https://github.com/actions/setup-node/compare/v2...v3.0.0)

---
updated-dependencies:
- dependency-name: actions/setup-node
  dependency-type: direct:production
  update-type: version-update:semver-major
...

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

* Use major version

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c8843b9fa..3ce540e1d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -110,7 +110,7 @@ jobs:
             {{cookiecutter.project_slug}}/requirements/local.txt
       - name: Install dependencies
         run: pip install -r requirements.txt
-      - uses: actions/setup-node@v2
+      - uses: actions/setup-node@v3
         with:
           node-version: "16"
       - name: Bare Metal ${{ matrix.script.name }}

From da5ce00503fee13c84d6d5c3831eb4c22de4a073 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 26 Feb 2022 02:16:42 +0000
Subject: [PATCH 2045/2840] Release 2022.02.25

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e87e97acc..32d202c15 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 -->
 
+## 2022.02.25
+
+### Updated
+- Bump actions/setup-node from 2 to 3 ([#3614](https://github.com/cookiecutter/cookiecutter-django/pull/3614))
+
 ## 2022.02.24
 
 ### Updated
diff --git a/setup.py b/setup.py
index e4b5e8f74..cda752f4a 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.02.24"
+version = "2022.02.25"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 92e88bca2a875f99c517d5e7b33e724a62aec7c4 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 28 Feb 2022 18:45:23 +0000
Subject: [PATCH 2046/2840] Bump peter-evans/create-pull-request from 3.12.1 to
 3.13.0 (#3616)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.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 98e2f592e..577641e52 100644
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -31,7 +31,7 @@ jobs:
         run: pre-commit autoupdate
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3.12.1
+        uses: peter-evans/create-pull-request@v3.13.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: update/pre-commit-autoupdate

From 1ffd194386c79cb900b160a4877cee08a5300ba8 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 28 Feb 2022 13:57:51 -0500
Subject: [PATCH 2047/2840] Update python-slugify to 6.1.1 (#3615)

---
 {{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 da5f58510..0c8708492 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,5 +1,5 @@
 pytz==2021.3  # https://github.com/stub42/pytz
-python-slugify==6.1.0  # https://github.com/un33k/python-slugify
+python-slugify==6.1.1  # https://github.com/un33k/python-slugify
 Pillow==9.0.1  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}
 {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %}

From 6014cb35dc7638fb6e05aff141d17946b3357078 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 1 Mar 2022 02:31:40 +0000
Subject: [PATCH 2048/2840] Release 2022.02.28

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32d202c15..6db9114af 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 -->
 
+## 2022.02.28
+
+### Updated
+- Update python-slugify to 6.1.1 ([#3615](https://github.com/cookiecutter/cookiecutter-django/pull/3615))
+- Bump peter-evans/create-pull-request from 3.12.1 to 3.13.0 ([#3616](https://github.com/cookiecutter/cookiecutter-django/pull/3616))
+
 ## 2022.02.25
 
 ### Updated
diff --git a/setup.py b/setup.py
index cda752f4a..d7fb0f0f1 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.02.25"
+version = "2022.02.28"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 8fa66e8593d008663c5b6dda5b279db36482234b Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Mar 2022 08:20:39 +0000
Subject: [PATCH 2049/2840] Bump peter-evans/create-pull-request from 3.13.0 to
 3.14.0 (#3618)

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 3.13.0 to 3.14.0.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v3.13.0...v3.14.0)

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

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.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 577641e52..9fc03f0f7 100644
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -31,7 +31,7 @@ jobs:
         run: pre-commit autoupdate
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3.13.0
+        uses: peter-evans/create-pull-request@v3.14.0
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: update/pre-commit-autoupdate

From 318c0182766cfe04afb036afdf2bcc0b7d0a40cf Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 1 Mar 2022 15:25:18 +0000
Subject: [PATCH 2050/2840] Bump actions/setup-python from 2 to 3 (#3617)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/ci.yml                    | 8 ++++----
 .github/workflows/django-issue-checker.yml  | 2 +-
 .github/workflows/pre-commit-autoupdate.yml | 2 +-
 .github/workflows/update-changelog.yml      | 2 +-
 .github/workflows/update-contributors.yml   | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 3ce540e1d..b7e37c51e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v3
         with:
           python-version: "3.9"
           cache: pip
@@ -33,7 +33,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v3
         with:
           python-version: "3.9"
           cache: pip
@@ -60,7 +60,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v3
         with:
           python-version: "3.9"
           cache: pip
@@ -100,7 +100,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v3
         with:
           python-version: "3.9"
           cache: pip
diff --git a/.github/workflows/django-issue-checker.yml b/.github/workflows/django-issue-checker.yml
index 1118e1b23..e8e076e60 100644
--- a/.github/workflows/django-issue-checker.yml
+++ b/.github/workflows/django-issue-checker.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v3
         with:
           python-version: "3.9"
       - name: Install dependencies
diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml
index 9fc03f0f7..53f2ebb75 100644
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-python@v2
+      - uses: actions/setup-python@v3
         with:
           python-version: "3.9"
 
diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index 00065c05b..810673e1b 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: "3.9"
       - name: Install dependencies
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 335159444..21c6b78bd 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v2
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: "3.9"
       - name: Install dependencies

From dbd8881c4191b5797172c47a5539c8017b7f4172 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 2 Mar 2022 02:36:54 +0000
Subject: [PATCH 2051/2840] Release 2022.03.01

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6db9114af..a4cb6c952 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 -->
 
+## 2022.03.01
+
+### Updated
+- Bump actions/setup-python from 2 to 3 ([#3617](https://github.com/cookiecutter/cookiecutter-django/pull/3617))
+- Bump peter-evans/create-pull-request from 3.13.0 to 3.14.0 ([#3618](https://github.com/cookiecutter/cookiecutter-django/pull/3618))
+
 ## 2022.02.28
 
 ### Updated
diff --git a/setup.py b/setup.py
index d7fb0f0f1..5e63698ff 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.02.28"
+version = "2022.03.01"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 3eaeb837603009b163e4b556d4724c49d9ce8173 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 2 Mar 2022 09:17:47 +0000
Subject: [PATCH 2052/2840] Bump actions/checkout from 2 to 3 (#3619)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
---
 .github/workflows/ci.yml                               | 8 ++++----
 .github/workflows/django-issue-checker.yml             | 2 +-
 .github/workflows/pre-commit-autoupdate.yml            | 2 +-
 .github/workflows/update-changelog.yml                 | 2 +-
 .github/workflows/update-contributors.yml              | 2 +-
 {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 4 ++--
 6 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index b7e37c51e..5c502b130 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -12,7 +12,7 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v3
         with:
           python-version: "3.9"
@@ -32,7 +32,7 @@ jobs:
     name: "Run tests"
     runs-on: ${{ matrix.os }}
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v3
         with:
           python-version: "3.9"
@@ -59,7 +59,7 @@ jobs:
       COMPOSE_DOCKER_CLI_BUILD: 1
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v3
         with:
           python-version: "3.9"
@@ -99,7 +99,7 @@ jobs:
       DATABASE_URL: "postgres://postgres:postgres@localhost:5432/postgres"
 
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v3
         with:
           python-version: "3.9"
diff --git a/.github/workflows/django-issue-checker.yml b/.github/workflows/django-issue-checker.yml
index e8e076e60..5ea023fdd 100644
--- a/.github/workflows/django-issue-checker.yml
+++ b/.github/workflows/django-issue-checker.yml
@@ -16,7 +16,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v3
         with:
           python-version: "3.9"
diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml
index 53f2ebb75..b5c91ca5c 100644
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -15,7 +15,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
       - uses: actions/setup-python@v3
         with:
           python-version: "3.9"
diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index 810673e1b..2b73498dc 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -14,7 +14,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Python
         uses: actions/setup-python@v3
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 21c6b78bd..0cc62cfb0 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -12,7 +12,7 @@ jobs:
 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v3
 
       - name: Set up Python
         uses: actions/setup-python@v3
diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
index 6381a05d4..e97c15b6e 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -24,7 +24,7 @@ jobs:
     steps:
 
       - name: Checkout Code Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up Python
         uses: actions/setup-python@v2
@@ -68,7 +68,7 @@ jobs:
     steps:
 
       - name: Checkout Code Repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
       {%- if cookiecutter.use_docker == 'y' %}
 
       - name: Build the Stack

From e33892ce1ef3a2343fc9c316c43327a60a9497cd Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 3 Mar 2022 02:29:51 +0000
Subject: [PATCH 2053/2840] Release 2022.03.02

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a4cb6c952..4b261941b 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 -->
 
+## 2022.03.02
+
+### Updated
+- Bump actions/checkout from 2 to 3 ([#3619](https://github.com/cookiecutter/cookiecutter-django/pull/3619))
+
 ## 2022.03.01
 
 ### Updated
diff --git a/setup.py b/setup.py
index 5e63698ff..760d24cb7 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.03.01"
+version = "2022.03.02"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From a1105457aaf138ddd0d8970c365b527179b72e8d Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 3 Mar 2022 22:21:04 +0000
Subject: [PATCH 2054/2840] Upgrade actions/setup-python to v3 (#3621)

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

diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
index e97c15b6e..20dd0d2f3 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: "3.9"
           cache: pip
@@ -85,7 +85,7 @@ jobs:
       {%- else %}
 
       - name: Set up Python
-        uses: actions/setup-python@v2
+        uses: actions/setup-python@v3
         with:
           python-version: "3.9"
           cache: pip

From 3b09cdadbf74fff5cbc92d9bc1be8370d8607b68 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 4 Mar 2022 02:26:46 +0000
Subject: [PATCH 2055/2840] Release 2022.03.03

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b261941b..8a07a72ab 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 -->
 
+## 2022.03.03
+
+### Updated
+- Upgrade actions/setup-python to v3 ([#3621](https://github.com/cookiecutter/cookiecutter-django/pull/3621))
+
 ## 2022.03.02
 
 ### Updated
diff --git a/setup.py b/setup.py
index 760d24cb7..9d796de4f 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.03.02"
+version = "2022.03.03"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 9819d59e19273349a8d7271573bc0896dcf5186d Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 8 Mar 2022 05:18:37 -0800
Subject: [PATCH 2056/2840] Update sentry-sdk from 1.5.6 to 1.5.7

---
 {{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 d7852f99d..07a571460 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.5.6  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.5.7  # 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 26394ae6c89ebae9879d4df32535b1e2315f874e Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 9 Mar 2022 02:24:23 +0000
Subject: [PATCH 2057/2840] Release 2022.03.08

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8a07a72ab..3e88be236 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 -->
 
+## 2022.03.08
+
+### Updated
+- Update sentry-sdk to 1.5.7 ([#3624](https://github.com/cookiecutter/cookiecutter-django/pull/3624))
+
 ## 2022.03.03
 
 ### Updated
diff --git a/setup.py b/setup.py
index 9d796de4f..1b023704c 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.03.03"
+version = "2022.03.08"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From bfb7e0b2a4391d81096652eb40585a17df56cf48 Mon Sep 17 00:00:00 2001
From: Artur Barseghyan <artur.barseghyan@gmail.com>
Date: Wed, 9 Mar 2022 17:25:00 +0100
Subject: [PATCH 2058/2840] Fix a few typos in the documentation (#3625)

---
 {{cookiecutter.project_slug}}/README.md      | 2 +-
 {{cookiecutter.project_slug}}/docs/howto.rst | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/README.md b/{{cookiecutter.project_slug}}/README.md
index 227e24c00..969520961 100644
--- a/{{cookiecutter.project_slug}}/README.md
+++ b/{{cookiecutter.project_slug}}/README.md
@@ -20,7 +20,7 @@ Moved to [settings](http://cookiecutter-django.readthedocs.io/en/latest/settings
 
 -   To create a **normal user account**, just go to Sign Up and fill out the form. Once you submit it, you'll see a "Verify Your E-mail Address" page. Go to your console to see a simulated email verification message. Copy the link into your browser. Now the user's email should be verified and ready to go.
 
--   To create an **superuser account**, use this command:
+-   To create a **superuser account**, use this command:
 
         $ python manage.py createsuperuser
 
diff --git a/{{cookiecutter.project_slug}}/docs/howto.rst b/{{cookiecutter.project_slug}}/docs/howto.rst
index 0ef90d023..7f2d26a1e 100644
--- a/{{cookiecutter.project_slug}}/docs/howto.rst
+++ b/{{cookiecutter.project_slug}}/docs/howto.rst
@@ -28,7 +28,7 @@ Docstrings to Documentation
 
 The sphinx extension `apidoc <https://www.sphinx-doc.org/en/master/man/sphinx-apidoc.html/>`_ is used to automatically document code using signatures and docstrings.
 
-Numpy or Google style docstrings will be picked up from project files and availble for documentation. See the `Napoleon <https://sphinxcontrib-napoleon.readthedocs.io/en/latest/>`_ extension for details.
+Numpy or Google style docstrings will be picked up from project files and available for documentation. See the `Napoleon <https://sphinxcontrib-napoleon.readthedocs.io/en/latest/>`_ extension for details.
 
 For an in-use example, see the `page source <_sources/users.rst.txt>`_ for :ref:`users`.
 

From d4e8896315acd394481912442c61b9e3082d434c Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 9 Mar 2022 16:25:45 +0000
Subject: [PATCH 2059/2840] 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 cbe2444ef..d3db1476f 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1247,5 +1247,10 @@
     "name": "Cebrail Yılmaz",
     "github_login": "b1sar",
     "twitter_username": ""
+  },
+  {
+    "name": "Artur Barseghyan",
+    "github_login": "barseghyanartur",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index ca7d812dc..fd5156781 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -285,6 +285,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Artur Barseghyan</td>
+    <td>
+      <a href="https://github.com/barseghyanartur">barseghyanartur</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>AsheKR</td>
     <td>

From 95b1c4386080ba50242f0d2c15099774877c82d3 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 10 Mar 2022 02:28:40 +0000
Subject: [PATCH 2060/2840] Release 2022.03.09

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3e88be236..4280feb1b 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 -->
 
+## 2022.03.09
+
+### Changed
+- Fix a few typos in the documentation ([#3625](https://github.com/cookiecutter/cookiecutter-django/pull/3625))
+
 ## 2022.03.08
 
 ### Updated
diff --git a/setup.py b/setup.py
index 1b023704c..56f8802dd 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.03.08"
+version = "2022.03.09"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 49956db9481c6cf8103de3e4b63b2c48ddc25a6e Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Sun, 13 Mar 2022 05:56:23 -0400
Subject: [PATCH 2061/2840] Add DRF spectacular link in requirements (#3630)

---
 {{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 0c8708492..695a86e1c 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -44,5 +44,5 @@ django-redis==5.2.0  # https://github.com/jazzband/django-redis
 djangorestframework==3.13.1  # https://github.com/encode/django-rest-framework
 django-cors-headers==3.11.0 # https://github.com/adamchainz/django-cors-headers
 # DRF-spectacular for api documentation
-drf-spectacular==0.21.2
+drf-spectacular==0.21.2  # https://github.com/tfranzel/drf-spectacular 
 {%- endif %}

From 91e260333976713c51f5a3d08627d13e8d781417 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Mon, 14 Mar 2022 02:23:26 +0000
Subject: [PATCH 2062/2840] Release 2022.03.13

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4280feb1b..1a202341c 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 -->
 
+## 2022.03.13
+
+### Changed
+- Add DRF spectacular link in requirements ([#3630](https://github.com/cookiecutter/cookiecutter-django/pull/3630))
+
 ## 2022.03.09
 
 ### Changed
diff --git a/setup.py b/setup.py
index 56f8802dd..007e8d879 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.03.09"
+version = "2022.03.13"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 0b934b383ef23322aa62b7eedd5f7ac2aaa5e7ae Mon Sep 17 00:00:00 2001
From: innicoder <100089381+innicoder@users.noreply.github.com>
Date: Mon, 14 Mar 2022 18:16:00 +0100
Subject: [PATCH 2063/2840] Fix broken link in README of generated projects
 (#3634)

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

diff --git a/{{cookiecutter.project_slug}}/README.md b/{{cookiecutter.project_slug}}/README.md
index 969520961..557194877 100644
--- a/{{cookiecutter.project_slug}}/README.md
+++ b/{{cookiecutter.project_slug}}/README.md
@@ -46,7 +46,7 @@ To run the tests, check your test coverage, and generate an HTML coverage report
 
 ### Live reloading and Sass CSS compilation
 
-Moved to [Live reloading and SASS compilation](http://cookiecutter-django.readthedocs.io/en/latest/live-reloading-and-sass-compilation.html).
+Moved to [Live reloading and SASS compilation](https://cookiecutter-django.readthedocs.io/en/latest/developing-locally.html#sass-compilation-live-reloading).
 
 {%- if cookiecutter.use_celery == "y" %}
 

From e7db2cd6b0d3b6019ef70fafcf9cfc519f323e87 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Mon, 14 Mar 2022 17:17:00 +0000
Subject: [PATCH 2064/2840] 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 d3db1476f..ad83662dd 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1252,5 +1252,10 @@
     "name": "Artur Barseghyan",
     "github_login": "barseghyanartur",
     "twitter_username": ""
+  },
+  {
+    "name": "innicoder",
+    "github_login": "innicoder",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index fd5156781..c33bf9e12 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -887,6 +887,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>innicoder</td>
+    <td>
+      <a href="https://github.com/innicoder">innicoder</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Irfan Ahmad</td>
     <td>

From 24bf66a1018e550bd26148901998f98f1a9bb832 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 15 Mar 2022 02:25:08 +0000
Subject: [PATCH 2065/2840] Release 2022.03.14

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1a202341c..84e61e6c6 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 -->
 
+## 2022.03.14
+
+### Fixed
+- Fix broken link in README of generated projects ([#3634](https://github.com/cookiecutter/cookiecutter-django/pull/3634))
+
 ## 2022.03.13
 
 ### Changed
diff --git a/setup.py b/setup.py
index 007e8d879..99e054595 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.03.13"
+version = "2022.03.14"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From bd12be3b3852b5bba3e1e95f4ed02d9ebf0a77f9 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sat, 19 Mar 2022 18:37:48 +0000
Subject: [PATCH 2066/2840] Fix a typo in the docs

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

diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index 3b86ff44e..e9c1234c2 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -168,7 +168,7 @@ If you've opted for Gulp as JS task runner, the project comes configured with `S
 
    The app will now run with live reloading enabled, applying front-end changes dynamically.
 
-.. note:: The task will start 2 processes in parallel: the static assets build loop on one side, and the Django server on the other. You don NOT need to run Django as your would normally with ``manage.py runserver``.
+.. note:: The task will start 2 processes in parallel: the static assets build loop on one side, and the Django server on the other. You do NOT need to run Django as your would normally with ``manage.py runserver``.
 
 .. _Node.js: http://nodejs.org/download/
 .. _Sass: https://sass-lang.com/

From ab4a32d5583ca05fc985d16fc1ffc894dab5db6a Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sun, 20 Mar 2022 15:00:40 +0000
Subject: [PATCH 2067/2840] Unify compressor, gulp and custom bootstrap options
 (#3535)

---
 .github/workflows/ci.yml                      |  6 +--
 README.md                                     | 12 +++---
 cookiecutter.json                             | 11 +++--
 docs/deployment-on-heroku.rst                 |  2 +-
 docs/developing-locally.rst                   |  2 +-
 docs/project-generation-options.rst           | 17 +++-----
 hooks/post_gen_project.py                     | 32 ++++++---------
 tests/test_cookiecutter_generation.py         |  9 ++---
 .../.github/dependabot.yml                    |  2 +-
 {{cookiecutter.project_slug}}/.gitignore      |  2 +-
 .../docker_compose_up_django.xml              |  2 +-
 .../.idea/{{cookiecutter.project_slug}}.iml   |  2 +-
 {{cookiecutter.project_slug}}/README.md       |  5 +--
 .../compose/production/django/Dockerfile      |  4 +-
 .../compose/production/django/start           |  2 +-
 .../config/settings/base.py                   |  2 +-
 .../config/settings/local.py                  |  2 +-
 .../config/settings/production.py             |  2 +-
 {{cookiecutter.project_slug}}/gulpfile.js     | 10 +----
 {{cookiecutter.project_slug}}/local.yml       |  2 +-
 {{cookiecutter.project_slug}}/pytest.ini      |  2 +-
 .../requirements/base.txt                     |  6 +--
 .../static/sass/project.scss                  |  3 --
 .../templates/base.html                       | 40 ++++++++++++-------
 24 files changed, 78 insertions(+), 101 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 5c502b130..121657e2f 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -50,7 +50,7 @@ jobs:
           - name: Basic
             args: ""
           - name: Extended
-            args: "use_celery=y use_drf=y js_task_runner=Gulp"
+            args: "use_celery=y use_drf=y frontend_pipeline=Gulp"
 
     name: "${{ matrix.script.name }} Docker"
     runs-on: ubuntu-latest
@@ -75,9 +75,9 @@ jobs:
       matrix:
         script:
           - name: With Celery
-            args: "use_celery=y use_compressor=y"
+            args: "use_celery=y frontend_pipeline='Django Compressor'"
           - name: With Gulp
-            args: "js_task_runner=Gulp custom_bootstrap_compilation=y"
+            args: "frontend_pipeline='Gulp'"
 
     name: "${{ matrix.script.name }} Bare metal"
     runs-on: ubuntu-latest
diff --git a/README.md b/README.md
index fcffd75ca..c96d8cc92 100644
--- a/README.md
+++ b/README.md
@@ -127,10 +127,6 @@ Answer the prompts with your own desired [options](http://cookiecutter-django.re
     4 - 11.14
     5 - 10.19
     Choose from 1, 2, 3, 4, 5 [1]: 1
-    Select js_task_runner:
-    1 - None
-    2 - Gulp
-    Choose from 1, 2 [1]: 1
     Select cloud_provider:
     1 - AWS
     2 - GCP
@@ -149,8 +145,12 @@ Answer the prompts with your own desired [options](http://cookiecutter-django.re
     Choose from 1, 2, 3, 4, 5, 6, 7, 8, 9 [1]: 1
     use_async [n]: n
     use_drf [n]: y
-    custom_bootstrap_compilation [n]: n
-    use_compressor [n]: n
+    Select frontend_pipeline:
+    1 - None
+    2 - Django Compressor
+    3 - Gulp
+    4 - Gulp with custom Bootstrap
+    Choose from 1, 2, 3, 4 [1]: 1
     use_celery [n]: y
     use_mailhog [n]: n
     use_sentry [n]: y
diff --git a/cookiecutter.json b/cookiecutter.json
index b24a3846d..4a43bae7e 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -24,10 +24,6 @@
     "11.14",
     "10.19"
   ],
-  "js_task_runner": [
-    "None",
-    "Gulp"
-  ],
   "cloud_provider": [
     "AWS",
     "GCP",
@@ -46,8 +42,11 @@
   ],
   "use_async": "n",
   "use_drf": "n",
-  "custom_bootstrap_compilation": "n",
-  "use_compressor": "n",
+  "frontend_pipeline": [
+    "None",
+    "Django Compressor",
+    "Gulp"
+  ],
   "use_celery": "n",
   "use_mailhog": "n",
   "use_sentry": "n",
diff --git a/docs/deployment-on-heroku.rst b/docs/deployment-on-heroku.rst
index bab5881cd..e239b6593 100644
--- a/docs/deployment-on-heroku.rst
+++ b/docs/deployment-on-heroku.rst
@@ -112,7 +112,7 @@ Or add the DSN for your account, if you already have one:
 Gulp & Bootstrap compilation
 ++++++++++++++++++++++++++++
 
-If you've opted for a custom bootstrap build, you'll most likely need to setup
+If you've opted for Gulp, you'll most likely need to setup
 your app to use `multiple buildpacks`_: one for Python & one for Node.js:
 
 .. code-block:: bash
diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index e9c1234c2..23bb7b9a8 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -155,7 +155,7 @@ To run Celery locally, make sure redis-server is installed (instructions are ava
 Sass Compilation & Live Reloading
 ---------------------------------
 
-If you've opted for Gulp as JS task runner, the project comes configured with `Sass`_ compilation and `live reloading`_. As you change you Sass/JS source files, the task runner will automatically rebuild the corresponding CSS and JS assets and reload them in your browser without refreshing the page.
+If you've opted for Gulp as front-end pipeline, the project comes configured with `Sass`_ compilation and `live reloading`_. As you change you Sass/JS source files, the task runner will automatically rebuild the corresponding CSS and JS assets and reload them in your browser without refreshing the page.
 
 #. Make sure that `Node.js`_ v16 is installed on your machine.
 #. In the project root, install the JS dependencies with::
diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index 26fb79d2f..3cc719779 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -61,12 +61,6 @@ postgresql_version:
     4. 11.14
     5. 10.19
 
-js_task_runner:
-    Select a JavaScript task runner. The choices are:
-
-    1. None
-    2. Gulp_
-
 cloud_provider:
     Select a cloud provider for static & media files. The choices are:
 
@@ -95,13 +89,12 @@ use_async:
 use_drf:
     Indicates whether the project should be configured to use `Django Rest Framework`_.
 
-custom_bootstrap_compilation:
-    Indicates whether the project should support Bootstrap recompilation
-    via the selected JavaScript task runner's task. This can be useful
-    for real-time Bootstrap variable alteration.
+frontend_pipeline:
+    Select a pipeline to compile and optimise frontend assets (JS, CSS, ...):
 
-use_compressor:
-    Indicates whether the project should be configured to use `Django Compressor`_.
+    1. None
+    2. `Django Compressor`_
+    3. `Gulp`_: support Bootstrap recompilation with real-time variables alteration.
 
 use_celery:
     Indicates whether the project should be configured to use Celery_.
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index d784ba62b..9c3d946c1 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -10,7 +10,6 @@ TODO: restrict Cookiecutter Django project initialization to
 """
 from __future__ import print_function
 
-import json
 import os
 import random
 import shutil
@@ -92,6 +91,11 @@ def remove_gulp_files():
     file_names = ["gulpfile.js"]
     for file_name in file_names:
         os.remove(file_name)
+    remove_sass_files()
+
+
+def remove_sass_files():
+    shutil.rmtree(os.path.join("{{cookiecutter.project_slug}}", "static", "sass"))
 
 
 def remove_packagejson_file():
@@ -100,16 +104,6 @@ def remove_packagejson_file():
         os.remove(file_name)
 
 
-def remove_bootstrap_packages():
-    with open("package.json", mode="r") as fd:
-        content = json.load(fd)
-    for package_name in ["bootstrap", "gulp-concat", "@popperjs/core"]:
-        content["devDependencies"].pop(package_name)
-    with open("package.json", mode="w") as fd:
-        json.dump(content, fd, ensure_ascii=False, indent=2)
-        fd.write("\n")
-
-
 def remove_celery_files():
     file_names = [
         os.path.join("config", "celery_app.py"),
@@ -363,13 +357,13 @@ def main():
 
     if (
         "{{ cookiecutter.use_docker }}".lower() == "y"
-        and "{{ cookiecutter.cloud_provider}}".lower() != "aws"
+        and "{{ cookiecutter.cloud_provider}}" != "AWS"
     ):
         remove_aws_dockerfile()
 
     if "{{ cookiecutter.use_heroku }}".lower() == "n":
         remove_heroku_files()
-    elif "{{ cookiecutter.use_compressor }}".lower() == "n":
+    elif "{{ cookiecutter.frontend_pipeline }}" != "Django Compressor":
         remove_heroku_build_hooks()
 
     if (
@@ -389,15 +383,13 @@ def main():
         if "{{ cookiecutter.keep_local_envs_in_vcs }}".lower() == "y":
             append_to_gitignore_file("!.envs/.local/")
 
-    if "{{ cookiecutter.js_task_runner}}".lower() == "none":
+    if "{{ cookiecutter.frontend_pipeline }}" != "Gulp":
         remove_gulp_files()
         remove_packagejson_file()
         if "{{ cookiecutter.use_docker }}".lower() == "y":
             remove_node_dockerfile()
-    elif "{{ cookiecutter.custom_bootstrap_compilation }}" == "n":
-        remove_bootstrap_packages()
 
-    if "{{ cookiecutter.cloud_provider}}".lower() == "none":
+    if "{{ cookiecutter.cloud_provider}}" == "None":
         print(
             WARNING + "You chose not to use a cloud provider, "
             "media files won't be served in production." + TERMINATOR
@@ -409,13 +401,13 @@ def main():
         if "{{ cookiecutter.use_docker }}".lower() == "y":
             remove_celery_compose_dirs()
 
-    if "{{ cookiecutter.ci_tool }}".lower() != "travis":
+    if "{{ cookiecutter.ci_tool }}" != "Travis":
         remove_dottravisyml_file()
 
-    if "{{ cookiecutter.ci_tool }}".lower() != "gitlab":
+    if "{{ cookiecutter.ci_tool }}" != "Gitlab":
         remove_dotgitlabciyml_file()
 
-    if "{{ cookiecutter.ci_tool }}".lower() != "github":
+    if "{{ cookiecutter.ci_tool }}" != "Github":
         remove_dotgithub_folder()
 
     if "{{ cookiecutter.use_drf }}".lower() == "n":
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index fc3ecf811..9c30aeedd 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -87,12 +87,9 @@ SUPPORTED_COMBINATIONS = [
     {"use_async": "n"},
     {"use_drf": "y"},
     {"use_drf": "n"},
-    {"js_task_runner": "None"},
-    {"js_task_runner": "Gulp"},
-    {"custom_bootstrap_compilation": "y"},
-    {"custom_bootstrap_compilation": "n"},
-    {"use_compressor": "y"},
-    {"use_compressor": "n"},
+    {"frontend_pipeline": "None"},
+    {"frontend_pipeline": "django-compressor"},
+    {"frontend_pipeline": "Gulp"},
     {"use_celery": "y"},
     {"use_celery": "n"},
     {"use_mailhog": "y"},
diff --git a/{{cookiecutter.project_slug}}/.github/dependabot.yml b/{{cookiecutter.project_slug}}/.github/dependabot.yml
index cf88cf33b..420a63cdc 100644
--- a/{{cookiecutter.project_slug}}/.github/dependabot.yml
+++ b/{{cookiecutter.project_slug}}/.github/dependabot.yml
@@ -82,7 +82,7 @@ updates:
     schedule:
       interval: "daily"
 
-{%- if cookiecutter.js_task_runner != "None" %}
+{%- if cookiecutter.frontend_pipeline == 'Gulp' %}
 
   # Enable version updates for javascript/npm
   - package-ecosystem: "npm"
diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore
index d48356fa1..ede26ef72 100644
--- a/{{cookiecutter.project_slug}}/.gitignore
+++ b/{{cookiecutter.project_slug}}/.gitignore
@@ -338,7 +338,7 @@ MailHog
 .ipython/
 {%- endif %}
 
-{%- if cookiecutter.js_task_runner == 'Gulp' %}
+{%- if cookiecutter.frontend_pipeline == 'Gulp' %}
 project.css
 project.min.css
 vendors.js
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/docker_compose_up_django.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/docker_compose_up_django.xml
index 67f369a3c..ad3b6a35a 100644
--- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/docker_compose_up_django.xml
+++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/docker_compose_up_django.xml
@@ -10,7 +10,7 @@
             <option value="celeryworker"/>
             <option value="celerybeat"/>
             {%- endif %}
-            {%- if cookiecutter.js_task_runner == 'Gulp' %}
+            {%- if cookiecutter.frontend_pipeline == 'Gulp' %}
             <option value="node"/>
             {%- endif %}
           </list>
diff --git a/{{cookiecutter.project_slug}}/.idea/{{cookiecutter.project_slug}}.iml b/{{cookiecutter.project_slug}}/.idea/{{cookiecutter.project_slug}}.iml
index 289d9716a..98759fa1b 100644
--- a/{{cookiecutter.project_slug}}/.idea/{{cookiecutter.project_slug}}.iml
+++ b/{{cookiecutter.project_slug}}/.idea/{{cookiecutter.project_slug}}.iml
@@ -13,7 +13,7 @@
     </facet>
   </component>
   <component name="NewModuleRootManager">
-    {% if cookiecutter.js_task_runner != 'None' %}
+    {% if cookiecutter.frontend_pipeline == 'Gulp' %}
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/node_modules" />
     </content>
diff --git a/{{cookiecutter.project_slug}}/README.md b/{{cookiecutter.project_slug}}/README.md
index 557194877..f7c29fb22 100644
--- a/{{cookiecutter.project_slug}}/README.md
+++ b/{{cookiecutter.project_slug}}/README.md
@@ -128,7 +128,7 @@ See detailed [cookiecutter-django Heroku documentation](http://cookiecutter-djan
 See detailed [cookiecutter-django Docker documentation](http://cookiecutter-django.readthedocs.io/en/latest/deployment-with-docker.html).
 
 {%- endif %}
-{%- if cookiecutter.custom_bootstrap_compilation == "y" %}
+{%- if cookiecutter.frontend_pipeline == 'Gulp' %}
 ### Custom Bootstrap Compilation
 
 The generated CSS is set up with automatic Bootstrap recompilation with variables of your choice.
@@ -136,8 +136,5 @@ Bootstrap v5 is installed using npm and customised by tweaking your variables in
 
 You can find a list of available variables [in the bootstrap source](https://github.com/twbs/bootstrap/blob/main/scss/_variables.scss), or get explanations on them in the [Bootstrap docs](https://getbootstrap.com/docs/5.1/customize/sass/).
 
-{%- if cookiecutter.js_task_runner == "Gulp" %}
 Bootstrap's javascript as well as its dependencies is concatenated into a single file: `static/js/vendors.js`.
 {%- endif %}
-
-{%- endif %}
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index 1dd47a2f7..86f4ac18a 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -1,6 +1,6 @@
 ARG PYTHON_VERSION=3.9-slim-bullseye
 
-{% if cookiecutter.js_task_runner == 'Gulp' -%}
+{% if cookiecutter.frontend_pipeline == 'Gulp' -%}
 FROM node:16-bullseye-slim as client-builder
 
 ARG APP_HOME=/app
@@ -99,7 +99,7 @@ RUN chmod +x /start-flower
 
 
 # copy application code to WORKDIR
-{%- if cookiecutter.js_task_runner == 'Gulp' %}
+{%- if cookiecutter.frontend_pipeline == 'Gulp' %}
 COPY --from=client-builder --chown=django:django ${APP_HOME} ${APP_HOME}
 {% else %}
 COPY --chown=django:django . ${APP_HOME}
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/start b/{{cookiecutter.project_slug}}/compose/production/django/start
index 8e324afe0..2ba79501c 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/start
+++ b/{{cookiecutter.project_slug}}/compose/production/django/start
@@ -6,7 +6,7 @@ set -o nounset
 
 
 python /app/manage.py collectstatic --noinput
-{% if cookiecutter.use_whitenoise == 'y' and cookiecutter.use_compressor == 'y' %}
+{% if cookiecutter.use_whitenoise == 'y' and cookiecutter.frontend_pipeline == 'Django Compressor' %}
 compress_enabled() {
 python << END
 import sys
diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 7165aa9da..ca8abda82 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -316,7 +316,7 @@ ACCOUNT_FORMS = {"signup": "{{cookiecutter.project_slug}}.users.forms.UserSignup
 SOCIALACCOUNT_ADAPTER = "{{cookiecutter.project_slug}}.users.adapters.SocialAccountAdapter"
 # https://django-allauth.readthedocs.io/en/latest/forms.html
 SOCIALACCOUNT_FORMS = {"signup": "{{cookiecutter.project_slug}}.users.forms.UserSocialSignupForm"}
-{% if cookiecutter.use_compressor == 'y' -%}
+{% if cookiecutter.frontend_pipeline == 'Django Compressor' -%}
 # django-compressor
 # ------------------------------------------------------------------------------
 # https://django-compressor.readthedocs.io/en/latest/quickstart/#installation
diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py
index 3ce150e1c..1eafd9fae 100644
--- a/{{cookiecutter.project_slug}}/config/settings/local.py
+++ b/{{cookiecutter.project_slug}}/config/settings/local.py
@@ -69,7 +69,7 @@ if env("USE_DOCKER") == "yes":
 
     hostname, _, ips = socket.gethostbyname_ex(socket.gethostname())
     INTERNAL_IPS += [".".join(ip.split(".")[:-1] + ["1"]) for ip in ips]
-    {%- if cookiecutter.js_task_runner == 'Gulp' %}
+    {%- if cookiecutter.frontend_pipeline == 'Gulp' %}
     try:
         _, _, ips = socket.gethostbyname_ex("node")
         INTERNAL_IPS.extend(ips)
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 06eb8d492..b792e5448 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -218,7 +218,7 @@ EMAIL_BACKEND = "django.core.mail.backends.smtp.EmailBackend"
 ANYMAIL = {}
 {%- endif %}
 
-{% if cookiecutter.use_compressor == 'y' -%}
+{% if cookiecutter.frontend_pipeline == 'Django Compressor' -%}
 # django-compressor
 # ------------------------------------------------------------------------------
 # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_ENABLED
diff --git a/{{cookiecutter.project_slug}}/gulpfile.js b/{{cookiecutter.project_slug}}/gulpfile.js
index 0f90be220..628b838ba 100644
--- a/{{cookiecutter.project_slug}}/gulpfile.js
+++ b/{{cookiecutter.project_slug}}/gulpfile.js
@@ -9,9 +9,7 @@ const pjson = require('./package.json')
 // Plugins
 const autoprefixer = require('autoprefixer')
 const browserSync = require('browser-sync').create()
-{% if cookiecutter.custom_bootstrap_compilation == 'y' %}
 const concat = require('gulp-concat')
-{% endif %}
 const cssnano = require ('cssnano')
 const imagemin = require('gulp-imagemin')
 const pixrem = require('pixrem')
@@ -29,13 +27,11 @@ function pathsConfig(appName) {
   const vendorsRoot = 'node_modules'
 
   return {
-    {%- if cookiecutter.custom_bootstrap_compilation == 'y' %}
     bootstrapSass: `${vendorsRoot}/bootstrap/scss`,
     vendorsJs: [
       `${vendorsRoot}/@popperjs/core/dist/umd/popper.js`,
       `${vendorsRoot}/bootstrap/dist/js/bootstrap.js`,
     ],
-    {%- endif %}
     app: this.app,
     templates: `${this.app}/templates`,
     css: `${this.app}/static/css`,
@@ -66,9 +62,7 @@ function styles() {
   return src(`${paths.sass}/project.scss`)
     .pipe(sass({
       includePaths: [
-        {%- if cookiecutter.custom_bootstrap_compilation == 'y' %}
         paths.bootstrapSass,
-        {%- endif %}
         paths.sass
       ]
     }).on('error', sass.logError))
@@ -89,7 +83,6 @@ function scripts() {
     .pipe(dest(paths.js))
 }
 
-{%- if cookiecutter.custom_bootstrap_compilation == 'y' %}
 // Vendor Javascript minification
 function vendorScripts() {
   return src(paths.vendorsJs)
@@ -100,7 +93,6 @@ function vendorScripts() {
     .pipe(rename({ suffix: '.min' }))
     .pipe(dest(paths.js))
 }
-{%- endif %}
 
 // Image compression
 function imgCompression() {
@@ -173,7 +165,7 @@ function watchPaths() {
 const generateAssets = parallel(
   styles,
   scripts,
-  {%- if cookiecutter.custom_bootstrap_compilation == 'y' %}vendorScripts,{% endif %}
+  vendorScripts,
   imgCompression
 )
 
diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index 590445820..fb203acd6 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -107,7 +107,7 @@ services:
     command: /start-flower
 
   {%- endif %}
-  {%- if cookiecutter.js_task_runner == 'Gulp' %}
+  {%- if cookiecutter.frontend_pipeline == 'Gulp' %}
 
   node:
     build:
diff --git a/{{cookiecutter.project_slug}}/pytest.ini b/{{cookiecutter.project_slug}}/pytest.ini
index e3b2248d9..969c7921e 100644
--- a/{{cookiecutter.project_slug}}/pytest.ini
+++ b/{{cookiecutter.project_slug}}/pytest.ini
@@ -1,6 +1,6 @@
 [pytest]
 addopts = --ds=config.settings.test --reuse-db
 python_files = tests.py test_*.py
-{%- if cookiecutter.js_task_runner != 'None' %}
+{%- if cookiecutter.frontend_pipeline == 'Gulp' %}
 norecursedirs = node_modules
 {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 695a86e1c..d3a6f46f0 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,7 +1,7 @@
 pytz==2021.3  # https://github.com/stub42/pytz
 python-slugify==6.1.1  # https://github.com/un33k/python-slugify
 Pillow==9.0.1  # https://github.com/python-pillow/Pillow
-{%- if cookiecutter.use_compressor == "y" %}
+{%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
 {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %}
 rcssmin==1.1.0 --install-option="--without-c-extensions"  # https://github.com/ndparker/rcssmin
 {%- else %}
@@ -35,11 +35,11 @@ django-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.49.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.14.0  # https://github.com/django-crispy-forms/django-crispy-forms
 crispy-bootstrap5==0.6  # https://github.com/django-crispy-forms/crispy-bootstrap5
-{%- if cookiecutter.use_compressor == "y" %}
+{%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
 django-compressor==3.1  # https://github.com/django-compressor/django-compressor
 {%- endif %}
 django-redis==5.2.0  # https://github.com/jazzband/django-redis
-{%- if cookiecutter.use_drf == "y" %}
+{%- if cookiecutter.use_drf == 'y' %}
 # Django REST Framework
 djangorestframework==3.13.1  # https://github.com/encode/django-rest-framework
 django-cors-headers==3.11.0 # https://github.com/adamchainz/django-cors-headers
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss
index 9fbf1b746..370096bb3 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss
@@ -1,8 +1,5 @@
-{% if cookiecutter.custom_bootstrap_compilation == 'y' %}
 @import "custom_bootstrap_vars";
 @import "bootstrap";
-{% endif %}
-
 
 
 // project specific CSS goes here
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
index e5087534d..58aca7208 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -1,4 +1,4 @@
-{% raw %}{% load static i18n {% endraw %}{% if cookiecutter.use_compressor == "y" %}compress{% endif %}{% raw %}%}<!DOCTYPE html>
+{% raw %}{% load static i18n {% endraw %}{% if cookiecutter.frontend_pipeline == 'Django Compressor' %}compress{% endif %}{% raw %}%}<!DOCTYPE html>
 {% get_current_language as LANGUAGE_CODE %}
 <html lang="{{ LANGUAGE_CODE }}">
   <head>
@@ -12,30 +12,34 @@
     <link rel="icon" href="{% static 'images/favicons/favicon.ico' %}">
 
     {% block css %}
-    {%- endraw %}{% if cookiecutter.custom_bootstrap_compilation == "n" %}{% raw %}
+    {%- endraw %}
+    {%- if cookiecutter.frontend_pipeline != 'Gulp' %}
+    {%- raw %}
     <!-- Latest compiled and minified Bootstrap CSS -->
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.3/css/bootstrap.min.css" integrity="sha512-GQGU0fMMi238uA+a/bdWJfpUGKUkBdgfFdgBm72SUQ6BeyWjoY/ton0tEjH+OSH9iP4Dfh+7HM0I9f5eR0L/4w==" crossorigin="anonymous" referrerpolicy="no-referrer" />
-    {%- endraw %}{% endif %}{% raw %}
-
+    {%- endraw %}
+    {%- endif %}
+    {%- raw %}
     <!-- Your stuff: Third-party CSS libraries go here -->
-    {%- endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% compress css %}{% endraw %}{% endif %}{% raw %}
+
     <!-- This file stores project-specific CSS -->
-    {%- endraw %}{% if cookiecutter.js_task_runner == "Gulp" and cookiecutter.use_compressor == "n" %}{% raw %}
-    <link href="{% static 'css/project.min.css' %}" rel="stylesheet">
-    {%- endraw %}{% else %}{% raw %}
+    {%- endraw %}{% if cookiecutter.frontend_pipeline == 'None' %}{% raw %}
     <link href="{% static 'css/project.css' %}" rel="stylesheet">
+    {%- endraw %}{% elif cookiecutter.frontend_pipeline == 'Django Compressor' %}{% raw %}
+    {% compress css %}
+    <link href="{% static 'css/project.css' %}" rel="stylesheet">
+    {% endcompress %}
+    {%- endraw %}{% elif cookiecutter.frontend_pipeline == 'Gulp' %}{% raw %}
+    <link href="{% static 'css/project.min.css' %}" rel="stylesheet">
     {%- endraw %}{% endif %}{% raw %}
-    {%- endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %}
     {% endblock %}
     <!-- Le javascript
     ================================================== -->
     {# Placed at the top of the document so pages load faster with defer #}
     {% block javascript %}
-      {%- endraw %}{% if cookiecutter.custom_bootstrap_compilation == "y" and cookiecutter.js_task_runner == "Gulp" %}{% raw %}
+      {%- endraw %}{% if cookiecutter.frontend_pipeline == 'Gulp' %}{% raw %}
       <!-- Vendor dependencies bundled as one file-->
-      {%- endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% compress js %}{% endraw %}{% endif %}{% raw %}
-      <script defer src="{% static 'js/vendors.js' %}"></script>
-      {%- endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %}
+      <script defer src="{% static 'js/vendors.min.js' %}"></script>
       {%- endraw %}{% else %}{% raw %}
       <!-- Bootstrap JS -->
       <script defer src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.3/js/bootstrap.min.js" integrity="sha512-OvBgP9A2JBgiRad/mM36mkzXSXaJE9BEIENnVEmeZdITvwT09xnxLtT4twkCa8m/loMbPHsvPl0T8lRGVBwjlQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
@@ -43,9 +47,15 @@
       {%- endraw %}{% endif %}{% raw %}
 
       <!-- place project specific Javascript in this file -->
-      {%- endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% compress js %}{% endraw %}{% endif %}{% raw %}
+      {%- endraw %}{% if cookiecutter.frontend_pipeline == 'None' %}{% raw %}
       <script defer src="{% static 'js/project.js' %}"></script>
-      {%- endraw %}{% if cookiecutter.use_compressor == "y" %}{% raw %}{% endcompress %}{% endraw %}{% endif %}{% raw %}
+      {%- endraw %}{% elif cookiecutter.frontend_pipeline == 'Django Compressor' %}{% raw %}
+      {% compress js %}
+      <script defer src="{% static 'js/project.js' %}"></script>
+      {% endcompress %}
+      {%- endraw %}{% elif cookiecutter.frontend_pipeline == 'Gulp' %}{% raw %}
+      <script defer src="{% static 'js/project.min.js' %}"></script>
+      {%- endraw %}{% endif %}{% raw %}
 
     {% endblock javascript %}
 

From b67b528636c8cd4fe6f98f3a7afd0b1e4f859a00 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sun, 20 Mar 2022 15:18:20 +0000
Subject: [PATCH 2068/2840] Remove outdated option from README

---
 README.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/README.md b/README.md
index c96d8cc92..b6e25272a 100644
--- a/README.md
+++ b/README.md
@@ -149,7 +149,6 @@ Answer the prompts with your own desired [options](http://cookiecutter-django.re
     1 - None
     2 - Django Compressor
     3 - Gulp
-    4 - Gulp with custom Bootstrap
     Choose from 1, 2, 3, 4 [1]: 1
     use_celery [n]: y
     use_mailhog [n]: n

From a840a37e30aa7d2cbccc691eaafff5063316b638 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sun, 20 Mar 2022 15:25:08 +0000
Subject: [PATCH 2069/2840] Move code of conduct to a dedicated file

This way it's picked up by GitHub ref #3601
---
 CODE_OF_CONDUCT.md | 3 +++
 README.md          | 5 -----
 2 files changed, 3 insertions(+), 5 deletions(-)
 create mode 100644 CODE_OF_CONDUCT.md

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
new file mode 100644
index 000000000..8a5fc4158
--- /dev/null
+++ b/CODE_OF_CONDUCT.md
@@ -0,0 +1,3 @@
+## Code of Conduct
+
+Everyone who interacts in the Cookiecutter project's codebase, issue trackers, chat rooms, and mailing lists is expected to follow the [PyPA Code of Conduct](https://www.pypa.io/en/latest/code-of-conduct/).
diff --git a/README.md b/README.md
index b6e25272a..9fb617bc2 100644
--- a/README.md
+++ b/README.md
@@ -244,8 +244,3 @@ experience better.
 -   [How to create a Django Application using Cookiecutter and Django 1.8](https://www.swapps.io/blog/how-to-create-a-django-application-using-cookiecutter-and-django-1-8/) - Sept. 12, 2015
 
 Have a blog or online publication? Write about your cookiecutter-django tips and tricks, then send us a pull request with the link.
-
-## Code of Conduct
-
-Everyone interacting in the Cookiecutter project's codebases, issue trackers, chat
-rooms, and mailing lists is expected to follow the [PyPA Code of Conduct](https://www.pypa.io/en/latest/code-of-conduct/).

From dc8ad895bbb7e678d861038536a89b4c4227d978 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sun, 20 Mar 2022 15:43:37 +0000
Subject: [PATCH 2070/2840] Fix link, formatting & a typo

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

diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index e0b522c8c..4bb5d9032 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -18,7 +18,7 @@ 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 [pre-commit](https://pre-commit.com/#install).
+* Pre-commit; refer to the official documentation for the `pre-commit`_.
 
 .. _`installation instructions`: https://docs.docker.com/install/#supported-platforms
 .. _`installation guide`: https://docs.docker.com/compose/install/
@@ -190,7 +190,7 @@ Celery tasks in local development
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 When not using docker Celery tasks are set to run in Eager mode, so that a full stack is not needed. When using docker the task scheduler will be used by default.
 
-If you need tasks to be executed on the main thread during development set CELERY_TASK_ALWAYS_EAGER = True in config/settings/local.py.
+If you need tasks to be executed on the main thread during development set ``CELERY_TASK_ALWAYS_EAGER = True`` in ``config/settings/local.py``.
 
 Possible uses could be for testing, or ease of profiling with DJDT.
 
@@ -215,7 +215,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.
 
-In 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 certificate installed in our Docker application.
 
 #.  **Let's Encrypt**
 

From 8d2833c5fe32aba44350adb3b0afe4060ec511be Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Mon, 21 Mar 2022 02:32:24 +0000
Subject: [PATCH 2071/2840] Release 2022.03.20

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84e61e6c6..6432f1123 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 -->
 
+## 2022.03.20
+
+### Changed
+- Unify compressor, gulp and custom bootstrap options ([#3535](https://github.com/cookiecutter/cookiecutter-django/pull/3535))
+
 ## 2022.03.14
 
 ### Fixed
diff --git a/setup.py b/setup.py
index 99e054595..dcf1c93a3 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.03.14"
+version = "2022.03.20"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 59b01a34628dc781ddae0063bab3f74a4e4dd8cb Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Mar 2022 19:55:45 +0000
Subject: [PATCH 2072/2840] Bump peter-evans/create-pull-request from 3.14.0 to
 4 (#3645)

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 3.14.0 to 4.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v3.14.0...v4)

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

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.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 b5c91ca5c..df4ea1f9a 100644
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -31,7 +31,7 @@ jobs:
         run: pre-commit autoupdate
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v3.14.0
+        uses: peter-evans/create-pull-request@v4
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: update/pre-commit-autoupdate

From 20b3e07deb2b95a2a21bbeee0b9b3d47d5344a9c Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 24 Mar 2022 02:31:47 +0000
Subject: [PATCH 2073/2840] Release 2022.03.23

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6432f1123..95dc9f73b 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 -->
 
+## 2022.03.23
+
+### Updated
+- Bump peter-evans/create-pull-request from 3.14.0 to 4 ([#3645](https://github.com/cookiecutter/cookiecutter-django/pull/3645))
+
 ## 2022.03.20
 
 ### Changed
diff --git a/setup.py b/setup.py
index dcf1c93a3..ed2418189 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.03.20"
+version = "2022.03.23"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From d7e31655d852d6286e65ef56ae22168598d206ff Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 27 Mar 2022 05:51:14 -0700
Subject: [PATCH 2074/2840] Update uvicorn to 0.17.6 (#3627)

---
 {{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 d3a6f46f0..dcdbf2c22 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -24,7 +24,7 @@ flower==1.0.0  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn[standard]==0.17.5  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.17.6  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django

From 241818d7ee9aa836a1199f0c4d036a8b8005fa3a Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 27 Mar 2022 05:57:24 -0700
Subject: [PATCH 2075/2840] Update pytest to 7.1.1 (#3637)

---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 1e98d0f2a..5461c637c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,7 +13,7 @@ pre-commit==2.17.0
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.24.5
-pytest==7.0.1
+pytest==7.1.1
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2
 pyyaml==6.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 781c67443..b19b6fe49 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.931  # https://github.com/python/mypy
 django-stubs==1.9.0  # https://github.com/typeddjango/django-stubs
-pytest==7.0.1  # https://github.com/pytest-dev/pytest
+pytest==7.1.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
 djangorestframework-stubs==1.4.0  # https://github.com/typeddjango/djangorestframework-stubs

From 23410b763b8fea970c99b5051e81272ae4ffdbd5 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 27 Mar 2022 06:14:19 -0700
Subject: [PATCH 2076/2840] Update sentry-sdk to 1.5.8 (#3638)

---
 {{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 07a571460..8be91c996 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.5.7  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.5.8  # 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 06ca1279e7c2e84c4f63a1cfb4eba4d9b54c4963 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 27 Mar 2022 06:21:54 -0700
Subject: [PATCH 2077/2840] Update pytz to 2022.1 (#3639)

---
 {{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 dcdbf2c22..457459399 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,4 +1,4 @@
-pytz==2021.3  # https://github.com/stub42/pytz
+pytz==2022.1  # https://github.com/stub42/pytz
 python-slugify==6.1.1  # https://github.com/un33k/python-slugify
 Pillow==9.0.1  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}

From faa6c51d63f02ecab3d1ef1611f9179411c90482 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 27 Mar 2022 06:32:19 -0700
Subject: [PATCH 2078/2840] Update drf-spectacular to 0.22.0 (#3642)

---
 {{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 457459399..01755a333 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -44,5 +44,5 @@ django-redis==5.2.0  # https://github.com/jazzband/django-redis
 djangorestframework==3.13.1  # https://github.com/encode/django-rest-framework
 django-cors-headers==3.11.0 # https://github.com/adamchainz/django-cors-headers
 # DRF-spectacular for api documentation
-drf-spectacular==0.21.2  # https://github.com/tfranzel/drf-spectacular 
+drf-spectacular==0.22.0  # https://github.com/tfranzel/drf-spectacular 
 {%- endif %}

From 39adcd5115122a6c58a2c452764fda7204655d4a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 27 Mar 2022 14:32:36 +0100
Subject: [PATCH 2079/2840] Bump stefanzweifel/git-auto-commit-action from
 4.13.1 to 4.14.0 (#3641)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/update-contributors.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 0cc62cfb0..e4cc19379 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -26,7 +26,7 @@ jobs:
         run: python scripts/update_contributors.py
 
       - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v4.13.1
+        uses: stefanzweifel/git-auto-commit-action@v4.14.0
         with:
           commit_message: Update Contributors
           file_pattern: CONTRIBUTORS.md .github/contributors.json

From 23675d96c1c6ec5167c22e50a2bab19e5f636f8e Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 27 Mar 2022 07:15:57 -0700
Subject: [PATCH 2080/2840] Update watchgod to 0.8.1 (#3643)

---
 {{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 b19b6fe49..a8669aef9 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 psycopg2-binary==2.9.3  # https://github.com/psycopg/psycopg2
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %}
-watchgod==0.7  # https://github.com/samuelcolvin/watchgod
+watchgod==0.8.1  # https://github.com/samuelcolvin/watchgod
 {%- endif %}
 
 # Testing

From 69cd920b6e68dcfc1465020d47b396b6457b57a2 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 27 Mar 2022 07:16:28 -0700
Subject: [PATCH 2081/2840] Update redis to 4.2.0 (#3646)

---
 {{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 01755a333..f7e485bac 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -12,7 +12,7 @@ argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==6.0.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==4.1.4  # https://github.com/redis/redis-py
+redis==4.2.0  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}

From 68888f0f9d9688bbb0dcb773d14f6e372ab06809 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 27 Mar 2022 07:17:20 -0700
Subject: [PATCH 2082/2840] Update jinja2 to 3.1.0 (#3647)

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

diff --git a/requirements.txt b/requirements.txt
index 5461c637c..65dde62c6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -22,5 +22,5 @@ pyyaml==6.0
 # ------------------------------------------------------------------------------
 PyGithub==1.55
 gitpython==3.1.27
-jinja2==3.0.3
+jinja2==3.1.0
 requests==2.27.1

From 25c590bc4a7a55ef552dafff9eea6cceea2d2ec7 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 27 Mar 2022 07:17:32 -0700
Subject: [PATCH 2083/2840] Update mypy to 0.942 (#3648)

---
 {{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 a8669aef9..032189263 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -13,7 +13,7 @@ watchgod==0.8.1  # https://github.com/samuelcolvin/watchgod
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.931  # https://github.com/python/mypy
+mypy==0.942  # https://github.com/python/mypy
 django-stubs==1.9.0  # https://github.com/typeddjango/django-stubs
 pytest==7.1.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar

From 05211d34dc9d21bca3f4599bdf607848c8ea11bd Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 27 Mar 2022 07:17:51 -0700
Subject: [PATCH 2084/2840] Update django-allauth to 0.50.0 (#3649)

---
 {{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 f7e485bac..5b09c9224 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -32,7 +32,7 @@ uvicorn[standard]==0.17.6  # https://github.com/encode/uvicorn
 django==3.2.12  # pyup: < 4.0  # https://www.djangoproject.com/
 django-environ==0.8.1  # https://github.com/joke2k/django-environ
 django-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
-django-allauth==0.49.0  # https://github.com/pennersr/django-allauth
+django-allauth==0.50.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.14.0  # https://github.com/django-crispy-forms/django-crispy-forms
 crispy-bootstrap5==0.6  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}

From 5031d323a97e6f2bc4b03ad6955efb2c03220c54 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 27 Mar 2022 07:18:06 -0700
Subject: [PATCH 2085/2840] Update pylint-django to 2.5.3 (#3650)

---
 {{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 032189263..f8aa840b6 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -32,7 +32,7 @@ flake8==4.0.1  # https://github.com/PyCQA/flake8
 flake8-isort==4.1.1  # https://github.com/gforcada/flake8-isort
 coverage==6.3.2  # https://github.com/nedbat/coveragepy
 black==22.1.0  # https://github.com/psf/black
-pylint-django==2.5.2  # https://github.com/PyCQA/pylint-django
+pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}

From bbebfde198e061e664760b5c7a70c07388527097 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 27 Mar 2022 10:14:01 -0700
Subject: [PATCH 2086/2840] Update jinja2 to 3.1.1 (#3652)

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

diff --git a/requirements.txt b/requirements.txt
index 65dde62c6..056eb1195 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -22,5 +22,5 @@ pyyaml==6.0
 # ------------------------------------------------------------------------------
 PyGithub==1.55
 gitpython==3.1.27
-jinja2==3.1.0
+jinja2==3.1.1
 requests==2.27.1

From a31a60eca5bf4efca8cd01a1e8d504344ee0e8e1 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 27 Mar 2022 10:50:59 -0700
Subject: [PATCH 2087/2840] Update sphinx to 4.5.0 (#3654)

---
 docs/requirements.txt                                | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index d9286ce24..ba0b67c5f 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,2 +1,2 @@
-sphinx==4.4.0
+sphinx==4.5.0
 sphinx-rtd-theme==1.0.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index f8aa840b6..92df64b5c 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -23,7 +23,7 @@ djangorestframework-stubs==1.4.0  # https://github.com/typeddjango/djangorestfra
 
 # Documentation
 # ------------------------------------------------------------------------------
-sphinx==4.4.0  # https://github.com/sphinx-doc/sphinx
+sphinx==4.5.0  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From 943207a4a948da9b32c80f178006ec304509199f Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Mon, 28 Mar 2022 02:34:21 +0000
Subject: [PATCH 2088/2840] Release 2022.03.27

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 95dc9f73b..756b78264 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,24 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.03.27
+
+### Updated
+- Update sphinx to 4.5.0 ([#3654](https://github.com/cookiecutter/cookiecutter-django/pull/3654))
+- Update jinja2 to 3.1.1 ([#3652](https://github.com/cookiecutter/cookiecutter-django/pull/3652))
+- Update pylint-django to 2.5.3 ([#3650](https://github.com/cookiecutter/cookiecutter-django/pull/3650))
+- Update django-allauth to 0.50.0 ([#3649](https://github.com/cookiecutter/cookiecutter-django/pull/3649))
+- Update mypy to 0.942 ([#3648](https://github.com/cookiecutter/cookiecutter-django/pull/3648))
+- Update jinja2 to 3.1.0 ([#3647](https://github.com/cookiecutter/cookiecutter-django/pull/3647))
+- Update redis to 4.2.0 ([#3646](https://github.com/cookiecutter/cookiecutter-django/pull/3646))
+- Update watchgod to 0.8.1 ([#3643](https://github.com/cookiecutter/cookiecutter-django/pull/3643))
+- Bump stefanzweifel/git-auto-commit-action from 4.13.1 to 4.14.0 ([#3641](https://github.com/cookiecutter/cookiecutter-django/pull/3641))
+- Update drf-spectacular to 0.22.0 ([#3642](https://github.com/cookiecutter/cookiecutter-django/pull/3642))
+- Update pytz to 2022.1 ([#3639](https://github.com/cookiecutter/cookiecutter-django/pull/3639))
+- Update sentry-sdk to 1.5.8 ([#3638](https://github.com/cookiecutter/cookiecutter-django/pull/3638))
+- Update pytest to 7.1.1 ([#3637](https://github.com/cookiecutter/cookiecutter-django/pull/3637))
+- Update uvicorn to 0.17.6 ([#3627](https://github.com/cookiecutter/cookiecutter-django/pull/3627))
+
 ## 2022.03.23
 
 ### Updated
diff --git a/setup.py b/setup.py
index ed2418189..6b85b28b7 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.03.23"
+version = "2022.03.27"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 43f947fcf97562c1294029cfe1cc7435b641040b Mon Sep 17 00:00:00 2001
From: Abdullah Adeel <64294045+mabdullahadeel@users.noreply.github.com>
Date: Tue, 29 Mar 2022 04:00:23 +0500
Subject: [PATCH 2089/2840] Update `black` version to `22.3.0` (#3657)

* update `black` version to `22.3.0`

* updated black version to `22.3.0` for generated project

* update black version to `22.3.0`
---
 .pre-commit-config.yaml                               | 2 +-
 requirements.txt                                      | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7c9e6eca7..c358db05e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/psf/black
-    rev: 22.1.0
+    rev: 22.3.0
     hooks:
       - id: black
 
diff --git a/requirements.txt b/requirements.txt
index 056eb1195..9fed76659 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-black==22.1.0
+black==22.3.0
 isort==5.10.1
 flake8==4.0.1
 flake8-isort==4.1.1
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index 5ea57c56c..cad6ad7b1 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/psf/black
-    rev: 22.1.0
+    rev: 22.3.0
     hooks:
       - id: black
 
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 92df64b5c..2b4bb5df9 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -31,7 +31,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 flake8==4.0.1  # https://github.com/PyCQA/flake8
 flake8-isort==4.1.1  # https://github.com/gforcada/flake8-isort
 coverage==6.3.2  # https://github.com/nedbat/coveragepy
-black==22.1.0  # https://github.com/psf/black
+black==22.3.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery

From 513351bdf341ab3cdd4b485e33368bf9c1b66575 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 29 Mar 2022 02:33:58 +0000
Subject: [PATCH 2090/2840] Release 2022.03.28

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 756b78264..823529cd6 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 -->
 
+## 2022.03.28
+
+### Changed
+- Update `black` version to `22.3.0` ([#3657](https://github.com/cookiecutter/cookiecutter-django/pull/3657))
+
 ## 2022.03.27
 
 ### Updated
diff --git a/setup.py b/setup.py
index 6b85b28b7..5fa7464cc 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.03.27"
+version = "2022.03.28"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 4ad88fc06adec5cdb9fe6715a094d4ee51a44f8e Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 1 Apr 2022 02:33:40 -0700
Subject: [PATCH 2091/2840] Update redis to 4.2.1 (#3660)

---
 {{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 5b09c9224..f4a8e3cda 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -12,7 +12,7 @@ argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==6.0.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==4.2.0  # https://github.com/redis/redis-py
+redis==4.2.1  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}

From 91c931273ca2a09fb5023d81faad80e40f489404 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 1 Apr 2022 17:32:05 +0100
Subject: [PATCH 2092/2840] Update domain for Celery docs (#3663)

---
 README.md                                      |  2 +-
 .../config/settings/base.py                    | 18 +++++++++---------
 .../config/settings/local.py                   |  4 ++--
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/README.md b/README.md
index 9fb617bc2..d4b067622 100644
--- a/README.md
+++ b/README.md
@@ -42,7 +42,7 @@ production-ready Django projects quickly.
 *These features can be enabled during initial project setup.*
 
 -   Serve static files from Amazon S3, Google Cloud Storage or [Whitenoise](https://whitenoise.readthedocs.io/)
--   Configuration for [Celery](http://www.celeryproject.org/) and [Flower](https://github.com/mher/flower) (the latter in Docker setup only)
+-   Configuration for [Celery](https://docs.celeryq.dev) and [Flower](https://github.com/mher/flower) (the latter in Docker setup only)
 -   Integration with [MailHog](https://github.com/mailhog/MailHog) for local email testing
 -   Integration with [Sentry](https://sentry.io/welcome/) for error logging
 
diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index ca8abda82..ad879fa72 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -277,25 +277,25 @@ LOGGING = {
 # Celery
 # ------------------------------------------------------------------------------
 if USE_TZ:
-    # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-timezone
+    # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-timezone
     CELERY_TIMEZONE = TIME_ZONE
-# http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-broker_url
+# https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-broker_url
 CELERY_BROKER_URL = env("CELERY_BROKER_URL")
-# http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-result_backend
+# https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-result_backend
 CELERY_RESULT_BACKEND = CELERY_BROKER_URL
-# http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-accept_content
+# https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-accept_content
 CELERY_ACCEPT_CONTENT = ["json"]
-# http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-task_serializer
+# https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-task_serializer
 CELERY_TASK_SERIALIZER = "json"
-# http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-result_serializer
+# https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-result_serializer
 CELERY_RESULT_SERIALIZER = "json"
-# http://docs.celeryproject.org/en/latest/userguide/configuration.html#task-time-limit
+# https://docs.celeryq.dev/en/stable/userguide/configuration.html#task-time-limit
 # TODO: set to whatever value is adequate in your circumstances
 CELERY_TASK_TIME_LIMIT = 5 * 60
-# http://docs.celeryproject.org/en/latest/userguide/configuration.html#task-soft-time-limit
+# https://docs.celeryq.dev/en/stable/userguide/configuration.html#task-soft-time-limit
 # TODO: set to whatever value is adequate in your circumstances
 CELERY_TASK_SOFT_TIME_LIMIT = 60
-# http://docs.celeryproject.org/en/latest/userguide/configuration.html#beat-scheduler
+# https://docs.celeryq.dev/en/stable/userguide/configuration.html#beat-scheduler
 CELERY_BEAT_SCHEDULER = "django_celery_beat.schedulers:DatabaseScheduler"
 
 {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py
index 1eafd9fae..a5fe0f71c 100644
--- a/{{cookiecutter.project_slug}}/config/settings/local.py
+++ b/{{cookiecutter.project_slug}}/config/settings/local.py
@@ -88,10 +88,10 @@ INSTALLED_APPS += ["django_extensions"]  # noqa F405
 # Celery
 # ------------------------------------------------------------------------------
 {% if cookiecutter.use_docker == 'n' -%}
-# http://docs.celeryproject.org/en/latest/userguide/configuration.html#task-always-eager
+# https://docs.celeryq.dev/en/stable/userguide/configuration.html#task-always-eager
 CELERY_TASK_ALWAYS_EAGER = True
 {%- endif %}
-# http://docs.celeryproject.org/en/latest/userguide/configuration.html#task-eager-propagates
+# https://docs.celeryq.dev/en/stable/userguide/configuration.html#task-eager-propagates
 CELERY_TASK_EAGER_PROPAGATES = True
 
 {%- endif %}

From a9d7400ad3cec21e171054dd02bbfd1aa2aae6c2 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 1 Apr 2022 09:52:59 -0700
Subject: [PATCH 2093/2840] Update watchgod from 0.8.1 to 0.8.2 (#3664)

---
 {{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 2b4bb5df9..0a54f3dd0 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 psycopg2-binary==2.9.3  # https://github.com/psycopg/psycopg2
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %}
-watchgod==0.8.1  # https://github.com/samuelcolvin/watchgod
+watchgod==0.8.2  # https://github.com/samuelcolvin/watchgod
 {%- endif %}
 
 # Testing

From 4832348d7e7cd61466b5a8377cb99d3dc5eaa0d4 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 2 Apr 2022 02:32:22 +0000
Subject: [PATCH 2094/2840] Release 2022.04.01

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 823529cd6..3d79f4a41 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.04.01
+
+### Changed
+- Update domain for Celery docs ([#3663](https://github.com/cookiecutter/cookiecutter-django/pull/3663))
+### Updated
+- Update watchgod to 0.8.2 ([#3664](https://github.com/cookiecutter/cookiecutter-django/pull/3664))
+- Update redis to 4.2.1 ([#3660](https://github.com/cookiecutter/cookiecutter-django/pull/3660))
+
 ## 2022.03.28
 
 ### Changed
diff --git a/setup.py b/setup.py
index 5fa7464cc..adf0f8e40 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.03.28"
+version = "2022.04.01"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 30a535f049c987040633be38168d72d9f4bc6b29 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 4 Apr 2022 02:16:30 -0700
Subject: [PATCH 2095/2840] Update pillow to 9.1.0 (#3665)

---
 {{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 f4a8e3cda..840bdb4c7 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,6 +1,6 @@
 pytz==2022.1  # https://github.com/stub42/pytz
 python-slugify==6.1.1  # https://github.com/un33k/python-slugify
-Pillow==9.0.1  # https://github.com/python-pillow/Pillow
+Pillow==9.1.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
 {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %}
 rcssmin==1.1.0 --install-option="--without-c-extensions"  # https://github.com/ndparker/rcssmin

From 233ac79c098db851e783729e798abe708c9aa198 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 4 Apr 2022 02:18:47 -0700
Subject: [PATCH 2096/2840] Update pre-commit to 2.18.1 (#3668)

---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 9fed76659..172249a22 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ black==22.3.0
 isort==5.10.1
 flake8==4.0.1
 flake8-isort==4.1.1
-pre-commit==2.17.0
+pre-commit==2.18.1
 
 # Testing
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 0a54f3dd0..c6d59f096 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -36,7 +36,7 @@ pylint-django==2.5.3  # 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.17.0  # https://github.com/pre-commit/pre-commit
+pre-commit==2.18.1  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From 273923e9ac1ff4bdd6ccc1397d145bdbe75353c8 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 4 Apr 2022 02:28:33 -0700
Subject: [PATCH 2097/2840] Update celery from 5.2.3 to 5.2.5 (#3669)

---
 {{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 840bdb4c7..c95faef28 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -17,7 +17,7 @@ redis==4.2.1  # https://github.com/redis/redis-py
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
-celery==5.2.3  # pyup: < 6.0  # https://github.com/celery/celery
+celery==5.2.5  # 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==1.0.0  # https://github.com/mher/flower

From cba1225a8a9bcb48f0dd49f6e19cdf6c8c1f4b1c Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 4 Apr 2022 07:18:23 -0700
Subject: [PATCH 2098/2840] Update redis to 4.2.2 (#3670)

---
 {{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 c95faef28..6facee07c 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -12,7 +12,7 @@ argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==6.0.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==4.2.1  # https://github.com/redis/redis-py
+redis==4.2.2  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}

From 0d7b284734aa56caf07565eeeb6854c1df53a748 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 5 Apr 2022 02:32:42 +0000
Subject: [PATCH 2099/2840] Release 2022.04.04

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3d79f4a41..e7ccd4aed 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.04.04
+
+### Updated
+- Update redis to 4.2.2 ([#3670](https://github.com/cookiecutter/cookiecutter-django/pull/3670))
+- Update celery to 5.2.5 ([#3669](https://github.com/cookiecutter/cookiecutter-django/pull/3669))
+- Update pre-commit to 2.18.1 ([#3668](https://github.com/cookiecutter/cookiecutter-django/pull/3668))
+- Update pillow to 9.1.0 ([#3665](https://github.com/cookiecutter/cookiecutter-django/pull/3665))
+
 ## 2022.04.01
 
 ### Changed
diff --git a/setup.py b/setup.py
index adf0f8e40..003b3f19d 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.04.01"
+version = "2022.04.04"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 3ba0c8a4e6b9858daf5103c015492f112a6d7c1a Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 5 Apr 2022 03:49:25 -0700
Subject: [PATCH 2100/2840] Update celery to 5.2.6 (#3671)

---
 {{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 6facee07c..bbf34db98 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -17,7 +17,7 @@ redis==4.2.2  # https://github.com/redis/redis-py
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
-celery==5.2.5  # pyup: < 6.0  # https://github.com/celery/celery
+celery==5.2.6  # 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==1.0.0  # https://github.com/mher/flower

From 883be20f34960b16bd2e6b337a30596208cad54d Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 6 Apr 2022 02:32:52 +0000
Subject: [PATCH 2101/2840] Release 2022.04.05

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7ccd4aed..b1fa29e47 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 -->
 
+## 2022.04.05
+
+### Updated
+- Update celery to 5.2.6 ([#3671](https://github.com/cookiecutter/cookiecutter-django/pull/3671))
+
 ## 2022.04.04
 
 ### Updated
diff --git a/setup.py b/setup.py
index 003b3f19d..63a7b4333 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.04.04"
+version = "2022.04.05"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From d143f0028d4094bcf0ac8f73dc5f6c5e97b2681d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 8 Apr 2022 14:03:12 +0100
Subject: [PATCH 2102/2840] Auto-update pre-commit hooks (#3673)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                               | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index c358db05e..da839860e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -3,7 +3,7 @@ default_stages: [commit]
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v4.2.0
     hooks:
       - id: trailing-whitespace
       - id: check-yaml
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index cad6ad7b1..dd663231e 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -3,7 +3,7 @@ default_stages: [commit]
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.1.0
+    rev: v4.2.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer

From b6a9ebb8d338a94516e79417d2cec34f852b1821 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 9 Apr 2022 02:30:24 +0000
Subject: [PATCH 2103/2840] Release 2022.04.08

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b1fa29e47..774b98520 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 -->
 
+## 2022.04.08
+
+### Updated
+- Auto-update pre-commit hooks ([#3673](https://github.com/cookiecutter/cookiecutter-django/pull/3673))
+
 ## 2022.04.05
 
 ### Updated
diff --git a/setup.py b/setup.py
index 63a7b4333..a9d11709a 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.04.05"
+version = "2022.04.08"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 35673be4886142d4106b194846417a5c6d937948 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 11 Apr 2022 11:12:57 -0700
Subject: [PATCH 2104/2840] Update django from 3.2.12 to 3.2.13 (#3676)

---
 {{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 bbf34db98..827362ae1 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,7 +29,7 @@ uvicorn[standard]==0.17.6  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.2.12  # pyup: < 4.0  # https://www.djangoproject.com/
+django==3.2.13  # pyup: < 4.0  # https://www.djangoproject.com/
 django-environ==0.8.1  # https://github.com/joke2k/django-environ
 django-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.50.0  # https://github.com/pennersr/django-allauth

From 2b72b436021c9d6a7bc58c501ea71a602ec8193d Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 12 Apr 2022 02:34:36 +0000
Subject: [PATCH 2105/2840] Release 2022.04.11

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 774b98520..55250aa77 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 -->
 
+## 2022.04.11
+
+### Updated
+- Update django to 3.2.13 ([#3676](https://github.com/cookiecutter/cookiecutter-django/pull/3676))
+
 ## 2022.04.08
 
 ### Updated
diff --git a/setup.py b/setup.py
index a9d11709a..29b70522f 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.04.08"
+version = "2022.04.11"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 4a557879208a5b2744fa78b61ff3eb19757595b3 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 13 Apr 2022 10:03:22 +0100
Subject: [PATCH 2106/2840] Bump stefanzweifel/git-auto-commit-action from
 4.14.0 to 4.14.1 (#3677)

Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from 4.14.0 to 4.14.1.
- [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases)
- [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.14.0...v4.14.1)

---
updated-dependencies:
- dependency-name: stefanzweifel/git-auto-commit-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/update-contributors.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index e4cc19379..16c5c6226 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -26,7 +26,7 @@ jobs:
         run: python scripts/update_contributors.py
 
       - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v4.14.0
+        uses: stefanzweifel/git-auto-commit-action@v4.14.1
         with:
           commit_message: Update Contributors
           file_pattern: CONTRIBUTORS.md .github/contributors.json

From 01e71eddd4625b5b1ea4b248b3b2554bd140ac37 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 14 Apr 2022 02:35:26 +0000
Subject: [PATCH 2107/2840] Release 2022.04.13

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55250aa77..08df7d10a 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 -->
 
+## 2022.04.13
+
+### Updated
+- Bump stefanzweifel/git-auto-commit-action from 4.14.0 to 4.14.1 ([#3677](https://github.com/cookiecutter/cookiecutter-django/pull/3677))
+
 ## 2022.04.11
 
 ### Updated
diff --git a/setup.py b/setup.py
index 29b70522f..a0605fe12 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.04.11"
+version = "2022.04.13"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From b39a5d8d64b23a221957fe26dae41daf28069130 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 19 Apr 2022 13:36:52 -0700
Subject: [PATCH 2108/2840] Update sentry-sdk to 1.5.10 (#3679)

---
 {{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 8be91c996..6708666f9 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.5.8  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.5.10  # 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 0f31ff3f94c33f38f65f442a876c5c155da9b9fe Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 19 Apr 2022 13:37:22 -0700
Subject: [PATCH 2109/2840] Update tox to 3.25.0 (#3675)

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

diff --git a/requirements.txt b/requirements.txt
index 172249a22..4d85d0a03 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==2.18.1
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.24.5
+tox==3.25.0
 pytest==7.1.1
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From 756b04f4f96ae7f13e164f8d8c914d792e840a91 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 20 Apr 2022 02:47:48 +0000
Subject: [PATCH 2110/2840] Release 2022.04.19

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 08df7d10a..5e911354b 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 -->
 
+## 2022.04.19
+
+### Updated
+- Update tox to 3.25.0 ([#3675](https://github.com/cookiecutter/cookiecutter-django/pull/3675))
+- Update sentry-sdk to 1.5.10 ([#3679](https://github.com/cookiecutter/cookiecutter-django/pull/3679))
+
 ## 2022.04.13
 
 ### Updated
diff --git a/setup.py b/setup.py
index a0605fe12..e75530a61 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.04.13"
+version = "2022.04.19"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From e0604a41d359c8c29e539b69e8894f62520f8768 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?=
 <bnafta@gmail.com>
Date: Thu, 21 Apr 2022 11:22:34 -0300
Subject: [PATCH 2111/2840] Add the possibility to set a max version

- remove new line character from version and compat_version before generate the markdown
---
 scripts/create_django_issue.py | 48 +++++++++++++++++++++++++---------
 1 file changed, 36 insertions(+), 12 deletions(-)

diff --git a/scripts/create_django_issue.py b/scripts/create_django_issue.py
index daee8fe16..f1ff51a06 100644
--- a/scripts/create_django_issue.py
+++ b/scripts/create_django_issue.py
@@ -47,6 +47,11 @@ class DjVersion(NamedTuple):
         major, minor, *_ = version_str.split(".")
         return cls(major=int(major), minor=int(minor))
 
+    @classmethod
+    def parse_to_tuple(cls, version_str: str):
+        version = cls.parse(version_str=version_str)
+        return version.major, version.minor
+
 
 def get_package_info(package: str) -> dict:
     """Get package metadata using PyPI API."""
@@ -75,17 +80,22 @@ def get_name_and_version(requirements_line: str) -> tuple[str, ...]:
     return name_without_extras, version
 
 
-def get_all_latest_django_versions() -> tuple[DjVersion, list[DjVersion]]:
+def get_all_latest_django_versions(
+    django_max_version: tuple[DjVersion] = None,
+) -> tuple[DjVersion, list[DjVersion]]:
     """
     Grabs all Django versions that are worthy of a GitHub issue.
-
     Depends on Django versions having higher major version or minor version.
     """
+    _django_max_version = (99, 99)
+    if django_max_version:
+        _django_max_version = django_max_version
+
     print("Fetching all Django versions from PyPI")
     base_txt = REQUIREMENTS_DIR / "base.txt"
     with base_txt.open() as f:
         for line in f.readlines():
-            if "django==" in line:
+            if "django==" in line.lower():
                 break
         else:
             print(f"django not found in {base_txt}")  # Huh...?
@@ -97,7 +107,7 @@ def get_all_latest_django_versions() -> tuple[DjVersion, list[DjVersion]]:
     current_minor_version = DjVersion.parse(current_version_str)
     newer_versions: set[DjVersion] = set()
     for django_version in get_django_versions():
-        if django_version > current_minor_version:
+        if _django_max_version >= django_version >= current_minor_version:
             newer_versions.add(django_version)
 
     return current_minor_version, sorted(newer_versions, reverse=True)
@@ -143,7 +153,13 @@ class GitHubManager:
         for requirements_file in self.requirements_files:
             with (REQUIREMENTS_DIR / f"{requirements_file}.txt").open() as f:
                 for line in f.readlines():
-                    if "==" in line and not line.startswith("{%"):
+                    if (
+                        "==" in line
+                        and not line.startswith("{%")
+                        and not line.startswith("    #")
+                        and not line.startswith("#")
+                        and not line.startswith(" ")
+                    ):
                         name, version = get_name_and_version(line)
                         self.requirements[requirements_file][name] = (
                             version,
@@ -192,9 +208,9 @@ class GitHubManager:
         # updated packages, or known releases that will happen but haven't yet
         if issue := self.existing_issues.get(needed_dj_version):
             if index := issue.body.find(package_name):
-                name, _current, prev_compat, ok = [
+                name, _current, prev_compat, ok = (
                     s.strip() for s in issue.body[index:].split("|", 4)[:4]
-                ]
+                )
                 if ok in ("✅", "❓", "🕒"):
                     return prev_compat, ok
 
@@ -251,11 +267,12 @@ class GitHubManager:
                 )
                 requirements += (
                     f"| {self._get_md_home_page_url(info).format(package_name)} "
-                    f"| {version} "
-                    f"| {compat_version} "
+                    f"| {version.strip()} "
+                    f"| {compat_version.strip()} "
                     f"| {icon} "
                     f"|\n"
                 )
+
         return requirements
 
     def create_or_edit_issue(self, needed_dj_version: DjVersion, description: str):
@@ -277,9 +294,11 @@ class GitHubManager:
             self.create_or_edit_issue(version, md_content)
 
 
-def main() -> None:
+def main(django_max_version=None) -> None:
     # Check if there are any djs
-    current_dj, latest_djs = get_all_latest_django_versions()
+    current_dj, latest_djs = get_all_latest_django_versions(
+        django_max_version=django_max_version
+    )
     if not latest_djs:
         sys.exit(0)
     manager = GitHubManager(current_dj, latest_djs)
@@ -292,4 +311,9 @@ if __name__ == "__main__":
         raise RuntimeError(
             "No github repo, please set the environment variable GITHUB_REPOSITORY"
         )
-    main()
+    max_version = None
+    last_arg = sys.argv[-1]
+    if CURRENT_FILE.name not in last_arg:
+        max_version = DjVersion.parse_to_tuple(version_str=last_arg)
+
+    main(django_max_version=max_version)

From c9b5367c2b47be4a18afef69508cde599bace805 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 25 Apr 2022 00:59:40 -0700
Subject: [PATCH 2112/2840] Update pytest to 7.1.2 (#3683)

* Update pytest from 7.1.1 to 7.1.2

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

diff --git a/requirements.txt b/requirements.txt
index 4d85d0a03..3f480418c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,7 +13,7 @@ pre-commit==2.18.1
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.25.0
-pytest==7.1.1
+pytest==7.1.2
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2
 pyyaml==6.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index c6d59f096..7944f35c1 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -15,7 +15,7 @@ watchgod==0.8.2  # https://github.com/samuelcolvin/watchgod
 # ------------------------------------------------------------------------------
 mypy==0.942  # https://github.com/python/mypy
 django-stubs==1.9.0  # https://github.com/typeddjango/django-stubs
-pytest==7.1.1  # https://github.com/pytest-dev/pytest
+pytest==7.1.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
 djangorestframework-stubs==1.4.0  # https://github.com/typeddjango/djangorestframework-stubs

From 97b9178b3657c0314e1070bffb1a973f3ca59eda Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 26 Apr 2022 02:45:39 +0000
Subject: [PATCH 2113/2840] Release 2022.04.25

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5e911354b..ac9bf7d86 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 -->
 
+## 2022.04.25
+
+### Updated
+- Update pytest to 7.1.2 ([#3683](https://github.com/cookiecutter/cookiecutter-django/pull/3683))
+
 ## 2022.04.19
 
 ### Updated
diff --git a/setup.py b/setup.py
index e75530a61..ad69562b3 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.04.19"
+version = "2022.04.25"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 865e97136cc0d9d4b1fa81b3b0f6d78947e6c2f0 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 27 Apr 2022 01:44:00 -0700
Subject: [PATCH 2114/2840] Update drf-spectacular from 0.22.0 to 0.22.1
 (#3684)

---
 {{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 827362ae1..ac6b637eb 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -44,5 +44,5 @@ django-redis==5.2.0  # https://github.com/jazzband/django-redis
 djangorestframework==3.13.1  # https://github.com/encode/django-rest-framework
 django-cors-headers==3.11.0 # https://github.com/adamchainz/django-cors-headers
 # DRF-spectacular for api documentation
-drf-spectacular==0.22.0  # https://github.com/tfranzel/drf-spectacular 
+drf-spectacular==0.22.1  # https://github.com/tfranzel/drf-spectacular 
 {%- endif %}

From b051b41129dd2dca6e4c69c37595e397d3237b63 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 27 Apr 2022 13:06:33 -0700
Subject: [PATCH 2115/2840] Update python-slugify to 6.1.2 (#3686)

---
 {{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 ac6b637eb..f0753f572 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,5 +1,5 @@
 pytz==2022.1  # https://github.com/stub42/pytz
-python-slugify==6.1.1  # https://github.com/un33k/python-slugify
+python-slugify==6.1.2  # https://github.com/un33k/python-slugify
 Pillow==9.1.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
 {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %}

From 0ff679073b58368fe3de6263af1a828fe635b05a Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 27 Apr 2022 13:08:23 -0700
Subject: [PATCH 2116/2840] Update mypy to 0.950 (#3687)

---
 {{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 7944f35c1..ea65e429c 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -13,7 +13,7 @@ watchgod==0.8.2  # https://github.com/samuelcolvin/watchgod
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.942  # https://github.com/python/mypy
+mypy==0.950  # https://github.com/python/mypy
 django-stubs==1.9.0  # https://github.com/typeddjango/django-stubs
 pytest==7.1.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar

From 870ed7eaf80e818a663f0abc37ced9e170297f43 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 28 Apr 2022 02:59:24 +0000
Subject: [PATCH 2117/2840] Release 2022.04.27

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ac9bf7d86..a616f9469 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.04.27
+
+### Updated
+- Update mypy to 0.950 ([#3687](https://github.com/cookiecutter/cookiecutter-django/pull/3687))
+- Update python-slugify to 6.1.2 ([#3686](https://github.com/cookiecutter/cookiecutter-django/pull/3686))
+- Update drf-spectacular to 0.22.1 ([#3684](https://github.com/cookiecutter/cookiecutter-django/pull/3684))
+
 ## 2022.04.25
 
 ### Updated
diff --git a/setup.py b/setup.py
index ad69562b3..3b3bf6b2f 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.04.25"
+version = "2022.04.27"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 3d7a2db072873496bd4cc779f9a2331bd46da81b Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 29 Apr 2022 02:46:26 +0000
Subject: [PATCH 2118/2840] Release 2022.04.28

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a616f9469..2ad4c77d7 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 -->
 
+## 2022.04.28
+
+### Changed
+- Add the possibility to set a max django version on create_django_issue script ([#3680](https://github.com/cookiecutter/cookiecutter-django/pull/3680))
+
 ## 2022.04.27
 
 ### Updated
diff --git a/setup.py b/setup.py
index 3b3bf6b2f..eb5db1a03 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.04.27"
+version = "2022.04.28"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 55124bd032406dcc06de0ce8d5214a06c2b175cb Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 1 May 2022 03:55:28 -0700
Subject: [PATCH 2119/2840] Update django-debug-toolbar from 3.2.4 to 3.3.0
 (#3690)

---
 {{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 ea65e429c..8da0d5a44 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -42,7 +42,7 @@ pre-commit==2.18.1  # https://github.com/pre-commit/pre-commit
 # ------------------------------------------------------------------------------
 factory-boy==3.2.1  # https://github.com/FactoryBoy/factory_boy
 
-django-debug-toolbar==3.2.4  # https://github.com/jazzband/django-debug-toolbar
+django-debug-toolbar==3.3.0  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.1.5  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==2.0.2  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.5.2  # https://github.com/pytest-dev/pytest-django

From e4458b6962895ab92b313c28a273dd0fd5a057b7 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Mon, 2 May 2022 02:50:42 +0000
Subject: [PATCH 2120/2840] Release 2022.05.01

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2ad4c77d7..cb4ca13c2 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 -->
 
+## 2022.05.01
+
+### Updated
+- Update django-debug-toolbar to 3.3.0 ([#3690](https://github.com/cookiecutter/cookiecutter-django/pull/3690))
+
 ## 2022.04.28
 
 ### Changed
diff --git a/setup.py b/setup.py
index eb5db1a03..e4c1d45f7 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.04.28"
+version = "2022.05.01"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From c1cd37fd7db707f6e33f32647c97263deae1f793 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 3 May 2022 12:09:55 -0700
Subject: [PATCH 2121/2840] Update sentry-sdk from 1.5.10 to 1.5.11 (#3693)

---
 {{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 6708666f9..5ac0fe09c 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.5.10  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.5.11  # 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 df529fc9e4d16bfe16f76e0e620c2f543f740ba3 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 3 May 2022 12:10:27 -0700
Subject: [PATCH 2122/2840] Update django-debug-toolbar from 3.3.0 to 3.4.0
 (#3692)

---
 {{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 8da0d5a44..e7401a143 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -42,7 +42,7 @@ pre-commit==2.18.1  # https://github.com/pre-commit/pre-commit
 # ------------------------------------------------------------------------------
 factory-boy==3.2.1  # https://github.com/FactoryBoy/factory_boy
 
-django-debug-toolbar==3.3.0  # https://github.com/jazzband/django-debug-toolbar
+django-debug-toolbar==3.4.0  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.1.5  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==2.0.2  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.5.2  # https://github.com/pytest-dev/pytest-django

From f1f1909c679ad76487fc7775bd35d7e67e276522 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 4 May 2022 02:45:00 +0000
Subject: [PATCH 2123/2840] Release 2022.05.03

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index cb4ca13c2..a64e17948 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 -->
 
+## 2022.05.03
+
+### Updated
+- Update django-debug-toolbar to 3.4.0 ([#3692](https://github.com/cookiecutter/cookiecutter-django/pull/3692))
+- Update sentry-sdk to 1.5.11 ([#3693](https://github.com/cookiecutter/cookiecutter-django/pull/3693))
+
 ## 2022.05.01
 
 ### Updated
diff --git a/setup.py b/setup.py
index e4c1d45f7..6910cf9a4 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.05.01"
+version = "2022.05.03"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 9a8e7abd249c0c9bb424a816c5093eecefe1668e Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 4 May 2022 06:29:30 -0700
Subject: [PATCH 2124/2840] Update django-coverage-plugin from 2.0.2 to 2.0.3
 (#3695)

---
 {{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 e7401a143..34daaf134 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -44,5 +44,5 @@ factory-boy==3.2.1  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==3.4.0  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.1.5  # https://github.com/django-extensions/django-extensions
-django-coverage-plugin==2.0.2  # https://github.com/nedbat/django_coverage_plugin
+django-coverage-plugin==2.0.3  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.5.2  # https://github.com/pytest-dev/pytest-django

From 0aed2350042e8329571aa01938d64edd137658ca Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 5 May 2022 02:37:43 +0000
Subject: [PATCH 2125/2840] Release 2022.05.04

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a64e17948..f9a80cf15 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 -->
 
+## 2022.05.04
+
+### Updated
+- Update django-coverage-plugin to 2.0.3 ([#3695](https://github.com/cookiecutter/cookiecutter-django/pull/3695))
+
 ## 2022.05.03
 
 ### Updated
diff --git a/setup.py b/setup.py
index 6910cf9a4..f9d21191b 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.05.03"
+version = "2022.05.04"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 964f08db43f5408572a2fe84b9dfd105b8d37d7f Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 6 May 2022 01:01:07 -0700
Subject: [PATCH 2126/2840] Update pre-commit to 2.19.0 (#3697)

* Update pre-commit from 2.18.1 to 2.19.0

* Update pre-commit from 2.18.1 to 2.19.0
---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 3f480418c..289c3e5c9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ black==22.3.0
 isort==5.10.1
 flake8==4.0.1
 flake8-isort==4.1.1
-pre-commit==2.18.1
+pre-commit==2.19.0
 
 # Testing
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 34daaf134..6cb5e3ced 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -36,7 +36,7 @@ pylint-django==2.5.3  # 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.18.1  # https://github.com/pre-commit/pre-commit
+pre-commit==2.19.0  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From 7c2476d847096b7accf186c6461028d3b2b7a6f2 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 7 May 2022 02:34:39 +0000
Subject: [PATCH 2127/2840] Release 2022.05.06

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9a80cf15..10631012e 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 -->
 
+## 2022.05.06
+
+### Updated
+- Update pre-commit to 2.19.0 ([#3697](https://github.com/cookiecutter/cookiecutter-django/pull/3697))
+
 ## 2022.05.04
 
 ### Updated
diff --git a/setup.py b/setup.py
index f9d21191b..f8ab4371b 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.05.04"
+version = "2022.05.06"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From e0c04fa0d30884e3387e32724068d66360451a22 Mon Sep 17 00:00:00 2001
From: Naveen <172697+naveensrinivasan@users.noreply.github.com>
Date: Sat, 7 May 2022 07:49:24 -0500
Subject: [PATCH 2128/2840] Set permissions for GitHub actions (#3698)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* chore: Set permissions for GitHub actions

 Restrict the GitHub token permissions only to the required ones; this way, even if the attackers will succeed in compromising your workflow, they won’t be able to do much.

- Included permissions for the action. https://github.com/ossf/scorecard/blob/main/docs/checks.md#token-permissions

https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#permissions

https://docs.github.com/en/actions/using-jobs/assigning-permissions-to-jobs

[Keeping your GitHub Actions and workflows secure Part 1: Preventing pwn requests](https://securitylab.github.com/research/github-actions-preventing-pwn-requests/)

Signed-off-by: naveen <172697+naveensrinivasan@users.noreply.github.com>

* Leave comment close to code

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 .github/workflows/pre-commit-autoupdate.yml | 6 ++++++
 .github/workflows/update-contributors.yml   | 5 +++++
 2 files changed, 11 insertions(+)

diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml
index df4ea1f9a..789c13b43 100644
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -8,10 +8,16 @@ on:
     - cron: "15 2 * * *"
   workflow_dispatch: # to trigger manually
 
+permissions:
+  contents: read
+
 jobs:
   auto-update:
     # Disables this workflow from running in a repository that is not part of the indicated organization/user
     if: github.repository_owner == 'cookiecutter'
+    permissions:
+      contents: write  # for peter-evans/create-pull-request to create branch
+      pull-requests: write  # for peter-evans/create-pull-request to create a PR
 
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 16c5c6226..2e690d329 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -5,10 +5,15 @@ on:
     branches:
       - master
 
+permissions:
+  contents: read
+
 jobs:
   build:
     # Disables this workflow from running in a repository that is not part of the indicated organization/user
     if: github.repository_owner == 'cookiecutter'
+    permissions:
+      contents: write  # for stefanzweifel/git-auto-commit-action to push code in repo
 
     runs-on: ubuntu-latest
     steps:

From 66d1d010e8a16806f39868af920804484ff4d65a Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 7 May 2022 12:49:50 +0000
Subject: [PATCH 2129/2840] 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 ad83662dd..6ee792c5b 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1257,5 +1257,10 @@
     "name": "innicoder",
     "github_login": "innicoder",
     "twitter_username": ""
+  },
+  {
+    "name": "Naveen",
+    "github_login": "naveensrinivasan",
+    "twitter_username": "snaveen"
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index c33bf9e12..90db6689f 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1349,6 +1349,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Naveen</td>
+    <td>
+      <a href="https://github.com/naveensrinivasan">naveensrinivasan</a>
+    </td>
+    <td>snaveen</td>
+  </tr>
   <tr>
     <td>Nico Stefani</td>
     <td>

From 337bbd282019df805159d69eb9b252db41b67ba4 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 7 May 2022 06:22:25 -0700
Subject: [PATCH 2130/2840] Update jinja2 from 3.1.1 to 3.1.2 (#3700)

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

diff --git a/requirements.txt b/requirements.txt
index 289c3e5c9..f5364be53 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -22,5 +22,5 @@ pyyaml==6.0
 # ------------------------------------------------------------------------------
 PyGithub==1.55
 gitpython==3.1.27
-jinja2==3.1.1
+jinja2==3.1.2
 requests==2.27.1

From 96b9b95af70f14afd976ac673f5571fa3a77bb25 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 7 May 2022 19:21:15 +0100
Subject: [PATCH 2131/2840] Add pyupgrade to pre-commit config (#3702)

* Add pyupgrade to pre-commit config

* Exclude hooks folder from pyupgrade

* Autofix: run pyupgrade

* Autofix: run pyupgrade on template files
---
 .pre-commit-config.yaml                                |  7 +++++++
 docs/conf.py                                           |  2 +-
 tests/test_cookiecutter_generation.py                  | 10 +++++-----
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml  |  6 ++++++
 .../merge_production_dotenvs_in_dotenv.py              |  6 +++---
 .../{{cookiecutter.project_slug}}/__init__.py          |  6 ++----
 6 files changed, 24 insertions(+), 13 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index da839860e..f9559ffa0 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -8,6 +8,13 @@ repos:
       - id: trailing-whitespace
       - id: check-yaml
 
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v2.32.1
+    hooks:
+      - id: pyupgrade
+        args: [--py39-plus]
+        exclude: hooks/
+
   - repo: https://github.com/psf/black
     rev: 22.3.0
     hooks:
diff --git a/docs/conf.py b/docs/conf.py
index f55bcb819..b53e6a7e7 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -39,7 +39,7 @@ master_doc = "index"
 
 # General information about the project.
 project = "Cookiecutter Django"
-copyright = "2013-{}, Daniel Roy Greenfeld".format(now.year)
+copyright = f"2013-{now.year}, Daniel Roy Greenfeld"
 
 # The version info for the project you're documenting, acts as replacement for
 # |version| and |release|, also used in various other places throughout the
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 9c30aeedd..63b4fc97c 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -138,7 +138,7 @@ def check_paths(paths):
         if is_binary(path):
             continue
 
-        for line in open(path, "r"):
+        for line in open(path):
             match = RE_OBJ.search(line)
             assert match is None, f"cookiecutter variable not replaced in {path}"
 
@@ -203,7 +203,7 @@ def test_travis_invokes_pytest(cookies, context, use_docker, expected_test_scrip
     assert result.project_path.name == context["project_slug"]
     assert result.project_path.is_dir()
 
-    with open(f"{result.project_path}/.travis.yml", "r") as travis_yml:
+    with open(f"{result.project_path}/.travis.yml") as travis_yml:
         try:
             yml = yaml.safe_load(travis_yml)["jobs"]["include"]
             assert yml[0]["script"] == ["flake8"]
@@ -230,7 +230,7 @@ def test_gitlab_invokes_flake8_and_pytest(
     assert result.project_path.name == context["project_slug"]
     assert result.project_path.is_dir()
 
-    with open(f"{result.project_path}/.gitlab-ci.yml", "r") as gitlab_yml:
+    with open(f"{result.project_path}/.gitlab-ci.yml") as gitlab_yml:
         try:
             gitlab_config = yaml.safe_load(gitlab_yml)
             assert gitlab_config["flake8"]["script"] == ["flake8"]
@@ -257,7 +257,7 @@ def test_github_invokes_linter_and_pytest(
     assert result.project_path.name == context["project_slug"]
     assert result.project_path.is_dir()
 
-    with open(f"{result.project_path}/.github/workflows/ci.yml", "r") as github_yml:
+    with open(f"{result.project_path}/.github/workflows/ci.yml") as github_yml:
         try:
             github_config = yaml.safe_load(github_yml)
             linter_present = False
@@ -308,6 +308,6 @@ 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_path}/docs/index.rst", "r") as f:
+    with open(f"{result.project_path}/docs/index.rst") as f:
         has_pycharm_docs = "pycharm/configuration" in f.read()
         assert has_pycharm_docs is pycharm_docs_exist
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index dd663231e..5b22d0dc9 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -9,6 +9,12 @@ repos:
       - id: end-of-file-fixer
       - id: check-yaml
 
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v2.32.1
+    hooks:
+      - id: pyupgrade
+        args: [--py39-plus]
+
   - repo: https://github.com/psf/black
     rev: 22.3.0
     hooks:
diff --git a/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py b/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py
index d1170eff6..09fedbb3f 100644
--- a/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py
+++ b/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py
@@ -18,7 +18,7 @@ def merge(
 ) -> None:
     with open(output_file_path, "w") as output_file:
         for merged_file_path in merged_file_paths:
-            with open(merged_file_path, "r") as merged_file:
+            with open(merged_file_path) as merged_file:
                 merged_file_content = merged_file.read()
                 output_file.write(merged_file_content)
                 if append_linesep:
@@ -41,7 +41,7 @@ def test_merge(tmpdir_factory, merged_file_count: int, append_linesep: bool):
     for i in range(merged_file_count):
         merged_file_ord = i + 1
 
-        merged_filename = ".service{}".format(merged_file_ord)
+        merged_filename = f".service{merged_file_ord}"
         merged_file_path = tmp_dir_path / merged_filename
 
         merged_file_content = merged_filename * merged_file_ord
@@ -57,7 +57,7 @@ def test_merge(tmpdir_factory, merged_file_count: int, append_linesep: bool):
 
     merge(output_file_path, merged_file_paths, append_linesep)
 
-    with open(output_file_path, "r") as output_file:
+    with open(output_file_path) as output_file:
         actual_output_file_content = output_file.read()
 
     assert actual_output_file_content == expected_output_file_content
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/__init__.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/__init__.py
index b4056707a..fb6532709 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/__init__.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/__init__.py
@@ -1,7 +1,5 @@
 __version__ = "{{ cookiecutter.version }}"
 __version_info__ = tuple(
-    [
-        int(num) if num.isdigit() else num
-        for num in __version__.replace("-", ".", 1).split(".")
-    ]
+    int(num) if num.isdigit() else num
+    for num in __version__.replace("-", ".", 1).split(".")
 )

From 5acde4875fbe38a8966f640249a6ba4bf7678ba0 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sun, 8 May 2022 02:41:22 +0000
Subject: [PATCH 2132/2840] Release 2022.05.07

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10631012e..db0a47975 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.05.07
+
+### Changed
+- Add pyupgrade to pre-commit config ([#3702](https://github.com/cookiecutter/cookiecutter-django/pull/3702))
+- Set permissions for GitHub actions ([#3698](https://github.com/cookiecutter/cookiecutter-django/pull/3698))
+### Updated
+- Update jinja2 to 3.1.2 ([#3700](https://github.com/cookiecutter/cookiecutter-django/pull/3700))
+
 ## 2022.05.06
 
 ### Updated
diff --git a/setup.py b/setup.py
index f8ab4371b..245681e27 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.05.06"
+version = "2022.05.07"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From a2a0d2b70a7bc6e4e2eb9e05f1d367451a23ef90 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 14 May 2022 03:24:48 -0700
Subject: [PATCH 2133/2840] Update redis from 4.2.2 to 4.3.1 (#3704)

---
 {{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 f0753f572..7cd126e6a 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -12,7 +12,7 @@ argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==6.0.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==4.2.2  # https://github.com/redis/redis-py
+redis==4.3.1  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}

From ae4431b755ae400d0aa71301f696f6f3df848c99 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 14 May 2022 03:26:08 -0700
Subject: [PATCH 2134/2840] Update sentry-sdk from 1.5.11 to 1.5.12 (#3706)

---
 {{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 5ac0fe09c..b006eb295 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.5.11  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.5.12  # 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 3cb97907a370c98351c309b7bbbe794d368066f8 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 14 May 2022 03:27:47 -0700
Subject: [PATCH 2135/2840] Update whitenoise from 6.0.0 to 6.1.0 (#3707)

---
 {{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 7cd126e6a..5d77f2f2f 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -10,7 +10,7 @@ rcssmin==1.1.0  # https://github.com/ndparker/rcssmin
 {%- endif %}
 argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
-whitenoise==6.0.0  # https://github.com/evansd/whitenoise
+whitenoise==6.1.0  # https://github.com/evansd/whitenoise
 {%- endif %}
 redis==4.3.1  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}

From 9a5ce7f6e192885fef5d9d7b35ce82bfd433ee28 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 14 May 2022 03:31:21 -0700
Subject: [PATCH 2136/2840] Update coverage from 6.3.2 to 6.3.3 (#3709)

---
 {{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 6cb5e3ced..83d01776c 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==4.0.1  # https://github.com/PyCQA/flake8
 flake8-isort==4.1.1  # https://github.com/gforcada/flake8-isort
-coverage==6.3.2  # https://github.com/nedbat/coveragepy
+coverage==6.3.3  # https://github.com/nedbat/coveragepy
 black==22.3.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 2c7c4bc435fb07dce0324b7194b357d3bda02cdb Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sun, 15 May 2022 02:42:24 +0000
Subject: [PATCH 2137/2840] Release 2022.05.14

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index db0a47975..6ecf7b214 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.05.14
+
+### Updated
+- Update coverage to 6.3.3 ([#3709](https://github.com/cookiecutter/cookiecutter-django/pull/3709))
+- Update whitenoise to 6.1.0 ([#3707](https://github.com/cookiecutter/cookiecutter-django/pull/3707))
+- Update sentry-sdk to 1.5.12 ([#3706](https://github.com/cookiecutter/cookiecutter-django/pull/3706))
+- Update redis to 4.3.1 ([#3704](https://github.com/cookiecutter/cookiecutter-django/pull/3704))
+
 ## 2022.05.07
 
 ### Changed
diff --git a/setup.py b/setup.py
index 245681e27..9d9b397c8 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.05.07"
+version = "2022.05.14"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From bc71a326da4ef6642e07db430a35404130e6cf19 Mon Sep 17 00:00:00 2001
From: Jimmy Gitonga <jimmy@afroshok.com>
Date: Mon, 16 May 2022 13:39:19 +0300
Subject: [PATCH 2138/2840] Update postgres versions (#3712)

* REFACTOR: Update PostgreSQL versions that fix some security issues.

* CHORE: Update PostgreSQL versions that fix some security issues.
---
 README.md                           | 10 +++++-----
 cookiecutter.json                   | 10 +++++-----
 docs/project-generation-options.rst | 10 +++++-----
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/README.md b/README.md
index d4b067622..5fda8ff24 100644
--- a/README.md
+++ b/README.md
@@ -121,11 +121,11 @@ Answer the prompts with your own desired [options](http://cookiecutter-django.re
     use_pycharm [n]: y
     use_docker [n]: n
     Select postgresql_version:
-    1 - 14.1
-    2 - 13.5
-    3 - 12.9
-    4 - 11.14
-    5 - 10.19
+    1 - 14
+    2 - 13
+    3 - 12
+    4 - 11
+    5 - 10
     Choose from 1, 2, 3, 4, 5 [1]: 1
     Select cloud_provider:
     1 - AWS
diff --git a/cookiecutter.json b/cookiecutter.json
index 4a43bae7e..90d084b3a 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -18,11 +18,11 @@
   "use_pycharm": "n",
   "use_docker": "n",
   "postgresql_version": [
-    "14.1",
-    "13.5",
-    "12.9",
-    "11.14",
-    "10.19"
+    "14",
+    "13",
+    "12",
+    "11",
+    "10"
   ],
   "cloud_provider": [
     "AWS",
diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index 3cc719779..2d8103cf2 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -55,11 +55,11 @@ use_docker:
 postgresql_version:
     Select a PostgreSQL_ version to use. The choices are:
 
-    1. 14.1
-    2. 13.5
-    3. 12.9
-    4. 11.14
-    5. 10.19
+    1. 14
+    2. 13
+    3. 12
+    4. 11
+    5. 10
 
 cloud_provider:
     Select a cloud provider for static & media files. The choices are:

From bc0ed07f451c3984fd28d6c9c8d67c1cbb67df5b Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 16 May 2022 03:41:09 -0700
Subject: [PATCH 2139/2840] Update django-anymail to 8.6 (#3713)

---
 .../requirements/production.txt                | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index b006eb295..ebadabf17 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -22,21 +22,21 @@ django-storages[boto3]==1.12.3  # https://github.com/jschneier/django-storages
 django-storages[google]==1.12.3  # https://github.com/jschneier/django-storages
 {%- endif %}
 {%- if cookiecutter.mail_service == 'Mailgun' %}
-django-anymail[mailgun]==8.5  # https://github.com/anymail/django-anymail
+django-anymail[mailgun]==8.6  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
-django-anymail[amazon_ses]==8.5  # https://github.com/anymail/django-anymail
+django-anymail[amazon_ses]==8.6  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
-django-anymail[mailjet]==8.5  # https://github.com/anymail/django-anymail
+django-anymail[mailjet]==8.6  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
-django-anymail[mandrill]==8.5  # https://github.com/anymail/django-anymail
+django-anymail[mandrill]==8.6  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
-django-anymail[postmark]==8.5  # https://github.com/anymail/django-anymail
+django-anymail[postmark]==8.6  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
-django-anymail[sendgrid]==8.5  # https://github.com/anymail/django-anymail
+django-anymail[sendgrid]==8.6  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
-django-anymail[sendinblue]==8.5  # https://github.com/anymail/django-anymail
+django-anymail[sendinblue]==8.6  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
-django-anymail[sparkpost]==8.5  # https://github.com/anymail/django-anymail
+django-anymail[sparkpost]==8.6  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
-django-anymail==8.5  # https://github.com/anymail/django-anymail
+django-anymail==8.6  # https://github.com/anymail/django-anymail
 {%- endif %}

From 1611719316c0498799c402f6fdb34802ca8b145b Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 17 May 2022 02:43:56 +0000
Subject: [PATCH 2140/2840] Release 2022.05.16

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6ecf7b214..a803ba3f6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.05.16
+
+### Changed
+- Update postgres versions ([#3712](https://github.com/cookiecutter/cookiecutter-django/pull/3712))
+### Updated
+- Update django-anymail to 8.6 ([#3713](https://github.com/cookiecutter/cookiecutter-django/pull/3713))
+
 ## 2022.05.14
 
 ### Updated
diff --git a/setup.py b/setup.py
index 9d9b397c8..34f441404 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.05.14"
+version = "2022.05.16"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 3743fded1e20df5e7b54b30c3e97fc731ad56742 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 18 May 2022 00:01:17 -0700
Subject: [PATCH 2141/2840] Update pillow from 9.1.0 to 9.1.1 (#3714)

---
 {{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 5d77f2f2f..0b0f34a7d 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,6 +1,6 @@
 pytz==2022.1  # https://github.com/stub42/pytz
 python-slugify==6.1.2  # https://github.com/un33k/python-slugify
-Pillow==9.1.0  # https://github.com/python-pillow/Pillow
+Pillow==9.1.1  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
 {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %}
 rcssmin==1.1.0 --install-option="--without-c-extensions"  # https://github.com/ndparker/rcssmin

From a6ce9f04fff7e90027e105bce72a8706206190cf Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 19 May 2022 02:46:40 +0000
Subject: [PATCH 2142/2840] Release 2022.05.18

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a803ba3f6..3c74256b9 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 -->
 
+## 2022.05.18
+
+### Updated
+- Update pillow to 9.1.1 ([#3714](https://github.com/cookiecutter/cookiecutter-django/pull/3714))
+
 ## 2022.05.16
 
 ### Changed
diff --git a/setup.py b/setup.py
index 34f441404..969822104 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.05.16"
+version = "2022.05.18"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 2d7b83e82182b29e9ebb733ed4b13d3a5f4640c8 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 24 May 2022 04:47:13 -0700
Subject: [PATCH 2143/2840] Update djangorestframework-stubs from 1.4.0 to
 1.6.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 83d01776c..bbd3e74dd 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -18,7 +18,7 @@ django-stubs==1.9.0  # https://github.com/typeddjango/django-stubs
 pytest==7.1.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
-djangorestframework-stubs==1.4.0  # https://github.com/typeddjango/djangorestframework-stubs
+djangorestframework-stubs==1.6.0  # https://github.com/typeddjango/djangorestframework-stubs
 {%- endif %}
 
 # Documentation

From c04088f8473325a3437cdc9121ff016ea345a304 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 24 May 2022 16:32:56 -0500
Subject: [PATCH 2144/2840] Update coverage from 6.3.3 to 6.4 (#3716)

---
 {{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 83d01776c..696848ff4 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==4.0.1  # https://github.com/PyCQA/flake8
 flake8-isort==4.1.1  # https://github.com/gforcada/flake8-isort
-coverage==6.3.3  # https://github.com/nedbat/coveragepy
+coverage==6.4  # https://github.com/nedbat/coveragepy
 black==22.3.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 5503df039f751d22ed89bbcf7337a14953fffd8f Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 25 May 2022 02:43:18 +0000
Subject: [PATCH 2145/2840] Release 2022.05.24

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3c74256b9..219ba76e2 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 -->
 
+## 2022.05.24
+
+### Updated
+- Update coverage to 6.4 ([#3716](https://github.com/cookiecutter/cookiecutter-django/pull/3716))
+
 ## 2022.05.18
 
 ### Updated
diff --git a/setup.py b/setup.py
index 969822104..34341ad8e 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.05.18"
+version = "2022.05.24"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 1596b65a39d0205de467675e5613ee04c9ca9a2e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 1 Jun 2022 09:11:14 -0700
Subject: [PATCH 2146/2840] Update redis from 4.3.1 to 4.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 0b0f34a7d..0886d1c7f 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -12,7 +12,7 @@ argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==6.1.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==4.3.1  # https://github.com/redis/redis-py
+redis==4.3.2  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}

From 8f66cad1b45d2ad553c0f75d0cbac896aed4d4a9 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 2 Jun 2022 02:49:02 +0000
Subject: [PATCH 2147/2840] Release 2022.06.01

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 219ba76e2..f06d6bff7 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 -->
 
+## 2022.06.01
+
+### Updated
+- Update redis to 4.3.2 ([#3726](https://github.com/cookiecutter/cookiecutter-django/pull/3726))
+
 ## 2022.05.24
 
 ### Updated
diff --git a/setup.py b/setup.py
index 34341ad8e..c30829dbf 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.05.24"
+version = "2022.06.01"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From a10cf3a9eab47975dd6b2580056fcc4860a48edb Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 2 Jun 2022 09:50:57 -0700
Subject: [PATCH 2148/2840] Update redis from 4.3.2 to 4.3.3

---
 {{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 0886d1c7f..50d2e98df 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -12,7 +12,7 @@ argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==6.1.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==4.3.2  # https://github.com/redis/redis-py
+redis==4.3.3  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}

From fb64830488046992981cd6e8229a55614caa23ea Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 2 Jun 2022 09:51:00 -0700
Subject: [PATCH 2149/2840] Update coverage from 6.4 to 6.4.1

---
 {{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 696848ff4..7a488f127 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==4.0.1  # https://github.com/PyCQA/flake8
 flake8-isort==4.1.1  # https://github.com/gforcada/flake8-isort
-coverage==6.4  # https://github.com/nedbat/coveragepy
+coverage==6.4.1  # https://github.com/nedbat/coveragepy
 black==22.3.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 134ceb7224b536e61f12ae6c16be741d2d1a8922 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 3 Jun 2022 02:37:45 +0000
Subject: [PATCH 2150/2840] Release 2022.06.02

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f06d6bff7..32a0b741d 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 -->
 
+## 2022.06.02
+
+### Updated
+- Update coverage to 6.4.1 ([#3729](https://github.com/cookiecutter/cookiecutter-django/pull/3729))
+- Update redis to 4.3.3 ([#3728](https://github.com/cookiecutter/cookiecutter-django/pull/3728))
+
 ## 2022.06.01
 
 ### Updated
diff --git a/setup.py b/setup.py
index c30829dbf..b1cc4a0c4 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.06.01"
+version = "2022.06.02"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 9e805ba0abb9ce85f0ec1c967cd9f8c5335381e4 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 3 Jun 2022 22:55:23 -0700
Subject: [PATCH 2151/2840] Update django-celery-beat from 2.2.1 to 2.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 50d2e98df..2f2eee7db 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -18,7 +18,7 @@ hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
 celery==5.2.6  # pyup: < 6.0  # https://github.com/celery/celery
-django-celery-beat==2.2.1  # https://github.com/celery/django-celery-beat
+django-celery-beat==2.3.0  # https://github.com/celery/django-celery-beat
 {%- if cookiecutter.use_docker == 'y' %}
 flower==1.0.0  # https://github.com/mher/flower
 {%- endif %}

From 8111fcf84062a9ffa6885d2bf2ebdc4f8483ff8f Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 4 Jun 2022 09:03:07 -0700
Subject: [PATCH 2152/2840] Update celery from 5.2.6 to 5.2.7

---
 {{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 2f2eee7db..321e868ea 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -17,7 +17,7 @@ redis==4.3.3  # https://github.com/redis/redis-py
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
-celery==5.2.6  # pyup: < 6.0  # https://github.com/celery/celery
+celery==5.2.7  # pyup: < 6.0  # https://github.com/celery/celery
 django-celery-beat==2.3.0  # https://github.com/celery/django-celery-beat
 {%- if cookiecutter.use_docker == 'y' %}
 flower==1.0.0  # https://github.com/mher/flower

From 246f8a4361d03bc1b9f6cfc848b797876d6fa76e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 29 May 2022 14:02:03 -0700
Subject: [PATCH 2153/2840] Update sphinx from 4.5.0 to 5.0.0

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

diff --git a/docs/requirements.txt b/docs/requirements.txt
index ba0b67c5f..1f3307af5 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,2 +1,2 @@
-sphinx==4.5.0
+sphinx==5.0.0
 sphinx-rtd-theme==1.0.0

From 6f8ed496bbcf18b0d74f2ba586da8c814841aefa Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 29 May 2022 14:02:03 -0700
Subject: [PATCH 2154/2840] Update sphinx from 4.5.0 to 5.0.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 7a488f127..a0557f705 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -23,7 +23,7 @@ djangorestframework-stubs==1.4.0  # https://github.com/typeddjango/djangorestfra
 
 # Documentation
 # ------------------------------------------------------------------------------
-sphinx==4.5.0  # https://github.com/sphinx-doc/sphinx
+sphinx==5.0.0  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From 4e830b1575a5e3aebf4f6aa98ae48148ad8c7a44 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 4 Jun 2022 10:31:11 -0700
Subject: [PATCH 2155/2840] Update sphinx from 5.0.0 to 5.0.1

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

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 1f3307af5..b18d014f5 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,2 +1,2 @@
-sphinx==5.0.0
+sphinx==5.0.1
 sphinx-rtd-theme==1.0.0

From b1eae5394cff71f2252b0a26fa5af68a5ab32612 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 4 Jun 2022 10:31:12 -0700
Subject: [PATCH 2156/2840] Update sphinx from 5.0.0 to 5.0.1

---
 {{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 a0557f705..c2ca554fc 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -23,7 +23,7 @@ djangorestframework-stubs==1.4.0  # https://github.com/typeddjango/djangorestfra
 
 # Documentation
 # ------------------------------------------------------------------------------
-sphinx==5.0.0  # https://github.com/sphinx-doc/sphinx
+sphinx==5.0.1  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From 502e8e523531b3c78f23a9af0765607e3e708ee5 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 4 Jun 2022 10:47:10 -0700
Subject: [PATCH 2157/2840] Update django-stubs from 1.9.0 to 1.11.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 c2ca554fc..5a5d518aa 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -14,7 +14,7 @@ watchgod==0.8.2  # https://github.com/samuelcolvin/watchgod
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.950  # https://github.com/python/mypy
-django-stubs==1.9.0  # https://github.com/typeddjango/django-stubs
+django-stubs==1.11.0  # https://github.com/typeddjango/django-stubs
 pytest==7.1.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}

From cf6fc443bbf25aad3b181170bc42587bc651165d Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sat, 4 Jun 2022 14:49:26 -0300
Subject: [PATCH 2158/2840] Fix type error

---
 .../{{cookiecutter.project_slug}}/users/tests/test_views.py     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
index 944daca52..0b47bd79f 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
@@ -63,7 +63,7 @@ class TestUserUpdateView:
 
         # Initialize the form
         form = UserAdminChangeForm()
-        form.cleaned_data = []
+        form.cleaned_data = {}
         view.form_valid(form)
 
         messages_sent = [m.message for m in messages.get_messages(request)]

From 8c1404fb737f0231a357c131fd08c205104fa6ba Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 4 Jun 2022 13:14:56 -0500
Subject: [PATCH 2159/2840] Update django-cors-headers to 3.12.0 (#3736)

---
 {{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 321e868ea..5d134cf3b 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -42,7 +42,7 @@ django-redis==5.2.0  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == 'y' %}
 # Django REST Framework
 djangorestframework==3.13.1  # https://github.com/encode/django-rest-framework
-django-cors-headers==3.11.0 # https://github.com/adamchainz/django-cors-headers
+django-cors-headers==3.12.0 # https://github.com/adamchainz/django-cors-headers
 # DRF-spectacular for api documentation
 drf-spectacular==0.22.1  # https://github.com/tfranzel/drf-spectacular 
 {%- endif %}

From d729d5ed4753527427c52dcfd263d37be36dcbd2 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sun, 5 Jun 2022 02:39:13 +0000
Subject: [PATCH 2160/2840] Release 2022.06.04

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32a0b741d..7758abd43 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 -->
 
+## 2022.06.04
+
+### Updated
+- Update django-cors-headers to 3.12.0 ([#3736](https://github.com/cookiecutter/cookiecutter-django/pull/3736))
+- Update djangorestframework-stubs to 1.6.0 ([#3718](https://github.com/cookiecutter/cookiecutter-django/pull/3718))
+- Update django-stubs to 1.11.0 ([#3734](https://github.com/cookiecutter/cookiecutter-django/pull/3734))
+- Update sphinx to 5.0.1 ([#3733](https://github.com/cookiecutter/cookiecutter-django/pull/3733))
+- Update sphinx to 5.0.0 ([#3724](https://github.com/cookiecutter/cookiecutter-django/pull/3724))
+- Update celery to 5.2.7 ([#3732](https://github.com/cookiecutter/cookiecutter-django/pull/3732))
+- Update django-celery-beat to 2.3.0 ([#3731](https://github.com/cookiecutter/cookiecutter-django/pull/3731))
+
 ## 2022.06.02
 
 ### Updated
diff --git a/setup.py b/setup.py
index b1cc4a0c4..c46be4578 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.06.02"
+version = "2022.06.04"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From a7d9f4656c0e34335e6200f6d48df70f252ca722 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 5 Jun 2022 18:09:22 -0500
Subject: [PATCH 2161/2840] Update django-cors-headers from 3.12.0 to 3.13.0
 (#3738)

---
 {{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 5d134cf3b..82130580e 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -42,7 +42,7 @@ django-redis==5.2.0  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == 'y' %}
 # Django REST Framework
 djangorestframework==3.13.1  # https://github.com/encode/django-rest-framework
-django-cors-headers==3.12.0 # https://github.com/adamchainz/django-cors-headers
+django-cors-headers==3.13.0 # https://github.com/adamchainz/django-cors-headers
 # DRF-spectacular for api documentation
 drf-spectacular==0.22.1  # https://github.com/tfranzel/drf-spectacular 
 {%- endif %}

From 98e6178375b24f45d9ee8f0ce32aefdbbe9d4278 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 5 Jun 2022 18:09:46 -0500
Subject: [PATCH 2162/2840] Update whitenoise from 6.1.0 to 6.2.0 (#3737)

---
 {{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 82130580e..0414efe7b 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -10,7 +10,7 @@ rcssmin==1.1.0  # https://github.com/ndparker/rcssmin
 {%- endif %}
 argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
-whitenoise==6.1.0  # https://github.com/evansd/whitenoise
+whitenoise==6.2.0  # https://github.com/evansd/whitenoise
 {%- endif %}
 redis==4.3.3  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}

From 635b1fa3ecbec5013c3c3507211805fde19ce0d0 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Mon, 6 Jun 2022 02:41:41 +0000
Subject: [PATCH 2163/2840] Release 2022.06.05

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7758abd43..8662d59c2 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 -->
 
+## 2022.06.05
+
+### Updated
+- Update whitenoise to 6.2.0 ([#3737](https://github.com/cookiecutter/cookiecutter-django/pull/3737))
+- Update django-cors-headers to 3.13.0 ([#3738](https://github.com/cookiecutter/cookiecutter-django/pull/3738))
+
 ## 2022.06.04
 
 ### Updated
diff --git a/setup.py b/setup.py
index c46be4578..bd9c45b4d 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.06.04"
+version = "2022.06.05"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From a965a1c1d43104a01b7b4bb58633f7c6863ae92c Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 6 Jun 2022 11:37:55 +0100
Subject: [PATCH 2164/2840] Bump pre-commit/action from 2.0.3 to 3.0.0 (#3739)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 121657e2f..8856c0d88 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -18,7 +18,7 @@ jobs:
           python-version: "3.9"
           cache: pip
       - name: Run pre-commit
-        uses: pre-commit/action@v2.0.3
+        uses: pre-commit/action@v3.0.0
 
   tests:
     strategy:

From 241da33539c3fc8b2dd88337bf2fe385d9e7bcbc Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 7 Jun 2022 02:40:08 +0000
Subject: [PATCH 2165/2840] Release 2022.06.06

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8662d59c2..82f12b88e 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 -->
 
+## 2022.06.06
+
+### Updated
+- Bump pre-commit/action from 2.0.3 to 3.0.0 ([#3739](https://github.com/cookiecutter/cookiecutter-django/pull/3739))
+
 ## 2022.06.05
 
 ### Updated
diff --git a/setup.py b/setup.py
index bd9c45b4d..84e0661bd 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.06.05"
+version = "2022.06.06"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 6f610f0ef4b665f9a317360f39fbeccf5c8833d4 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 7 Jun 2022 21:11:34 +0100
Subject: [PATCH 2166/2840] Auto-update pre-commit hooks (#3742)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                               | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f9559ffa0..ad2dab61b 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.32.1
+    rev: v2.34.0
     hooks:
       - id: pyupgrade
         args: [--py39-plus]
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index 5b22d0dc9..b42c689ea 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.32.1
+    rev: v2.34.0
     hooks:
       - id: pyupgrade
         args: [--py39-plus]

From 81ce5c5c3ea71a5b61f4740ac0bc56805442e18a Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 7 Jun 2022 15:17:02 -0500
Subject: [PATCH 2167/2840] Update django-allauth from 0.50.0 to 0.51.0 (#3743)

---
 {{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 0414efe7b..54b510a2c 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -32,7 +32,7 @@ uvicorn[standard]==0.17.6  # https://github.com/encode/uvicorn
 django==3.2.13  # pyup: < 4.0  # https://www.djangoproject.com/
 django-environ==0.8.1  # https://github.com/joke2k/django-environ
 django-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
-django-allauth==0.50.0  # https://github.com/pennersr/django-allauth
+django-allauth==0.51.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.14.0  # https://github.com/django-crispy-forms/django-crispy-forms
 crispy-bootstrap5==0.6  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}

From 2ac315f0ac2f113d9cb4d710c6c6880e78aa23aa Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 8 Jun 2022 02:43:44 +0000
Subject: [PATCH 2168/2840] Release 2022.06.07

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 82f12b88e..bee54f303 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 -->
 
+## 2022.06.07
+
+### Updated
+- Update django-allauth to 0.51.0 ([#3743](https://github.com/cookiecutter/cookiecutter-django/pull/3743))
+- Auto-update pre-commit hooks ([#3742](https://github.com/cookiecutter/cookiecutter-django/pull/3742))
+
 ## 2022.06.06
 
 ### Updated
diff --git a/setup.py b/setup.py
index 84e0661bd..9dce22fef 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.06.06"
+version = "2022.06.07"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 71b19bbd926db3397616402a8229021446485311 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 8 Jun 2022 17:54:58 +0100
Subject: [PATCH 2169/2840] Auto-update pre-commit hooks (#3744)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                               | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ad2dab61b..31ed0fa8f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -3,7 +3,7 @@ default_stages: [commit]
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.2.0
+    rev: v4.3.0
     hooks:
       - id: trailing-whitespace
       - id: check-yaml
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index b42c689ea..465f76f3a 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -3,7 +3,7 @@ default_stages: [commit]
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.2.0
+    rev: v4.3.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer

From e3b4ed2fe5211a9092c26e396438bf59985165b7 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 9 Jun 2022 02:44:13 +0000
Subject: [PATCH 2170/2840] Release 2022.06.08

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bee54f303..e488f7b85 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 -->
 
+## 2022.06.08
+
+### Updated
+- Auto-update pre-commit hooks ([#3744](https://github.com/cookiecutter/cookiecutter-django/pull/3744))
+
 ## 2022.06.07
 
 ### Updated
diff --git a/setup.py b/setup.py
index 9dce22fef..3caee68c1 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.06.07"
+version = "2022.06.08"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 2963fd8b09174bbaeb30314a5efa6a84c4792813 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 9 Jun 2022 11:58:10 +0100
Subject: [PATCH 2171/2840] Bump actions/setup-python from 3 to 4 (#3746)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/ci.yml                    | 8 ++++----
 .github/workflows/django-issue-checker.yml  | 2 +-
 .github/workflows/pre-commit-autoupdate.yml | 2 +-
 .github/workflows/update-changelog.yml      | 2 +-
 .github/workflows/update-contributors.yml   | 2 +-
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8856c0d88..0fa5add0d 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -13,7 +13,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: "3.9"
           cache: pip
@@ -33,7 +33,7 @@ jobs:
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: "3.9"
           cache: pip
@@ -60,7 +60,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: "3.9"
           cache: pip
@@ -100,7 +100,7 @@ jobs:
 
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: "3.9"
           cache: pip
diff --git a/.github/workflows/django-issue-checker.yml b/.github/workflows/django-issue-checker.yml
index 5ea023fdd..26f57c51f 100644
--- a/.github/workflows/django-issue-checker.yml
+++ b/.github/workflows/django-issue-checker.yml
@@ -17,7 +17,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: "3.9"
       - name: Install dependencies
diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml
index 789c13b43..e51b4cbdc 100644
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v3
-      - uses: actions/setup-python@v3
+      - uses: actions/setup-python@v4
         with:
           python-version: "3.9"
 
diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index 2b73498dc..14c590e59 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -17,7 +17,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Set up Python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v4
         with:
           python-version: "3.9"
       - name: Install dependencies
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 2e690d329..6ecf8af90 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -20,7 +20,7 @@ jobs:
       - uses: actions/checkout@v3
 
       - name: Set up Python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v4
         with:
           python-version: "3.9"
       - name: Install dependencies

From c1c1f07446414e06ad98789b741c4e70c9a4d891 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 10 Jun 2022 02:43:15 +0000
Subject: [PATCH 2172/2840] Release 2022.06.09

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e488f7b85..64d00de71 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 -->
 
+## 2022.06.09
+
+### Updated
+- Bump actions/setup-python from 3 to 4 ([#3746](https://github.com/cookiecutter/cookiecutter-django/pull/3746))
+
 ## 2022.06.08
 
 ### Updated
diff --git a/setup.py b/setup.py
index 3caee68c1..4940a6f90 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.06.08"
+version = "2022.06.09"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From fe6d29006ad6832a5eeee55323b6e96d579eeb34 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 11 Jun 2022 10:41:01 -0500
Subject: [PATCH 2173/2840] Update requests from 2.27.1 to 2.28.0 (#3748)

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

diff --git a/requirements.txt b/requirements.txt
index f5364be53..ea2455268 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -23,4 +23,4 @@ pyyaml==6.0
 PyGithub==1.55
 gitpython==3.1.27
 jinja2==3.1.2
-requests==2.27.1
+requests==2.28.0

From d57e2e634c464da0d77a757d5b92db4ec5909d99 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sun, 12 Jun 2022 02:46:20 +0000
Subject: [PATCH 2174/2840] Release 2022.06.11

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 64d00de71..ba788a7f5 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 -->
 
+## 2022.06.11
+
+### Updated
+- Update requests to 2.28.0 ([#3748](https://github.com/cookiecutter/cookiecutter-django/pull/3748))
+
 ## 2022.06.09
 
 ### Updated
diff --git a/setup.py b/setup.py
index 4940a6f90..a15caee61 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.06.09"
+version = "2022.06.11"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From a51c8d29618db4d2328191e922914aad7b1d9246 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 13 Jun 2022 14:17:46 -0500
Subject: [PATCH 2175/2840] Update cookiecutter to 2.1.1 (#3727)

* Update cookiecutter from 1.7.3 to 2.1.1

* Fix postgreSQL versions in tests

* Fix front-end pipeline choice in tests

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
---
 requirements.txt                      |  2 +-
 tests/test_cookiecutter_generation.py | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index ea2455268..9d9ed4460 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,4 +1,4 @@
-cookiecutter==1.7.3
+cookiecutter==2.1.1
 sh==1.14.2
 binaryornot==0.4.4
 
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 63b4fc97c..3a757fcb7 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -47,11 +47,11 @@ SUPPORTED_COMBINATIONS = [
     {"use_pycharm": "n"},
     {"use_docker": "y"},
     {"use_docker": "n"},
-    {"postgresql_version": "14.1"},
-    {"postgresql_version": "13.5"},
-    {"postgresql_version": "12.9"},
-    {"postgresql_version": "11.14"},
-    {"postgresql_version": "10.19"},
+    {"postgresql_version": "14"},
+    {"postgresql_version": "13"},
+    {"postgresql_version": "12"},
+    {"postgresql_version": "11"},
+    {"postgresql_version": "10"},
     {"cloud_provider": "AWS", "use_whitenoise": "y"},
     {"cloud_provider": "AWS", "use_whitenoise": "n"},
     {"cloud_provider": "GCP", "use_whitenoise": "y"},
@@ -88,7 +88,7 @@ SUPPORTED_COMBINATIONS = [
     {"use_drf": "y"},
     {"use_drf": "n"},
     {"frontend_pipeline": "None"},
-    {"frontend_pipeline": "django-compressor"},
+    {"frontend_pipeline": "Django Compressor"},
     {"frontend_pipeline": "Gulp"},
     {"use_celery": "y"},
     {"use_celery": "n"},

From c5f373d1f71fdefdb89b88f91232b47d39b0e064 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 14 Jun 2022 02:48:43 +0000
Subject: [PATCH 2176/2840] Release 2022.06.13

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba788a7f5..363e5bcc2 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 -->
 
+## 2022.06.13
+
+### Updated
+- Update cookiecutter to 2.1.1 ([#3727](https://github.com/cookiecutter/cookiecutter-django/pull/3727))
+
 ## 2022.06.11
 
 ### Updated
diff --git a/setup.py b/setup.py
index a15caee61..b0121827e 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.06.11"
+version = "2022.06.13"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 570b77446eb5c8c57e97635359d94e4f7111864b Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 15 Jun 2022 13:14:32 -0500
Subject: [PATCH 2177/2840] Update django-environ to 0.9.0 (#3751)

---
 {{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 54b510a2c..2d65dc0c0 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -30,7 +30,7 @@ uvicorn[standard]==0.17.6  # https://github.com/encode/uvicorn
 # Django
 # ------------------------------------------------------------------------------
 django==3.2.13  # pyup: < 4.0  # https://www.djangoproject.com/
-django-environ==0.8.1  # https://github.com/joke2k/django-environ
+django-environ==0.9.0  # https://github.com/joke2k/django-environ
 django-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.51.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.14.0  # https://github.com/django-crispy-forms/django-crispy-forms

From 223dd6dc910cd9a5bcdca25ef0545223352662cc Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 16 Jun 2022 02:45:20 +0000
Subject: [PATCH 2178/2840] Release 2022.06.15

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 363e5bcc2..16b67c921 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 -->
 
+## 2022.06.15
+
+### Updated
+- Update django-environ to 0.9.0 ([#3751](https://github.com/cookiecutter/cookiecutter-django/pull/3751))
+
 ## 2022.06.13
 
 ### Updated
diff --git a/setup.py b/setup.py
index b0121827e..3f71a5d6d 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.06.13"
+version = "2022.06.15"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From c42c6f4628620cdb3e706034d5854690b61a8acf Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 22 Jun 2022 10:40:52 -0500
Subject: [PATCH 2179/2840] Update djangorestframework-stubs to 1.7.0 (#3754)

---
 {{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 cd82050c6..cb88cfc2b 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -18,7 +18,7 @@ django-stubs==1.11.0  # https://github.com/typeddjango/django-stubs
 pytest==7.1.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
-djangorestframework-stubs==1.6.0  # https://github.com/typeddjango/djangorestframework-stubs
+djangorestframework-stubs==1.7.0  # https://github.com/typeddjango/djangorestframework-stubs
 {%- endif %}
 
 # Documentation

From 98faa89dd516113bd9f8288e9c6b101726da8b05 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 22 Jun 2022 10:41:05 -0500
Subject: [PATCH 2180/2840] Update sentry-sdk to 1.6.0 (#3756)

---
 {{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 ebadabf17..7b10184db 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.5.12  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.6.0  # 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 1f4340acdcd42badef04ee39fff7c1677526d7b5 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 22 Jun 2022 17:06:11 -0500
Subject: [PATCH 2181/2840] Update django-stubs to 1.12.0 (#3757)

---
 {{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 cb88cfc2b..ca1caf241 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -14,7 +14,7 @@ watchgod==0.8.2  # https://github.com/samuelcolvin/watchgod
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.950  # https://github.com/python/mypy
-django-stubs==1.11.0  # https://github.com/typeddjango/django-stubs
+django-stubs==1.12.0  # https://github.com/typeddjango/django-stubs
 pytest==7.1.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}

From 43c491f59bd33c52379b5973928f91590ec161bc Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 23 Jun 2022 02:47:20 +0000
Subject: [PATCH 2182/2840] Release 2022.06.22

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16b67c921..7898d950a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.06.22
+
+### Updated
+- Update django-stubs to 1.12.0 ([#3757](https://github.com/cookiecutter/cookiecutter-django/pull/3757))
+- Update sentry-sdk to 1.6.0 ([#3756](https://github.com/cookiecutter/cookiecutter-django/pull/3756))
+- Update djangorestframework-stubs to 1.7.0 ([#3754](https://github.com/cookiecutter/cookiecutter-django/pull/3754))
+
 ## 2022.06.15
 
 ### Updated
diff --git a/setup.py b/setup.py
index 3f71a5d6d..eb1cb4af1 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.06.15"
+version = "2022.06.22"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 897913f392d0a998608071603c92f3e6a90d5f36 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 23 Jun 2022 17:46:48 -0500
Subject: [PATCH 2183/2840] Update django-debug-toolbar from 3.4.0 to 3.5.0
 (#3760)

---
 {{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 ca1caf241..8f30a1565 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -42,7 +42,7 @@ pre-commit==2.19.0  # https://github.com/pre-commit/pre-commit
 # ------------------------------------------------------------------------------
 factory-boy==3.2.1  # https://github.com/FactoryBoy/factory_boy
 
-django-debug-toolbar==3.4.0  # https://github.com/jazzband/django-debug-toolbar
+django-debug-toolbar==3.5.0  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.1.5  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==2.0.3  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.5.2  # https://github.com/pytest-dev/pytest-django

From 1a97e72f7d83bb292194277e62bf5d384287d276 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 24 Jun 2022 02:47:10 +0000
Subject: [PATCH 2184/2840] Release 2022.06.23

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7898d950a..63175708e 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 -->
 
+## 2022.06.23
+
+### Updated
+- Update django-debug-toolbar to 3.5.0 ([#3760](https://github.com/cookiecutter/cookiecutter-django/pull/3760))
+
 ## 2022.06.22
 
 ### Updated
diff --git a/setup.py b/setup.py
index eb1cb4af1..7e1a01017 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.06.22"
+version = "2022.06.23"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 24132594d70fdff69575159625f445f50a9e9eab Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 28 Jun 2022 02:22:54 -0500
Subject: [PATCH 2185/2840] Update black to 22.6.0 (#3764)

* Update black from 22.3.0 to 22.6.0

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

diff --git a/requirements.txt b/requirements.txt
index 9d9ed4460..66c8ef722 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-black==22.3.0
+black==22.6.0
 isort==5.10.1
 flake8==4.0.1
 flake8-isort==4.1.1
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 8f30a1565..c11910ec5 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -31,7 +31,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 flake8==4.0.1  # https://github.com/PyCQA/flake8
 flake8-isort==4.1.1  # https://github.com/gforcada/flake8-isort
 coverage==6.4.1  # https://github.com/nedbat/coveragepy
-black==22.3.0  # https://github.com/psf/black
+black==22.6.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery

From ac49f4efd026cdbed633dbb67dca6e2fc251cfbb Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 28 Jun 2022 08:23:08 +0100
Subject: [PATCH 2186/2840] Auto-update pre-commit hooks (#3765)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                               | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 31ed0fa8f..b7c525794 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -16,7 +16,7 @@ repos:
         exclude: hooks/
 
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 22.6.0
     hooks:
       - id: black
 
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index 465f76f3a..cee63c214 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -16,7 +16,7 @@ repos:
         args: [--py39-plus]
 
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 22.6.0
     hooks:
       - id: black
 

From 9653b52873d8f843091d746ec49e57cf31f492c3 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 29 Jun 2022 02:49:10 +0000
Subject: [PATCH 2187/2840] Release 2022.06.28

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 63175708e..81705a15e 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 -->
 
+## 2022.06.28
+
+### Updated
+- Auto-update pre-commit hooks ([#3765](https://github.com/cookiecutter/cookiecutter-django/pull/3765))
+- Update black to 22.6.0 ([#3764](https://github.com/cookiecutter/cookiecutter-django/pull/3764))
+
 ## 2022.06.23
 
 ### Updated
diff --git a/setup.py b/setup.py
index 7e1a01017..1e705da37 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.06.23"
+version = "2022.06.28"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From e7e76df4b58bf126bcc55b6adb65ce27a3019311 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 6 Jul 2022 12:11:01 -0500
Subject: [PATCH 2188/2840] Update django to 3.2.14 (#3768)

---
 {{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 2d65dc0c0..e540f13fe 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,7 +29,7 @@ uvicorn[standard]==0.17.6  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.2.13  # pyup: < 4.0  # https://www.djangoproject.com/
+django==3.2.14  # pyup: < 4.0  # https://www.djangoproject.com/
 django-environ==0.9.0  # https://github.com/joke2k/django-environ
 django-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.51.0  # https://github.com/pennersr/django-allauth

From 3db1e7704fee21f605abd5ad4d4682a2c3e78faf Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 7 Jul 2022 02:53:12 +0000
Subject: [PATCH 2189/2840] Release 2022.07.06

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81705a15e..ab604aecd 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 -->
 
+## 2022.07.06
+
+### Updated
+- Update django to 3.2.14 ([#3768](https://github.com/cookiecutter/cookiecutter-django/pull/3768))
+
 ## 2022.06.28
 
 ### Updated
diff --git a/setup.py b/setup.py
index 1e705da37..26f69e53d 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.06.28"
+version = "2022.07.06"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 5008557deab8152cf3d443c815547fb2a153a615 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 10 Jul 2022 12:02:35 +0100
Subject: [PATCH 2190/2840] Auto-update pre-commit hooks (#3775)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                               | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b7c525794..60665f0ab 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.34.0
+    rev: v2.35.0
     hooks:
       - id: pyupgrade
         args: [--py39-plus]
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index cee63c214..fe45acb85 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.34.0
+    rev: v2.35.0
     hooks:
       - id: pyupgrade
         args: [--py39-plus]

From fd3ae639fe739bbfaf02a61769c21ef14f6c1265 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sun, 10 Jul 2022 21:44:13 +0100
Subject: [PATCH 2191/2840] Revert "Auto-update pre-commit hooks (#3775)"
 (#3778)

This reverts commit 5008557deab8152cf3d443c815547fb2a153a615.
---
 .pre-commit-config.yaml                               | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 60665f0ab..b7c525794 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.35.0
+    rev: v2.34.0
     hooks:
       - id: pyupgrade
         args: [--py39-plus]
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index fe45acb85..cee63c214 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.35.0
+    rev: v2.34.0
     hooks:
       - id: pyupgrade
         args: [--py39-plus]

From b5342f0225000733712c6b60074cc4c794b240bc Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Mon, 11 Jul 2022 02:47:38 +0000
Subject: [PATCH 2192/2840] Release 2022.07.10

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ab604aecd..13cb3b757 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.07.10
+
+### Changed
+- Revert auto-update pre-commit hooks ([#3778](https://github.com/cookiecutter/cookiecutter-django/pull/3778))
+### Updated
+- Auto-update pre-commit hooks ([#3775](https://github.com/cookiecutter/cookiecutter-django/pull/3775))
+
 ## 2022.07.06
 
 ### Updated
diff --git a/setup.py b/setup.py
index 26f69e53d..ff30f8761 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.07.06"
+version = "2022.07.10"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 41e565924810b60f7e97283e9031bb757136e5b6 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 21 Jul 2022 17:39:53 -0500
Subject: [PATCH 2193/2840] Update requests to 2.28.1 (#3766)

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

diff --git a/requirements.txt b/requirements.txt
index 66c8ef722..07fe7fd75 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -23,4 +23,4 @@ pyyaml==6.0
 PyGithub==1.55
 gitpython==3.1.27
 jinja2==3.1.2
-requests==2.28.0
+requests==2.28.1

From ae9203f61693f4eef7c137c2db341bb00916afa1 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 21 Jul 2022 17:40:22 -0500
Subject: [PATCH 2194/2840] Update redis from 4.3.3 to 4.3.4 (#3763)

---
 {{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 e540f13fe..62687cc8a 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -12,7 +12,7 @@ argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==6.2.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==4.3.3  # https://github.com/redis/redis-py
+redis==4.3.4  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}

From fc4307dfcb8d39c8462ba1a5f6daf5460ff68bee Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 21 Jul 2022 17:41:06 -0500
Subject: [PATCH 2195/2840] Update uvicorn from 0.17.6 to 0.18.2 (#3762)

---
 {{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 62687cc8a..3bef0c201 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -24,7 +24,7 @@ flower==1.0.0  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn[standard]==0.17.6  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.18.2  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django

From 0996c367ad82769628159b9eaba2f34f7d130269 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 21 Jul 2022 17:41:45 -0500
Subject: [PATCH 2196/2840] Update tox to 3.25.1 (#3767)

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

diff --git a/requirements.txt b/requirements.txt
index 07fe7fd75..c9e6a52e1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==2.19.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.25.0
+tox==3.25.1
 pytest==7.1.2
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From c764b8d4b80b9c87b1d81e9cb6af02f77c1c0ac1 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 21 Jul 2022 17:42:59 -0500
Subject: [PATCH 2197/2840] Update django-extensions to 3.2.0 (#3774)

---
 {{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 c11910ec5..18a5d6b88 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -43,6 +43,6 @@ pre-commit==2.19.0  # https://github.com/pre-commit/pre-commit
 factory-boy==3.2.1  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==3.5.0  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==3.1.5  # https://github.com/django-extensions/django-extensions
+django-extensions==3.2.0  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==2.0.3  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.5.2  # https://github.com/pytest-dev/pytest-django

From 9ccee8349e915ad2ef9a16514db5a37a57a45404 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 21 Jul 2022 17:44:38 -0500
Subject: [PATCH 2198/2840] Update pre-commit to 2.20.0 (#3779)

* Update pre-commit from 2.19.0 to 2.20.0

* Update pre-commit from 2.19.0 to 2.20.0
---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index c9e6a52e1..328f65d26 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ black==22.6.0
 isort==5.10.1
 flake8==4.0.1
 flake8-isort==4.1.1
-pre-commit==2.19.0
+pre-commit==2.20.0
 
 # Testing
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 18a5d6b88..c9174c53e 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -36,7 +36,7 @@ pylint-django==2.5.3  # 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.19.0  # https://github.com/pre-commit/pre-commit
+pre-commit==2.20.0  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From 071a4d2458a764fac2298edceabb4445ca7dc731 Mon Sep 17 00:00:00 2001
From: Nikita Sobolev <mail@sobolevn.me>
Date: Fri, 22 Jul 2022 01:46:43 +0300
Subject: [PATCH 2199/2840] Always use `const` instead of `var` in
 `gulpfile.js` (#3786)

---
 {{cookiecutter.project_slug}}/gulpfile.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/gulpfile.js b/{{cookiecutter.project_slug}}/gulpfile.js
index 628b838ba..680e3672e 100644
--- a/{{cookiecutter.project_slug}}/gulpfile.js
+++ b/{{cookiecutter.project_slug}}/gulpfile.js
@@ -42,7 +42,7 @@ function pathsConfig(appName) {
   }
 }
 
-var paths = pathsConfig()
+const paths = pathsConfig()
 
 ////////////////////////////////
 // Tasks
@@ -50,12 +50,12 @@ var paths = pathsConfig()
 
 // Styles autoprefixing and minification
 function styles() {
-  var processCss = [
+  const processCss = [
       autoprefixer(), // adds vendor prefixes
       pixrem(),       // add fallbacks for rem units
   ]
 
-  var minifyCss = [
+  const minifyCss = [
       cssnano({ preset: 'default' })   // minify result
   ]
 
@@ -104,7 +104,7 @@ function imgCompression() {
 {%- if cookiecutter.use_async == 'y' -%}
 // Run django server
 function asyncRunServer() {
-  var cmd = spawn('gunicorn', [
+  const cmd = spawn('gunicorn', [
       'config.asgi', '-k', 'uvicorn.workers.UvicornWorker', '--reload'
       ], {stdio: 'inherit'}
   )
@@ -115,7 +115,7 @@ function asyncRunServer() {
 {%- else %}
 // Run django server
 function runServer(cb) {
-  var cmd = spawn('python', ['manage.py', 'runserver'], {stdio: 'inherit'})
+  const cmd = spawn('python', ['manage.py', 'runserver'], {stdio: 'inherit'})
   cmd.on('close', function(code) {
     console.log('runServer exited with code ' + code)
     cb(code)

From 8f0d301099eed27a6f534d9af6964c1815cbf5a0 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 21 Jul 2022 22:47:16 +0000
Subject: [PATCH 2200/2840] 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 6ee792c5b..99bb25d4a 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1262,5 +1262,10 @@
     "name": "Naveen",
     "github_login": "naveensrinivasan",
     "twitter_username": "snaveen"
+  },
+  {
+    "name": "Nikita Sobolev",
+    "github_login": "sobolevn",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 90db6689f..479aa34d7 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1363,6 +1363,13 @@ Listed in alphabetical order.
     </td>
     <td>moby_dick91</td>
   </tr>
+  <tr>
+    <td>Nikita Sobolev</td>
+    <td>
+      <a href="https://github.com/sobolevn">sobolevn</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Noah H</td>
     <td>

From a46d94de433593a56cbfb59f5e7f95291e16b785 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 21 Jul 2022 17:49:32 -0500
Subject: [PATCH 2201/2840] Update sentry-sdk to 1.8.0 (#3792)

---
 {{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 7b10184db..415c83b8d 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.6.0  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.8.0  # 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 78826c2d34b6c055391b0e1204ed19b7fbc595b5 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 21 Jul 2022 17:49:59 -0500
Subject: [PATCH 2202/2840] Update mypy to 0.971 (#3788)

---
 {{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 c9174c53e..a058f1fe1 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -13,7 +13,7 @@ watchgod==0.8.2  # https://github.com/samuelcolvin/watchgod
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.950  # https://github.com/python/mypy
+mypy==0.971  # https://github.com/python/mypy
 django-stubs==1.12.0  # https://github.com/typeddjango/django-stubs
 pytest==7.1.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar

From ee20b4d156d2e4165d6f69331da4dcbc8c526337 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 21 Jul 2022 17:50:50 -0500
Subject: [PATCH 2203/2840] Update coverage to 6.4.2 (#3783)

---
 {{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 a058f1fe1..5614bd202 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==4.0.1  # https://github.com/PyCQA/flake8
 flake8-isort==4.1.1  # https://github.com/gforcada/flake8-isort
-coverage==6.4.1  # https://github.com/nedbat/coveragepy
+coverage==6.4.2  # https://github.com/nedbat/coveragepy
 black==22.6.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From b2b082d8d8c0e8ef936c7c5ad56e7f22d34e8b1a Mon Sep 17 00:00:00 2001
From: Sebastian Reyes Espinosa <sebaslander@gmail.com>
Date: Thu, 21 Jul 2022 18:06:35 -0500
Subject: [PATCH 2204/2840] Fix warning from django-coverage-plugin in tests
 (#3790)

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/config/settings/test.py | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/config/settings/test.py b/{{cookiecutter.project_slug}}/config/settings/test.py
index 78fb6cc66..f103eb10b 100644
--- a/{{cookiecutter.project_slug}}/config/settings/test.py
+++ b/{{cookiecutter.project_slug}}/config/settings/test.py
@@ -25,5 +25,9 @@ PASSWORD_HASHERS = ["django.contrib.auth.hashers.MD5PasswordHasher"]
 # https://docs.djangoproject.com/en/dev/ref/settings/#email-backend
 EMAIL_BACKEND = "django.core.mail.backends.locmem.EmailBackend"
 
+# DEBUGING FOR TEMPLATES
+# ------------------------------------------------------------------------------
+TEMPLATES[0]["OPTIONS"]["debug"] = True  # type: ignore # noqa F405
+
 # Your stuff...
 # ------------------------------------------------------------------------------

From 9ed990986670d7305ebbcba36d457772161724fe Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 21 Jul 2022 23:07:01 +0000
Subject: [PATCH 2205/2840] 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 99bb25d4a..43f60067c 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1267,5 +1267,10 @@
     "name": "Nikita Sobolev",
     "github_login": "sobolevn",
     "twitter_username": ""
+  },
+  {
+    "name": "Sebastian Reyes Espinosa",
+    "github_login": "sebastian-code",
+    "twitter_username": "sebastianreyese"
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 479aa34d7..7153871f2 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1531,6 +1531,13 @@ Listed in alphabetical order.
     </td>
     <td>saschalalala</td>
   </tr>
+  <tr>
+    <td>Sebastian Reyes Espinosa</td>
+    <td>
+      <a href="https://github.com/sebastian-code">sebastian-code</a>
+    </td>
+    <td>sebastianreyese</td>
+  </tr>
   <tr>
     <td>Simon Rey</td>
     <td>

From c7a8b6498c0d983c2dbca63e46366a788af04937 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Thu, 21 Jul 2022 19:09:12 -0400
Subject: [PATCH 2206/2840] Update view test should set user to form instance
 (#3776)

---
 .../{{cookiecutter.project_slug}}/users/tests/test_views.py      | 1 +
 1 file changed, 1 insertion(+)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
index 0b47bd79f..d968d7ec9 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
@@ -64,6 +64,7 @@ class TestUserUpdateView:
         # Initialize the form
         form = UserAdminChangeForm()
         form.cleaned_data = {}
+        form.instance = user
         view.form_valid(form)
 
         messages_sent = [m.message for m in messages.get_messages(request)]

From 4a3feb51f5c5ba504e864b64f19a5a94d6f706c5 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 21 Jul 2022 18:21:31 -0500
Subject: [PATCH 2207/2840] Update flower to 1.1.0 (#3796)

---
 {{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 3bef0c201..8d784d37a 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -20,7 +20,7 @@ hiredis==2.0.0  # https://github.com/redis/hiredis-py
 celery==5.2.7  # pyup: < 6.0  # https://github.com/celery/celery
 django-celery-beat==2.3.0  # https://github.com/celery/django-celery-beat
 {%- if cookiecutter.use_docker == 'y' %}
-flower==1.0.0  # https://github.com/mher/flower
+flower==1.1.0  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}

From 4f73cd5c016999d08a028d8e0c1009c0ca567f55 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 22 Jul 2022 02:50:47 +0000
Subject: [PATCH 2208/2840] Release 2022.07.21

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 13cb3b757..10846e623 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,24 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.07.21
+
+### Changed
+- Set user to form instance in update user view test ([#3776](https://github.com/cookiecutter/cookiecutter-django/pull/3776))
+- Fix warning from django-coverage-plugin in tests ([#3790](https://github.com/cookiecutter/cookiecutter-django/pull/3790))
+- Always use `const` instead of `var` in `gulpfile.js` ([#3786](https://github.com/cookiecutter/cookiecutter-django/pull/3786))
+### Updated
+- Update flower to 1.1.0 ([#3796](https://github.com/cookiecutter/cookiecutter-django/pull/3796))
+- Update coverage to 6.4.2 ([#3783](https://github.com/cookiecutter/cookiecutter-django/pull/3783))
+- Update mypy to 0.971 ([#3788](https://github.com/cookiecutter/cookiecutter-django/pull/3788))
+- Update sentry-sdk to 1.8.0 ([#3792](https://github.com/cookiecutter/cookiecutter-django/pull/3792))
+- Update pre-commit to 2.20.0 ([#3779](https://github.com/cookiecutter/cookiecutter-django/pull/3779))
+- Update django-extensions to 3.2.0 ([#3774](https://github.com/cookiecutter/cookiecutter-django/pull/3774))
+- Update tox to 3.25.1 ([#3767](https://github.com/cookiecutter/cookiecutter-django/pull/3767))
+- Update uvicorn to 0.18.2 ([#3762](https://github.com/cookiecutter/cookiecutter-django/pull/3762))
+- Update redis to 4.3.4 ([#3763](https://github.com/cookiecutter/cookiecutter-django/pull/3763))
+- Update requests to 2.28.1 ([#3766](https://github.com/cookiecutter/cookiecutter-django/pull/3766))
+
 ## 2022.07.10
 
 ### Changed
diff --git a/setup.py b/setup.py
index ff30f8761..3c7bc05e5 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.07.10"
+version = "2022.07.21"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 9b19891b286c3bf31cf013fea2a5d106049d57fa Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 22 Jul 2022 11:10:47 -0500
Subject: [PATCH 2209/2840] Update werkzeug to 2.1.2 (#3797)

---
 {{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 5614bd202..2dd74665a 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,6 +1,6 @@
 -r base.txt
 
-Werkzeug[watchdog]==2.0.3 # https://github.com/pallets/werkzeug
+Werkzeug[watchdog]==2.1.2 # https://github.com/pallets/werkzeug
 ipdb==0.13.9  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.9.3  # https://github.com/psycopg/psycopg2

From 8f12442c7eaace582e0aec35549c02e860aa90b9 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 22 Jul 2022 11:11:05 -0500
Subject: [PATCH 2210/2840] Update pillow to 9.2.0 (#3799)

---
 {{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 8d784d37a..9bbf9653b 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,6 +1,6 @@
 pytz==2022.1  # https://github.com/stub42/pytz
 python-slugify==6.1.2  # https://github.com/un33k/python-slugify
-Pillow==9.1.1  # https://github.com/python-pillow/Pillow
+Pillow==9.2.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
 {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %}
 rcssmin==1.1.0 --install-option="--without-c-extensions"  # https://github.com/ndparker/rcssmin

From 6f351155de56997a5b0a351bb2011133cb1ed579 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 22 Jul 2022 11:11:56 -0500
Subject: [PATCH 2211/2840] Update sphinx to 5.0.2 (#3801)

---
 docs/requirements.txt                                | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index b18d014f5..d044fe689 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,2 +1,2 @@
-sphinx==5.0.1
+sphinx==5.0.2
 sphinx-rtd-theme==1.0.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 2dd74665a..31e107269 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -23,7 +23,7 @@ djangorestframework-stubs==1.7.0  # https://github.com/typeddjango/djangorestfra
 
 # Documentation
 # ------------------------------------------------------------------------------
-sphinx==5.0.1  # https://github.com/sphinx-doc/sphinx
+sphinx==5.0.2  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From e3add7ef33d7edceef6e1cfff386b76ecc8bccfe Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 22 Jul 2022 11:12:56 -0500
Subject: [PATCH 2212/2840] Update pytest-sugar to 0.9.5 (#3800)

---
 {{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 31e107269..0222b6821 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -16,7 +16,7 @@ watchgod==0.8.2  # https://github.com/samuelcolvin/watchgod
 mypy==0.971  # https://github.com/python/mypy
 django-stubs==1.12.0  # https://github.com/typeddjango/django-stubs
 pytest==7.1.2  # https://github.com/pytest-dev/pytest
-pytest-sugar==0.9.4  # https://github.com/Frozenball/pytest-sugar
+pytest-sugar==0.9.5  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
 djangorestframework-stubs==1.7.0  # https://github.com/typeddjango/djangorestframework-stubs
 {%- endif %}

From 119a282dad957d8763cfdbab659a335637323cf4 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 23 Jul 2022 02:47:49 +0000
Subject: [PATCH 2213/2840] Release 2022.07.22

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 10846e623..113ae012d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.07.22
+
+### Updated
+- Update pytest-sugar to 0.9.5 ([#3800](https://github.com/cookiecutter/cookiecutter-django/pull/3800))
+- Update sphinx to 5.0.2 ([#3801](https://github.com/cookiecutter/cookiecutter-django/pull/3801))
+- Update pillow to 9.2.0 ([#3799](https://github.com/cookiecutter/cookiecutter-django/pull/3799))
+- Update werkzeug to 2.1.2 ([#3797](https://github.com/cookiecutter/cookiecutter-django/pull/3797))
+
 ## 2022.07.21
 
 ### Changed
diff --git a/setup.py b/setup.py
index 3c7bc05e5..f3813f236 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.07.21"
+version = "2022.07.22"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 903fe45eca5db320cdd3063bcca3eff7f740c84e Mon Sep 17 00:00:00 2001
From: jugglinmike <mike@mikepennisi.com>
Date: Tue, 26 Jul 2022 18:17:45 -0400
Subject: [PATCH 2214/2840] Provide more context when wating for PostgreSQL
 takes too long (#3782)

---
 .../compose/production/django/entrypoint      | 38 ++++++++++---------
 1 file changed, 21 insertions(+), 17 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint
index 95ab8297a..2fbcad955 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint
+++ b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint
@@ -16,30 +16,34 @@ if [ -z "${POSTGRES_USER}" ]; then
 fi
 export DATABASE_URL="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}"
 
-postgres_ready() {
 python << END
 import sys
+import time
 
 import psycopg2
 
-try:
-    psycopg2.connect(
-        dbname="${POSTGRES_DB}",
-        user="${POSTGRES_USER}",
-        password="${POSTGRES_PASSWORD}",
-        host="${POSTGRES_HOST}",
-        port="${POSTGRES_PORT}",
-    )
-except psycopg2.OperationalError:
-    sys.exit(-1)
-sys.exit(0)
+suggest_unrecoverable_after = 30
+start = time.time()
 
+while True:
+    try:
+        psycopg2.connect(
+            dbname="${POSTGRES_DB}",
+            user="${POSTGRES_USER}",
+            password="${POSTGRES_PASSWORD}",
+            host="${POSTGRES_HOST}",
+            port="${POSTGRES_PORT}",
+        )
+        break
+    except psycopg2.OperationalError as error:
+        sys.stderr.write("Waiting for PostgreSQL to become available...\n")
+
+        if time.time() - start > suggest_unrecoverable_after:
+            sys.stderr.write("  This is taking longer than expected. The following exception may be indicative of an unrecoverable error: '{}'\n".format(error))
+
+    time.sleep(1)
 END
-}
-until postgres_ready; do
-  >&2 echo 'Waiting for PostgreSQL to become available...'
-  sleep 1
-done
+
 >&2 echo 'PostgreSQL is available'
 
 exec "$@"

From c19f6008588a888488eaf559130bd8fe7aff6b95 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 26 Jul 2022 22:18:18 +0000
Subject: [PATCH 2215/2840] 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 43f60067c..aa844ae3b 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1272,5 +1272,10 @@
     "name": "Sebastian Reyes Espinosa",
     "github_login": "sebastian-code",
     "twitter_username": "sebastianreyese"
+  },
+  {
+    "name": "jugglinmike",
+    "github_login": "jugglinmike",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 7153871f2..490751944 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1006,6 +1006,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>jugglinmike</td>
+    <td>
+      <a href="https://github.com/jugglinmike">jugglinmike</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Jules Cheron</td>
     <td>

From 419f6b0e87046d350f30bd0be2e49a0d338101a3 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 26 Jul 2022 23:37:02 +0100
Subject: [PATCH 2216/2840] Auto-update pre-commit hooks (#3780)

* Auto-update pre-commit hooks

* Run 'pre-commit run -a'

* Fix pyupgrade into generated project

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
---
 .pre-commit-config.yaml                                        | 2 +-
 scripts/create_django_issue.py                                 | 3 ++-
 scripts/update_changelog.py                                    | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml          | 2 +-
 .../merge_production_dotenvs_in_dotenv.py                      | 2 +-
 .../{{cookiecutter.project_slug}}/users/tests/factories.py     | 3 ++-
 6 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b7c525794..ed35d59fb 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.34.0
+    rev: v2.37.3
     hooks:
       - id: pyupgrade
         args: [--py39-plus]
diff --git a/scripts/create_django_issue.py b/scripts/create_django_issue.py
index f1ff51a06..262618531 100644
--- a/scripts/create_django_issue.py
+++ b/scripts/create_django_issue.py
@@ -11,8 +11,9 @@ from __future__ import annotations
 import os
 import re
 import sys
+from collections.abc import Iterable
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, Iterable, NamedTuple
+from typing import TYPE_CHECKING, Any, NamedTuple
 
 import requests
 from github import Github
diff --git a/scripts/update_changelog.py b/scripts/update_changelog.py
index c3c834eef..b50d25066 100644
--- a/scripts/update_changelog.py
+++ b/scripts/update_changelog.py
@@ -1,8 +1,8 @@
 import datetime as dt
 import os
 import re
+from collections.abc import Iterable
 from pathlib import Path
-from typing import Iterable
 
 import git
 import github.PullRequest
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index cee63c214..0f3a2693b 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.34.0
+    rev: v2.37.3
     hooks:
       - id: pyupgrade
         args: [--py39-plus]
diff --git a/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py b/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py
index 09fedbb3f..d702a5f67 100644
--- a/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py
+++ b/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py
@@ -1,6 +1,6 @@
 import os
+from collections.abc import Sequence
 from pathlib import Path
-from typing import Sequence
 
 import pytest
 
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
index edd306cb8..e30476227 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
@@ -1,4 +1,5 @@
-from typing import Any, Sequence
+from collections.abc import Sequence
+from typing import Any
 
 from django.contrib.auth import get_user_model
 from factory import Faker, post_generation

From 1f92d572a8a7ec63a7a70e9fcac86a6b079fb50b Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 26 Jul 2022 17:43:17 -0500
Subject: [PATCH 2217/2840] Update sh to 1.14.3 (#3798)

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 328f65d26..47b8aff0e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 cookiecutter==2.1.1
-sh==1.14.2
+sh==1.14.3; sys_platform != "win32"
 binaryornot==0.4.4
 
 # Code quality

From 122ebfc3a8d637cf217e0c9dfeb70dff1b07371b Mon Sep 17 00:00:00 2001
From: Dani Hodovic <danihodovic@users.noreply.github.com>
Date: Wed, 27 Jul 2022 00:44:34 +0200
Subject: [PATCH 2218/2840] Simplify database access in tests (#3807)

---
 .../{{cookiecutter.project_slug}}/conftest.py                 | 2 +-
 .../{{cookiecutter.project_slug}}/users/tests/test_admin.py   | 3 ---
 .../users/tests/test_drf_urls.py                              | 3 ---
 .../users/tests/test_drf_views.py                             | 3 ---
 .../{{cookiecutter.project_slug}}/users/tests/test_forms.py   | 3 ---
 .../{{cookiecutter.project_slug}}/users/tests/test_models.py  | 4 ----
 .../{{cookiecutter.project_slug}}/users/tests/test_swagger.py | 3 +--
 .../{{cookiecutter.project_slug}}/users/tests/test_urls.py    | 3 ---
 8 files changed, 2 insertions(+), 22 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/conftest.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/conftest.py
index 335648e07..7095a4714 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/conftest.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/conftest.py
@@ -10,5 +10,5 @@ def media_storage(settings, tmpdir):
 
 
 @pytest.fixture
-def user() -> User:
+def user(db) -> User:
     return UserFactory()
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py
index c50a4be4c..a370784fc 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py
@@ -1,10 +1,7 @@
-import pytest
 from django.urls import reverse
 
 from {{ cookiecutter.project_slug }}.users.models import User
 
-pytestmark = pytest.mark.django_db
-
 
 class TestUserAdmin:
     def test_changelist(self, admin_client):
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_urls.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_urls.py
index 83b623f45..7d9c444d3 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_urls.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_urls.py
@@ -1,10 +1,7 @@
-import pytest
 from django.urls import resolve, reverse
 
 from {{ cookiecutter.project_slug }}.users.models import User
 
-pytestmark = pytest.mark.django_db
-
 
 def test_user_detail(user: User):
     assert (
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
index 924573089..4d163bf08 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
@@ -1,11 +1,8 @@
-import pytest
 from django.test import RequestFactory
 
 from {{ cookiecutter.project_slug }}.users.api.views import UserViewSet
 from {{ cookiecutter.project_slug }}.users.models import User
 
-pytestmark = pytest.mark.django_db
-
 
 class TestUserViewSet:
     def test_get_queryset(self, user: User, rf: RequestFactory):
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
index e51bb6bf2..261f88c8c 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
@@ -1,14 +1,11 @@
 """
 Module for all Form Tests.
 """
-import pytest
 from django.utils.translation import gettext_lazy as _
 
 from {{ cookiecutter.project_slug }}.users.forms import UserAdminCreationForm
 from {{ cookiecutter.project_slug }}.users.models import User
 
-pytestmark = pytest.mark.django_db
-
 
 class TestUserAdminCreationForm:
     """
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_models.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_models.py
index 3194be1fd..b09bcdf0b 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_models.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_models.py
@@ -1,9 +1,5 @@
-import pytest
-
 from {{ cookiecutter.project_slug }}.users.models import User
 
-pytestmark = pytest.mark.django_db
-
 
 def test_user_get_absolute_url(user: User):
     assert user.get_absolute_url() == f"/users/{user.username}/"
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger.py
index 7f5b75844..f97658b55 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_swagger.py
@@ -1,8 +1,6 @@
 import pytest
 from django.urls import reverse
 
-pytestmark = pytest.mark.django_db
-
 
 def test_swagger_accessible_by_admin(admin_client):
     url = reverse("api-docs")
@@ -10,6 +8,7 @@ def test_swagger_accessible_by_admin(admin_client):
     assert response.status_code == 200
 
 
+@pytest.mark.django_db
 def test_swagger_ui_not_accessible_by_normal_user(client):
     url = reverse("api-docs")
     response = client.get(url)
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
index aab6d0a87..7cd056db5 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
@@ -1,10 +1,7 @@
-import pytest
 from django.urls import resolve, reverse
 
 from {{ cookiecutter.project_slug }}.users.models import User
 
-pytestmark = pytest.mark.django_db
-
 
 def test_detail(user: User):
     assert (

From 42a81d84132362d832492c89a7d1dd1cddf0509c Mon Sep 17 00:00:00 2001
From: Sebastian Reyes Espinosa <sebaslander@gmail.com>
Date: Tue, 26 Jul 2022 17:47:03 -0500
Subject: [PATCH 2219/2840] Changed pylint configuration file (#3806)

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

diff --git a/{{cookiecutter.project_slug}}/.pylintrc b/{{cookiecutter.project_slug}}/.pylintrc
index 6f195c6ef..9d604334b 100644
--- a/{{cookiecutter.project_slug}}/.pylintrc
+++ b/{{cookiecutter.project_slug}}/.pylintrc
@@ -1,6 +1,6 @@
 [MASTER]
 load-plugins=pylint_django{% if cookiecutter.use_celery == "y" %}, pylint_celery{% endif %}
-django-settings-module=config.settings.base
+django-settings-module=config.settings.local
 [FORMAT]
 max-line-length=120
 

From bb4012b6cecb6391c6a800fa53850af94829c50d Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 26 Jul 2022 17:51:25 -0500
Subject: [PATCH 2220/2840] Update sphinx to 5.1.0 (#3808)

---
 docs/requirements.txt                                | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index d044fe689..dc70f9ac9 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,2 +1,2 @@
-sphinx==5.0.2
+sphinx==5.1.0
 sphinx-rtd-theme==1.0.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 0222b6821..9d60be8f9 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -23,7 +23,7 @@ djangorestframework-stubs==1.7.0  # https://github.com/typeddjango/djangorestfra
 
 # Documentation
 # ------------------------------------------------------------------------------
-sphinx==5.0.2  # https://github.com/sphinx-doc/sphinx
+sphinx==5.1.0  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From 1ddb7c85331200bca22cbcbf729d417420139c6d Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 26 Jul 2022 17:52:21 -0500
Subject: [PATCH 2221/2840] Update flake8-isort to 4.1.2.post0 (#3809)

---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 47b8aff0e..08c79654c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ binaryornot==0.4.4
 black==22.6.0
 isort==5.10.1
 flake8==4.0.1
-flake8-isort==4.1.1
+flake8-isort==4.1.2.post0
 pre-commit==2.20.0
 
 # Testing
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 9d60be8f9..e684060f8 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -29,7 +29,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # Code quality
 # ------------------------------------------------------------------------------
 flake8==4.0.1  # https://github.com/PyCQA/flake8
-flake8-isort==4.1.1  # https://github.com/gforcada/flake8-isort
+flake8-isort==4.1.2.post0  # https://github.com/gforcada/flake8-isort
 coverage==6.4.2  # https://github.com/nedbat/coveragepy
 black==22.6.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django

From 6bfe2f4859e04d6e5718bbde6ddf502e16390799 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 26 Jul 2022 18:04:37 -0500
Subject: [PATCH 2222/2840] Update django-compressor to 4.0 (#3802)

---
 {{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 9bbf9653b..f2dad5307 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -36,7 +36,7 @@ django-allauth==0.51.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.14.0  # https://github.com/django-crispy-forms/django-crispy-forms
 crispy-bootstrap5==0.6  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
-django-compressor==3.1  # https://github.com/django-compressor/django-compressor
+django-compressor==4.0  # https://github.com/django-compressor/django-compressor
 {%- endif %}
 django-redis==5.2.0  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == 'y' %}

From 26eff143080978b98777ca2c0aeb451894feada9 Mon Sep 17 00:00:00 2001
From: monosans <hsyqixco@protonmail.com>
Date: Tue, 26 Jul 2022 23:12:18 +0000
Subject: [PATCH 2223/2840] Switch from watchgod to watchfiles (#3791)

---
 .../compose/local/django/celery/worker/start                    | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt            | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
index d7b63cd41..4ddcfa137 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
@@ -4,4 +4,4 @@ set -o errexit
 set -o nounset
 
 
-watchgod celery.__main__.main --args -A config.celery_app worker -l INFO
+watchfiles celery.__main__.main --args '-A config.celery_app worker -l INFO'
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index e684060f8..8b4f0b4e9 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 psycopg2-binary==2.9.3  # https://github.com/psycopg/psycopg2
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %}
-watchgod==0.8.2  # https://github.com/samuelcolvin/watchgod
+watchfiles==0.16.1  # https://github.com/samuelcolvin/watchfiles
 {%- endif %}
 
 # Testing

From cc6a0e770ac4e9577307053a8b836fefd56e038e Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 26 Jul 2022 23:12:47 +0000
Subject: [PATCH 2224/2840] 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 aa844ae3b..961ddc863 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1277,5 +1277,10 @@
     "name": "jugglinmike",
     "github_login": "jugglinmike",
     "twitter_username": ""
+  },
+  {
+    "name": "monosans",
+    "github_login": "monosans",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 490751944..b937e124c 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1342,6 +1342,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>monosans</td>
+    <td>
+      <a href="https://github.com/monosans">monosans</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>mozillazg</td>
     <td>

From b1cea690b9d4ee73883dec086305c24c858f74d9 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 26 Jul 2022 16:55:57 -0700
Subject: [PATCH 2225/2840] Update sphinx from 5.1.0 to 5.1.1

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

diff --git a/docs/requirements.txt b/docs/requirements.txt
index dc70f9ac9..dc8f4c6e9 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,2 +1,2 @@
-sphinx==5.1.0
+sphinx==5.1.1
 sphinx-rtd-theme==1.0.0

From 74f71095a50ffb27b490a6b743f49e4fa4a1a90f Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 26 Jul 2022 16:55:58 -0700
Subject: [PATCH 2226/2840] Update sphinx from 5.1.0 to 5.1.1

---
 {{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 8b4f0b4e9..0144481eb 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -23,7 +23,7 @@ djangorestframework-stubs==1.7.0  # https://github.com/typeddjango/djangorestfra
 
 # Documentation
 # ------------------------------------------------------------------------------
-sphinx==5.1.0  # https://github.com/sphinx-doc/sphinx
+sphinx==5.1.1  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From 672a756f4d13d003b759af39c42cc3d7a1401d21 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 27 Jul 2022 02:54:42 +0000
Subject: [PATCH 2227/2840] Release 2022.07.26

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 113ae012d..6a7896225 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,20 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.07.26
+
+### Changed
+- Switch from `watchgod` to `watchfiles` ([#3791](https://github.com/cookiecutter/cookiecutter-django/pull/3791))
+- Change Django settings file used by pylint ([#3806](https://github.com/cookiecutter/cookiecutter-django/pull/3806))
+- Simplify database access in tests ([#3807](https://github.com/cookiecutter/cookiecutter-django/pull/3807))
+- Provide more context when wating for PostgreSQL takes too long ([#3782](https://github.com/cookiecutter/cookiecutter-django/pull/3782))
+### Updated
+- Update django-compressor to 4.0 ([#3802](https://github.com/cookiecutter/cookiecutter-django/pull/3802))
+- Update flake8-isort to 4.1.2.post0 ([#3809](https://github.com/cookiecutter/cookiecutter-django/pull/3809))
+- Update sphinx to 5.1.0 ([#3808](https://github.com/cookiecutter/cookiecutter-django/pull/3808))
+- Update sh to 1.14.3 ([#3798](https://github.com/cookiecutter/cookiecutter-django/pull/3798))
+- Auto-update pre-commit hooks ([#3780](https://github.com/cookiecutter/cookiecutter-django/pull/3780))
+
 ## 2022.07.22
 
 ### Updated
diff --git a/setup.py b/setup.py
index f3813f236..7dd41a5aa 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.07.22"
+version = "2022.07.26"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 91983075f0273a0a57e63344f7756b5b347a61f0 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 27 Jul 2022 05:11:57 -0700
Subject: [PATCH 2228/2840] Update drf-spectacular from 0.22.1 to 0.23.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 f2dad5307..a9d60a518 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -44,5 +44,5 @@ django-redis==5.2.0  # https://github.com/jazzband/django-redis
 djangorestframework==3.13.1  # https://github.com/encode/django-rest-framework
 django-cors-headers==3.13.0 # https://github.com/adamchainz/django-cors-headers
 # DRF-spectacular for api documentation
-drf-spectacular==0.22.1  # https://github.com/tfranzel/drf-spectacular 
+drf-spectacular==0.23.1  # https://github.com/tfranzel/drf-spectacular 
 {%- endif %}

From 4bae5f380272e77c6c41cc91b75253916598e8fe Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 27 Jul 2022 15:05:17 -0500
Subject: [PATCH 2229/2840] Update werkzeug to 2.2.0 (#3813)

---
 {{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 0144481eb..daff0ff56 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,6 +1,6 @@
 -r base.txt
 
-Werkzeug[watchdog]==2.1.2 # https://github.com/pallets/werkzeug
+Werkzeug[watchdog]==2.2.0 # https://github.com/pallets/werkzeug
 ipdb==0.13.9  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.9.3  # https://github.com/psycopg/psycopg2

From 0e2a0428809188ee89f055f42a89c2cbbad20b82 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 28 Jul 2022 02:47:38 +0000
Subject: [PATCH 2230/2840] Release 2022.07.27

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6a7896225..651d74fa3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.07.27
+
+### Updated
+- Update werkzeug to 2.2.0 ([#3813](https://github.com/cookiecutter/cookiecutter-django/pull/3813))
+- Update sphinx to 5.1.1 ([#3811](https://github.com/cookiecutter/cookiecutter-django/pull/3811))
+- Update drf-spectacular to 0.23.1 ([#3812](https://github.com/cookiecutter/cookiecutter-django/pull/3812))
+
 ## 2022.07.26
 
 ### Changed
diff --git a/setup.py b/setup.py
index 7dd41a5aa..2f7250bba 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.07.26"
+version = "2022.07.27"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From fcfaa2df4fcfb890f2267dae49bff10613b7f38b Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 28 Jul 2022 03:36:32 -0500
Subject: [PATCH 2231/2840] Update werkzeug from 2.2.0 to 2.2.1 (#3814)

---
 {{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 daff0ff56..3ce9dd619 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,6 +1,6 @@
 -r base.txt
 
-Werkzeug[watchdog]==2.2.0 # https://github.com/pallets/werkzeug
+Werkzeug[watchdog]==2.2.1 # https://github.com/pallets/werkzeug
 ipdb==0.13.9  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.9.3  # https://github.com/psycopg/psycopg2

From 23064e632c269aebf7c0ca7e5bf1a1a787e9dcb8 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 29 Jul 2022 02:54:19 +0000
Subject: [PATCH 2232/2840] Release 2022.07.28

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 651d74fa3..0b444c4c0 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 -->
 
+## 2022.07.28
+
+### Updated
+- Update werkzeug to 2.2.1 ([#3814](https://github.com/cookiecutter/cookiecutter-django/pull/3814))
+
 ## 2022.07.27
 
 ### Updated
diff --git a/setup.py b/setup.py
index 2f7250bba..13800338d 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.07.27"
+version = "2022.07.28"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From f08f055bd870c5d2e1c3b31f8c510f8abe43f6df Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 29 Jul 2022 02:16:36 -0500
Subject: [PATCH 2233/2840] Update sentry-sdk from 1.8.0 to 1.9.0 (#3815)

---
 {{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 415c83b8d..6fef91b51 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.8.0  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.9.0  # 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 14eb5c35d8d65d02fad191a64fbbd496ddafd52d Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 30 Jul 2022 02:50:07 +0000
Subject: [PATCH 2234/2840] Release 2022.07.29

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0b444c4c0..dab4e0d20 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 -->
 
+## 2022.07.29
+
+### Updated
+- Update sentry-sdk to 1.9.0 ([#3815](https://github.com/cookiecutter/cookiecutter-django/pull/3815))
+
 ## 2022.07.28
 
 ### Updated
diff --git a/setup.py b/setup.py
index 13800338d..c612a7be7 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.07.28"
+version = "2022.07.29"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 613b22ea81a689196b826af2a931ee2ca51f1cf1 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 3 Aug 2022 03:06:04 -0700
Subject: [PATCH 2235/2840] Update django from 3.2.14 to 3.2.15

---
 {{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 a9d60a518..cb886b631 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,7 +29,7 @@ uvicorn[standard]==0.18.2  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.2.14  # pyup: < 4.0  # https://www.djangoproject.com/
+django==3.2.15  # pyup: < 4.0  # https://www.djangoproject.com/
 django-environ==0.9.0  # https://github.com/joke2k/django-environ
 django-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.51.0  # https://github.com/pennersr/django-allauth

From 1312d3d24660c3476e304ef571fe75fbbb4f6a69 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 4 Aug 2022 02:46:02 +0000
Subject: [PATCH 2236/2840] Release 2022.08.03

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dab4e0d20..eb8332155 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 -->
 
+## 2022.08.03
+
+### Updated
+- Update django to 3.2.15 ([#3822](https://github.com/cookiecutter/cookiecutter-django/pull/3822))
+
 ## 2022.07.29
 
 ### Updated
diff --git a/setup.py b/setup.py
index c612a7be7..417f2b40a 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.07.29"
+version = "2022.08.03"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 15aaf2eb2a6f44a02f553ede5aaa8fd37bdb8d47 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 4 Aug 2022 16:58:39 -0500
Subject: [PATCH 2237/2840] Update flake8-isort to 4.2.0 (#3828)

---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 08c79654c..1b9ee5581 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ binaryornot==0.4.4
 black==22.6.0
 isort==5.10.1
 flake8==4.0.1
-flake8-isort==4.1.2.post0
+flake8-isort==4.2.0
 pre-commit==2.20.0
 
 # Testing
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 3ce9dd619..b4ef249ea 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -29,7 +29,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # Code quality
 # ------------------------------------------------------------------------------
 flake8==4.0.1  # https://github.com/PyCQA/flake8
-flake8-isort==4.1.2.post0  # https://github.com/gforcada/flake8-isort
+flake8-isort==4.2.0  # https://github.com/gforcada/flake8-isort
 coverage==6.4.2  # https://github.com/nedbat/coveragepy
 black==22.6.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django

From 0b44dd7534ca3584ffcd54a16bba6c3124660bf7 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 4 Aug 2022 17:01:29 -0500
Subject: [PATCH 2238/2840] Update django-compressor to 4.1 (#3823)

---
 {{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 cb886b631..a0ad278b4 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -36,7 +36,7 @@ django-allauth==0.51.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.14.0  # https://github.com/django-crispy-forms/django-crispy-forms
 crispy-bootstrap5==0.6  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
-django-compressor==4.0  # https://github.com/django-compressor/django-compressor
+django-compressor==4.1  # https://github.com/django-compressor/django-compressor
 {%- endif %}
 django-redis==5.2.0  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == 'y' %}

From 37f91171d16e14f4ca5564b023b3cb4142d27601 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 4 Aug 2022 17:26:51 -0500
Subject: [PATCH 2239/2840] Update flake8 to 5.0.4 (#3829)

* Update flake8 from 4.0.1 to 5.0.4

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

diff --git a/requirements.txt b/requirements.txt
index 1b9ee5581..961c4c13e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ binaryornot==0.4.4
 # ------------------------------------------------------------------------------
 black==22.6.0
 isort==5.10.1
-flake8==4.0.1
+flake8==5.0.4
 flake8-isort==4.2.0
 pre-commit==2.20.0
 
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index b4ef249ea..c6e6a1dcf 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
 
 # Code quality
 # ------------------------------------------------------------------------------
-flake8==4.0.1  # https://github.com/PyCQA/flake8
+flake8==5.0.4  # https://github.com/PyCQA/flake8
 flake8-isort==4.2.0  # https://github.com/gforcada/flake8-isort
 coverage==6.4.2  # https://github.com/nedbat/coveragepy
 black==22.6.0  # https://github.com/psf/black

From 7740eedea5e4be656f910b1ee4cb5eebb84af2e7 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 4 Aug 2022 23:33:09 +0100
Subject: [PATCH 2240/2840] Auto-update pre-commit hooks (#3816)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                               | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ed35d59fb..a6dcf09f3 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -26,7 +26,7 @@ repos:
       - id: isort
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 4.0.1
+    rev: 5.0.4
     hooks:
       - id: flake8
 
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index 0f3a2693b..ee635fb14 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -26,7 +26,7 @@ repos:
       - id: isort
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 4.0.1
+    rev: 5.0.4
     hooks:
       - id: flake8
         args: ["--config=setup.cfg"]

From 490a8b1489236216a29092031cfc6672ce107503 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 5 Aug 2022 02:51:38 +0000
Subject: [PATCH 2241/2840] Release 2022.08.04

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb8332155..e7af4db5c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.08.04
+
+### Updated
+- Auto-update pre-commit hooks ([#3816](https://github.com/cookiecutter/cookiecutter-django/pull/3816))
+- Update flake8 to 5.0.4 ([#3829](https://github.com/cookiecutter/cookiecutter-django/pull/3829))
+- Update django-compressor to 4.1 ([#3823](https://github.com/cookiecutter/cookiecutter-django/pull/3823))
+- Update flake8-isort to 4.2.0 ([#3828](https://github.com/cookiecutter/cookiecutter-django/pull/3828))
+
 ## 2022.08.03
 
 ### Updated
diff --git a/setup.py b/setup.py
index 417f2b40a..fda3e3184 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.08.03"
+version = "2022.08.04"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 0d122db299a265042f15b6be8c47a2e72cd9acae Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 5 Aug 2022 16:05:19 -0500
Subject: [PATCH 2242/2840] Update sentry-sdk from 1.9.0 to 1.9.2 (#3832)

---
 {{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 6fef91b51..bcd0808b4 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.9.0  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.9.2  # 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 5cede52fbf8a4f5dc500b50f6c92a96407fb6bed Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 6 Aug 2022 02:42:57 +0000
Subject: [PATCH 2243/2840] Release 2022.08.05

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7af4db5c..836f8d70b 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 -->
 
+## 2022.08.05
+
+### Updated
+- Update sentry-sdk to 1.9.2 ([#3832](https://github.com/cookiecutter/cookiecutter-django/pull/3832))
+
 ## 2022.08.04
 
 ### Updated
diff --git a/setup.py b/setup.py
index fda3e3184..20bebd34a 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.08.04"
+version = "2022.08.05"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 93aafa01c241e2d7890524d19efd9e1616a41c3d Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 9 Aug 2022 07:25:05 -0700
Subject: [PATCH 2244/2840] Update sentry-sdk from 1.9.2 to 1.9.3

---
 {{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 bcd0808b4..6c9ef2105 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.9.2  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.9.3  # 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 73b2e95c19eb455b73bdfe1be6fd02f5b54e8552 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 10 Aug 2022 02:34:46 +0000
Subject: [PATCH 2245/2840] Release 2022.08.09

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 836f8d70b..392698f94 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 -->
 
+## 2022.08.09
+
+### Updated
+- Update sentry-sdk to 1.9.3 ([#3837](https://github.com/cookiecutter/cookiecutter-django/pull/3837))
+
 ## 2022.08.05
 
 ### Updated
diff --git a/setup.py b/setup.py
index 20bebd34a..cfc415f8c 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.08.05"
+version = "2022.08.09"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 0727d9cbe9ad43ffa69539e93f30080d71585578 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 15 Aug 2022 02:42:07 -0500
Subject: [PATCH 2246/2840] Update sentry-sdk from 1.9.3 to 1.9.4 (#3838)

---
 {{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 6c9ef2105..08cd953c6 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.9.3  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.9.4  # 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 e47c35a701053719a130c456c4e253ecb9440237 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 15 Aug 2022 02:42:58 -0500
Subject: [PATCH 2247/2840] Update pytz from 2022.1 to 2022.2.1 (#3840)

---
 {{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 a0ad278b4..5379ce758 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,4 +1,4 @@
-pytz==2022.1  # https://github.com/stub42/pytz
+pytz==2022.2.1  # https://github.com/stub42/pytz
 python-slugify==6.1.2  # https://github.com/un33k/python-slugify
 Pillow==9.2.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}

From 45a9f830896f581945d9357eb220e54173aeb68f Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 15 Aug 2022 02:52:17 -0500
Subject: [PATCH 2248/2840] Update coverage from 6.4.2 to 6.4.3 (#3835)

---
 {{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 c6e6a1dcf..61e7dc91d 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==5.0.4  # https://github.com/PyCQA/flake8
 flake8-isort==4.2.0  # https://github.com/gforcada/flake8-isort
-coverage==6.4.2  # https://github.com/nedbat/coveragepy
+coverage==6.4.3  # https://github.com/nedbat/coveragepy
 black==22.6.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 23ba1b129c1c5860f8aa61db2570f7e08ec2f351 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 16 Aug 2022 02:52:00 +0000
Subject: [PATCH 2249/2840] Release 2022.08.15

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 392698f94..65ea96563 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.08.15
+
+### Updated
+- Update coverage to 6.4.3 ([#3835](https://github.com/cookiecutter/cookiecutter-django/pull/3835))
+- Update pytz to 2022.2.1 ([#3840](https://github.com/cookiecutter/cookiecutter-django/pull/3840))
+- Update sentry-sdk to 1.9.4 ([#3838](https://github.com/cookiecutter/cookiecutter-django/pull/3838))
+
 ## 2022.08.09
 
 ### Updated
diff --git a/setup.py b/setup.py
index cfc415f8c..ac676d994 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.08.09"
+version = "2022.08.15"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From d5f55551fd3ed55c202cb5f8d61e1878662a940a Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 24 Aug 2022 16:38:07 -0500
Subject: [PATCH 2250/2840] Update django-storages to 1.13.1 (#3833)

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

diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 08cd953c6..b2dcfdb5e 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -17,9 +17,9 @@ hiredis==2.0.0  # https://github.com/redis/hiredis-py
 # Django
 # ------------------------------------------------------------------------------
 {%- if cookiecutter.cloud_provider == 'AWS' %}
-django-storages[boto3]==1.12.3  # https://github.com/jschneier/django-storages
+django-storages[boto3]==1.13.1  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
-django-storages[google]==1.12.3  # https://github.com/jschneier/django-storages
+django-storages[google]==1.13.1  # https://github.com/jschneier/django-storages
 {%- endif %}
 {%- if cookiecutter.mail_service == 'Mailgun' %}
 django-anymail[mailgun]==8.6  # https://github.com/anymail/django-anymail

From 92be4b2b40577fe83b7667464d830201f066334a Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 24 Aug 2022 16:40:09 -0500
Subject: [PATCH 2251/2840] Update flower to 1.2.0 (#3836)

---
 {{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 5379ce758..43717276a 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -20,7 +20,7 @@ hiredis==2.0.0  # https://github.com/redis/hiredis-py
 celery==5.2.7  # pyup: < 6.0  # https://github.com/celery/celery
 django-celery-beat==2.3.0  # https://github.com/celery/django-celery-beat
 {%- if cookiecutter.use_docker == 'y' %}
-flower==1.1.0  # https://github.com/mher/flower
+flower==1.2.0  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}

From 0b103a37ad1f862d64e0af06c188db8f374a27e8 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 24 Aug 2022 16:40:31 -0500
Subject: [PATCH 2252/2840] Update sentry-sdk to 1.9.5 (#3841)

---
 {{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 b2dcfdb5e..afd04a1ea 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.9.4  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.9.5  # 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 eb11cac0bc0aa1f2523d44a92301b1b5f7243f3e Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 24 Aug 2022 16:41:33 -0500
Subject: [PATCH 2253/2840] Update uvicorn to 0.18.3 (#3845)

---
 {{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 43717276a..966075655 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -24,7 +24,7 @@ flower==1.2.0  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn[standard]==0.18.2  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.18.3  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django

From f571864cf08b28843c6d8555d72ee6f0744285c2 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 24 Aug 2022 16:42:32 -0500
Subject: [PATCH 2254/2840] Update coverage to 6.4.4 (#3842)

---
 {{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 61e7dc91d..46c6e4266 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==5.0.4  # https://github.com/PyCQA/flake8
 flake8-isort==4.2.0  # https://github.com/gforcada/flake8-isort
-coverage==6.4.3  # https://github.com/nedbat/coveragepy
+coverage==6.4.4  # https://github.com/nedbat/coveragepy
 black==22.6.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 98822a938df902d140300dc5c89144cd94be4a40 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 24 Aug 2022 16:59:07 -0500
Subject: [PATCH 2255/2840] Update werkzeug to 2.2.2 (#3846)

---
 {{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 46c6e4266..5e11e66a4 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,6 +1,6 @@
 -r base.txt
 
-Werkzeug[watchdog]==2.2.1 # https://github.com/pallets/werkzeug
+Werkzeug[watchdog]==2.2.2 # https://github.com/pallets/werkzeug
 ipdb==0.13.9  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.9.3  # https://github.com/psycopg/psycopg2

From 7160d0e24ea7e215b5d6be3b89bb9f2706e042c9 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 24 Aug 2022 17:00:46 -0500
Subject: [PATCH 2256/2840] Update django-debug-toolbar to 3.6.0 (#3847)

---
 {{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 5e11e66a4..6b24ce51c 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -42,7 +42,7 @@ pre-commit==2.20.0  # https://github.com/pre-commit/pre-commit
 # ------------------------------------------------------------------------------
 factory-boy==3.2.1  # https://github.com/FactoryBoy/factory_boy
 
-django-debug-toolbar==3.5.0  # https://github.com/jazzband/django-debug-toolbar
+django-debug-toolbar==3.6.0  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.2.0  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==2.0.3  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.5.2  # https://github.com/pytest-dev/pytest-django

From cacffd0e145846d3f522b6046c0577a18b22dc0a Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 25 Aug 2022 02:56:47 +0000
Subject: [PATCH 2257/2840] Release 2022.08.24

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65ea96563..16432dd0b 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 -->
 
+## 2022.08.24
+
+### Updated
+- Update django-debug-toolbar to 3.6.0 ([#3847](https://github.com/cookiecutter/cookiecutter-django/pull/3847))
+- Update werkzeug to 2.2.2 ([#3846](https://github.com/cookiecutter/cookiecutter-django/pull/3846))
+- Update coverage to 6.4.4 ([#3842](https://github.com/cookiecutter/cookiecutter-django/pull/3842))
+- Update uvicorn to 0.18.3 ([#3845](https://github.com/cookiecutter/cookiecutter-django/pull/3845))
+- Update sentry-sdk to 1.9.5 ([#3841](https://github.com/cookiecutter/cookiecutter-django/pull/3841))
+- Update flower to 1.2.0 ([#3836](https://github.com/cookiecutter/cookiecutter-django/pull/3836))
+- Update django-storages to 1.13.1 ([#3833](https://github.com/cookiecutter/cookiecutter-django/pull/3833))
+
 ## 2022.08.15
 
 ### Updated
diff --git a/setup.py b/setup.py
index ac676d994..cc8f8e3c9 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.08.15"
+version = "2022.08.24"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From bb282ee7f948b6302b1014b8d842aba6b903a759 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 25 Aug 2022 07:11:57 +0100
Subject: [PATCH 2258/2840] Bump Heroku python runtime to 3.9.13

---
 {{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 425359e69..c6f7782f6 100644
--- a/{{cookiecutter.project_slug}}/runtime.txt
+++ b/{{cookiecutter.project_slug}}/runtime.txt
@@ -1 +1 @@
-python-3.9.9
+python-3.9.13

From 28a06b12aff0e4b60b0c08d58ae5ae25356eac75 Mon Sep 17 00:00:00 2001
From: Marcio Mazza <marciomazza@gmail.com>
Date: Fri, 26 Aug 2022 11:00:57 -0300
Subject: [PATCH 2259/2840] Fix typo in docs (#3850)

---
 docs/faq.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/faq.rst b/docs/faq.rst
index 820fb60fa..52a99467c 100644
--- a/docs/faq.rst
+++ b/docs/faq.rst
@@ -6,7 +6,7 @@ FAQ
 Why is there a django.contrib.sites directory in Cookiecutter Django?
 ---------------------------------------------------------------------
 
-It is there to add a migration so you don't have to manually change the ``sites.Site`` record from ``example.com`` to whatever your domain is. Instead, your ``{{cookiecutter.domain_name}}`` and {{cookiecutter.project_name}} value is placed by **Cookiecutter** in the domain and name fields respectively.
+It is there to add a migration so you don't have to manually change the ``sites.Site`` record from ``example.com`` to whatever your domain is. Instead, your ``{{cookiecutter.domain_name}}`` and ``{{cookiecutter.project_name}}`` value is placed by **Cookiecutter** in the domain and name fields respectively.
 
 See `0003_set_site_domain_and_name.py`_.
 

From 5552ddf09108f4b2fb6895a70ee428dc7914d727 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 26 Aug 2022 14:01:28 +0000
Subject: [PATCH 2260/2840] 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 961ddc863..15d481a4d 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1282,5 +1282,10 @@
     "name": "monosans",
     "github_login": "monosans",
     "twitter_username": ""
+  },
+  {
+    "name": "Marcio Mazza",
+    "github_login": "marciomazza",
+    "twitter_username": "marciomazza"
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index b937e124c..0dd360bd3 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1209,6 +1209,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Marcio Mazza</td>
+    <td>
+      <a href="https://github.com/marciomazza">marciomazza</a>
+    </td>
+    <td>marciomazza</td>
+  </tr>
   <tr>
     <td>Martin Blech</td>
     <td>

From e8b9253c0b4d4fb08439d81fe175519fdad2dabb Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 27 Aug 2022 02:55:08 +0000
Subject: [PATCH 2261/2840] Release 2022.08.26

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16432dd0b..f015e7f66 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 -->
 
+## 2022.08.26
+
+### Changed
+- Fix formatting in docs ([#3850](https://github.com/cookiecutter/cookiecutter-django/pull/3850))
+
 ## 2022.08.24
 
 ### Updated
diff --git a/setup.py b/setup.py
index cc8f8e3c9..0d141fe99 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.08.24"
+version = "2022.08.26"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 72508484277292f51ea85000c39e5f3010712831 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 1 Sep 2022 01:18:52 -0500
Subject: [PATCH 2262/2840] Update black to 22.8.0 (#3857)

* Update black from 22.6.0 to 22.8.0

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

diff --git a/requirements.txt b/requirements.txt
index 961c4c13e..96dc45612 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-black==22.6.0
+black==22.8.0
 isort==5.10.1
 flake8==5.0.4
 flake8-isort==4.2.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 6b24ce51c..bfd3fbeed 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -31,7 +31,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 flake8==5.0.4  # https://github.com/PyCQA/flake8
 flake8-isort==4.2.0  # https://github.com/gforcada/flake8-isort
 coverage==6.4.4  # https://github.com/nedbat/coveragepy
-black==22.6.0  # https://github.com/psf/black
+black==22.8.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery

From dd0e8bade373a662175507d2eb9866ba2b67f2cf Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 1 Sep 2022 07:19:06 +0100
Subject: [PATCH 2263/2840] Auto-update pre-commit hooks (#3858)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                               | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index a6dcf09f3..4bed79641 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -16,7 +16,7 @@ repos:
         exclude: hooks/
 
   - repo: https://github.com/psf/black
-    rev: 22.6.0
+    rev: 22.8.0
     hooks:
       - id: black
 
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index ee635fb14..ec386b17e 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -16,7 +16,7 @@ repos:
         args: [--py39-plus]
 
   - repo: https://github.com/psf/black
-    rev: 22.6.0
+    rev: 22.8.0
     hooks:
       - id: black
 

From 9e9814aefb737d1c5acfb1872728955e1bdec2cb Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 1 Sep 2022 01:19:34 -0500
Subject: [PATCH 2264/2840] Update sentry-sdk from 1.9.5 to 1.9.6 (#3856)

---
 {{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 afd04a1ea..7d61d5273 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.9.5  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.9.6  # 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 050111cf61556e9840f66ffd5e0e6bc9d9725023 Mon Sep 17 00:00:00 2001
From: Haseeb ur Rehman <professorhaseeb@users.noreply.github.com>
Date: Thu, 1 Sep 2022 11:22:32 +0500
Subject: [PATCH 2265/2840] Update README.md (#3844)

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 5fda8ff24..7059e07d2 100644
--- a/README.md
+++ b/README.md
@@ -232,6 +232,7 @@ experience better.
 
 ## Articles
 
+-   [Cookiecutter Django With Amazon RDS](https://haseeburrehman.com/posts/cookiecutter-django-with-amazon-rds/) - Apr, 2, 2021
 -   [Using cookiecutter-django with Google Cloud Storage](https://ahhda.github.io/cloud/gce/django/2019/03/12/using-django-cookiecutter-cloud-storage.html) - Mar. 12, 2019
 -   [cookiecutter-django with Nginx, Route 53 and ELB](https://msaizar.com/blog/cookiecutter-django-nginx-route-53-and-elb/) - Feb. 12, 2018
 -   [cookiecutter-django and Amazon RDS](https://msaizar.com/blog/cookiecutter-django-and-amazon-rds/) - Feb. 7, 2018

From 8778f1a4cfed5355df018fa5c66ebb1324b791af Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 2 Sep 2022 02:59:24 +0000
Subject: [PATCH 2266/2840] Release 2022.09.01

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f015e7f66..5d9443a1d 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.09.01
+
+### Changed
+- Add article to README about how to use a hosted DB ([#3844](https://github.com/cookiecutter/cookiecutter-django/pull/3844))
+### Updated
+- Update sentry-sdk to 1.9.6 ([#3856](https://github.com/cookiecutter/cookiecutter-django/pull/3856))
+- Auto-update pre-commit hooks ([#3858](https://github.com/cookiecutter/cookiecutter-django/pull/3858))
+- Update black to 22.8.0 ([#3857](https://github.com/cookiecutter/cookiecutter-django/pull/3857))
+
 ## 2022.08.26
 
 ### Changed
diff --git a/setup.py b/setup.py
index 0d141fe99..6c62a34de 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.08.26"
+version = "2022.09.01"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 33b1b8eb872e0c21b080c3edfb6abeda32bdf57a Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 2 Sep 2022 13:34:03 -0500
Subject: [PATCH 2267/2840] Update sentry-sdk from 1.9.6 to 1.9.7 (#3859)

---
 {{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 7d61d5273..32216d1bb 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.9.6  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.9.7  # 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 bd19b98eec4eb3986e8cf39619994e3d156567ff Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 2 Sep 2022 13:34:19 -0500
Subject: [PATCH 2268/2840] Update pytest to 7.1.3 (#3860)

* Update pytest from 7.1.2 to 7.1.3

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

diff --git a/requirements.txt b/requirements.txt
index 96dc45612..4151bff95 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,7 +13,7 @@ pre-commit==2.20.0
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.25.1
-pytest==7.1.2
+pytest==7.1.3
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2
 pyyaml==6.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index bfd3fbeed..1c0dacd38 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -15,7 +15,7 @@ watchfiles==0.16.1  # https://github.com/samuelcolvin/watchfiles
 # ------------------------------------------------------------------------------
 mypy==0.971  # https://github.com/python/mypy
 django-stubs==1.12.0  # https://github.com/typeddjango/django-stubs
-pytest==7.1.2  # https://github.com/pytest-dev/pytest
+pytest==7.1.3  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.5  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
 djangorestframework-stubs==1.7.0  # https://github.com/typeddjango/djangorestframework-stubs

From f0fd23cd4ae9a4cb9ad2fcb7afba560623638d3f Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 3 Sep 2022 02:56:18 +0000
Subject: [PATCH 2269/2840] Release 2022.09.02

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d9443a1d..fe3614744 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 -->
 
+## 2022.09.02
+
+### Updated
+- Update pytest to 7.1.3 ([#3860](https://github.com/cookiecutter/cookiecutter-django/pull/3860))
+- Update sentry-sdk to 1.9.7 ([#3859](https://github.com/cookiecutter/cookiecutter-django/pull/3859))
+
 ## 2022.09.01
 
 ### Changed
diff --git a/setup.py b/setup.py
index 6c62a34de..0294ef3dd 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.09.01"
+version = "2022.09.02"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From db0fc69f5fd5c0e196f0d728546c428d5f1d3ec9 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 5 Sep 2022 09:31:14 -0500
Subject: [PATCH 2270/2840] Update sentry-sdk to 1.9.8 (#3861)

---
 {{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 32216d1bb..371f81cbc 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.9.7  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.9.8  # 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 ab13c6263ab0de30609060908b90871831328f05 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 6 Sep 2022 03:02:41 +0000
Subject: [PATCH 2271/2840] Release 2022.09.05

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fe3614744..193ef9228 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 -->
 
+## 2022.09.05
+
+### Updated
+- Update sentry-sdk to 1.9.8 ([#3861](https://github.com/cookiecutter/cookiecutter-django/pull/3861))
+
 ## 2022.09.02
 
 ### Updated
diff --git a/setup.py b/setup.py
index 0294ef3dd..a10b51e7f 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.09.02"
+version = "2022.09.05"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 87897f22ff90d9123ba0028800fca7b9684cfbc6 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 15 Sep 2022 03:10:12 -0500
Subject: [PATCH 2272/2840] Update drf-spectacular to 0.24.0 (#3870)

---
 {{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 966075655..8d7243c91 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -44,5 +44,5 @@ django-redis==5.2.0  # https://github.com/jazzband/django-redis
 djangorestframework==3.13.1  # https://github.com/encode/django-rest-framework
 django-cors-headers==3.13.0 # https://github.com/adamchainz/django-cors-headers
 # DRF-spectacular for api documentation
-drf-spectacular==0.23.1  # https://github.com/tfranzel/drf-spectacular 
+drf-spectacular==0.24.0  # https://github.com/tfranzel/drf-spectacular 
 {%- endif %}

From 638bbd5f5191b3377254728a4e1ee898b9c3a6ec Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 15 Sep 2022 03:10:34 -0500
Subject: [PATCH 2273/2840] Update watchfiles to 0.17.0 (#3869)

---
 {{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 1c0dacd38..dae689706 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 psycopg2-binary==2.9.3  # https://github.com/psycopg/psycopg2
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %}
-watchfiles==0.16.1  # https://github.com/samuelcolvin/watchfiles
+watchfiles==0.17.0  # https://github.com/samuelcolvin/watchfiles
 {%- endif %}
 
 # Testing

From 8bcfcc764d39898a151ae2c7f9f22c7ff2c42a92 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 16 Sep 2022 03:01:32 +0000
Subject: [PATCH 2274/2840] Release 2022.09.15

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 193ef9228..a3e281f2e 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 -->
 
+## 2022.09.15
+
+### Updated
+- Update watchfiles to 0.17.0 ([#3869](https://github.com/cookiecutter/cookiecutter-django/pull/3869))
+- Update drf-spectacular to 0.24.0 ([#3870](https://github.com/cookiecutter/cookiecutter-django/pull/3870))
+
 ## 2022.09.05
 
 ### Updated
diff --git a/setup.py b/setup.py
index a10b51e7f..48068adfd 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.09.05"
+version = "2022.09.15"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From c6a12fae8bd80041fa445fe9c8b625e5ede1d04e Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 16 Sep 2022 03:17:49 +0000
Subject: [PATCH 2275/2840] Auto-update pre-commit hooks

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

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 4bed79641..82ba2f231 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.37.3
+    rev: v2.38.0
     hooks:
       - id: pyupgrade
         args: [--py39-plus]
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index ec386b17e..e055b3cf8 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.37.3
+    rev: v2.38.0
     hooks:
       - id: pyupgrade
         args: [--py39-plus]

From 84ec3e2f6f2c5281864cb0c69808876127fd5c32 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 23 Sep 2022 03:47:54 -0500
Subject: [PATCH 2276/2840] Update drf-spectacular from 0.24.0 to 0.24.1
 (#3874)

---
 {{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 8d7243c91..58b2c6520 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -44,5 +44,5 @@ django-redis==5.2.0  # https://github.com/jazzband/django-redis
 djangorestframework==3.13.1  # https://github.com/encode/django-rest-framework
 django-cors-headers==3.13.0 # https://github.com/adamchainz/django-cors-headers
 # DRF-spectacular for api documentation
-drf-spectacular==0.24.0  # https://github.com/tfranzel/drf-spectacular 
+drf-spectacular==0.24.1  # https://github.com/tfranzel/drf-spectacular 
 {%- endif %}

From 18f7488c3c66eabc0f5351cd7580244f6f1dc823 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 23 Sep 2022 03:48:18 -0500
Subject: [PATCH 2277/2840] Update tox from 3.25.1 to 3.26.0 (#3864)

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

diff --git a/requirements.txt b/requirements.txt
index 4151bff95..c8b7cf9a0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==2.20.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.25.1
+tox==3.26.0
 pytest==7.1.3
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From 944bd491eae52678aa60847cf3ec9dbd1290be7c Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 23 Sep 2022 03:48:48 -0500
Subject: [PATCH 2278/2840] Update django-extensions from 3.2.0 to 3.2.1
 (#3867)

---
 {{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 dae689706..7910ce6d8 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -43,6 +43,6 @@ pre-commit==2.20.0  # https://github.com/pre-commit/pre-commit
 factory-boy==3.2.1  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==3.6.0  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==3.2.0  # https://github.com/django-extensions/django-extensions
+django-extensions==3.2.1  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==2.0.3  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.5.2  # https://github.com/pytest-dev/pytest-django

From e944a5ffe117c887661dcd8a5ac3ef9e9cb119a6 Mon Sep 17 00:00:00 2001
From: Brandon Rumiser <brumiser1550@gmail.com>
Date: Fri, 23 Sep 2022 15:51:05 -0400
Subject: [PATCH 2279/2840] Mailjet default api url does not work out of the
 box (#3871)

---
 {{cookiecutter.project_slug}}/config/settings/production.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index b792e5448..046f5e4a0 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -167,7 +167,6 @@ EMAIL_BACKEND = "anymail.backends.mailjet.EmailBackend"
 ANYMAIL = {
     "MAILJET_API_KEY": env("MAILJET_API_KEY"),
     "MAILJET_SECRET_KEY": env("MAILJET_SECRET_KEY"),
-    "MAILJET_API_URL": env("MAILJET_API_URL", default="https://api.mailjet.com/v3"),
 }
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
 # https://anymail.readthedocs.io/en/stable/esps/mandrill/

From 96dcbae247331466454a2ec70d5576880c2759a6 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 23 Sep 2022 19:51:49 +0000
Subject: [PATCH 2280/2840] 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 15d481a4d..8a391f657 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1287,5 +1287,10 @@
     "name": "Marcio Mazza",
     "github_login": "marciomazza",
     "twitter_username": "marciomazza"
+  },
+  {
+    "name": "Brandon Rumiser",
+    "github_login": "brumiser1550",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 0dd360bd3..05443098b 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -376,6 +376,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Brandon Rumiser</td>
+    <td>
+      <a href="https://github.com/brumiser1550">brumiser1550</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Brent Payne</td>
     <td>

From 9cf280d34365ebf6fb6bea4a4c7330bb463d324c Mon Sep 17 00:00:00 2001
From: monosans <hsyqixco@protonmail.com>
Date: Fri, 23 Sep 2022 20:28:11 +0000
Subject: [PATCH 2281/2840] Reload uvicorn on html file change (#3866)

---
 docs/developing-locally.rst                              | 2 +-
 {{cookiecutter.project_slug}}/compose/local/django/start | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index 23bb7b9a8..77c8a5206 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -82,7 +82,7 @@ First things first.
 
 or if you're running asynchronously: ::
 
-    $ uvicorn config.asgi:application --host 0.0.0.0 --reload
+    $ uvicorn config.asgi:application --host 0.0.0.0 --reload --reload-include '*.html'
 
 .. _PostgreSQL: https://www.postgresql.org/download/
 .. _Redis: https://redis.io/download
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start b/{{cookiecutter.project_slug}}/compose/local/django/start
index 9cbb6c897..3fe547357 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/start
@@ -7,7 +7,7 @@ set -o nounset
 
 python manage.py migrate
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn config.asgi:application --host 0.0.0.0 --reload
+uvicorn config.asgi:application --host 0.0.0.0 --reload --reload-include '*.html'
 {%- else %}
 python manage.py runserver_plus 0.0.0.0:8000
 {%- endif %}

From 92c790df8326d4a71d24e4af0343b2a3b7d6d8f9 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 24 Sep 2022 03:00:13 +0000
Subject: [PATCH 2282/2840] Release 2022.09.23

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a3e281f2e..1cab789ac 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 -->
 
+## 2022.09.23
+
+### Changed
+- Reload uvicorn on html file change ([#3866](https://github.com/cookiecutter/cookiecutter-django/pull/3866))
+- Mailjet default api url does not work out of the box ([#3871](https://github.com/cookiecutter/cookiecutter-django/pull/3871))
+### Updated
+- Auto-update pre-commit hooks ([#3872](https://github.com/cookiecutter/cookiecutter-django/pull/3872))
+- Update django-extensions to 3.2.1 ([#3867](https://github.com/cookiecutter/cookiecutter-django/pull/3867))
+- Update tox to 3.26.0 ([#3864](https://github.com/cookiecutter/cookiecutter-django/pull/3864))
+- Update drf-spectacular to 0.24.1 ([#3874](https://github.com/cookiecutter/cookiecutter-django/pull/3874))
+
 ## 2022.09.15
 
 ### Updated
diff --git a/setup.py b/setup.py
index 48068adfd..52e998a8d 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.09.15"
+version = "2022.09.23"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 88c063f7ff975d7e23ff32a8eb55a04bdadf8558 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 24 Sep 2022 14:37:12 +0100
Subject: [PATCH 2283/2840] Remove `--no-deps` in pip wheels command of docs
 Dockerfile (#3875)

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

diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
index 6f1bb8b5e..0ba192b10 100644
--- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
@@ -22,7 +22,7 @@ RUN apt-get update && apt-get install --no-install-recommends -y \
 COPY ./requirements /requirements
 
 # create python dependency wheels
-RUN pip wheel --no-cache-dir --no-deps --wheel-dir /usr/src/app/wheels  \
+RUN pip wheel --no-cache-dir --wheel-dir /usr/src/app/wheels  \
   -r /requirements/local.txt -r /requirements/production.txt \
   && rm -rf /requirements
 

From 012fb2b56f0723c2d8806f32c476ee0eb002a825 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sun, 25 Sep 2022 03:00:16 +0000
Subject: [PATCH 2284/2840] Release 2022.09.24

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1cab789ac..404417a5e 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 -->
 
+## 2022.09.24
+
+### Fixed
+- Remove `--no-deps` in pip wheels command of docs Dockerfile ([#3875](https://github.com/cookiecutter/cookiecutter-django/pull/3875))
+
 ## 2022.09.23
 
 ### Changed
diff --git a/setup.py b/setup.py
index 52e998a8d..94c3f40fd 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.09.23"
+version = "2022.09.24"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 928836ee8904c93305b1c98e5425103334e20960 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 26 Sep 2022 08:11:30 -0500
Subject: [PATCH 2285/2840] Update sphinx to 5.2.1 (#3879)

---
 docs/requirements.txt                                | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index dc8f4c6e9..371755c3f 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,2 +1,2 @@
-sphinx==5.1.1
+sphinx==5.2.1
 sphinx-rtd-theme==1.0.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 7910ce6d8..ed3eb15db 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -23,7 +23,7 @@ djangorestframework-stubs==1.7.0  # https://github.com/typeddjango/djangorestfra
 
 # Documentation
 # ------------------------------------------------------------------------------
-sphinx==5.1.1  # https://github.com/sphinx-doc/sphinx
+sphinx==5.2.1  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From a8c7900b48cbdf4571884c37e7d72b4eeb7b2515 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 26 Sep 2022 14:11:57 +0100
Subject: [PATCH 2286/2840] Bump stefanzweifel/git-auto-commit-action from
 4.14.1 to 4.15.0 (#3880)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/update-contributors.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 6ecf8af90..78a4ef9ed 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -31,7 +31,7 @@ jobs:
         run: python scripts/update_contributors.py
 
       - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v4.14.1
+        uses: stefanzweifel/git-auto-commit-action@v4.15.0
         with:
           commit_message: Update Contributors
           file_pattern: CONTRIBUTORS.md .github/contributors.json

From e7ab32e794c5cbebccb89474081f04f91b9ad690 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 26 Sep 2022 14:12:18 +0100
Subject: [PATCH 2287/2840] Auto-update pre-commit hooks (#3877)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                               | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 82ba2f231..f74f410ea 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.38.0
+    rev: v2.38.2
     hooks:
       - id: pyupgrade
         args: [--py39-plus]
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index e055b3cf8..d64af3bf3 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.38.0
+    rev: v2.38.2
     hooks:
       - id: pyupgrade
         args: [--py39-plus]

From d189be03708a35bd89385f724a1848109fa333b5 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 26 Sep 2022 08:12:57 -0500
Subject: [PATCH 2288/2840] Update django-debug-toolbar to 3.7.0 (#3878)

---
 {{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 ed3eb15db..7b9cac4b3 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -42,7 +42,7 @@ pre-commit==2.20.0  # https://github.com/pre-commit/pre-commit
 # ------------------------------------------------------------------------------
 factory-boy==3.2.1  # https://github.com/FactoryBoy/factory_boy
 
-django-debug-toolbar==3.6.0  # https://github.com/jazzband/django-debug-toolbar
+django-debug-toolbar==3.7.0  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.2.1  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==2.0.3  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.5.2  # https://github.com/pytest-dev/pytest-django

From 94292f1aa9761776c403611f158f67977c6aef01 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 26 Sep 2022 10:03:39 -0500
Subject: [PATCH 2289/2840] Update djangorestframework to 3.14.0 (#3881)

---
 {{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 58b2c6520..23375fab5 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -41,7 +41,7 @@ django-compressor==4.1  # https://github.com/django-compressor/django-compressor
 django-redis==5.2.0  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == 'y' %}
 # Django REST Framework
-djangorestframework==3.13.1  # https://github.com/encode/django-rest-framework
+djangorestframework==3.14.0  # https://github.com/encode/django-rest-framework
 django-cors-headers==3.13.0 # https://github.com/adamchainz/django-cors-headers
 # DRF-spectacular for api documentation
 drf-spectacular==0.24.1  # https://github.com/tfranzel/drf-spectacular 

From 6202d26fe82b8d002c3456acc04a1248e4bec482 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 26 Sep 2022 08:58:07 -0700
Subject: [PATCH 2290/2840] Update drf-spectacular from 0.24.1 to 0.24.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 23375fab5..7d664a39b 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -44,5 +44,5 @@ django-redis==5.2.0  # https://github.com/jazzband/django-redis
 djangorestframework==3.14.0  # https://github.com/encode/django-rest-framework
 django-cors-headers==3.13.0 # https://github.com/adamchainz/django-cors-headers
 # DRF-spectacular for api documentation
-drf-spectacular==0.24.1  # https://github.com/tfranzel/drf-spectacular 
+drf-spectacular==0.24.2  # https://github.com/tfranzel/drf-spectacular 
 {%- endif %}

From 7a1dedaffe072ed782ef08621b4153a08cf6e7b3 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 27 Sep 2022 02:58:00 +0000
Subject: [PATCH 2291/2840] Release 2022.09.26

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 404417a5e..6886d71f4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.09.26
+
+### Updated
+- Update drf-spectacular to 0.24.2 ([#3882](https://github.com/cookiecutter/cookiecutter-django/pull/3882))
+- Update djangorestframework to 3.14.0 ([#3881](https://github.com/cookiecutter/cookiecutter-django/pull/3881))
+- Update django-debug-toolbar to 3.7.0 ([#3878](https://github.com/cookiecutter/cookiecutter-django/pull/3878))
+- Auto-update pre-commit hooks ([#3877](https://github.com/cookiecutter/cookiecutter-django/pull/3877))
+- Bump stefanzweifel/git-auto-commit-action from 4.14.1 to 4.15.0 ([#3880](https://github.com/cookiecutter/cookiecutter-django/pull/3880))
+- Update sphinx to 5.2.1 ([#3879](https://github.com/cookiecutter/cookiecutter-django/pull/3879))
+
 ## 2022.09.24
 
 ### Fixed
diff --git a/setup.py b/setup.py
index 94c3f40fd..9bff976f9 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.09.24"
+version = "2022.09.26"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 68f21b6028bd531d5108e7454a83ad8473e466a5 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 27 Sep 2022 16:07:21 -0500
Subject: [PATCH 2292/2840] Update sphinx to 5.2.2 (#3884)

* Update sphinx from 5.2.1 to 5.2.2

* Update sphinx from 5.2.1 to 5.2.2
---
 docs/requirements.txt                                | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 371755c3f..14fb7fd49 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,2 +1,2 @@
-sphinx==5.2.1
+sphinx==5.2.2
 sphinx-rtd-theme==1.0.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 7b9cac4b3..53340a9c4 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -23,7 +23,7 @@ djangorestframework-stubs==1.7.0  # https://github.com/typeddjango/djangorestfra
 
 # Documentation
 # ------------------------------------------------------------------------------
-sphinx==5.2.1  # https://github.com/sphinx-doc/sphinx
+sphinx==5.2.2  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From cd5d2790503e8f557747b8c736521acda04a3209 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 28 Sep 2022 02:59:08 +0000
Subject: [PATCH 2293/2840] Release 2022.09.27

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6886d71f4..f0cb88010 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 -->
 
+## 2022.09.27
+
+### Updated
+- Update sphinx to 5.2.2 ([#3884](https://github.com/cookiecutter/cookiecutter-django/pull/3884))
+
 ## 2022.09.26
 
 ### Updated
diff --git a/setup.py b/setup.py
index 9bff976f9..a4f23da25 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.09.26"
+version = "2022.09.27"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 3b05e02aa091cb629de00c378319ec70d310dc88 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 28 Sep 2022 12:55:37 -0700
Subject: [PATCH 2294/2840] Update crispy-bootstrap5 from 0.6 to 0.7

---
 {{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 7d664a39b..a1aee1c8b 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -34,7 +34,7 @@ django-environ==0.9.0  # https://github.com/joke2k/django-environ
 django-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.51.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.14.0  # https://github.com/django-crispy-forms/django-crispy-forms
-crispy-bootstrap5==0.6  # https://github.com/django-crispy-forms/crispy-bootstrap5
+crispy-bootstrap5==0.7  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
 django-compressor==4.1  # https://github.com/django-compressor/django-compressor
 {%- endif %}

From f1ef4f85ff2f34e58ba2779bd047a7232e68dfce Mon Sep 17 00:00:00 2001
From: krati yadav <kratiy.5@gmail.com>
Date: Fri, 30 Sep 2022 03:37:49 +0530
Subject: [PATCH 2295/2840] Removed SENDGRID_MERGE_FIELD_FORMAT from
 production.py (#3885)

---
 {{cookiecutter.project_slug}}/config/settings/production.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 046f5e4a0..4115eacee 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -189,8 +189,6 @@ ANYMAIL = {
 EMAIL_BACKEND = "anymail.backends.sendgrid.EmailBackend"
 ANYMAIL = {
     "SENDGRID_API_KEY": env("SENDGRID_API_KEY"),
-    "SENDGRID_GENERATE_MESSAGE_ID": env("SENDGRID_GENERATE_MESSAGE_ID"),
-    "SENDGRID_MERGE_FIELD_FORMAT": env("SENDGRID_MERGE_FIELD_FORMAT"),
     "SENDGRID_API_URL": env("SENDGRID_API_URL", default="https://api.sendgrid.com/v3/"),
 }
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}

From 71d4a52d11b8d76b0bbab5ed2478afdb94708078 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 29 Sep 2022 22:08:27 +0000
Subject: [PATCH 2296/2840] 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 8a391f657..2467ed3e1 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1292,5 +1292,10 @@
     "name": "Brandon Rumiser",
     "github_login": "brumiser1550",
     "twitter_username": ""
+  },
+  {
+    "name": "krati yadav",
+    "github_login": "krati5",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 05443098b..669e9d772 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1104,6 +1104,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>krati yadav</td>
+    <td>
+      <a href="https://github.com/krati5">krati5</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Krzysztof Szumny</td>
     <td>

From 5e3397a972744e5c4b464fc15019a40d7ca92452 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 30 Sep 2022 03:02:52 +0000
Subject: [PATCH 2297/2840] Release 2022.09.29

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f0cb88010..5d5af52e4 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 -->
 
+## 2022.09.29
+
+### Changed
+- Remove outdated &amp; optional Sendgrid settings from production config ([#3885](https://github.com/cookiecutter/cookiecutter-django/pull/3885))
+
 ## 2022.09.27
 
 ### Updated
diff --git a/setup.py b/setup.py
index a4f23da25..5e8a0926a 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.09.27"
+version = "2022.09.29"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 4edbc804f6053e0c9572f701cfe306fd7bc71199 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 30 Sep 2022 14:23:33 -0500
Subject: [PATCH 2298/2840] Update sphinx to 5.2.3 (#3887)

---
 docs/requirements.txt                                | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 14fb7fd49..113d073e3 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,2 +1,2 @@
-sphinx==5.2.2
+sphinx==5.2.3
 sphinx-rtd-theme==1.0.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 53340a9c4..f014ac9cf 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -23,7 +23,7 @@ djangorestframework-stubs==1.7.0  # https://github.com/typeddjango/djangorestfra
 
 # Documentation
 # ------------------------------------------------------------------------------
-sphinx==5.2.2  # https://github.com/sphinx-doc/sphinx
+sphinx==5.2.3  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From fd8aa73d313d8e3520f8292613444d59701fb613 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 30 Sep 2022 14:25:08 -0500
Subject: [PATCH 2299/2840] Update sentry-sdk to 1.9.9 (#3888)

---
 {{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 371f81cbc..c58861083 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.9.8  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.9.9  # 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 25ffbb00813b7072993c512c1f958e91686674d7 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 30 Sep 2022 14:26:01 -0500
Subject: [PATCH 2300/2840] Update mypy to 0.981 (#3889)

---
 {{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 f014ac9cf..4a38d7953 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -13,7 +13,7 @@ watchfiles==0.17.0  # https://github.com/samuelcolvin/watchfiles
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.971  # https://github.com/python/mypy
+mypy==0.981  # https://github.com/python/mypy
 django-stubs==1.12.0  # https://github.com/typeddjango/django-stubs
 pytest==7.1.3  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.5  # https://github.com/Frozenball/pytest-sugar

From 7fcfc0154192560cd4e45f1aca8599ba9d3d8989 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 30 Sep 2022 14:32:52 -0500
Subject: [PATCH 2301/2840] Update coverage to 6.5.0 (#3890)

---
 {{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 4a38d7953..ec038f618 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==5.0.4  # https://github.com/PyCQA/flake8
 flake8-isort==4.2.0  # https://github.com/gforcada/flake8-isort
-coverage==6.4.4  # https://github.com/nedbat/coveragepy
+coverage==6.5.0  # https://github.com/nedbat/coveragepy
 black==22.8.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 15487a1ac7a54222e825a2cc2dd297f58449328c Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 1 Oct 2022 03:01:43 +0000
Subject: [PATCH 2302/2840] Release 2022.09.30

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5d5af52e4..4b21b5ca3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.09.30
+
+### Updated
+- Update coverage to 6.5.0 ([#3890](https://github.com/cookiecutter/cookiecutter-django/pull/3890))
+- Update mypy to 0.981 ([#3889](https://github.com/cookiecutter/cookiecutter-django/pull/3889))
+- Update sentry-sdk to 1.9.9 ([#3888](https://github.com/cookiecutter/cookiecutter-django/pull/3888))
+- Update sphinx to 5.2.3 ([#3887](https://github.com/cookiecutter/cookiecutter-django/pull/3887))
+
 ## 2022.09.29
 
 ### Changed
diff --git a/setup.py b/setup.py
index 5e8a0926a..3ecf541fe 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.09.29"
+version = "2022.09.30"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 544cbef0ca08c05d0e2cab4698781bdc1b1bc1b3 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 2 Oct 2022 04:17:44 -0500
Subject: [PATCH 2303/2840] Update pytz from 2022.2.1 to 2022.4 (#3891)

---
 {{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 7d664a39b..ff2e606f8 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,4 +1,4 @@
-pytz==2022.2.1  # https://github.com/stub42/pytz
+pytz==2022.4  # https://github.com/stub42/pytz
 python-slugify==6.1.2  # https://github.com/un33k/python-slugify
 Pillow==9.2.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}

From ad28f471b610bdbf3f7e95040fafa967189e0ef0 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Mon, 3 Oct 2022 02:45:53 +0000
Subject: [PATCH 2304/2840] Release 2022.10.02

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b21b5ca3..0240994f4 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 -->
 
+## 2022.10.02
+
+### Updated
+- Update pytz to 2022.4 ([#3891](https://github.com/cookiecutter/cookiecutter-django/pull/3891))
+
 ## 2022.09.30
 
 ### Updated
diff --git a/setup.py b/setup.py
index 3ecf541fe..3a6ae26a5 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.09.30"
+version = "2022.10.02"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 712c48582621ddb7ae35b4005ac3de6ec3a2f4d6 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 3 Oct 2022 16:52:34 -0500
Subject: [PATCH 2305/2840] Update sentry-sdk from 1.9.9 to 1.9.10 (#3892)

---
 {{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 c58861083..df34af5e5 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.9.9  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.9.10  # 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 31c38c9566e0a1a300bc728bc51fb973f2c50e9a Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 4 Oct 2022 02:50:00 +0000
Subject: [PATCH 2306/2840] Release 2022.10.03

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0240994f4..490c15c19 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 -->
 
+## 2022.10.03
+
+### Updated
+- Update sentry-sdk to 1.9.10 ([#3892](https://github.com/cookiecutter/cookiecutter-django/pull/3892))
+
 ## 2022.10.02
 
 ### Updated
diff --git a/setup.py b/setup.py
index 3a6ae26a5..76481dcef 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.10.02"
+version = "2022.10.03"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 9e69de4a6a09390084ddbf4028e43904d82f135a Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 4 Oct 2022 08:19:35 +0100
Subject: [PATCH 2307/2840] Auto-update pre-commit hooks (#3894)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                               | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index f74f410ea..e57cbf3cb 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.38.2
+    rev: v3.0.0
     hooks:
       - id: pyupgrade
         args: [--py39-plus]
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index d64af3bf3..b40b8717d 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.38.2
+    rev: v3.0.0
     hooks:
       - id: pyupgrade
         args: [--py39-plus]

From 942a0bc3a9bbba6dfc3116d020ada143c1d25f27 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 4 Oct 2022 06:30:18 -0500
Subject: [PATCH 2308/2840] Update mypy to 0.982 (#3893)

---
 {{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 ec038f618..6144e64ed 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -13,7 +13,7 @@ watchfiles==0.17.0  # https://github.com/samuelcolvin/watchfiles
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.981  # https://github.com/python/mypy
+mypy==0.982  # https://github.com/python/mypy
 django-stubs==1.12.0  # https://github.com/typeddjango/django-stubs
 pytest==7.1.3  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.5  # https://github.com/Frozenball/pytest-sugar

From 1ac727931a2766ee4e3d304cf6098fa55a91a6e5 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 4 Oct 2022 10:23:16 -0500
Subject: [PATCH 2309/2840] Update django to 3.2.16 (#3895)

---
 {{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 ff2e606f8..e533275a6 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,7 +29,7 @@ uvicorn[standard]==0.18.3  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.2.15  # pyup: < 4.0  # https://www.djangoproject.com/
+django==3.2.16  # pyup: < 4.0  # https://www.djangoproject.com/
 django-environ==0.9.0  # https://github.com/joke2k/django-environ
 django-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.51.0  # https://github.com/pennersr/django-allauth

From 4c9d7c663bb4dbaec42000b6c740e8974bf7ea4e Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 5 Oct 2022 02:49:42 +0000
Subject: [PATCH 2310/2840] Release 2022.10.04

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 490c15c19..de62415b1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.10.04
+
+### Updated
+- Update django to 3.2.16 ([#3895](https://github.com/cookiecutter/cookiecutter-django/pull/3895))
+- Update mypy to 0.982 ([#3893](https://github.com/cookiecutter/cookiecutter-django/pull/3893))
+- Auto-update pre-commit hooks ([#3894](https://github.com/cookiecutter/cookiecutter-django/pull/3894))
+
 ## 2022.10.03
 
 ### Updated
diff --git a/setup.py b/setup.py
index 76481dcef..81c0f86ed 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.10.03"
+version = "2022.10.04"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 4eaa833a9011ec362faa51a520ab2d1bea17442a Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 11 Oct 2022 06:35:40 -0500
Subject: [PATCH 2311/2840] Update black to 22.10.0 (#3898)

---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index c8b7cf9a0..f95f4e5eb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-black==22.8.0
+black==22.10.0
 isort==5.10.1
 flake8==5.0.4
 flake8-isort==4.2.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 6144e64ed..1f9fe4df1 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -31,7 +31,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 flake8==5.0.4  # https://github.com/PyCQA/flake8
 flake8-isort==4.2.0  # https://github.com/gforcada/flake8-isort
 coverage==6.5.0  # https://github.com/nedbat/coveragepy
-black==22.8.0  # https://github.com/psf/black
+black==22.10.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery

From 790cf7e3797a4e0145078c156457466f241c2c4e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 13:11:05 +0100
Subject: [PATCH 2312/2840] Bump stefanzweifel/git-auto-commit-action from
 4.15.0 to 4.15.1 (#3903)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/update-contributors.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 78a4ef9ed..31fd3a2e0 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -31,7 +31,7 @@ jobs:
         run: python scripts/update_contributors.py
 
       - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v4.15.0
+        uses: stefanzweifel/git-auto-commit-action@v4.15.1
         with:
           commit_message: Update Contributors
           file_pattern: CONTRIBUTORS.md .github/contributors.json

From ebe1a3dc4cd744ac2becad7d2b000a617f6c1f03 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 11 Oct 2022 12:22:29 -0500
Subject: [PATCH 2313/2840] Update psycopg2 to 2.9.4 (#3896)

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/requirements/local.txt      | 4 ++--
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 1f9fe4df1..718c1df7d 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -3,9 +3,9 @@
 Werkzeug[watchdog]==2.2.2 # https://github.com/pallets/werkzeug
 ipdb==0.13.9  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
-psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
+psycopg2==2.9.4  # https://github.com/psycopg/psycopg2
 {%- else %}
-psycopg2-binary==2.9.3  # https://github.com/psycopg/psycopg2
+psycopg2-binary==2.9.4  # https://github.com/psycopg/psycopg2
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %}
 watchfiles==0.17.0  # https://github.com/samuelcolvin/watchfiles
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index df34af5e5..bfbf02023 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -3,7 +3,7 @@
 -r base.txt
 
 gunicorn==20.1.0  # https://github.com/benoitc/gunicorn
-psycopg2==2.9.3  # https://github.com/psycopg/psycopg2
+psycopg2==2.9.4  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}

From ac1c5c7cbd768e3db2e2d398dd1af6cae3e0fc27 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 11 Oct 2022 12:23:15 -0500
Subject: [PATCH 2314/2840] Update gitpython to 3.1.29 (#3902)

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

diff --git a/requirements.txt b/requirements.txt
index f95f4e5eb..7ce718451 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,6 +21,6 @@ pyyaml==6.0
 # Scripting
 # ------------------------------------------------------------------------------
 PyGithub==1.55
-gitpython==3.1.27
+gitpython==3.1.29
 jinja2==3.1.2
 requests==2.28.1

From be5cf566a58ee6597d56b9f3eced755a8879e087 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 11 Oct 2022 12:23:37 -0500
Subject: [PATCH 2315/2840] Update flake8-isort to 5.0.0 (#3901)

---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 7ce718451..2e8e46fe3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ binaryornot==0.4.4
 black==22.10.0
 isort==5.10.1
 flake8==5.0.4
-flake8-isort==4.2.0
+flake8-isort==5.0.0
 pre-commit==2.20.0
 
 # Testing
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 718c1df7d..73d16a08e 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -29,7 +29,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # Code quality
 # ------------------------------------------------------------------------------
 flake8==5.0.4  # https://github.com/PyCQA/flake8
-flake8-isort==4.2.0  # https://github.com/gforcada/flake8-isort
+flake8-isort==5.0.0  # https://github.com/gforcada/flake8-isort
 coverage==6.5.0  # https://github.com/nedbat/coveragepy
 black==22.10.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django

From 7eca9be8d287cc0c334df6abebcded7dec0ffc8d Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 11 Oct 2022 18:23:58 +0100
Subject: [PATCH 2316/2840] Auto-update pre-commit hooks (#3899)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                               | 4 ++--
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e57cbf3cb..aa9d6f4eb 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,14 +9,14 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.0.0
+    rev: v3.1.0
     hooks:
       - id: pyupgrade
         args: [--py39-plus]
         exclude: hooks/
 
   - repo: https://github.com/psf/black
-    rev: 22.8.0
+    rev: 22.10.0
     hooks:
       - id: black
 
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index b40b8717d..1b68d8858 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -10,13 +10,13 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.0.0
+    rev: v3.1.0
     hooks:
       - id: pyupgrade
         args: [--py39-plus]
 
   - repo: https://github.com/psf/black
-    rev: 22.8.0
+    rev: 22.10.0
     hooks:
       - id: black
 

From 507854158d6f134a91aaa4f3b1e40abba784eebd Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 12 Oct 2022 02:59:21 +0000
Subject: [PATCH 2317/2840] Release 2022.10.11

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index de62415b1..e01f9c35f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.10.11
+
+### Updated
+- Auto-update pre-commit hooks ([#3899](https://github.com/cookiecutter/cookiecutter-django/pull/3899))
+- Update flake8-isort to 5.0.0 ([#3901](https://github.com/cookiecutter/cookiecutter-django/pull/3901))
+- Update gitpython to 3.1.29 ([#3902](https://github.com/cookiecutter/cookiecutter-django/pull/3902))
+- Update psycopg2 to 2.9.4 ([#3896](https://github.com/cookiecutter/cookiecutter-django/pull/3896))
+- Bump stefanzweifel/git-auto-commit-action from 4.15.0 to 4.15.1 ([#3903](https://github.com/cookiecutter/cookiecutter-django/pull/3903))
+- Update black to 22.10.0 ([#3898](https://github.com/cookiecutter/cookiecutter-django/pull/3898))
+
 ## 2022.10.04
 
 ### Updated
diff --git a/setup.py b/setup.py
index 81c0f86ed..8b7bfda00 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.10.04"
+version = "2022.10.11"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 985decdceca7e25b9b1c333b81dafd85ee177df2 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 13 Oct 2022 02:47:29 -0500
Subject: [PATCH 2318/2840] Update pygithub from 1.55 to 1.56 (#3904)

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

diff --git a/requirements.txt b/requirements.txt
index 2e8e46fe3..b72480ba4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -20,7 +20,7 @@ pyyaml==6.0
 
 # Scripting
 # ------------------------------------------------------------------------------
-PyGithub==1.55
+PyGithub==1.56
 gitpython==3.1.29
 jinja2==3.1.2
 requests==2.28.1

From b6039b00de8cab2f64b56d9981d51547e922b9ab Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 14 Oct 2022 03:01:59 +0000
Subject: [PATCH 2319/2840] Release 2022.10.13

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e01f9c35f..55c855859 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 -->
 
+## 2022.10.13
+
+### Updated
+- Update pygithub to 1.56 ([#3904](https://github.com/cookiecutter/cookiecutter-django/pull/3904))
+
 ## 2022.10.11
 
 ### Updated
diff --git a/setup.py b/setup.py
index 8b7bfda00..1954ecd4e 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.10.11"
+version = "2022.10.13"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From e002389c3576b772186ca3e0ba617248cbb573e7 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 19 Oct 2022 13:47:52 -0500
Subject: [PATCH 2320/2840] Update watchfiles to 0.18.0 (#3907)

---
 {{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 73d16a08e..c034aace0 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.4  # https://github.com/psycopg/psycopg2
 psycopg2-binary==2.9.4  # https://github.com/psycopg/psycopg2
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %}
-watchfiles==0.17.0  # https://github.com/samuelcolvin/watchfiles
+watchfiles==0.18.0  # https://github.com/samuelcolvin/watchfiles
 {%- endif %}
 
 # Testing

From b87aaff263c7b82da859b47df04e846dfc489d2b Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 19 Oct 2022 13:48:22 -0500
Subject: [PATCH 2321/2840] Update django-celery-beat to 2.4.0 (#3908)

---
 {{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 e533275a6..7e641fc48 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -18,7 +18,7 @@ hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
 celery==5.2.7  # pyup: < 6.0  # https://github.com/celery/celery
-django-celery-beat==2.3.0  # https://github.com/celery/django-celery-beat
+django-celery-beat==2.4.0  # https://github.com/celery/django-celery-beat
 {%- if cookiecutter.use_docker == 'y' %}
 flower==1.2.0  # https://github.com/mher/flower
 {%- endif %}

From 0c98640a0bc2e30572bc1f89cd5cf51c6dff8be1 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 19 Oct 2022 13:48:41 -0500
Subject: [PATCH 2322/2840] Update sphinx to 5.3.0 (#3905)

---
 docs/requirements.txt                                | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 113d073e3..c3b371b13 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,2 +1,2 @@
-sphinx==5.2.3
+sphinx==5.3.0
 sphinx-rtd-theme==1.0.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index c034aace0..b935093d7 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -23,7 +23,7 @@ djangorestframework-stubs==1.7.0  # https://github.com/typeddjango/djangorestfra
 
 # Documentation
 # ------------------------------------------------------------------------------
-sphinx==5.2.3  # https://github.com/sphinx-doc/sphinx
+sphinx==5.3.0  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From 56d9a5e9fafab6a4deb98fd817d2638177d7d57a Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 19 Oct 2022 13:48:56 -0500
Subject: [PATCH 2323/2840] Update pytz to 2022.5 (#3906)

---
 {{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 7e641fc48..9f40fd2df 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,4 +1,4 @@
-pytz==2022.4  # https://github.com/stub42/pytz
+pytz==2022.5  # https://github.com/stub42/pytz
 python-slugify==6.1.2  # https://github.com/un33k/python-slugify
 Pillow==9.2.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}

From 9db27525981efb1de8cb80e2458c4388fb79042e Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 19 Oct 2022 20:01:43 +0100
Subject: [PATCH 2324/2840] Upgrade to Django 4.0 (#3848)

---
 README.md                                                       | 2 +-
 setup.py                                                        | 2 +-
 {{cookiecutter.project_slug}}/requirements/base.txt             | 2 +-
 .../users/migrations/0001_initial.py                            | 1 -
 4 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index 7059e07d2..149227e03 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ production-ready Django projects quickly.
 
 ## Features
 
--   For Django 3.2
+-   For Django 4.0
 -   Works with Python 3.9
 -   Renders Django projects with 100% starting test coverage
 -   Twitter [Bootstrap](https://github.com/twbs/bootstrap) v5
diff --git a/setup.py b/setup.py
index 1954ecd4e..f3fa55b07 100644
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@ setup(
     classifiers=[
         "Development Status :: 4 - Beta",
         "Environment :: Console",
-        "Framework :: Django :: 3.2",
+        "Framework :: Django :: 4.0",
         "Intended Audience :: Developers",
         "Natural Language :: English",
         "License :: OSI Approved :: BSD License",
diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 9f40fd2df..de5c61416 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,7 +29,7 @@ uvicorn[standard]==0.18.3  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==3.2.16  # pyup: < 4.0  # https://www.djangoproject.com/
+django==4.0.8  # pyup: < 4.1  # https://www.djangoproject.com/
 django-environ==0.9.0  # https://github.com/joke2k/django-environ
 django-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
 django-allauth==0.51.0  # https://github.com/pennersr/django-allauth
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py
index 4c4d6954c..acd18512f 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py
@@ -1,4 +1,3 @@
-# Generated by Django 3.2.9 on 2021-11-20 11:23
 import django.contrib.auth.models
 import django.contrib.auth.validators
 from django.db import migrations, models

From bdc4c323f914dc38be412f437ffe3df168aa4fcb Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Wed, 19 Oct 2022 20:14:03 +0100
Subject: [PATCH 2325/2840] Don't treat current version as newer

---
 scripts/create_django_issue.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/create_django_issue.py b/scripts/create_django_issue.py
index 262618531..5809f393d 100644
--- a/scripts/create_django_issue.py
+++ b/scripts/create_django_issue.py
@@ -108,7 +108,7 @@ def get_all_latest_django_versions(
     current_minor_version = DjVersion.parse(current_version_str)
     newer_versions: set[DjVersion] = set()
     for django_version in get_django_versions():
-        if _django_max_version >= django_version >= current_minor_version:
+        if current_minor_version < django_version <= _django_max_version:
             newer_versions.add(django_version)
 
     return current_minor_version, sorted(newer_versions, reverse=True)

From b623c0f956ed73bd237edd0b4b10f47f52387c09 Mon Sep 17 00:00:00 2001
From: Dani Hodovic <danihodovic@users.noreply.github.com>
Date: Wed, 19 Oct 2022 22:15:25 +0300
Subject: [PATCH 2326/2840] Set AWS_S3_MAX_MEMORY_SIZE (#3810)

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 docs/settings.rst                                           | 1 +
 {{cookiecutter.project_slug}}/config/settings/production.py | 5 +++++
 2 files changed, 6 insertions(+)

diff --git a/docs/settings.rst b/docs/settings.rst
index 7563f50d2..b8c6d448e 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -46,6 +46,7 @@ DJANGO_AWS_SECRET_ACCESS_KEY            AWS_SECRET_ACCESS_KEY       n/a
 DJANGO_AWS_STORAGE_BUCKET_NAME          AWS_STORAGE_BUCKET_NAME     n/a                                            raises error
 DJANGO_AWS_S3_REGION_NAME               AWS_S3_REGION_NAME          n/a                                            None
 DJANGO_AWS_S3_CUSTOM_DOMAIN             AWS_S3_CUSTOM_DOMAIN        n/a                                            None
+DJANGO_AWS_S3_MAX_MEMORY_SIZE           AWS_S3_MAX_MEMORY_SIZE      n/a                                            100_000_000
 DJANGO_GCP_STORAGE_BUCKET_NAME          GS_BUCKET_NAME              n/a                                            raises error
 GOOGLE_APPLICATION_CREDENTIALS          n/a                         n/a                                            raises error
 SENTRY_DSN                              SENTRY_DSN                  n/a                                            raises error
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 4115eacee..8eed5a805 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -88,6 +88,11 @@ AWS_S3_OBJECT_PARAMETERS = {
     "CacheControl": f"max-age={_AWS_EXPIRY}, s-maxage={_AWS_EXPIRY}, must-revalidate"
 }
 # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
+AWS_S3_MAX_MEMORY_SIZE = env.int(
+    "DJANGO_AWS_S3_MAX_MEMORY_SIZE",
+    default=100_000_000,  # 100MB
+)
+# https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
 AWS_S3_REGION_NAME = env("DJANGO_AWS_S3_REGION_NAME", default=None)
 # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#cloudfront
 AWS_S3_CUSTOM_DOMAIN = env("DJANGO_AWS_S3_CUSTOM_DOMAIN", default=None)

From 7fca0e9d9890f82cf015b6ff387c393a1875da1e Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 20 Oct 2022 03:00:16 +0000
Subject: [PATCH 2327/2840] Release 2022.10.19

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 55c855859..ece2b518d 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 -->
 
+## 2022.10.19
+
+### Changed
+- Set AWS_S3_MAX_MEMORY_SIZE ([#3810](https://github.com/cookiecutter/cookiecutter-django/pull/3810))
+- Upgrade to Django 4.0 ([#3848](https://github.com/cookiecutter/cookiecutter-django/pull/3848))
+### Updated
+- Update pytz to 2022.5 ([#3906](https://github.com/cookiecutter/cookiecutter-django/pull/3906))
+- Update sphinx to 5.3.0 ([#3905](https://github.com/cookiecutter/cookiecutter-django/pull/3905))
+- Update django-celery-beat to 2.4.0 ([#3908](https://github.com/cookiecutter/cookiecutter-django/pull/3908))
+- Update watchfiles to 0.18.0 ([#3907](https://github.com/cookiecutter/cookiecutter-django/pull/3907))
+
 ## 2022.10.13
 
 ### Updated
diff --git a/setup.py b/setup.py
index f3fa55b07..2b4640013 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.10.13"
+version = "2022.10.19"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 4ea0e98f3f1dafe31f3505644a9d141e1fc66746 Mon Sep 17 00:00:00 2001
From: Jelmer <info@jelmert.nl>
Date: Mon, 24 Oct 2022 22:41:00 +0200
Subject: [PATCH 2328/2840] Upgrade Python version from 3.9 to 3.10 (#3913)

---
 .github/workflows/ci.yml                                  | 8 ++++----
 .github/workflows/django-issue-checker.yml                | 2 +-
 .github/workflows/pre-commit-autoupdate.yml               | 2 +-
 .github/workflows/update-changelog.yml                    | 2 +-
 .github/workflows/update-contributors.yml                 | 2 +-
 .pre-commit-config.yaml                                   | 2 +-
 CONTRIBUTING.md                                           | 2 +-
 README.md                                                 | 2 +-
 docs/deployment-on-pythonanywhere.rst                     | 2 +-
 docs/developing-locally.rst                               | 4 ++--
 hooks/pre_gen_project.py                                  | 2 +-
 setup.py                                                  | 2 +-
 tox.ini                                                   | 2 +-
 {{cookiecutter.project_slug}}/.github/workflows/ci.yml    | 4 ++--
 {{cookiecutter.project_slug}}/.gitlab-ci.yml              | 4 ++--
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml     | 2 +-
 {{cookiecutter.project_slug}}/.readthedocs.yml            | 2 +-
 {{cookiecutter.project_slug}}/.travis.yml                 | 4 ++--
 .../compose/local/django/Dockerfile                       | 2 +-
 .../compose/local/docs/Dockerfile                         | 2 +-
 .../compose/production/django/Dockerfile                  | 2 +-
 {{cookiecutter.project_slug}}/runtime.txt                 | 2 +-
 {{cookiecutter.project_slug}}/setup.cfg                   | 2 +-
 23 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 0fa5add0d..d466f4032 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -15,7 +15,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
           cache: pip
       - name: Run pre-commit
         uses: pre-commit/action@v3.0.0
@@ -35,7 +35,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
           cache: pip
       - name: Install dependencies
         run: pip install -r requirements.txt
@@ -62,7 +62,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
           cache: pip
       - name: Install dependencies
         run: pip install -r requirements.txt
@@ -102,7 +102,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
           cache: pip
           cache-dependency-path: |
             requirements.txt
diff --git a/.github/workflows/django-issue-checker.yml b/.github/workflows/django-issue-checker.yml
index 26f57c51f..fd250604f 100644
--- a/.github/workflows/django-issue-checker.yml
+++ b/.github/workflows/django-issue-checker.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml
index e51b4cbdc..1708e8b82 100644
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
 
       - name: Install pre-commit
         run: pip install pre-commit
diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index 14c590e59..27113a89f 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 31fd3a2e0..e9e994093 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.9"
+          python-version: "3.10"
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index aa9d6f4eb..6d22c2e84 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,7 +12,7 @@ repos:
     rev: v3.1.0
     hooks:
       - id: pyupgrade
-        args: [--py39-plus]
+        args: [--py310-plus]
         exclude: hooks/
 
   - repo: https://github.com/psf/black
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index a9d5b088f..28bb81e38 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -33,7 +33,7 @@ To run all tests using various versions of python in virtualenvs defined in tox.
 It is possible to test with a specific version of python. To do this, the command
 is:
 
-    $ tox -e py39
+    $ tox -e py310
 
 This will run pytest with the python3.9 interpreter, for example.
 
diff --git a/README.md b/README.md
index 149227e03..9f2af6d37 100644
--- a/README.md
+++ b/README.md
@@ -18,7 +18,7 @@ production-ready Django projects quickly.
 ## Features
 
 -   For Django 4.0
--   Works with Python 3.9
+-   Works with Python 3.10
 -   Renders Django projects with 100% starting test coverage
 -   Twitter [Bootstrap](https://github.com/twbs/bootstrap) v5
 -   [12-Factor](http://12factor.net/) based settings via [django-environ](https://github.com/joke2k/django-environ)
diff --git a/docs/deployment-on-pythonanywhere.rst b/docs/deployment-on-pythonanywhere.rst
index f7bff12a4..7984d7b5e 100644
--- a/docs/deployment-on-pythonanywhere.rst
+++ b/docs/deployment-on-pythonanywhere.rst
@@ -34,7 +34,7 @@ Make sure your project is fully committed and pushed up to Bitbucket or Github o
 
     git clone <my-repo-url>  # you can also use hg
     cd my-project-name
-    mkvirtualenv --python=/usr/bin/python3.9 my-project-name
+    mkvirtualenv --python=/usr/bin/python3.10 my-project-name
     pip install -r requirements/production.txt  # may take a few minutes
 
 
diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index 77c8a5206..c9d28ff73 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -9,7 +9,7 @@ Setting Up Development Environment
 
 Make sure to have the following on your host:
 
-* Python 3.9
+* Python 3.10
 * PostgreSQL_.
 * Redis_, if using Celery
 * Cookiecutter_
@@ -18,7 +18,7 @@ First things first.
 
 #. Create a virtualenv: ::
 
-    $ python3.9 -m venv <virtual env path>
+    $ python3.10 -m venv <virtual env path>
 
 #. Activate the virtualenv you have just created: ::
 
diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py
index 3fd4131c8..2845f012c 100644
--- a/hooks/pre_gen_project.py
+++ b/hooks/pre_gen_project.py
@@ -36,7 +36,7 @@ if "{{ cookiecutter.use_docker }}".lower() == "n":
     if python_major_version == 2:
         print(
             WARNING + "You're running cookiecutter under Python 2, but the generated "
-            "project requires Python 3.9+. Do you want to proceed (y/n)? " + TERMINATOR
+            "project requires Python 3.10+. Do you want to proceed (y/n)? " + TERMINATOR
         )
         yes_options, no_options = frozenset(["y"]), frozenset(["n"])
         while True:
diff --git a/setup.py b/setup.py
index 2b4640013..cf99cfa35 100644
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@ setup(
         "License :: OSI Approved :: BSD License",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.9",
+        "Programming Language :: Python :: 3.10",
         "Programming Language :: Python :: Implementation :: CPython",
         "Topic :: Software Development",
     ],
diff --git a/tox.ini b/tox.ini
index 0afe3931d..0400e4f91 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 skipsdist = true
-envlist = py39,black-template
+envlist = py310,black-template
 
 [testenv]
 deps = -rrequirements.txt
diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
index 20dd0d2f3..0790187bd 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v3
         with:
-          python-version: "3.9"
+          python-version: "3.10"
           cache: pip
           cache-dependency-path: |
             requirements/base.txt
@@ -87,7 +87,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v3
         with:
-          python-version: "3.9"
+          python-version: "3.10"
           cache: pip
           cache-dependency-path: |
             requirements/base.txt
diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
index fb82ec5d5..dbb65fb73 100644
--- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml
+++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
@@ -13,7 +13,7 @@ variables:
 
 flake8:
   stage: lint
-  image: python:3.9-alpine
+  image: python:3.10-alpine
   before_script:
     - pip install -q flake8
   script:
@@ -35,7 +35,7 @@ pytest:
   script:
     - docker-compose -f local.yml run django pytest
   {%- else -%}
-  image: python:3.9
+  image: python:3.10
   tags:
     - python
   services:
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index 1b68d8858..ebcc5989c 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -13,7 +13,7 @@ repos:
     rev: v3.1.0
     hooks:
       - id: pyupgrade
-        args: [--py39-plus]
+        args: [--py310-plus]
 
   - repo: https://github.com/psf/black
     rev: 22.10.0
diff --git a/{{cookiecutter.project_slug}}/.readthedocs.yml b/{{cookiecutter.project_slug}}/.readthedocs.yml
index b4cf0c080..e943a5fa9 100644
--- a/{{cookiecutter.project_slug}}/.readthedocs.yml
+++ b/{{cookiecutter.project_slug}}/.readthedocs.yml
@@ -7,6 +7,6 @@ build:
   image: testing
 
 python:
-  version: 3.9
+  version: 3.10
   install:
     - requirements: requirements/local.txt
diff --git a/{{cookiecutter.project_slug}}/.travis.yml b/{{cookiecutter.project_slug}}/.travis.yml
index a684da225..326d78392 100644
--- a/{{cookiecutter.project_slug}}/.travis.yml
+++ b/{{cookiecutter.project_slug}}/.travis.yml
@@ -2,7 +2,7 @@ dist: focal
 
 language: python
 python:
-  - "3.9"
+  - "3.10"
 
 services:
   - {% if cookiecutter.use_docker == 'y' %}docker{% else %}postgresql{% endif %}
@@ -37,7 +37,7 @@ jobs:
         - sudo apt-get install -qq libsqlite3-dev libxml2 libxml2-dev libssl-dev libbz2-dev wget curl llvm
       language: python
       python:
-        - "3.9"
+        - "3.10"
       install:
         - pip install -r requirements/local.txt
       script:
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index 044ef4a74..3ea6b2d4c 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -1,4 +1,4 @@
-ARG PYTHON_VERSION=3.9-slim-bullseye
+ARG PYTHON_VERSION=3.10-slim-bullseye
 
 # define an alias for the specfic python version used in this file.
 FROM python:${PYTHON_VERSION} as python
diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
index 0ba192b10..c45d18c95 100644
--- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
@@ -1,4 +1,4 @@
-ARG PYTHON_VERSION=3.9-slim-bullseye
+ARG PYTHON_VERSION=3.10-slim-bullseye
 
 # define an alias for the specfic python version used in this file.
 FROM python:${PYTHON_VERSION} as python
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index 86f4ac18a..4652f0898 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -1,4 +1,4 @@
-ARG PYTHON_VERSION=3.9-slim-bullseye
+ARG PYTHON_VERSION=3.10-slim-bullseye
 
 {% if cookiecutter.frontend_pipeline == 'Gulp' -%}
 FROM node:16-bullseye-slim as client-builder
diff --git a/{{cookiecutter.project_slug}}/runtime.txt b/{{cookiecutter.project_slug}}/runtime.txt
index c6f7782f6..69b0ccfc8 100644
--- a/{{cookiecutter.project_slug}}/runtime.txt
+++ b/{{cookiecutter.project_slug}}/runtime.txt
@@ -1 +1 @@
-python-3.9.13
+python-3.10.8
diff --git a/{{cookiecutter.project_slug}}/setup.cfg b/{{cookiecutter.project_slug}}/setup.cfg
index dad64e1fa..3bec1fbee 100644
--- a/{{cookiecutter.project_slug}}/setup.cfg
+++ b/{{cookiecutter.project_slug}}/setup.cfg
@@ -18,7 +18,7 @@ force_grid_wrap = 0
 use_parentheses = true
 
 [mypy]
-python_version = 3.9
+python_version = 3.10
 check_untyped_defs = True
 ignore_missing_imports = True
 warn_unused_ignores = True

From 2321c8a47c9202dd09b88fa10ec8ee7520798cd0 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Mon, 24 Oct 2022 21:45:46 +0100
Subject: [PATCH 2329/2840] Bump stefanzweifel/git-auto-commit-action from
 4.15.1 to 4.15.2 (#3914)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/update-contributors.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index e9e994093..75dc2c3e0 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -31,7 +31,7 @@ jobs:
         run: python scripts/update_contributors.py
 
       - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v4.15.1
+        uses: stefanzweifel/git-auto-commit-action@v4.15.2
         with:
           commit_message: Update Contributors
           file_pattern: CONTRIBUTORS.md .github/contributors.json

From 0cd240598b3021ca2565d0c857fa272df9b499e5 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 24 Oct 2022 15:46:56 -0500
Subject: [PATCH 2330/2840] Update sentry-sdk to 1.10.1 (#3911)

---
 {{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 bfbf02023..88f6a706a 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.4  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.9.10  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.10.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 06c8adc6224a488e666fb60f43c11e0957865d93 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 25 Oct 2022 03:01:24 +0000
Subject: [PATCH 2331/2840] Release 2022.10.24

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ece2b518d..da352847b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.10.24
+
+### Changed
+- Upgrade Python version from 3.9 to 3.10 ([#3913](https://github.com/cookiecutter/cookiecutter-django/pull/3913))
+### Updated
+- Update sentry-sdk to 1.10.1 ([#3911](https://github.com/cookiecutter/cookiecutter-django/pull/3911))
+- Bump stefanzweifel/git-auto-commit-action from 4.15.1 to 4.15.2 ([#3914](https://github.com/cookiecutter/cookiecutter-django/pull/3914))
+
 ## 2022.10.19
 
 ### Changed
diff --git a/setup.py b/setup.py
index cf99cfa35..722dc8a78 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.10.19"
+version = "2022.10.24"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From b5528f0b72b38f4d0d961d592efce57690f88f69 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 26 Oct 2022 09:41:33 -0500
Subject: [PATCH 2332/2840] Update psycopg2 to 2.9.5 (#3918)

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/requirements/local.txt      | 4 ++--
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index b935093d7..f0a2bfc86 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -3,9 +3,9 @@
 Werkzeug[watchdog]==2.2.2 # https://github.com/pallets/werkzeug
 ipdb==0.13.9  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
-psycopg2==2.9.4  # https://github.com/psycopg/psycopg2
+psycopg2==2.9.5  # https://github.com/psycopg/psycopg2
 {%- else %}
-psycopg2-binary==2.9.4  # https://github.com/psycopg/psycopg2
+psycopg2-binary==2.9.5  # https://github.com/psycopg/psycopg2
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %}
 watchfiles==0.18.0  # https://github.com/samuelcolvin/watchfiles
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 88f6a706a..e2c2046d2 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -3,7 +3,7 @@
 -r base.txt
 
 gunicorn==20.1.0  # https://github.com/benoitc/gunicorn
-psycopg2==2.9.4  # https://github.com/psycopg/psycopg2
+psycopg2==2.9.5  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}

From 4fac524c40fd087589b07dbe11880c238eb35999 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 26 Oct 2022 09:42:37 -0500
Subject: [PATCH 2333/2840] Update tox from 3.26.0 to 3.27.0 (#3917)

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

diff --git a/requirements.txt b/requirements.txt
index b72480ba4..1a5d99dad 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==2.20.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.26.0
+tox==3.27.0
 pytest==7.1.3
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From 0b17d64d4171f20e92249aa303754edd8126adb6 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 26 Oct 2022 12:38:24 -0500
Subject: [PATCH 2334/2840] Update pytest to 7.2.0 (#3919)

* Update pytest from 7.1.3 to 7.2.0

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

diff --git a/requirements.txt b/requirements.txt
index 1a5d99dad..691ecf0b4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,7 +13,7 @@ pre-commit==2.20.0
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.27.0
-pytest==7.1.3
+pytest==7.2.0
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2
 pyyaml==6.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index f0a2bfc86..df77fba4b 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -15,7 +15,7 @@ watchfiles==0.18.0  # https://github.com/samuelcolvin/watchfiles
 # ------------------------------------------------------------------------------
 mypy==0.982  # https://github.com/python/mypy
 django-stubs==1.12.0  # https://github.com/typeddjango/django-stubs
-pytest==7.1.3  # https://github.com/pytest-dev/pytest
+pytest==7.2.0  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.5  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
 djangorestframework-stubs==1.7.0  # https://github.com/typeddjango/djangorestframework-stubs

From 9f290f21c81aff37c73ddc776655974cf86ea9c8 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 26 Oct 2022 12:38:40 -0500
Subject: [PATCH 2335/2840] Update uvicorn from 0.18.3 to 0.19.0 (#3920)

---
 {{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 de5c61416..2c8f5312f 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -24,7 +24,7 @@ flower==1.2.0  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn[standard]==0.18.3  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.19.0  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django

From 368bdad664df6cab2f758e97d65d60643800bbaf Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 27 Oct 2022 02:49:12 +0000
Subject: [PATCH 2336/2840] Release 2022.10.26

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index da352847b..ee49c20d1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.10.26
+
+### Updated
+- Update uvicorn to 0.19.0 ([#3920](https://github.com/cookiecutter/cookiecutter-django/pull/3920))
+- Update pytest to 7.2.0 ([#3919](https://github.com/cookiecutter/cookiecutter-django/pull/3919))
+- Update tox to 3.27.0 ([#3917](https://github.com/cookiecutter/cookiecutter-django/pull/3917))
+- Update psycopg2 to 2.9.5 ([#3918](https://github.com/cookiecutter/cookiecutter-django/pull/3918))
+
 ## 2022.10.24
 
 ### Changed
diff --git a/setup.py b/setup.py
index 722dc8a78..509a10527 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.10.24"
+version = "2022.10.26"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From f98d50194e53e1124082c76ed6c57a8542f80eaa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 28 Oct 2022 09:50:30 +0200
Subject: [PATCH 2337/2840] Bump stefanzweifel/git-auto-commit-action from
 4.15.2 to 4.15.3 (#3921)

Bumps [stefanzweifel/git-auto-commit-action](https://github.com/stefanzweifel/git-auto-commit-action) from 4.15.2 to 4.15.3.
- [Release notes](https://github.com/stefanzweifel/git-auto-commit-action/releases)
- [Changelog](https://github.com/stefanzweifel/git-auto-commit-action/blob/master/CHANGELOG.md)
- [Commits](https://github.com/stefanzweifel/git-auto-commit-action/compare/v4.15.2...v4.15.3)

---
updated-dependencies:
- dependency-name: stefanzweifel/git-auto-commit-action
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/update-contributors.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 75dc2c3e0..ee0c547e1 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -31,7 +31,7 @@ jobs:
         run: python scripts/update_contributors.py
 
       - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v4.15.2
+        uses: stefanzweifel/git-auto-commit-action@v4.15.3
         with:
           commit_message: Update Contributors
           file_pattern: CONTRIBUTORS.md .github/contributors.json

From 9c132e2095d8f454e7c4a726c7a604559d3c75d6 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 29 Oct 2022 02:46:36 +0000
Subject: [PATCH 2338/2840] Release 2022.10.28

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ee49c20d1..4ab184396 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 -->
 
+## 2022.10.28
+
+### Updated
+- Bump stefanzweifel/git-auto-commit-action from 4.15.2 to 4.15.3 ([#3921](https://github.com/cookiecutter/cookiecutter-django/pull/3921))
+
 ## 2022.10.26
 
 ### Updated
diff --git a/setup.py b/setup.py
index 509a10527..b87d2a54b 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.10.26"
+version = "2022.10.28"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From f51e8e88e5c4779643f2e0e961a4886a63813440 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sat, 29 Oct 2022 10:17:18 -0700
Subject: [PATCH 2339/2840] Update pillow from 9.2.0 to 9.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 2c8f5312f..b65c228eb 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,6 +1,6 @@
 pytz==2022.5  # https://github.com/stub42/pytz
 python-slugify==6.1.2  # https://github.com/un33k/python-slugify
-Pillow==9.2.0  # https://github.com/python-pillow/Pillow
+Pillow==9.3.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
 {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %}
 rcssmin==1.1.0 --install-option="--without-c-extensions"  # https://github.com/ndparker/rcssmin

From db3edf1e70ea617552b1cc30bd79032b6ed24817 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 30 Oct 2022 09:59:28 +0000
Subject: [PATCH 2340/2840] Auto-update pre-commit hooks (#3924)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                               | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 6d22c2e84..10af89e41 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.1.0
+    rev: v3.2.0
     hooks:
       - id: pyupgrade
         args: [--py310-plus]
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index ebcc5989c..5cf841bc3 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.1.0
+    rev: v3.2.0
     hooks:
       - id: pyupgrade
         args: [--py310-plus]

From 2f4bb6c1ba566af7bb73a131c75cb47352e2a215 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Mon, 31 Oct 2022 02:54:35 +0000
Subject: [PATCH 2341/2840] Release 2022.10.30

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ab184396..e7ef7f8f6 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 -->
 
+## 2022.10.30
+
+### Updated
+- Auto-update pre-commit hooks ([#3924](https://github.com/cookiecutter/cookiecutter-django/pull/3924))
+
 ## 2022.10.28
 
 ### Updated
diff --git a/setup.py b/setup.py
index b87d2a54b..8bc2d7a73 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.10.28"
+version = "2022.10.30"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 8bc9e1cabd7af41ca9f3eb76bcbb6789dc3b2663 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 31 Oct 2022 05:19:20 -0700
Subject: [PATCH 2342/2840] Update django-coverage-plugin from 2.0.3 to 2.0.4

---
 {{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 df77fba4b..2b40810b5 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -44,5 +44,5 @@ factory-boy==3.2.1  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==3.7.0  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.2.1  # https://github.com/django-extensions/django-extensions
-django-coverage-plugin==2.0.3  # https://github.com/nedbat/django_coverage_plugin
+django-coverage-plugin==2.0.4  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.5.2  # https://github.com/pytest-dev/pytest-django

From f4668797b937a76930ea8ac44f78fade54dc6b0e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 31 Oct 2022 19:23:53 -0700
Subject: [PATCH 2343/2840] Update pytz from 2022.5 to 2022.6

---
 {{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 2c8f5312f..655a65e56 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,4 +1,4 @@
-pytz==2022.5  # https://github.com/stub42/pytz
+pytz==2022.6  # https://github.com/stub42/pytz
 python-slugify==6.1.2  # https://github.com/un33k/python-slugify
 Pillow==9.2.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}

From 9cc2a202d2555d8e2844208168b7fabf7ba85666 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 1 Nov 2022 13:37:23 -0700
Subject: [PATCH 2344/2840] Update sphinx-rtd-theme from 1.0.0 to 1.1.0

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

diff --git a/docs/requirements.txt b/docs/requirements.txt
index c3b371b13..2c673d1b4 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,2 +1,2 @@
 sphinx==5.3.0
-sphinx-rtd-theme==1.0.0
+sphinx-rtd-theme==1.1.0

From 11b8ffa93de38ebf5cc12bcf57e3fb0976420430 Mon Sep 17 00:00:00 2001
From: Abe <abe@habet.dev>
Date: Tue, 1 Nov 2022 20:59:58 -0400
Subject: [PATCH 2345/2840] fix typo - closes #3931

---
 CONTRIBUTING.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 28bb81e38..69bce6f2e 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -35,7 +35,7 @@ is:
 
     $ tox -e py310
 
-This will run pytest with the python3.9 interpreter, for example.
+This will run pytest with the python3.10 interpreter, for example.
 
 To run a particular test with tox for against your current Python version:
 

From ca422e9916e247f24c93b6f564e0b32dfee724c0 Mon Sep 17 00:00:00 2001
From: luzfcb <luzfcb@users.noreply.github.com>
Date: Wed, 2 Nov 2022 01:14:12 +0000
Subject: [PATCH 2346/2840] 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 2467ed3e1..190b81d38 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1297,5 +1297,10 @@
     "name": "krati yadav",
     "github_login": "krati5",
     "twitter_username": ""
+  },
+  {
+    "name": "Abe Hanoka",
+    "github_login": "abe-101",
+    "twitter_username": "abe__101"
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 669e9d772..86ee9251c 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -138,6 +138,13 @@ Listed in alphabetical order.
     </td>
     <td>abdadeel_</td>
   </tr>
+  <tr>
+    <td>Abe Hanoka</td>
+    <td>
+      <a href="https://github.com/abe-101">abe-101</a>
+    </td>
+    <td>abe__101</td>
+  </tr>
   <tr>
     <td>Adam Bogdał</td>
     <td>

From 0247ea5d37e6c3f99eee096b57a7b899b06dc5ef Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 3 Nov 2022 02:45:00 +0000
Subject: [PATCH 2347/2840] Release 2022.11.02

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7ef7f8f6..81a35d4b6 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 -->
 
+## 2022.11.02
+
+### Changed
+- fix typo in CONTRIBUTING.md ([#3932](https://github.com/cookiecutter/cookiecutter-django/pull/3932))
+### Updated
+- Update crispy-bootstrap5 to 0.7 ([#3886](https://github.com/cookiecutter/cookiecutter-django/pull/3886))
+- Update django-coverage-plugin to 2.0.4 ([#3927](https://github.com/cookiecutter/cookiecutter-django/pull/3927))
+- Update pytz to 2022.6 ([#3928](https://github.com/cookiecutter/cookiecutter-django/pull/3928))
+- Update sphinx-rtd-theme to 1.1.0 ([#3929](https://github.com/cookiecutter/cookiecutter-django/pull/3929))
+- Update pillow to 9.3.0 ([#3922](https://github.com/cookiecutter/cookiecutter-django/pull/3922))
+
 ## 2022.10.30
 
 ### Updated
diff --git a/setup.py b/setup.py
index 8bc2d7a73..46dd4d16c 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.10.30"
+version = "2022.11.02"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From d1d6ee4dd79645e4b756640676655b1358e33995 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 6 Nov 2022 06:24:07 -0500
Subject: [PATCH 2348/2840] Update sphinx-rtd-theme to 1.1.1 (#3935)

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

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 2c673d1b4..2cc8302a2 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,2 +1,2 @@
 sphinx==5.3.0
-sphinx-rtd-theme==1.1.0
+sphinx-rtd-theme==1.1.1

From 725f524b9ccad4f5df6b114ce5019d3d8edaf369 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 6 Nov 2022 06:24:18 -0500
Subject: [PATCH 2349/2840] Update pygithub to 1.57 (#3936)

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

diff --git a/requirements.txt b/requirements.txt
index 691ecf0b4..ea9671876 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -20,7 +20,7 @@ pyyaml==6.0
 
 # Scripting
 # ------------------------------------------------------------------------------
-PyGithub==1.56
+PyGithub==1.57
 gitpython==3.1.29
 jinja2==3.1.2
 requests==2.28.1

From 76234ca9e641e8b05efab272b716dd25b493e0c9 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 6 Nov 2022 07:34:58 -0500
Subject: [PATCH 2350/2840] Update pytest-sugar to 0.9.6 (#3937)

---
 {{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 2b40810b5..b108431b1 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -16,7 +16,7 @@ watchfiles==0.18.0  # https://github.com/samuelcolvin/watchfiles
 mypy==0.982  # https://github.com/python/mypy
 django-stubs==1.12.0  # https://github.com/typeddjango/django-stubs
 pytest==7.2.0  # https://github.com/pytest-dev/pytest
-pytest-sugar==0.9.5  # https://github.com/Frozenball/pytest-sugar
+pytest-sugar==0.9.6  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
 djangorestframework-stubs==1.7.0  # https://github.com/typeddjango/djangorestframework-stubs
 {%- endif %}

From 3359f6a4dfdfdab34a749bd9ffb4e12e2a59c68e Mon Sep 17 00:00:00 2001
From: Abe Hanoka <abe@habet.dev>
Date: Sun, 6 Nov 2022 07:36:17 -0500
Subject: [PATCH 2351/2840] add os requirements for Ubuntu 22.04 (Jammy)
 (#3930)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Co-authored-by: Fábio C. Barrionuevo da Luz <bnafta@gmail.com>
---
 .../utility/requirements-jammy.apt            | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100644 {{cookiecutter.project_slug}}/utility/requirements-jammy.apt

diff --git a/{{cookiecutter.project_slug}}/utility/requirements-jammy.apt b/{{cookiecutter.project_slug}}/utility/requirements-jammy.apt
new file mode 100644
index 000000000..63d1587e6
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/utility/requirements-jammy.apt
@@ -0,0 +1,23 @@
+##basic build dependencies of various Django apps for Ubuntu Jammy 22.04
+#build-essential metapackage install: make, gcc, g++,
+build-essential
+#required to translate
+gettext
+python3-dev
+
+##shared dependencies of:
+##Pillow, pylibmc
+zlib1g-dev
+
+##Postgresql and psycopg2 dependencies
+libpq-dev
+
+##Pillow dependencies
+libtiff5-dev
+libjpeg8-dev
+libfreetype6-dev
+liblcms2-dev
+libwebp-dev
+
+##django-extensions
+graphviz-dev

From ca82618526d8f2424c721a4bfaeb8abc54b5b030 Mon Sep 17 00:00:00 2001
From: Dani Hodovic <danihodovic@users.noreply.github.com>
Date: Sun, 6 Nov 2022 13:40:16 +0100
Subject: [PATCH 2352/2840] Store extended Celery task attributes in backend
 (#3855)

---
 {{cookiecutter.project_slug}}/config/settings/base.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index ad879fa72..9cd6a081b 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -283,6 +283,8 @@ if USE_TZ:
 CELERY_BROKER_URL = env("CELERY_BROKER_URL")
 # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-result_backend
 CELERY_RESULT_BACKEND = CELERY_BROKER_URL
+# https://docs.celeryq.dev/en/stable/userguide/configuration.html#result-extended
+CELERY_RESULT_EXTENDED = True
 # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-accept_content
 CELERY_ACCEPT_CONTENT = ["json"]
 # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-task_serializer

From a22f842f16879ac9d62b19ada4c03f63b1203fbd Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Mon, 7 Nov 2022 02:43:39 +0000
Subject: [PATCH 2353/2840] Release 2022.11.06

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 81a35d4b6..a253b878c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.11.06
+
+### Changed
+- Store extended Celery task attributes in backend ([#3855](https://github.com/cookiecutter/cookiecutter-django/pull/3855))
+- add os requirements for Ubuntu 22.04 (Jammy) ([#3930](https://github.com/cookiecutter/cookiecutter-django/pull/3930))
+### Updated
+- Update pytest-sugar to 0.9.6 ([#3937](https://github.com/cookiecutter/cookiecutter-django/pull/3937))
+- Update pygithub to 1.57 ([#3936](https://github.com/cookiecutter/cookiecutter-django/pull/3936))
+- Update sphinx-rtd-theme to 1.1.1 ([#3935](https://github.com/cookiecutter/cookiecutter-django/pull/3935))
+
 ## 2022.11.02
 
 ### Changed
diff --git a/setup.py b/setup.py
index 46dd4d16c..1633d385b 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.11.02"
+version = "2022.11.06"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From b74584a4673078bf22111aa431baa7a63609282c Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 7 Nov 2022 07:42:26 -0500
Subject: [PATCH 2354/2840] Update watchfiles to 0.18.1 (#3938)

---
 {{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 b108431b1..130cb24cc 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.5  # https://github.com/psycopg/psycopg2
 psycopg2-binary==2.9.5  # https://github.com/psycopg/psycopg2
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %}
-watchfiles==0.18.0  # https://github.com/samuelcolvin/watchfiles
+watchfiles==0.18.1  # https://github.com/samuelcolvin/watchfiles
 {%- endif %}
 
 # Testing

From d4184cc1c68eee2c27f7b38fbc1bdf3fad6b6494 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 8 Nov 2022 02:43:08 +0000
Subject: [PATCH 2355/2840] Release 2022.11.07

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a253b878c..bc6394eac 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 -->
 
+## 2022.11.07
+
+### Updated
+- Update watchfiles to 0.18.1 ([#3938](https://github.com/cookiecutter/cookiecutter-django/pull/3938))
+
 ## 2022.11.06
 
 ### Changed
diff --git a/setup.py b/setup.py
index 1633d385b..8100edc12 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.11.06"
+version = "2022.11.07"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 040537a5d69ea96b245b24214105da740f8bca53 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 11 Nov 2022 10:00:06 +0000
Subject: [PATCH 2356/2840] Auto-update pre-commit hooks (#3942)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                               | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 10af89e41..e31055bb1 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.2.0
+    rev: v3.2.2
     hooks:
       - id: pyupgrade
         args: [--py310-plus]
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index 5cf841bc3..433d97de9 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.2.0
+    rev: v3.2.2
     hooks:
       - id: pyupgrade
         args: [--py310-plus]

From aa6cc603e24616d6e16761e1596153b0d0f04141 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 12 Nov 2022 02:41:33 +0000
Subject: [PATCH 2357/2840] Release 2022.11.11

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bc6394eac..88f2ab45b 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 -->
 
+## 2022.11.11
+
+### Updated
+- Auto-update pre-commit hooks ([#3942](https://github.com/cookiecutter/cookiecutter-django/pull/3942))
+
 ## 2022.11.07
 
 ### Updated
diff --git a/setup.py b/setup.py
index 8100edc12..ea0d169e3 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.11.07"
+version = "2022.11.11"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 27655eca7ee1a9647ff67af2eed3b419a766aff6 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 14 Nov 2022 00:51:28 -0800
Subject: [PATCH 2358/2840] Update tox from 3.27.0 to 3.27.1

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

diff --git a/requirements.txt b/requirements.txt
index ea9671876..783edeb18 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==2.20.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.27.0
+tox==3.27.1
 pytest==7.2.0
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From 466bb798aa4b44787649bc1b9280bd4c1f9642d5 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 15 Nov 2022 20:35:34 -0600
Subject: [PATCH 2359/2840] Update django-model-utils from 4.2.0 to 4.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 af9c4b52e..1a8ed77ae 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -31,7 +31,7 @@ uvicorn[standard]==0.19.0  # https://github.com/encode/uvicorn
 # ------------------------------------------------------------------------------
 django==4.0.8  # pyup: < 4.1  # https://www.djangoproject.com/
 django-environ==0.9.0  # https://github.com/joke2k/django-environ
-django-model-utils==4.2.0  # https://github.com/jazzband/django-model-utils
+django-model-utils==4.3.1  # https://github.com/jazzband/django-model-utils
 django-allauth==0.51.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.14.0  # https://github.com/django-crispy-forms/django-crispy-forms
 crispy-bootstrap5==0.7  # https://github.com/django-crispy-forms/crispy-bootstrap5

From 7bdc6aea668464216b77d9492dd3ba7631a299fe Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 18 Nov 2022 14:21:59 -0600
Subject: [PATCH 2360/2840] Update python-slugify from 6.1.2 to 7.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 af9c4b52e..3fa109387 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,5 +1,5 @@
 pytz==2022.6  # https://github.com/stub42/pytz
-python-slugify==6.1.2  # https://github.com/un33k/python-slugify
+python-slugify==7.0.0  # https://github.com/un33k/python-slugify
 Pillow==9.3.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
 {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %}

From 81ea9775daf987b39dc54b106884595a81cb044c Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 20 Nov 2022 07:32:12 -0600
Subject: [PATCH 2361/2840] Update flake8-isort from 5.0.0 to 5.0.3

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

diff --git a/requirements.txt b/requirements.txt
index ea9671876..262462cda 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ binaryornot==0.4.4
 black==22.10.0
 isort==5.10.1
 flake8==5.0.4
-flake8-isort==5.0.0
+flake8-isort==5.0.3
 pre-commit==2.20.0
 
 # Testing

From 827e1364d1bb0df69c5b2b200ebe70128cdb1825 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 20 Nov 2022 07:32:13 -0600
Subject: [PATCH 2362/2840] Update flake8-isort from 5.0.0 to 5.0.3

---
 {{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 130cb24cc..e7674ce93 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -29,7 +29,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # Code quality
 # ------------------------------------------------------------------------------
 flake8==5.0.4  # https://github.com/PyCQA/flake8
-flake8-isort==5.0.0  # https://github.com/gforcada/flake8-isort
+flake8-isort==5.0.3  # https://github.com/gforcada/flake8-isort
 coverage==6.5.0  # https://github.com/nedbat/coveragepy
 black==22.10.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django

From 202da796b36afbc7f9aabc88960ba301ff3b5acd Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 20 Nov 2022 08:12:28 -0600
Subject: [PATCH 2363/2840] Update uvicorn from 0.19.0 to 0.20.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 af9c4b52e..3d0da64f9 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -24,7 +24,7 @@ flower==1.2.0  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn[standard]==0.19.0  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.20.0  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django

From f70b397c8672fad1a71b1e08872625c57f1d8f62 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 22 Nov 2022 02:58:49 -0600
Subject: [PATCH 2364/2840] Update redis from 4.3.4 to 4.3.5

---
 {{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 af9c4b52e..9073d7034 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -12,7 +12,7 @@ argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==6.2.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==4.3.4  # https://github.com/redis/redis-py
+redis==4.3.5  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}

From 0e91f40969fd7a0cdcf59be2f03f8e08dc43bce5 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 22 Nov 2022 07:59:10 -0600
Subject: [PATCH 2365/2840] Update sentry-sdk from 1.10.1 to 1.11.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 e2c2046d2..275633dd4 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.5  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.10.1  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.11.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 7d517dc6775a6d3cf7c231ec38468108c259b640 Mon Sep 17 00:00:00 2001
From: adinhodovic <hodovicadin@gmail.com>
Date: Tue, 22 Nov 2022 20:08:02 +0100
Subject: [PATCH 2366/2840] feat(celery): Send task events for Celery by
 default

Is useful for e.g Flower and Celery-exporter
---
 {{cookiecutter.project_slug}}/config/settings/base.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 9cd6a081b..b8368b6cb 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -299,6 +299,8 @@ CELERY_TASK_TIME_LIMIT = 5 * 60
 CELERY_TASK_SOFT_TIME_LIMIT = 60
 # https://docs.celeryq.dev/en/stable/userguide/configuration.html#beat-scheduler
 CELERY_BEAT_SCHEDULER = "django_celery_beat.schedulers:DatabaseScheduler"
+# https://docs.celeryq.dev/en/stable/userguide/configuration.html#worker-send-task-events
+CELERY_WORKER_SEND_TASK_EVENTS = True
 
 {%- endif %}
 # django-allauth

From 65ac3d8a3f2e9ec5e66c21ba23c1e589ef7b29c7 Mon Sep 17 00:00:00 2001
From: luzfcb <luzfcb@users.noreply.github.com>
Date: Tue, 22 Nov 2022 19:20:22 +0000
Subject: [PATCH 2367/2840] 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 190b81d38..bdbc76158 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1302,5 +1302,10 @@
     "name": "Abe Hanoka",
     "github_login": "abe-101",
     "twitter_username": "abe__101"
+  },
+  {
+    "name": "Adin Hodovic",
+    "github_login": "adinhodovic",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 86ee9251c..29db8acb3 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -166,6 +166,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Adin Hodovic</td>
+    <td>
+      <a href="https://github.com/adinhodovic">adinhodovic</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Agam Dua</td>
     <td>

From de48e315174fc38dd4c925528bad907c00822981 Mon Sep 17 00:00:00 2001
From: adinhodovic <hodovicadin@gmail.com>
Date: Tue, 22 Nov 2022 20:28:52 +0100
Subject: [PATCH 2368/2840] feat(celery): Enable sending the sent task event by
 default

---
 {{cookiecutter.project_slug}}/config/settings/base.py | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index b8368b6cb..b1d11cd3d 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -301,6 +301,8 @@ CELERY_TASK_SOFT_TIME_LIMIT = 60
 CELERY_BEAT_SCHEDULER = "django_celery_beat.schedulers:DatabaseScheduler"
 # https://docs.celeryq.dev/en/stable/userguide/configuration.html#worker-send-task-events
 CELERY_WORKER_SEND_TASK_EVENTS = True
+# https://docs.celeryq.dev/en/stable/userguide/configuration.html#std-setting-task_send_sent_event
+CELERY_TASK_SEND_SENT_EVENT = True
 
 {%- endif %}
 # django-allauth

From d98aad07109fe02613cab9850378eefc9f350748 Mon Sep 17 00:00:00 2001
From: Leifur Halldor Asgeirsson <leifurhauks@gmail.com>
Date: Tue, 22 Nov 2022 14:59:34 -0500
Subject: [PATCH 2369/2840] Remove platform from compose file (#3957)

---
 {{cookiecutter.project_slug}}/local.yml      | 2 --
 {{cookiecutter.project_slug}}/production.yml | 1 -
 2 files changed, 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index fb203acd6..33a8db07a 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -11,7 +11,6 @@ services:
       dockerfile: ./compose/local/django/Dockerfile
     image: {{ cookiecutter.project_slug }}_local_django
     container_name: {{ cookiecutter.project_slug }}_local_django
-    platform: linux/x86_64
     depends_on:
       - postgres
       {%- if cookiecutter.use_celery == 'y' %}
@@ -44,7 +43,6 @@ services:
   docs:
     image: {{ cookiecutter.project_slug }}_local_docs
     container_name: {{ cookiecutter.project_slug }}_local_docs
-    platform: linux/x86_64
     build:
       context: .
       dockerfile: ./compose/local/docs/Dockerfile
diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index 4c1d64c20..ea4292a0d 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -11,7 +11,6 @@ services:
       context: .
       dockerfile: ./compose/production/django/Dockerfile
     image: {{ cookiecutter.project_slug }}_production_django
-    platform: linux/x86_64
     depends_on:
       - postgres
       - redis

From a78b052bcce3a67ff7bc2634fcd4590cb1e0bb77 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 22 Nov 2022 19:59:59 +0000
Subject: [PATCH 2370/2840] 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 bdbc76158..c8da987a2 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1307,5 +1307,10 @@
     "name": "Adin Hodovic",
     "github_login": "adinhodovic",
     "twitter_username": ""
+  },
+  {
+    "name": "Leifur Halldor Asgeirsson",
+    "github_login": "leifurhauks",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 29db8acb3..000e5fb1f 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1160,6 +1160,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Leifur Halldor Asgeirsson</td>
+    <td>
+      <a href="https://github.com/leifurhauks">leifurhauks</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Leo won</td>
     <td>

From b5ad2fc232b136dc7d249c0a41bbf941b7247954 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Tue, 22 Nov 2022 17:51:31 -0500
Subject: [PATCH 2371/2840] Remove USE_L10N due to deprecation (#3960)

---
 {{cookiecutter.project_slug}}/config/settings/base.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index b8368b6cb..62c4b4327 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -30,8 +30,6 @@ LANGUAGE_CODE = "en-us"
 SITE_ID = 1
 # https://docs.djangoproject.com/en/dev/ref/settings/#use-i18n
 USE_I18N = True
-# https://docs.djangoproject.com/en/dev/ref/settings/#use-l10n
-USE_L10N = True
 # https://docs.djangoproject.com/en/dev/ref/settings/#use-tz
 USE_TZ = True
 # https://docs.djangoproject.com/en/dev/ref/settings/#locale-paths

From 3e32780ccf39c1128a0ab1d2dc68d7e61b32096d Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 23 Nov 2022 02:34:55 +0000
Subject: [PATCH 2372/2840] Release 2022.11.22

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 88f2ab45b..85a0cb793 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.11.22
+
+### Changed
+- Remove USE_L10N due to deprecation ([#3960](https://github.com/cookiecutter/cookiecutter-django/pull/3960))
+- Remove platform from compose file ([#3957](https://github.com/cookiecutter/cookiecutter-django/pull/3957))
+- feat(celery): Send task events for Celery by default ([#3959](https://github.com/cookiecutter/cookiecutter-django/pull/3959))
+### Updated
+- Update python-slugify to 7.0.0 ([#3950](https://github.com/cookiecutter/cookiecutter-django/pull/3950))
+- Update redis to 4.3.5 ([#3954](https://github.com/cookiecutter/cookiecutter-django/pull/3954))
+- Update sentry-sdk to 1.11.1 ([#3955](https://github.com/cookiecutter/cookiecutter-django/pull/3955))
+- Update uvicorn to 0.20.0 ([#3953](https://github.com/cookiecutter/cookiecutter-django/pull/3953))
+- Update tox to 3.27.1 ([#3945](https://github.com/cookiecutter/cookiecutter-django/pull/3945))
+
 ## 2022.11.11
 
 ### Updated
diff --git a/setup.py b/setup.py
index ea0d169e3..55cc3d400 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.11.11"
+version = "2022.11.22"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 51f4374a8ab88cffd20b13cc36be10d35cfd79b0 Mon Sep 17 00:00:00 2001
From: Chao Yang Wu <peteeelol@gmail.com>
Date: Wed, 23 Nov 2022 22:51:20 +0800
Subject: [PATCH 2373/2840] Fix graceful shutdown of local dev containers and
 use watchfiles for beat + flower (#3925)

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 .../compose/local/django/celery/beat/start               | 2 +-
 .../compose/local/django/celery/flower/start             | 9 +++------
 .../compose/local/django/celery/worker/start             | 2 +-
 {{cookiecutter.project_slug}}/compose/local/django/start | 4 ++--
 {{cookiecutter.project_slug}}/compose/local/docs/start   | 2 +-
 .../compose/production/django/start                      | 4 ++--
 6 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
index c04a7365e..61f83968b 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
@@ -5,4 +5,4 @@ set -o nounset
 
 
 rm -f './celerybeat.pid'
-celery -A config.celery_app beat -l INFO
+exec watchfiles celery.__main__.main --args '-A config.celery_app beat -l INFO'
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start
index bd3c9f2fd..8ff56d118 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start
@@ -3,9 +3,6 @@
 set -o errexit
 set -o nounset
 
-
-celery \
-    -A config.celery_app \
-    -b "${CELERY_BROKER_URL}" \
-    flower \
-    --basic_auth="${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}"
+exec watchfiles celery.__.main__.main \
+    --args \
+    "-A config.celery_app -b \"${CELERY_BROKER_URL}\" flower --basic_auth=\"${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}\""
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
index 4ddcfa137..16341fdd1 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
@@ -4,4 +4,4 @@ set -o errexit
 set -o nounset
 
 
-watchfiles celery.__main__.main --args '-A config.celery_app worker -l INFO'
+exec watchfiles celery.__main__.main --args '-A config.celery_app worker -l INFO'
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start b/{{cookiecutter.project_slug}}/compose/local/django/start
index 3fe547357..ec57dc8e4 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/start
@@ -7,7 +7,7 @@ set -o nounset
 
 python manage.py migrate
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn config.asgi:application --host 0.0.0.0 --reload --reload-include '*.html'
+exec uvicorn config.asgi:application --host 0.0.0.0 --reload --reload-include '*.html'
 {%- else %}
-python manage.py runserver_plus 0.0.0.0:8000
+exec python manage.py runserver_plus 0.0.0.0:8000
 {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/start b/{{cookiecutter.project_slug}}/compose/local/docs/start
index fd2e0de6a..96a94f566 100644
--- a/{{cookiecutter.project_slug}}/compose/local/docs/start
+++ b/{{cookiecutter.project_slug}}/compose/local/docs/start
@@ -4,4 +4,4 @@ set -o errexit
 set -o pipefail
 set -o nounset
 
-make livehtml
+exec make livehtml
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/start b/{{cookiecutter.project_slug}}/compose/production/django/start
index 2ba79501c..73f686bd7 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/start
+++ b/{{cookiecutter.project_slug}}/compose/production/django/start
@@ -28,7 +28,7 @@ if compress_enabled; then
 fi
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-/usr/local/bin/gunicorn config.asgi --bind 0.0.0.0:5000 --chdir=/app -k uvicorn.workers.UvicornWorker
+exec /usr/local/bin/gunicorn config.asgi --bind 0.0.0.0:5000 --chdir=/app -k uvicorn.workers.UvicornWorker
 {%- else %}
-/usr/local/bin/gunicorn config.wsgi --bind 0.0.0.0:5000 --chdir=/app
+exec /usr/local/bin/gunicorn config.wsgi --bind 0.0.0.0:5000 --chdir=/app
 {%- endif %}

From c35a074d720c252986bae05c6da038a566ea3706 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 23 Nov 2022 14:51:51 +0000
Subject: [PATCH 2374/2840] Bump stefanzweifel/git-auto-commit-action from
 4.15.3 to 4.15.4 (#3940)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/update-contributors.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index ee0c547e1..571bdcd02 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -31,7 +31,7 @@ jobs:
         run: python scripts/update_contributors.py
 
       - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v4.15.3
+        uses: stefanzweifel/git-auto-commit-action@v4.15.4
         with:
           commit_message: Update Contributors
           file_pattern: CONTRIBUTORS.md .github/contributors.json

From 5ad6cb48c5a7ba03e866ae0159116bd08ccf6234 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 24 Nov 2022 02:32:07 +0000
Subject: [PATCH 2375/2840] Release 2022.11.23

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85a0cb793..24dbdc41f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.11.23
+
+### Changed
+- Fix graceful shutdown of local dev containers and use watchfiles for beat + flower ([#3925](https://github.com/cookiecutter/cookiecutter-django/pull/3925))
+- feat(celery): Enable sending the sent task event by default ([#3961](https://github.com/cookiecutter/cookiecutter-django/pull/3961))
+### Updated
+- Bump stefanzweifel/git-auto-commit-action from 4.15.3 to 4.15.4 ([#3940](https://github.com/cookiecutter/cookiecutter-django/pull/3940))
+- Update django-model-utils to 4.3.1 ([#3948](https://github.com/cookiecutter/cookiecutter-django/pull/3948))
+- Update flake8-isort to 5.0.3 ([#3952](https://github.com/cookiecutter/cookiecutter-django/pull/3952))
+
 ## 2022.11.22
 
 ### Changed
diff --git a/setup.py b/setup.py
index 55cc3d400..d097c04e5 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.11.22"
+version = "2022.11.23"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From b21f50e22b465bb5e01608c46738b9c022080243 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Thu, 24 Nov 2022 08:17:41 +0000
Subject: [PATCH 2376/2840] Auto-update pre-commit hooks (#3963)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                               | 4 ++--
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e31055bb1..df197108f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -3,7 +3,7 @@ default_stages: [commit]
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.4.0
     hooks:
       - id: trailing-whitespace
       - id: check-yaml
@@ -26,7 +26,7 @@ repos:
       - id: isort
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 5.0.4
+    rev: 6.0.0
     hooks:
       - id: flake8
 
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index 433d97de9..e53422ed3 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -3,7 +3,7 @@ default_stages: [commit]
 
 repos:
   - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v4.3.0
+    rev: v4.4.0
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
@@ -26,7 +26,7 @@ repos:
       - id: isort
 
   - repo: https://github.com/PyCQA/flake8
-    rev: 5.0.4
+    rev: 6.0.0
     hooks:
       - id: flake8
         args: ["--config=setup.cfg"]

From fec7ba3aa89332f1056d1835913c12e7d4d3eb1a Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 25 Nov 2022 02:33:31 +0000
Subject: [PATCH 2377/2840] Release 2022.11.24

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 24dbdc41f..2b8be74db 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 -->
 
+## 2022.11.24
+
+### Updated
+- Auto-update pre-commit hooks ([#3963](https://github.com/cookiecutter/cookiecutter-django/pull/3963))
+
 ## 2022.11.23
 
 ### Changed
diff --git a/setup.py b/setup.py
index d097c04e5..7a2223092 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.11.23"
+version = "2022.11.24"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 77695c7c10a902b8345e75a2a4cf06fb2d8971ad Mon Sep 17 00:00:00 2001
From: David <dev@davidjaybuckley.com>
Date: Sat, 26 Nov 2022 04:08:39 -0700
Subject: [PATCH 2378/2840] Fix typo in flower start for watching celery
 (#3966)

---
 .../compose/local/django/celery/flower/start                    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start
index 8ff56d118..ac3cc6b36 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start
@@ -3,6 +3,6 @@
 set -o errexit
 set -o nounset
 
-exec watchfiles celery.__.main__.main \
+exec watchfiles celery.__main__.main \
     --args \
     "-A config.celery_app -b \"${CELERY_BROKER_URL}\" flower --basic_auth=\"${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}\""

From fd45bb18ea992423c79a2878d02620e190b1ac2e Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 26 Nov 2022 11:09:10 +0000
Subject: [PATCH 2379/2840] 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 c8da987a2..3d4ec0488 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1312,5 +1312,10 @@
     "name": "Leifur Halldor Asgeirsson",
     "github_login": "leifurhauks",
     "twitter_username": ""
+  },
+  {
+    "name": "David",
+    "github_login": "buckldav",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 000e5fb1f..028ed7231 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -607,6 +607,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>David</td>
+    <td>
+      <a href="https://github.com/buckldav">buckldav</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>David Díaz</td>
     <td>

From 0a8b15615a51f09083ce5386c4e09c5fe2ed2757 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sun, 27 Nov 2022 02:34:17 +0000
Subject: [PATCH 2380/2840] Release 2022.11.26

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b8be74db..ba72b2cf3 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 -->
 
+## 2022.11.26
+
+### Changed
+- Fix typo in flower start for watching celery ([#3966](https://github.com/cookiecutter/cookiecutter-django/pull/3966))
+
 ## 2022.11.24
 
 ### Updated
diff --git a/setup.py b/setup.py
index 7a2223092..6f2fde261 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.11.24"
+version = "2022.11.26"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 5ca7ae1c4306da865acdedb0899ad35cda471d79 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 30 Nov 2022 09:37:03 +0000
Subject: [PATCH 2381/2840] Auto-update pre-commit hooks (#3970)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                               | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index df197108f..75d2409cd 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.2.2
+    rev: v3.2.3
     hooks:
       - id: pyupgrade
         args: [--py310-plus]
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index e53422ed3..e8e69627d 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.2.2
+    rev: v3.2.3
     hooks:
       - id: pyupgrade
         args: [--py310-plus]

From 49b3bb8ffe6311b877409886ecfdb90d8b4beb15 Mon Sep 17 00:00:00 2001
From: rguptar <69279773+rguptar@users.noreply.github.com>
Date: Wed, 30 Nov 2022 10:26:58 -0800
Subject: [PATCH 2382/2840] Add Azure Storage as an option to serve static and
 media files (#3967)

Fix https://github.com/cookiecutter/cookiecutter-django/issues/2301
---
 README.md                                          |  4 ++--
 cookiecutter.json                                  |  1 +
 docs/project-generation-options.rst                |  4 +++-
 docs/settings.rst                                  |  3 +++
 hooks/pre_gen_project.py                           |  7 ++-----
 tests/test_cookiecutter_generation.py              | 14 +++++++++++++-
 .../.envs/.production/.django                      |  6 ++++++
 .../config/settings/production.py                  | 12 +++++++++++-
 .../requirements/production.txt                    |  2 ++
 .../utils/storages.py                              | 11 +++++++++++
 10 files changed, 54 insertions(+), 10 deletions(-)

diff --git a/README.md b/README.md
index 9f2af6d37..27fc6e0e1 100644
--- a/README.md
+++ b/README.md
@@ -29,7 +29,7 @@ production-ready Django projects quickly.
 -   Optional basic ASGI setup for Websockets
 -   Optional custom static build using Gulp and livereload
 -   Send emails via [Anymail](https://github.com/anymail/django-anymail) (using [Mailgun](http://www.mailgun.com/) by default or Amazon SES if AWS is selected cloud provider, but switchable)
--   Media storage using Amazon S3 or Google Cloud Storage
+-   Media storage using Amazon S3, Google Cloud Storage or Azure Storage
 -   Docker support using [docker-compose](https://github.com/docker/compose) for development and production (using [Traefik](https://traefik.io/) with [LetsEncrypt](https://letsencrypt.org/) support)
 -   [Procfile](https://devcenter.heroku.com/articles/procfile) for deploying to Heroku
 -   Instructions for deploying to [PythonAnywhere](https://www.pythonanywhere.com/)
@@ -41,7 +41,7 @@ production-ready Django projects quickly.
 
 *These features can be enabled during initial project setup.*
 
--   Serve static files from Amazon S3, Google Cloud Storage or [Whitenoise](https://whitenoise.readthedocs.io/)
+-   Serve static files from Amazon S3, Google Cloud Storage, Azure Storage or [Whitenoise](https://whitenoise.readthedocs.io/)
 -   Configuration for [Celery](https://docs.celeryq.dev) and [Flower](https://github.com/mher/flower) (the latter in Docker setup only)
 -   Integration with [MailHog](https://github.com/mailhog/MailHog) for local email testing
 -   Integration with [Sentry](https://sentry.io/welcome/) for error logging
diff --git a/cookiecutter.json b/cookiecutter.json
index 90d084b3a..970411013 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -27,6 +27,7 @@
   "cloud_provider": [
     "AWS",
     "GCP",
+    "Azure",
     "None"
   ],
   "mail_service": [
diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index 2d8103cf2..0560badd3 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -66,7 +66,8 @@ cloud_provider:
 
     1. AWS_
     2. GCP_
-    3. None
+    3. Azure_
+    4. None
 
     Note that if you choose no cloud provider, media files won't work.
 
@@ -147,6 +148,7 @@ debug:
 
 .. _AWS: https://aws.amazon.com/s3/
 .. _GCP: https://cloud.google.com/storage/
+.. _Azure: https://azure.microsoft.com/en-us/products/storage/blobs/
 
 .. _Amazon SES: https://aws.amazon.com/ses/
 .. _Mailgun: https://www.mailgun.com
diff --git a/docs/settings.rst b/docs/settings.rst
index b8c6d448e..4691adbbd 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -49,6 +49,9 @@ DJANGO_AWS_S3_CUSTOM_DOMAIN             AWS_S3_CUSTOM_DOMAIN        n/a
 DJANGO_AWS_S3_MAX_MEMORY_SIZE           AWS_S3_MAX_MEMORY_SIZE      n/a                                            100_000_000
 DJANGO_GCP_STORAGE_BUCKET_NAME          GS_BUCKET_NAME              n/a                                            raises error
 GOOGLE_APPLICATION_CREDENTIALS          n/a                         n/a                                            raises error
+DJANGO_AZURE_ACCOUNT_KEY                AZURE_ACCOUNT_KEY           n/a                                            raises error
+DJANGO_AZURE_ACCOUNT_NAME               AZURE_ACCOUNT_NAME          n/a                                            raises error
+DJANGO_AZURE_CONTAINER_NAME             AZURE_CONTAINER             n/a                                            raises error
 SENTRY_DSN                              SENTRY_DSN                  n/a                                            raises error
 SENTRY_ENVIRONMENT                      n/a                         n/a                                            production
 SENTRY_TRACES_SAMPLE_RATE               n/a                         n/a                                            0.0
diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py
index 2845f012c..c3eef1e43 100644
--- a/hooks/pre_gen_project.py
+++ b/hooks/pre_gen_project.py
@@ -72,11 +72,8 @@ if (
     sys.exit(1)
 
 if (
-    "{{ cookiecutter.cloud_provider }}" == "GCP"
-    and "{{ cookiecutter.mail_service }}" == "Amazon SES"
-) or (
-    "{{ cookiecutter.cloud_provider }}" == "None"
-    and "{{ cookiecutter.mail_service }}" == "Amazon SES"
+    "{{ cookiecutter.mail_service }}" == "Amazon SES"
+    and "{{ cookiecutter.cloud_provider }}" != "AWS"
 ):
     print(
         "You should either use AWS or select a different "
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 3a757fcb7..6219f75ef 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -56,6 +56,8 @@ SUPPORTED_COMBINATIONS = [
     {"cloud_provider": "AWS", "use_whitenoise": "n"},
     {"cloud_provider": "GCP", "use_whitenoise": "y"},
     {"cloud_provider": "GCP", "use_whitenoise": "n"},
+    {"cloud_provider": "Azure", "use_whitenoise": "y"},
+    {"cloud_provider": "Azure", "use_whitenoise": "n"},
     {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "Mailgun"},
     {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "Mailjet"},
     {"cloud_provider": "None", "use_whitenoise": "y", "mail_service": "Mandrill"},
@@ -82,7 +84,16 @@ SUPPORTED_COMBINATIONS = [
     {"cloud_provider": "GCP", "mail_service": "SendinBlue"},
     {"cloud_provider": "GCP", "mail_service": "SparkPost"},
     {"cloud_provider": "GCP", "mail_service": "Other SMTP"},
-    # Note: cloud_providers GCP and None with mail_service Amazon SES is not supported
+    {"cloud_provider": "Azure", "mail_service": "Mailgun"},
+    {"cloud_provider": "Azure", "mail_service": "Mailjet"},
+    {"cloud_provider": "Azure", "mail_service": "Mandrill"},
+    {"cloud_provider": "Azure", "mail_service": "Postmark"},
+    {"cloud_provider": "Azure", "mail_service": "Sendgrid"},
+    {"cloud_provider": "Azure", "mail_service": "SendinBlue"},
+    {"cloud_provider": "Azure", "mail_service": "SparkPost"},
+    {"cloud_provider": "Azure", "mail_service": "Other SMTP"},
+    # Note: cloud_providers GCP, Azure, and None
+    # with mail_service Amazon SES is not supported
     {"use_async": "y"},
     {"use_async": "n"},
     {"use_drf": "y"},
@@ -113,6 +124,7 @@ SUPPORTED_COMBINATIONS = [
 UNSUPPORTED_COMBINATIONS = [
     {"cloud_provider": "None", "use_whitenoise": "n"},
     {"cloud_provider": "GCP", "mail_service": "Amazon SES"},
+    {"cloud_provider": "Azure", "mail_service": "Amazon SES"},
     {"cloud_provider": "None", "mail_service": "Amazon SES"},
 ]
 
diff --git a/{{cookiecutter.project_slug}}/.envs/.production/.django b/{{cookiecutter.project_slug}}/.envs/.production/.django
index e7e8461c9..ad652c9ad 100644
--- a/{{cookiecutter.project_slug}}/.envs/.production/.django
+++ b/{{cookiecutter.project_slug}}/.envs/.production/.django
@@ -44,6 +44,12 @@ DJANGO_AWS_STORAGE_BUCKET_NAME=
 # ------------------------------------------------------------------------------
 GOOGLE_APPLICATION_CREDENTIALS=
 DJANGO_GCP_STORAGE_BUCKET_NAME=
+{% elif cookiecutter.cloud_provider == 'Azure' %}
+# Azure
+# ------------------------------------------------------------------------------
+DJANGO_AZURE_ACCOUNT_KEY=
+DJANGO_AZURE_ACCOUNT_NAME=
+DJANGO_AZURE_CONTAINER_NAME=
 {% endif %}
 # django-allauth
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 8eed5a805..40d3f19cc 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -100,6 +100,10 @@ aws_s3_domain = AWS_S3_CUSTOM_DOMAIN or f"{AWS_STORAGE_BUCKET_NAME}.s3.amazonaws
 {% elif cookiecutter.cloud_provider == 'GCP' %}
 GS_BUCKET_NAME = env("DJANGO_GCP_STORAGE_BUCKET_NAME")
 GS_DEFAULT_ACL = "publicRead"
+{% elif cookiecutter.cloud_provider == 'Azure' %}
+AZURE_ACCOUNT_KEY = env("DJANGO_AZURE_ACCOUNT_KEY")
+AZURE_ACCOUNT_NAME = env("DJANGO_AZURE_ACCOUNT_NAME")
+AZURE_CONTAINER = env("DJANGO_AZURE_CONTAINER_NAME")
 {% endif -%}
 
 {% if cookiecutter.cloud_provider != 'None' or cookiecutter.use_whitenoise == 'y' -%}
@@ -116,6 +120,9 @@ STATIC_URL = f"https://{aws_s3_domain}/static/"
 STATICFILES_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.StaticRootGoogleCloudStorage"
 COLLECTFAST_STRATEGY = "collectfast.strategies.gcloud.GoogleCloudStrategy"
 STATIC_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/static/"
+{% elif cookiecutter.cloud_provider == 'Azure' -%}
+STATICFILES_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.StaticRootAzureStorage"
+STATIC_URL = f"https://{AZURE_ACCOUNT_NAME}.blob.core.windows.net/static/"
 {% endif -%}
 
 # MEDIA
@@ -126,6 +133,9 @@ MEDIA_URL = f"https://{aws_s3_domain}/media/"
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
 DEFAULT_FILE_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.MediaRootGoogleCloudStorage"
 MEDIA_URL = f"https://storage.googleapis.com/{GS_BUCKET_NAME}/media/"
+{%- elif cookiecutter.cloud_provider == 'Azure' %}
+DEFAULT_FILE_STORAGE = "{{cookiecutter.project_slug}}.utils.storages.MediaRootAzureStorage"
+MEDIA_URL = f"https://{AZURE_ACCOUNT_NAME}.blob.core.windows.net/media/"
 {%- endif %}
 
 # EMAIL
@@ -228,7 +238,7 @@ COMPRESS_ENABLED = env.bool("COMPRESS_ENABLED", default=True)
 {%- if cookiecutter.cloud_provider == 'None' %}
 # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_STORAGE
 COMPRESS_STORAGE = "compressor.storage.GzipCompressorFileStorage"
-{%- elif cookiecutter.cloud_provider in ('AWS', 'GCP') and cookiecutter.use_whitenoise == 'n' %}
+{%- elif cookiecutter.cloud_provider in ('AWS', 'GCP', 'Azure') and cookiecutter.use_whitenoise == 'n' %}
 # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_STORAGE
 COMPRESS_STORAGE = STATICFILES_STORAGE
 {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 275633dd4..c9b5b88a7 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -20,6 +20,8 @@ hiredis==2.0.0  # https://github.com/redis/hiredis-py
 django-storages[boto3]==1.13.1  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
 django-storages[google]==1.13.1  # https://github.com/jschneier/django-storages
+{%- elif cookiecutter.cloud_provider == 'Azure' %}
+django-storages[azure]==1.13.1  # https://github.com/jschneier/django-storages
 {%- endif %}
 {%- if cookiecutter.mail_service == 'Mailgun' %}
 django-anymail[mailgun]==8.6  # https://github.com/anymail/django-anymail
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/storages.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/storages.py
index b712d3239..27595ad1a 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/storages.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/utils/storages.py
@@ -22,4 +22,15 @@ class StaticRootGoogleCloudStorage(GoogleCloudStorage):
 class MediaRootGoogleCloudStorage(GoogleCloudStorage):
     location = "media"
     file_overwrite = False
+{%- elif cookiecutter.cloud_provider == 'Azure' -%}
+from storages.backends.azure_storage import AzureStorage
+
+
+class StaticRootAzureStorage(AzureStorage):
+    location = "static"
+
+
+class MediaRootAzureStorage(AzureStorage):
+    location = "media"
+    file_overwrite = False
 {%- endif %}

From 9f8e25ebbc4c6ed1b09c07fe6c36a5b5e8bb2530 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 30 Nov 2022 18:27:34 +0000
Subject: [PATCH 2383/2840] 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 3d4ec0488..49ebfe4d8 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1317,5 +1317,10 @@
     "name": "David",
     "github_login": "buckldav",
     "twitter_username": ""
+  },
+  {
+    "name": "rguptar",
+    "github_login": "rguptar",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 028ed7231..d97324708 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1545,6 +1545,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>rguptar</td>
+    <td>
+      <a href="https://github.com/rguptar">rguptar</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Richard Hajdu</td>
     <td>

From 431dfc94e2dd70941757221aceb4000ca2c9c022 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 1 Dec 2022 02:37:11 +0000
Subject: [PATCH 2384/2840] Release 2022.11.30

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ba72b2cf3..45e784f8b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.11.30
+
+### Changed
+- Add Azure Storage as an option to serve static and media files ([#3967](https://github.com/cookiecutter/cookiecutter-django/pull/3967))
+### Updated
+- Auto-update pre-commit hooks ([#3970](https://github.com/cookiecutter/cookiecutter-django/pull/3970))
+
 ## 2022.11.26
 
 ### Changed
diff --git a/setup.py b/setup.py
index 6f2fde261..a388c0b61 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.11.26"
+version = "2022.11.30"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From a464856234fd9f8f68d17d72fe01f35868179790 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 2 Dec 2022 05:43:02 -0500
Subject: [PATCH 2385/2840] Update flake8 to 6.0.0 (#3974)

---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 88c8176f1..684ec91e0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -6,7 +6,7 @@ binaryornot==0.4.4
 # ------------------------------------------------------------------------------
 black==22.10.0
 isort==5.10.1
-flake8==5.0.4
+flake8==6.0.0
 flake8-isort==5.0.3
 pre-commit==2.20.0
 
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index e7674ce93..a55b1019a 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
 
 # Code quality
 # ------------------------------------------------------------------------------
-flake8==5.0.4  # https://github.com/PyCQA/flake8
+flake8==6.0.0  # https://github.com/PyCQA/flake8
 flake8-isort==5.0.3  # https://github.com/gforcada/flake8-isort
 coverage==6.5.0  # https://github.com/nedbat/coveragepy
 black==22.10.0  # https://github.com/psf/black

From 8ad762cbc654219824cc596b1eb456452b7b1b39 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 3 Dec 2022 02:21:12 +0000
Subject: [PATCH 2386/2840] Release 2022.12.02

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 45e784f8b..7a78b7cf4 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 -->
 
+## 2022.12.02
+
+### Updated
+- Update flake8 to 6.0.0 ([#3974](https://github.com/cookiecutter/cookiecutter-django/pull/3974))
+
 ## 2022.11.30
 
 ### Changed
diff --git a/setup.py b/setup.py
index a388c0b61..0fa4ba7ca 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.11.30"
+version = "2022.12.02"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 600783c89bd2fbb0cc459d103ca42bd8c791fb78 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 3 Dec 2022 11:36:29 +0000
Subject: [PATCH 2387/2840] Auto-update pre-commit hooks (#3975)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                               | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 75d2409cd..e8d055772 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.2.3
+    rev: v3.3.0
     hooks:
       - id: pyupgrade
         args: [--py310-plus]
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index e8e69627d..516323b42 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.2.3
+    rev: v3.3.0
     hooks:
       - id: pyupgrade
         args: [--py310-plus]

From 3deb4d90f2e5884f183b1270b416f7f41cd3f5b1 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 3 Dec 2022 19:12:25 -0500
Subject: [PATCH 2388/2840] Update django-debug-toolbar to 3.8.1 (#3976)

---
 {{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 a55b1019a..ba8db0339 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -42,7 +42,7 @@ pre-commit==2.20.0  # https://github.com/pre-commit/pre-commit
 # ------------------------------------------------------------------------------
 factory-boy==3.2.1  # https://github.com/FactoryBoy/factory_boy
 
-django-debug-toolbar==3.7.0  # https://github.com/jazzband/django-debug-toolbar
+django-debug-toolbar==3.8.1  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.2.1  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==2.0.4  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.5.2  # https://github.com/pytest-dev/pytest-django

From b5ccdf104174edfc3ff7f55b98a2fc5ee3c093ff Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sun, 4 Dec 2022 02:27:06 +0000
Subject: [PATCH 2389/2840] Release 2022.12.03

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7a78b7cf4..dd8a4e0d1 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 -->
 
+## 2022.12.03
+
+### Updated
+- Auto-update pre-commit hooks ([#3975](https://github.com/cookiecutter/cookiecutter-django/pull/3975))
+
 ## 2022.12.02
 
 ### Updated
diff --git a/setup.py b/setup.py
index 0fa4ba7ca..6d0fccd46 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.12.02"
+version = "2022.12.03"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 0336f08da1709b503043e902237d8e5caa12ee96 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 4 Dec 2022 09:10:58 -0500
Subject: [PATCH 2390/2840] Update redis to 4.4.0 (#3977)

---
 {{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 0817c4262..827530be9 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -12,7 +12,7 @@ argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==6.2.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==4.3.5  # https://github.com/redis/redis-py
+redis==4.4.0  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.0.0  # https://github.com/redis/hiredis-py
 {%- endif %}

From 82e0c275f846c3996d66251dab49007d46b47945 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Mon, 5 Dec 2022 02:26:01 +0000
Subject: [PATCH 2391/2840] Release 2022.12.04

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index dd8a4e0d1..b0e1e6690 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 -->
 
+## 2022.12.04
+
+### Updated
+- Update redis to 4.4.0 ([#3977](https://github.com/cookiecutter/cookiecutter-django/pull/3977))
+- Update django-debug-toolbar to 3.8.1 ([#3976](https://github.com/cookiecutter/cookiecutter-django/pull/3976))
+
 ## 2022.12.03
 
 ### Updated
diff --git a/setup.py b/setup.py
index 6d0fccd46..e187601c3 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.12.03"
+version = "2022.12.04"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From b2deb65c0dedc336e2e7259026cb5b36478e4590 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 6 Dec 2022 09:41:28 +0000
Subject: [PATCH 2392/2840] Bump stefanzweifel/git-auto-commit-action from
 4.15.4 to 4.16.0 (#3978)

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .github/workflows/update-contributors.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 571bdcd02..952486c1b 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -31,7 +31,7 @@ jobs:
         run: python scripts/update_contributors.py
 
       - name: Commit changes
-        uses: stefanzweifel/git-auto-commit-action@v4.15.4
+        uses: stefanzweifel/git-auto-commit-action@v4.16.0
         with:
           commit_message: Update Contributors
           file_pattern: CONTRIBUTORS.md .github/contributors.json

From d272d9752d0c8a6ba8d0c189549355a9a1e3d2dc Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 6 Dec 2022 06:37:50 -0500
Subject: [PATCH 2393/2840] Update django-coverage-plugin to 3.0.0 (#3979)

---
 {{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 ba8db0339..6082a72c8 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -44,5 +44,5 @@ factory-boy==3.2.1  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==3.8.1  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.2.1  # https://github.com/django-extensions/django-extensions
-django-coverage-plugin==2.0.4  # https://github.com/nedbat/django_coverage_plugin
+django-coverage-plugin==3.0.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.5.2  # https://github.com/pytest-dev/pytest-django

From 33af8e3988067811f48f73f8a589002b136aad1a Mon Sep 17 00:00:00 2001
From: Adin Hodovic <hodovicadin@gmail.com>
Date: Tue, 6 Dec 2022 20:04:38 +0100
Subject: [PATCH 2394/2840] Simplify production `DATABASES` setting to extend
 base definition (#3969)

---
 {{cookiecutter.project_slug}}/config/settings/production.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 40d3f19cc..15d3a7683 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -22,8 +22,6 @@ ALLOWED_HOSTS = env.list("DJANGO_ALLOWED_HOSTS", default=["{{ cookiecutter.domai
 
 # DATABASES
 # ------------------------------------------------------------------------------
-DATABASES["default"] = env.db("DATABASE_URL")  # noqa F405
-DATABASES["default"]["ATOMIC_REQUESTS"] = True  # noqa F405
 DATABASES["default"]["CONN_MAX_AGE"] = env.int("CONN_MAX_AGE", default=60)  # noqa F405
 
 # CACHES

From fc081ce1fef82d71e1f8e948821623354884b147 Mon Sep 17 00:00:00 2001
From: ghazi-git <ghazi-git@users.noreply.github.com>
Date: Tue, 6 Dec 2022 14:26:24 -0500
Subject: [PATCH 2395/2840] set SERVERS in production settings instead of base
 settings (#3609)

fixes https://github.com/cookiecutter/cookiecutter-django/issues/3593
---
 {{cookiecutter.project_slug}}/config/settings/base.py  |  4 ----
 .../config/settings/production.py                      | 10 ++++++++++
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 52798146e..1989fd8cb 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -350,10 +350,6 @@ SPECTACULAR_SETTINGS = {
     "DESCRIPTION": "Documentation of API endpoints of {{ cookiecutter.project_name }}",
     "VERSION": "1.0.0",
     "SERVE_PERMISSIONS": ["rest_framework.permissions.IsAdminUser"],
-    "SERVERS": [
-        {"url": "http://127.0.0.1:8000", "description": "Local Development server"},
-        {"url": "https://{{ cookiecutter.domain_name }}", "description": "Production server"},
-    ],
 }
 {%- endif %}
 # Your stuff...
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 15d3a7683..5de0529e2 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -368,5 +368,15 @@ sentry_sdk.init(
     traces_sample_rate=env.float("SENTRY_TRACES_SAMPLE_RATE", default=0.0),
 )
 {% endif %}
+{% if cookiecutter.use_drf == "y" -%}
+
+# django-rest-framework
+# -------------------------------------------------------------------------------
+# Tools that generate code samples can use SERVERS to point to the correct domain
+SPECTACULAR_SETTINGS["SERVERS"] = [  # noqa F405
+    {"url": "https://{{ cookiecutter.domain_name }}", "description": "Production server"}
+]
+
+{%- endif %}
 # Your stuff...
 # ------------------------------------------------------------------------------

From eff4969a39876d8d30dd5232a911f4c8e9fc3ec5 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 7 Dec 2022 02:50:13 +0000
Subject: [PATCH 2396/2840] Release 2022.12.06

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b0e1e6690..5654520ff 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.12.06
+
+### Changed
+- Simplify production `DATABASES` setting to extend base definition ([#3969](https://github.com/cookiecutter/cookiecutter-django/pull/3969))
+### Fixed
+- Only set `SERVERS` for `drf-spectacular` in production ([#3609](https://github.com/cookiecutter/cookiecutter-django/pull/3609))
+### Updated
+- Update django-coverage-plugin to 3.0.0 ([#3979](https://github.com/cookiecutter/cookiecutter-django/pull/3979))
+- Bump stefanzweifel/git-auto-commit-action from 4.15.4 to 4.16.0 ([#3978](https://github.com/cookiecutter/cookiecutter-django/pull/3978))
+
 ## 2022.12.04
 
 ### Updated
diff --git a/setup.py b/setup.py
index e187601c3..b7bc61890 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.12.04"
+version = "2022.12.06"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 57496c56c57659bde9d9523d532f96ee9d79fc28 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 7 Dec 2022 07:48:50 +0000
Subject: [PATCH 2397/2840] Auto-update pre-commit hooks (#3983)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                               | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index e8d055772..5669b756e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -9,7 +9,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.0
+    rev: v3.3.1
     hooks:
       - id: pyupgrade
         args: [--py310-plus]
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index 516323b42..1b0150c4a 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -10,7 +10,7 @@ repos:
       - id: check-yaml
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.0
+    rev: v3.3.1
     hooks:
       - id: pyupgrade
         args: [--py310-plus]

From aa318af1fc3cf9a74af6edfcaaaddd9e64ec4be2 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 8 Dec 2022 02:45:51 +0000
Subject: [PATCH 2398/2840] Release 2022.12.07

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5654520ff..415ccd23f 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 -->
 
+## 2022.12.07
+
+### Updated
+- Auto-update pre-commit hooks ([#3983](https://github.com/cookiecutter/cookiecutter-django/pull/3983))
+
 ## 2022.12.06
 
 ### Changed
diff --git a/setup.py b/setup.py
index b7bc61890..151b1e356 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.12.06"
+version = "2022.12.07"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From d15465a5821d2565467f5a390007285dd967732b Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 8 Dec 2022 08:16:33 -0500
Subject: [PATCH 2399/2840] Update django-stubs to 1.13.1 (#3986)

---
 {{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 6082a72c8..bacfdbbe5 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -14,7 +14,7 @@ watchfiles==0.18.1  # https://github.com/samuelcolvin/watchfiles
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.982  # https://github.com/python/mypy
-django-stubs==1.12.0  # https://github.com/typeddjango/django-stubs
+django-stubs==1.13.1  # https://github.com/typeddjango/django-stubs
 pytest==7.2.0  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.6  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}

From 585620eca732aad7bd0e67a1cba025b58003f823 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 8 Dec 2022 08:17:00 -0500
Subject: [PATCH 2400/2840] Update tox to 4.0.2 (#3985)

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

diff --git a/requirements.txt b/requirements.txt
index 684ec91e0..f428f623b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==2.20.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.27.1
+tox==4.0.2
 pytest==7.2.0
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From b2d6ddbc480d791eb8bdd1bc9cf86b27759badb7 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 8 Dec 2022 17:07:18 -0500
Subject: [PATCH 2401/2840] Update tox from 4.0.2 to 4.0.3 (#3987)

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

diff --git a/requirements.txt b/requirements.txt
index f428f623b..c35de3b6d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==2.20.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.0.2
+tox==4.0.3
 pytest==7.2.0
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From c2602032c8203d5e71fb71bc111e04b86a242af0 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 9 Dec 2022 02:45:59 +0000
Subject: [PATCH 2402/2840] Release 2022.12.08

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 415ccd23f..132fd96fb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.12.08
+
+### Updated
+- Update tox to 4.0.3 ([#3987](https://github.com/cookiecutter/cookiecutter-django/pull/3987))
+- Update tox to 4.0.2 ([#3985](https://github.com/cookiecutter/cookiecutter-django/pull/3985))
+- Update django-stubs to 1.13.1 ([#3986](https://github.com/cookiecutter/cookiecutter-django/pull/3986))
+
 ## 2022.12.07
 
 ### Updated
diff --git a/setup.py b/setup.py
index 151b1e356..558ea522a 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.12.07"
+version = "2022.12.08"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 2f92644fce097a64a4a47205e24d4ac653cb199c Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 9 Dec 2022 22:04:12 +0000
Subject: [PATCH 2403/2840] Remove bind mounts for docker compose volumes
 (#3981)

Fix #3685
---
 {{cookiecutter.project_slug}}/local.yml      | 4 ++--
 {{cookiecutter.project_slug}}/production.yml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index 33a8db07a..38b9d77d3 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -35,8 +35,8 @@ services:
     image: {{ cookiecutter.project_slug }}_production_postgres
     container_name: {{ cookiecutter.project_slug }}_local_postgres
     volumes:
-      - {{ cookiecutter.project_slug }}_local_postgres_data:/var/lib/postgresql/data:Z
-      - {{ cookiecutter.project_slug }}_local_postgres_data_backups:/backups:z
+      - {{ cookiecutter.project_slug }}_local_postgres_data:/var/lib/postgresql/data
+      - {{ cookiecutter.project_slug }}_local_postgres_data_backups:/backups
     env_file:
       - ./.envs/.local/.postgres
 
diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index ea4292a0d..cc4c9bca1 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -25,8 +25,8 @@ services:
       dockerfile: ./compose/production/postgres/Dockerfile
     image: {{ cookiecutter.project_slug }}_production_postgres
     volumes:
-      - production_postgres_data:/var/lib/postgresql/data:Z
-      - production_postgres_data_backups:/backups:z
+      - production_postgres_data:/var/lib/postgresql/data
+      - production_postgres_data_backups:/backups
     env_file:
       - ./.envs/.production/.postgres
 
@@ -38,7 +38,7 @@ services:
     depends_on:
       - django
     volumes:
-      - production_traefik:/etc/traefik/acme:z
+      - production_traefik:/etc/traefik/acme
     ports:
       - "0.0.0.0:80:80"
       - "0.0.0.0:443:443"

From a9c3b56e5f6de3c9d216847e3bd404c80ae67c63 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 9 Dec 2022 17:04:36 -0500
Subject: [PATCH 2404/2840] Update black to 22.12.0 (#3988)

* Update black from 22.10.0 to 22.12.0

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

diff --git a/requirements.txt b/requirements.txt
index c35de3b6d..0aedb48e8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-black==22.10.0
+black==22.12.0
 isort==5.10.1
 flake8==6.0.0
 flake8-isort==5.0.3
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index bacfdbbe5..e02ea203e 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -31,7 +31,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 flake8==6.0.0  # https://github.com/PyCQA/flake8
 flake8-isort==5.0.3  # https://github.com/gforcada/flake8-isort
 coverage==6.5.0  # https://github.com/nedbat/coveragepy
-black==22.10.0  # https://github.com/psf/black
+black==22.12.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery

From 20b7ca105bbdc21d21c267427c5974515b6cba5e Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 9 Dec 2022 17:18:10 -0500
Subject: [PATCH 2405/2840] Update djangorestframework-stubs to 1.8.0 (#3990)

---
 {{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 e02ea203e..6b073194c 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -18,7 +18,7 @@ django-stubs==1.13.1  # https://github.com/typeddjango/django-stubs
 pytest==7.2.0  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.6  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
-djangorestframework-stubs==1.7.0  # https://github.com/typeddjango/djangorestframework-stubs
+djangorestframework-stubs==1.8.0  # https://github.com/typeddjango/djangorestframework-stubs
 {%- endif %}
 
 # Documentation

From db048af2d34dea0b2c92d962f88453be458ede7d Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 10 Dec 2022 02:24:07 +0000
Subject: [PATCH 2406/2840] Release 2022.12.09

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 132fd96fb..8ae474316 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.12.09
+
+### Changed
+- Remove bind option mounts for docker compose volumes ([#3981](https://github.com/cookiecutter/cookiecutter-django/pull/3981))
+### Updated
+- Update djangorestframework-stubs to 1.8.0 ([#3990](https://github.com/cookiecutter/cookiecutter-django/pull/3990))
+- Update black to 22.12.0 ([#3988](https://github.com/cookiecutter/cookiecutter-django/pull/3988))
+
 ## 2022.12.08
 
 ### Updated
diff --git a/setup.py b/setup.py
index 558ea522a..42af5a0dc 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.12.08"
+version = "2022.12.09"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 8b9c719a31039e200526087c0b43e289a47619dd Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 10 Dec 2022 15:13:10 +0000
Subject: [PATCH 2407/2840] Auto-update pre-commit hooks (#3991)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                               | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 5669b756e..b256f5bff 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -16,7 +16,7 @@ repos:
         exclude: hooks/
 
   - repo: https://github.com/psf/black
-    rev: 22.10.0
+    rev: 22.12.0
     hooks:
       - id: black
 
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index 1b0150c4a..18301b233 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -16,7 +16,7 @@ repos:
         args: [--py310-plus]
 
   - repo: https://github.com/psf/black
-    rev: 22.10.0
+    rev: 22.12.0
     hooks:
       - id: black
 

From 8f84d146e35ba4feb131c9786cb2a5abde5fb35a Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 10 Dec 2022 10:13:41 -0500
Subject: [PATCH 2408/2840] Update tox from 4.0.3 to 4.0.5 (#3993)

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

diff --git a/requirements.txt b/requirements.txt
index 0aedb48e8..0ec11e7b5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==2.20.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.0.3
+tox==4.0.5
 pytest==7.2.0
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From 026165d52ea779d507856564bd87971dd1de7301 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sun, 11 Dec 2022 02:30:45 +0000
Subject: [PATCH 2409/2840] Release 2022.12.10

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8ae474316..74ed1e650 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 -->
 
+## 2022.12.10
+
+### Updated
+- Update tox to 4.0.5 ([#3993](https://github.com/cookiecutter/cookiecutter-django/pull/3993))
+- Auto-update pre-commit hooks ([#3991](https://github.com/cookiecutter/cookiecutter-django/pull/3991))
+
 ## 2022.12.09
 
 ### Changed
diff --git a/setup.py b/setup.py
index 42af5a0dc..15ed7ce23 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.12.09"
+version = "2022.12.10"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 5ccf73843afd7f0af383f30f4c1f55a6605b673a Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 13 Dec 2022 04:05:57 -0500
Subject: [PATCH 2410/2840] Update isort from 5.10.1 to 5.11.0 (#3997)

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

diff --git a/requirements.txt b/requirements.txt
index 0ec11e7b5..7f53de8ca 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==22.12.0
-isort==5.10.1
+isort==5.11.0
 flake8==6.0.0
 flake8-isort==5.0.3
 pre-commit==2.20.0

From 2cadf20adf25173acf8e2e95137f69953b5f4410 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 13 Dec 2022 09:06:12 +0000
Subject: [PATCH 2411/2840] Auto-update pre-commit hooks (#3998)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                               | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index b256f5bff..fedfdc47f 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -21,7 +21,7 @@ repos:
       - id: black
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.10.1
+    rev: 5.11.1
     hooks:
       - id: isort
 
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index 18301b233..f0231004c 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -21,7 +21,7 @@ repos:
       - id: black
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.10.1
+    rev: 5.11.1
     hooks:
       - id: isort
 

From a04558a7d5ad31e26edd0111c20b23d48b62899a Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 13 Dec 2022 04:48:21 -0500
Subject: [PATCH 2412/2840] Update isort from 5.11.0 to 5.11.1 (#3999)

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

diff --git a/requirements.txt b/requirements.txt
index 7f53de8ca..62d71b3b4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==22.12.0
-isort==5.11.0
+isort==5.11.1
 flake8==6.0.0
 flake8-isort==5.0.3
 pre-commit==2.20.0

From ed90ead15f56493723e1fc0590c9bdb0bdccea01 Mon Sep 17 00:00:00 2001
From: Omer-5 <61422607+Omer-5@users.noreply.github.com>
Date: Tue, 13 Dec 2022 23:32:57 +0200
Subject: [PATCH 2413/2840] Improve documentation for Getting started with
 Docker (#4003)

Fix https://github.com/cookiecutter/cookiecutter-django/issues/3971
---
 docs/developing-locally-docker.rst | 9 ++++++---
 docs/developing-locally.rst        | 6 +++---
 docs/generate-project-block.rst    | 7 +++++++
 3 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 docs/generate-project-block.rst

diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index 4bb5d9032..a7d77e108 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -3,9 +3,6 @@ Getting Up and Running Locally With Docker
 
 .. index:: Docker
 
-The steps below will get you up and running with a local development environment.
-All of these commands assume you are in the root of your generated project.
-
 .. note::
 
     If you're new to Docker, please be aware that some resources are cached system-wide
@@ -19,10 +16,16 @@ 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 `pre-commit`_.
+* Cookiecutter; refer to the official GitHub repository of `Cookiecutter`_
 
 .. _`installation instructions`: https://docs.docker.com/install/#supported-platforms
 .. _`installation guide`: https://docs.docker.com/compose/install/
 .. _`pre-commit`: https://pre-commit.com/#install
+.. _`Cookiecutter`: https://github.com/cookiecutter/cookiecutter
+
+Before Getting Started
+----------------------
+.. include:: generate-project-block.rst
 
 Build the Stack
 ---------------
diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index c9d28ff73..e1c946268 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -24,9 +24,8 @@ First things first.
 
     $ source <virtual env path>/bin/activate
 
-#. Install cookiecutter-django: ::
-
-    $ cookiecutter gh:cookiecutter/cookiecutter-django
+#.
+    .. include:: generate-project-block.rst
 
 #. Install development requirements: ::
 
@@ -43,6 +42,7 @@ First things first.
 #. Create a new PostgreSQL database using createdb_: ::
 
     $ createdb --username=postgres <project_slug>
+
    ``project_slug`` is what you have entered as the project_slug at the setup stage.
 
    .. note::
diff --git a/docs/generate-project-block.rst b/docs/generate-project-block.rst
new file mode 100644
index 000000000..2842b551d
--- /dev/null
+++ b/docs/generate-project-block.rst
@@ -0,0 +1,7 @@
+Generate a new cookiecutter-django project: ::
+
+    $ cookiecutter gh:cookiecutter/cookiecutter-django
+
+For more information refer to
+:ref:`Project Generation Options <template-options>`.
+

From bf9346eda57fb1ca238b7bb2569de6ec64ed6f40 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 13 Dec 2022 21:35:25 +0000
Subject: [PATCH 2414/2840] Fix update contributors workflow

---
 .github/workflows/update-contributors.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 952486c1b..83c651a46 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -29,6 +29,8 @@ jobs:
           pip install -r requirements.txt
       - name: Update list
         run: python scripts/update_contributors.py
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Commit changes
         uses: stefanzweifel/git-auto-commit-action@v4.16.0

From 7af6f69b2899d30cc977aa69838fdce64f835093 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 13 Dec 2022 21:35:58 +0000
Subject: [PATCH 2415/2840] 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 49ebfe4d8..68f1b4c2d 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1322,5 +1322,10 @@
     "name": "rguptar",
     "github_login": "rguptar",
     "twitter_username": ""
+  },
+  {
+    "name": "Omer-5",
+    "github_login": "Omer-5",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index d97324708..d8a9d8190 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1447,6 +1447,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Omer-5</td>
+    <td>
+      <a href="https://github.com/Omer-5">Omer-5</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Pablo</td>
     <td>

From 882f5052891c1a414386172ba1063eb309e512be Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 14 Dec 2022 02:29:57 +0000
Subject: [PATCH 2416/2840] Release 2022.12.13

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 74ed1e650..5ee4a4757 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.12.13
+
+### Changed
+- Improve documentation for Getting started with Docker ([#4003](https://github.com/cookiecutter/cookiecutter-django/pull/4003))
+### Updated
+- Update isort to 5.11.1 ([#3999](https://github.com/cookiecutter/cookiecutter-django/pull/3999))
+- Auto-update pre-commit hooks ([#3998](https://github.com/cookiecutter/cookiecutter-django/pull/3998))
+- Update isort to 5.11.0 ([#3997](https://github.com/cookiecutter/cookiecutter-django/pull/3997))
+
 ## 2022.12.10
 
 ### Updated
diff --git a/setup.py b/setup.py
index 15ed7ce23..680a75c09 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.12.10"
+version = "2022.12.13"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From d3bd184aaaf326a172e719a238f9ebe14cfb3184 Mon Sep 17 00:00:00 2001
From: TAKAHASHI Shuuji <shuuji3@gmail.com>
Date: Wed, 21 Dec 2022 18:47:51 +0900
Subject: [PATCH 2417/2840] Update image URL for build status shield badge
 (#4018)

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 27fc6e0e1..eaac817a3 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Cookiecutter Django
 
-[![Build Status](https://img.shields.io/github/workflow/status/cookiecutter/cookiecutter-django/CI/master)](https://github.com/cookiecutter/cookiecutter-django/actions?query=workflow%3ACI)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/cookiecutter/cookiecutter-django/ci.yml?branch=master)](https://github.com/cookiecutter/cookiecutter-django/actions?query=workflow%3ACI)
 [![Documentation Status](https://readthedocs.org/projects/cookiecutter-django/badge/?version=latest)](https://cookiecutter-django.readthedocs.io/en/latest/?badge=latest)
 [![Updates](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/shield.svg)](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/)
 [![Join our Discord](https://img.shields.io/badge/Discord-cookiecutter-5865F2?style=flat&logo=discord&logoColor=white)](https://discord.gg/uFXweDQc5a)

From ebec4dc44db9dfd43d2cdcddb2d3aaf4d8e8ebe7 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 21 Dec 2022 09:48:24 +0000
Subject: [PATCH 2418/2840] 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 68f1b4c2d..5c8b1f753 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1327,5 +1327,10 @@
     "name": "Omer-5",
     "github_login": "Omer-5",
     "twitter_username": ""
+  },
+  {
+    "name": "TAKAHASHI Shuuji",
+    "github_login": "shuuji3",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index d8a9d8190..dba721de6 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1671,6 +1671,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>TAKAHASHI Shuuji</td>
+    <td>
+      <a href="https://github.com/shuuji3">shuuji3</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Tames McTigue</td>
     <td>

From 9b9bc9bec175490f8ed0016ca938fca5e08c5167 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 21 Dec 2022 09:49:45 +0000
Subject: [PATCH 2419/2840] Update target URL for build badge

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index eaac817a3..38724caff 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Cookiecutter Django
 
-[![Build Status](https://img.shields.io/github/actions/workflow/status/cookiecutter/cookiecutter-django/ci.yml?branch=master)](https://github.com/cookiecutter/cookiecutter-django/actions?query=workflow%3ACI)
+[![Build Status](https://img.shields.io/github/actions/workflow/status/cookiecutter/cookiecutter-django/ci.yml?branch=master)]([https://github.com/cookiecutter/cookiecutter-django/actions?query=workflow%3ACI](https://github.com/cookiecutter/cookiecutter-django/actions/workflows/ci.yml?query=workflow%3ACI+branch%3Amaster))
 [![Documentation Status](https://readthedocs.org/projects/cookiecutter-django/badge/?version=latest)](https://cookiecutter-django.readthedocs.io/en/latest/?badge=latest)
 [![Updates](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/shield.svg)](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/)
 [![Join our Discord](https://img.shields.io/badge/Discord-cookiecutter-5865F2?style=flat&logo=discord&logoColor=white)](https://discord.gg/uFXweDQc5a)

From 2c914c203220206d028b88208cf4a7a8a4d002e3 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 21 Dec 2022 09:51:17 +0000
Subject: [PATCH 2420/2840] Fix URL

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 38724caff..d8fc58ec4 100644
--- a/README.md
+++ b/README.md
@@ -1,6 +1,6 @@
 # Cookiecutter Django
 
-[![Build Status](https://img.shields.io/github/actions/workflow/status/cookiecutter/cookiecutter-django/ci.yml?branch=master)]([https://github.com/cookiecutter/cookiecutter-django/actions?query=workflow%3ACI](https://github.com/cookiecutter/cookiecutter-django/actions/workflows/ci.yml?query=workflow%3ACI+branch%3Amaster))
+[![Build Status](https://img.shields.io/github/actions/workflow/status/cookiecutter/cookiecutter-django/ci.yml?branch=master)](https://github.com/cookiecutter/cookiecutter-django/actions/workflows/ci.yml?query=branch%3Amaster)
 [![Documentation Status](https://readthedocs.org/projects/cookiecutter-django/badge/?version=latest)](https://cookiecutter-django.readthedocs.io/en/latest/?badge=latest)
 [![Updates](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/shield.svg)](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/)
 [![Join our Discord](https://img.shields.io/badge/Discord-cookiecutter-5865F2?style=flat&logo=discord&logoColor=white)](https://discord.gg/uFXweDQc5a)

From 7a6435695b82c86e6895862f5d2c0c0b5a0a57f6 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 21 Dec 2022 04:52:05 -0500
Subject: [PATCH 2421/2840] Update hiredis to 2.1.0 (#4006)

---
 {{cookiecutter.project_slug}}/requirements/base.txt       | 2 +-
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 827530be9..6aa2b6558 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -14,7 +14,7 @@ whitenoise==6.2.0  # https://github.com/evansd/whitenoise
 {%- endif %}
 redis==4.4.0  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
-hiredis==2.0.0  # https://github.com/redis/hiredis-py
+hiredis==2.1.0  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
 celery==5.2.7  # pyup: < 6.0  # https://github.com/celery/celery
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index c9b5b88a7..1d199b125 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.11.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
+hiredis==2.1.0  # https://github.com/redis/hiredis-py
 {%- endif %}
 
 # Django

From 256a967087e7a1bc945be18be43cc36adfc65522 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 21 Dec 2022 06:02:04 -0500
Subject: [PATCH 2422/2840] Update drf-spectacular to 0.25.1 (#4009)

---
 {{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 6aa2b6558..e5aafcd73 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -44,5 +44,5 @@ django-redis==5.2.0  # https://github.com/jazzband/django-redis
 djangorestframework==3.14.0  # https://github.com/encode/django-rest-framework
 django-cors-headers==3.13.0 # https://github.com/adamchainz/django-cors-headers
 # DRF-spectacular for api documentation
-drf-spectacular==0.24.2  # https://github.com/tfranzel/drf-spectacular 
+drf-spectacular==0.25.1  # https://github.com/tfranzel/drf-spectacular 
 {%- endif %}

From d26fc164e7e384c6d1532c815d7d21467f8f972c Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 21 Dec 2022 06:16:43 -0500
Subject: [PATCH 2423/2840] Update isort to 5.11.3 (#4010)

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

diff --git a/requirements.txt b/requirements.txt
index 62d71b3b4..1a1688a6b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==22.12.0
-isort==5.11.1
+isort==5.11.3
 flake8==6.0.0
 flake8-isort==5.0.3
 pre-commit==2.20.0

From e101fbc5215dbe7f5571e308c043b480d8867bc0 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 21 Dec 2022 11:20:19 +0000
Subject: [PATCH 2424/2840] Auto-update pre-commit hooks (#4005)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                               | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index fedfdc47f..6400b593e 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -21,7 +21,7 @@ repos:
       - id: black
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.11.1
+    rev: v5.11.3
     hooks:
       - id: isort
 
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index f0231004c..8cec23181 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -21,7 +21,7 @@ repos:
       - id: black
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.11.1
+    rev: v5.11.3
     hooks:
       - id: isort
 

From 81309a610fcf8901a736689740b3f67cbecc2cab Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 21 Dec 2022 06:20:42 -0500
Subject: [PATCH 2425/2840] Update django-anymail to 9.0 (#4012)

---
 .../requirements/production.txt                | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 1d199b125..adb7dbcdf 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -24,21 +24,21 @@ django-storages[google]==1.13.1  # https://github.com/jschneier/django-storages
 django-storages[azure]==1.13.1  # https://github.com/jschneier/django-storages
 {%- endif %}
 {%- if cookiecutter.mail_service == 'Mailgun' %}
-django-anymail[mailgun]==8.6  # https://github.com/anymail/django-anymail
+django-anymail[mailgun]==9.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
-django-anymail[amazon_ses]==8.6  # https://github.com/anymail/django-anymail
+django-anymail[amazon_ses]==9.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
-django-anymail[mailjet]==8.6  # https://github.com/anymail/django-anymail
+django-anymail[mailjet]==9.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
-django-anymail[mandrill]==8.6  # https://github.com/anymail/django-anymail
+django-anymail[mandrill]==9.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
-django-anymail[postmark]==8.6  # https://github.com/anymail/django-anymail
+django-anymail[postmark]==9.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
-django-anymail[sendgrid]==8.6  # https://github.com/anymail/django-anymail
+django-anymail[sendgrid]==9.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
-django-anymail[sendinblue]==8.6  # https://github.com/anymail/django-anymail
+django-anymail[sendinblue]==9.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
-django-anymail[sparkpost]==8.6  # https://github.com/anymail/django-anymail
+django-anymail[sparkpost]==9.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
-django-anymail==8.6  # https://github.com/anymail/django-anymail
+django-anymail==9.0  # https://github.com/anymail/django-anymail
 {%- endif %}

From dd1f3a6d12d3e9e1a4b8fb0cb3e9d0046c38f702 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 21 Dec 2022 08:57:20 -0500
Subject: [PATCH 2426/2840] Update coverage to 7.0.0 (#4013)

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 {{cookiecutter.project_slug}}/setup.cfg              | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 6b073194c..91994de00 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==6.0.0  # https://github.com/PyCQA/flake8
 flake8-isort==5.0.3  # https://github.com/gforcada/flake8-isort
-coverage==6.5.0  # https://github.com/nedbat/coveragepy
+coverage==7.0.0  # https://github.com/nedbat/coveragepy
 black==22.12.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
diff --git a/{{cookiecutter.project_slug}}/setup.cfg b/{{cookiecutter.project_slug}}/setup.cfg
index 3bec1fbee..b99bba644 100644
--- a/{{cookiecutter.project_slug}}/setup.cfg
+++ b/{{cookiecutter.project_slug}}/setup.cfg
@@ -34,7 +34,7 @@ django_settings_module = config.settings.test
 ignore_errors = True
 
 [coverage:run]
-include = {{cookiecutter.project_slug}}/*
+include = {{cookiecutter.project_slug}}/**
 omit = *migrations*, *tests*
 plugins =
     django_coverage_plugin

From 31a1de9bfb9f991019b6c541daa20723b887dcdb Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 21 Dec 2022 08:58:04 -0500
Subject: [PATCH 2427/2840] Update sentry-sdk to 1.12.1 (#4014)

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

From 9bc388dd0d323a299cf786b61133d63f437ef80e Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 21 Dec 2022 08:58:53 -0500
Subject: [PATCH 2428/2840] Update tox to 4.0.16 (#4017)

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

diff --git a/requirements.txt b/requirements.txt
index 1a1688a6b..3f5b0a6d8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==2.20.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.0.5
+tox==4.0.16
 pytest==7.2.0
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From e869ab7cc40da5bd482d4410b2befd2fac668263 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 21 Dec 2022 09:22:37 -0500
Subject: [PATCH 2429/2840] Update ipdb to 0.13.11 (#4019)

---
 {{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 91994de00..3732a3f18 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,7 +1,7 @@
 -r base.txt
 
 Werkzeug[watchdog]==2.2.2 # https://github.com/pallets/werkzeug
-ipdb==0.13.9  # https://github.com/gotcha/ipdb
+ipdb==0.13.11  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.9.5  # https://github.com/psycopg/psycopg2
 {%- else %}

From 7fc0b1d16738ad8441833c369d75c6c7f107d0f5 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 21 Dec 2022 09:24:02 -0500
Subject: [PATCH 2430/2840] Update pytz to 2022.7 (#4020)

---
 {{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 e5aafcd73..9acae6a80 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,4 +1,4 @@
-pytz==2022.6  # https://github.com/stub42/pytz
+pytz==2022.7  # https://github.com/stub42/pytz
 python-slugify==7.0.0  # https://github.com/un33k/python-slugify
 Pillow==9.3.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}

From 93c0769516b7e64e8f5471bbe79f5e3dfa7cdd62 Mon Sep 17 00:00:00 2001
From: Dani Hodovic <danihodovic@users.noreply.github.com>
Date: Wed, 21 Dec 2022 15:39:54 +0100
Subject: [PATCH 2431/2840] Retry when trying to store a Celery result in
 backend (#3996)

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
---
 {{cookiecutter.project_slug}}/config/settings/base.py | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 1989fd8cb..6bf6a6e5c 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -283,6 +283,11 @@ CELERY_BROKER_URL = env("CELERY_BROKER_URL")
 CELERY_RESULT_BACKEND = CELERY_BROKER_URL
 # https://docs.celeryq.dev/en/stable/userguide/configuration.html#result-extended
 CELERY_RESULT_EXTENDED = True
+# https://docs.celeryq.dev/en/stable/userguide/configuration.html#result-backend-always-retry
+# https://github.com/celery/celery/pull/6122
+CELERY_RESULT_BACKEND_ALWAYS_RETRY = True
+# https://docs.celeryq.dev/en/stable/userguide/configuration.html#result-backend-max-retries
+CELERY_RESULT_BACKEND_MAX_RETRIES = 10
 # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-accept_content
 CELERY_ACCEPT_CONTENT = ["json"]
 # https://docs.celeryq.dev/en/stable/userguide/configuration.html#std:setting-task_serializer

From be69fadefcba0de477d94d4695e26722bc93992a Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 22 Dec 2022 02:21:52 +0000
Subject: [PATCH 2432/2840] Release 2022.12.21

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5ee4a4757..150b750b7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,23 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.12.21
+
+### Changed
+- Retry when trying to store a Celery result in backend ([#3996](https://github.com/cookiecutter/cookiecutter-django/pull/3996))
+- Update image URL for build status shield badge ([#4018](https://github.com/cookiecutter/cookiecutter-django/pull/4018))
+### Updated
+- Update pytz to 2022.7 ([#4020](https://github.com/cookiecutter/cookiecutter-django/pull/4020))
+- Update ipdb to 0.13.11 ([#4019](https://github.com/cookiecutter/cookiecutter-django/pull/4019))
+- Update tox to 4.0.16 ([#4017](https://github.com/cookiecutter/cookiecutter-django/pull/4017))
+- Update sentry-sdk to 1.12.1 ([#4014](https://github.com/cookiecutter/cookiecutter-django/pull/4014))
+- Update coverage to 7.0.0 ([#4013](https://github.com/cookiecutter/cookiecutter-django/pull/4013))
+- Update django-anymail to 9.0 ([#4012](https://github.com/cookiecutter/cookiecutter-django/pull/4012))
+- Auto-update pre-commit hooks ([#4005](https://github.com/cookiecutter/cookiecutter-django/pull/4005))
+- Update isort to 5.11.3 ([#4010](https://github.com/cookiecutter/cookiecutter-django/pull/4010))
+- Update drf-spectacular to 0.25.1 ([#4009](https://github.com/cookiecutter/cookiecutter-django/pull/4009))
+- Update hiredis to 2.1.0 ([#4006](https://github.com/cookiecutter/cookiecutter-django/pull/4006))
+
 ## 2022.12.13
 
 ### Changed
diff --git a/setup.py b/setup.py
index 680a75c09..7adacfaee 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.12.13"
+version = "2022.12.21"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From bd2d3edd314a90147dc7280781830b358a1e5616 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 24 Dec 2022 06:25:53 -0500
Subject: [PATCH 2433/2840] Update coverage from 7.0.0 to 7.0.1 (#4024)

---
 {{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 3732a3f18..adba4a0f7 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==6.0.0  # https://github.com/PyCQA/flake8
 flake8-isort==5.0.3  # https://github.com/gforcada/flake8-isort
-coverage==7.0.0  # https://github.com/nedbat/coveragepy
+coverage==7.0.1  # https://github.com/nedbat/coveragepy
 black==22.12.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 5e098901510b845c781bdae3e7f498898b61da9e Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sun, 25 Dec 2022 02:24:44 +0000
Subject: [PATCH 2434/2840] Release 2022.12.24

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 150b750b7..17c7fffbc 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 -->
 
+## 2022.12.24
+
+### Updated
+- Update coverage to 7.0.1 ([#4024](https://github.com/cookiecutter/cookiecutter-django/pull/4024))
+
 ## 2022.12.21
 
 ### Changed
diff --git a/setup.py b/setup.py
index 7adacfaee..5bdf3eeb3 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.12.21"
+version = "2022.12.24"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 5c30b67df1145c4b009981e27c0a21257c26ed50 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 25 Dec 2022 09:33:59 +0000
Subject: [PATCH 2435/2840] Auto-update pre-commit hooks (#4021)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                               | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 6400b593e..ca86e7eb5 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -21,7 +21,7 @@ repos:
       - id: black
 
   - repo: https://github.com/PyCQA/isort
-    rev: v5.11.3
+    rev: 5.11.4
     hooks:
       - id: isort
 
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index 8cec23181..c1aaf0d9f 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -21,7 +21,7 @@ repos:
       - id: black
 
   - repo: https://github.com/PyCQA/isort
-    rev: v5.11.3
+    rev: 5.11.4
     hooks:
       - id: isort
 

From 88370e648849e3d4fb68f68b19450f5021bf3af2 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Mon, 26 Dec 2022 02:22:40 +0000
Subject: [PATCH 2436/2840] Release 2022.12.25

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17c7fffbc..75cbf2ade 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 -->
 
+## 2022.12.25
+
+### Updated
+- Auto-update pre-commit hooks ([#4021](https://github.com/cookiecutter/cookiecutter-django/pull/4021))
+
 ## 2022.12.24
 
 ### Updated
diff --git a/setup.py b/setup.py
index 5bdf3eeb3..e41708a8e 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.12.24"
+version = "2022.12.25"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 019efba2e1cc44aa1b4aa9627cf49729c3dea24d Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 26 Dec 2022 05:03:43 -0500
Subject: [PATCH 2437/2840] Update pre-commit to 2.21.0 (#4026)

* Update pre-commit from 2.20.0 to 2.21.0

* Update pre-commit from 2.20.0 to 2.21.0
---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 3f5b0a6d8..27cdeeb11 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ black==22.12.0
 isort==5.11.3
 flake8==6.0.0
 flake8-isort==5.0.3
-pre-commit==2.20.0
+pre-commit==2.21.0
 
 # Testing
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index adba4a0f7..22b0f0fa3 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -36,7 +36,7 @@ pylint-django==2.5.3  # 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.20.0  # https://github.com/pre-commit/pre-commit
+pre-commit==2.21.0  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From f1b5056f4a02a29de23a3d20be422fffc2c1fa30 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 26 Dec 2022 05:03:58 -0500
Subject: [PATCH 2438/2840] Update tox from 4.0.16 to 4.0.17 (#4027)

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

diff --git a/requirements.txt b/requirements.txt
index 27cdeeb11..ec14de1c6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==2.21.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.0.16
+tox==4.0.17
 pytest==7.2.0
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From 6b3b5cd067995dd4a199d17c259ae18ed55ec50f Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 27 Dec 2022 02:20:11 +0000
Subject: [PATCH 2439/2840] Release 2022.12.26

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75cbf2ade..9ff6f2286 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 -->
 
+## 2022.12.26
+
+### Updated
+- Update tox to 4.0.17 ([#4027](https://github.com/cookiecutter/cookiecutter-django/pull/4027))
+- Update pre-commit to 2.21.0 ([#4026](https://github.com/cookiecutter/cookiecutter-django/pull/4026))
+
 ## 2022.12.25
 
 ### Updated
diff --git a/setup.py b/setup.py
index e41708a8e..e7ec62436 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.12.25"
+version = "2022.12.26"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From c72818063133cd3da8fcb13d0d62a49379c6ed00 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 29 Dec 2022 00:18:41 -0800
Subject: [PATCH 2440/2840] Update gitpython from 3.1.29 to 3.1.30

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

diff --git a/requirements.txt b/requirements.txt
index ec14de1c6..04852f01c 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,6 +21,6 @@ pyyaml==6.0
 # Scripting
 # ------------------------------------------------------------------------------
 PyGithub==1.57
-gitpython==3.1.29
+gitpython==3.1.30
 jinja2==3.1.2
 requests==2.28.1

From 5530eebfec0b7607078bdca6bd2e95cdcafbfe73 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Thu, 29 Dec 2022 02:21:49 -0800
Subject: [PATCH 2441/2840] Update django-allauth from 0.51.0 to 0.52.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 9acae6a80..8ae17ad60 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -32,7 +32,7 @@ uvicorn[standard]==0.20.0  # https://github.com/encode/uvicorn
 django==4.0.8  # pyup: < 4.1  # https://www.djangoproject.com/
 django-environ==0.9.0  # https://github.com/joke2k/django-environ
 django-model-utils==4.3.1  # https://github.com/jazzband/django-model-utils
-django-allauth==0.51.0  # https://github.com/pennersr/django-allauth
+django-allauth==0.52.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.14.0  # https://github.com/django-crispy-forms/django-crispy-forms
 crispy-bootstrap5==0.7  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}

From 51abef1b8dccac6e89f14abcf195dc539f3407ed Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 29 Dec 2022 13:17:02 -0500
Subject: [PATCH 2442/2840] Update tox from 4.0.17 to 4.0.19 (#4030)

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

diff --git a/requirements.txt b/requirements.txt
index ec14de1c6..f5e828ad0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==2.21.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.0.17
+tox==4.0.19
 pytest==7.2.0
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From f6c44d69563e99c588598505879e24498726d145 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 29 Dec 2022 13:30:50 -0500
Subject: [PATCH 2443/2840] Update tox from 4.0.19 to 4.1.0 (#4035)

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

diff --git a/requirements.txt b/requirements.txt
index f5e828ad0..ef0272058 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==2.21.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.0.19
+tox==4.1.0
 pytest==7.2.0
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From 03e90149302cf5f17d16a57699c14f7589fe49ae Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 30 Dec 2022 02:22:45 +0000
Subject: [PATCH 2444/2840] Release 2022.12.29

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9ff6f2286..aca668c5f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2022.12.29
+
+### Updated
+- Update tox to 4.1.0 ([#4035](https://github.com/cookiecutter/cookiecutter-django/pull/4035))
+- Update tox to 4.0.19 ([#4030](https://github.com/cookiecutter/cookiecutter-django/pull/4030))
+- Update django-allauth to 0.52.0 ([#4033](https://github.com/cookiecutter/cookiecutter-django/pull/4033))
+
 ## 2022.12.26
 
 ### Updated
diff --git a/setup.py b/setup.py
index e7ec62436..e03b72109 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.12.26"
+version = "2022.12.29"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From a7f195680f52eec8b25eb48a59fc3d5639780592 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 1 Jan 2023 21:15:53 -0800
Subject: [PATCH 2445/2840] Update pillow from 9.3.0 to 9.4.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 8ae17ad60..e37caf3c7 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,6 +1,6 @@
 pytz==2022.7  # https://github.com/stub42/pytz
 python-slugify==7.0.0  # https://github.com/un33k/python-slugify
-Pillow==9.3.0  # https://github.com/python-pillow/Pillow
+Pillow==9.4.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
 {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %}
 rcssmin==1.1.0 --install-option="--without-c-extensions"  # https://github.com/ndparker/rcssmin

From 522574d1b241a486ff5327d6033e0da0abea9296 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 2 Jan 2023 16:43:31 -0800
Subject: [PATCH 2446/2840] Update tox from 4.1.0 to 4.1.3

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

diff --git a/requirements.txt b/requirements.txt
index ef0272058..040189b28 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==2.21.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.1.0
+tox==4.1.3
 pytest==7.2.0
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From af625635230bffc77cc0c6c8eebacee278cfcb18 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 2 Jan 2023 16:43:37 -0800
Subject: [PATCH 2447/2840] Update coverage from 7.0.1 to 7.0.2

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

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 22b0f0fa3..016880601 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==6.0.0  # https://github.com/PyCQA/flake8
 flake8-isort==5.0.3  # https://github.com/gforcada/flake8-isort
-coverage==7.0.1  # https://github.com/nedbat/coveragepy
+coverage==7.0.2  # https://github.com/nedbat/coveragepy
 black==22.12.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 3bb37120744d77cebedcec25dad12998adebbd6e Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 3 Jan 2023 04:30:22 -0800
Subject: [PATCH 2448/2840] Update whitenoise from 6.2.0 to 6.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 8ae17ad60..1c4507d84 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -10,7 +10,7 @@ rcssmin==1.1.0  # https://github.com/ndparker/rcssmin
 {%- endif %}
 argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
-whitenoise==6.2.0  # https://github.com/evansd/whitenoise
+whitenoise==6.3.0  # https://github.com/evansd/whitenoise
 {%- endif %}
 redis==4.4.0  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}

From f7b628092d5a18cbf7edc2ac58069f72a10545af Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 3 Jan 2023 13:31:12 -0500
Subject: [PATCH 2449/2840] Update flake8-isort to 6.0.0 (#4022)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Update flake8-isort from 5.0.3 to 6.0.0

Co-authored-by: Fábio C. Barrionuevo da Luz <bnafta@gmail.com>
---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 45167a17f..f514ad0f4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ binaryornot==0.4.4
 black==22.12.0
 isort==5.11.3
 flake8==6.0.0
-flake8-isort==5.0.3
+flake8-isort==6.0.0
 pre-commit==2.21.0
 
 # Testing
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 016880601..a703dedf0 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -29,7 +29,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # Code quality
 # ------------------------------------------------------------------------------
 flake8==6.0.0  # https://github.com/PyCQA/flake8
-flake8-isort==5.0.3  # https://github.com/gforcada/flake8-isort
+flake8-isort==6.0.0  # https://github.com/gforcada/flake8-isort
 coverage==7.0.2  # https://github.com/nedbat/coveragepy
 black==22.12.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django

From 065b994238a9cad8fa5481de021dcb08c807844b Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 4 Jan 2023 02:24:51 +0000
Subject: [PATCH 2450/2840] Release 2023.01.03

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aca668c5f..69a9e780a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.01.03
+
+### Updated
+- Update flake8-isort to 6.0.0 ([#4022](https://github.com/cookiecutter/cookiecutter-django/pull/4022))
+- Update tox to 4.1.3 ([#4041](https://github.com/cookiecutter/cookiecutter-django/pull/4041))
+- Update pillow to 9.4.0 ([#4040](https://github.com/cookiecutter/cookiecutter-django/pull/4040))
+- Update gitpython to 3.1.30 ([#4032](https://github.com/cookiecutter/cookiecutter-django/pull/4032))
+- Update coverage to 7.0.2 ([#4042](https://github.com/cookiecutter/cookiecutter-django/pull/4042))
+- Update whitenoise to 6.3.0 ([#4044](https://github.com/cookiecutter/cookiecutter-django/pull/4044))
+
 ## 2022.12.29
 
 ### Updated
diff --git a/setup.py b/setup.py
index e03b72109..90e524837 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2022.12.29"
+version = "2023.01.03"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 2da98ab87cc99420557aa0e84d3834886b8cc590 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 4 Jan 2023 07:22:18 -0500
Subject: [PATCH 2451/2840] Update coverage from 7.0.2 to 7.0.3 (#4047)

---
 {{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 a703dedf0..0bb99c1a6 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==6.0.0  # https://github.com/PyCQA/flake8
 flake8-isort==6.0.0  # https://github.com/gforcada/flake8-isort
-coverage==7.0.2  # https://github.com/nedbat/coveragepy
+coverage==7.0.3  # https://github.com/nedbat/coveragepy
 black==22.12.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From b00fde9a872da1a3ae2e9771e468074ad1da427b Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 4 Jan 2023 07:24:21 -0500
Subject: [PATCH 2452/2840] Update tox from 4.1.3 to 4.2.1 (#4046)

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

diff --git a/requirements.txt b/requirements.txt
index f514ad0f4..412410843 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==2.21.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.1.3
+tox==4.2.1
 pytest==7.2.0
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From ebcee95c8b055c9bb4bf18878badfb81b31354a1 Mon Sep 17 00:00:00 2001
From: Thomas Booij <thomasbooij95@gmail.com>
Date: Wed, 4 Jan 2023 16:33:02 +0100
Subject: [PATCH 2453/2840] Fix typo on the test settings (#4049)

---
 {{cookiecutter.project_slug}}/config/settings/test.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/test.py b/{{cookiecutter.project_slug}}/config/settings/test.py
index f103eb10b..198b5aa5d 100644
--- a/{{cookiecutter.project_slug}}/config/settings/test.py
+++ b/{{cookiecutter.project_slug}}/config/settings/test.py
@@ -25,7 +25,7 @@ PASSWORD_HASHERS = ["django.contrib.auth.hashers.MD5PasswordHasher"]
 # https://docs.djangoproject.com/en/dev/ref/settings/#email-backend
 EMAIL_BACKEND = "django.core.mail.backends.locmem.EmailBackend"
 
-# DEBUGING FOR TEMPLATES
+# DEBUGGING FOR TEMPLATES
 # ------------------------------------------------------------------------------
 TEMPLATES[0]["OPTIONS"]["debug"] = True  # type: ignore # noqa F405
 

From abf9405a59656d4bd46685e256a2778579cf0601 Mon Sep 17 00:00:00 2001
From: luzfcb <luzfcb@users.noreply.github.com>
Date: Wed, 4 Jan 2023 15:33:47 +0000
Subject: [PATCH 2454/2840] 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 5c8b1f753..55a6df601 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1332,5 +1332,10 @@
     "name": "TAKAHASHI Shuuji",
     "github_login": "shuuji3",
     "twitter_username": ""
+  },
+  {
+    "name": "Thomas Booij",
+    "github_login": "ThomasBooij95",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index dba721de6..fbc8dd973 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1706,6 +1706,13 @@ Listed in alphabetical order.
     </td>
     <td>thibault</td>
   </tr>
+  <tr>
+    <td>Thomas Booij</td>
+    <td>
+      <a href="https://github.com/ThomasBooij95">ThomasBooij95</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Théo Segonds</td>
     <td>

From bd5ceb00481dfaac12e0c24e1e1011ac45c98d56 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 4 Jan 2023 15:51:37 -0500
Subject: [PATCH 2455/2840] Update tox from 4.2.1 to 4.2.2 (#4050)

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

diff --git a/requirements.txt b/requirements.txt
index 412410843..7db83d824 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==2.21.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.2.1
+tox==4.2.2
 pytest==7.2.0
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From d7485fd93e587b13570f4d7755e594470ad901e8 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 5 Jan 2023 02:25:14 +0000
Subject: [PATCH 2456/2840] Release 2023.01.04

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 69a9e780a..eb5f7b48f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.01.04
+
+### Changed
+- Fix typo on test settings ([#4049](https://github.com/cookiecutter/cookiecutter-django/pull/4049))
+### Updated
+- Update tox to 4.2.2 ([#4050](https://github.com/cookiecutter/cookiecutter-django/pull/4050))
+- Update tox to 4.2.1 ([#4046](https://github.com/cookiecutter/cookiecutter-django/pull/4046))
+- Update coverage to 7.0.3 ([#4047](https://github.com/cookiecutter/cookiecutter-django/pull/4047))
+
 ## 2023.01.03
 
 ### Updated
diff --git a/setup.py b/setup.py
index 90e524837..ba0475913 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.01.03"
+version = "2023.01.04"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 66be5ceab463307c25d42c979825960aadca2198 Mon Sep 17 00:00:00 2001
From: Pamela Fox <pamela.fox@gmail.com>
Date: Fri, 6 Jan 2023 09:48:39 -0800
Subject: [PATCH 2457/2840] Fix link, add non-Docker commands (#4036)

---
 docs/testing.rst | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/docs/testing.rst b/docs/testing.rst
index dd6fcb48f..bea45c6dd 100644
--- a/docs/testing.rst
+++ b/docs/testing.rst
@@ -28,10 +28,15 @@ Coverage
 
 You should build your tests to provide the highest level of **code coverage**. You can run the ``pytest`` with code ``coverage`` by typing in the following command: ::
 
-   $ docker-compose -f local.yml run --rm django coverage run -m pytest
+   $ coverage run -m pytest
 
 Once the tests are complete, in order to see the code coverage, run the following command: ::
 
+   $ coverage report
+
+If you're running the project locally with Docker, use these commands instead: ::
+
+   $ docker-compose -f local.yml run --rm django coverage run -m pytest
    $ docker-compose -f local.yml run --rm django coverage report
 
 .. note::
@@ -53,4 +58,4 @@ Once the tests are complete, in order to see the code coverage, run the followin
 .. _develop locally with docker: ./developing-locally-docker.html
 .. _customize: https://docs.pytest.org/en/latest/customize.html
 .. _unittest: https://docs.python.org/3/library/unittest.html#module-unittest
-.. _configuring: https://coverage.readthedocs.io/en/v4.5.x/config.html
+.. _configuring: https://coverage.readthedocs.io/en/latest/config.html

From d5631b7d2a6363f6520adf38f869410f4330e389 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 6 Jan 2023 17:49:08 +0000
Subject: [PATCH 2458/2840] 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 55a6df601..9ba9955cc 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1337,5 +1337,10 @@
     "name": "Thomas Booij",
     "github_login": "ThomasBooij95",
     "twitter_username": ""
+  },
+  {
+    "name": "Pamela Fox",
+    "github_login": "pamelafox",
+    "twitter_username": "pamelafox"
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index fbc8dd973..e54c1f650 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1461,6 +1461,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Pamela Fox</td>
+    <td>
+      <a href="https://github.com/pamelafox">pamelafox</a>
+    </td>
+    <td>pamelafox</td>
+  </tr>
   <tr>
     <td>Parbhat Puri</td>
     <td>

From 84851ef6096d97bcf70ea11c3c94faf682411c2d Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 6 Jan 2023 12:49:41 -0500
Subject: [PATCH 2459/2840] Update tox to 4.2.3 (#4051)

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

diff --git a/requirements.txt b/requirements.txt
index 7db83d824..5db12aac8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==2.21.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.2.2
+tox==4.2.3
 pytest==7.2.0
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From 62df4f44603e07f23f126a9e78da706c53a170f5 Mon Sep 17 00:00:00 2001
From: Robin <7276999+Kaffeetasse@users.noreply.github.com>
Date: Fri, 6 Jan 2023 18:56:41 +0100
Subject: [PATCH 2460/2840] Add .git to .dockerignore (#4054)

---
 {{cookiecutter.project_slug}}/.dockerignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/{{cookiecutter.project_slug}}/.dockerignore b/{{cookiecutter.project_slug}}/.dockerignore
index 5518e60af..7369480e3 100644
--- a/{{cookiecutter.project_slug}}/.dockerignore
+++ b/{{cookiecutter.project_slug}}/.dockerignore
@@ -8,3 +8,4 @@
 .readthedocs.yml
 .travis.yml
 venv
+.git

From b9933f54afea71f6b94181f191c4040a13e9b0eb Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Fri, 6 Jan 2023 18:06:14 +0000
Subject: [PATCH 2461/2840] 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 9ba9955cc..34c84979d 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1342,5 +1342,10 @@
     "name": "Pamela Fox",
     "github_login": "pamelafox",
     "twitter_username": "pamelafox"
+  },
+  {
+    "name": "Robin",
+    "github_login": "Kaffeetasse",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index e54c1f650..718d58c57 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1573,6 +1573,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Robin</td>
+    <td>
+      <a href="https://github.com/Kaffeetasse">Kaffeetasse</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Roman Afanaskin</td>
     <td>

From d91c2141eaa84f7fb0fe574e2d22a755169444ea Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 6 Jan 2023 10:50:05 -0800
Subject: [PATCH 2462/2840] Update rcssmin from 1.1.0 to 1.1.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 f4d2399de..16e96cc2b 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -5,7 +5,7 @@ Pillow==9.4.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %}
 rcssmin==1.1.0 --install-option="--without-c-extensions"  # https://github.com/ndparker/rcssmin
 {%- else %}
-rcssmin==1.1.0  # https://github.com/ndparker/rcssmin
+rcssmin==1.1.1  # https://github.com/ndparker/rcssmin
 {%- endif %}
 {%- endif %}
 argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi

From 9c23a17987cc4a737780bd11a39eb617a5cd42e4 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 6 Jan 2023 14:11:14 -0800
Subject: [PATCH 2463/2840] Update django-compressor from 4.1 to 4.3

---
 {{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 f4d2399de..a20b98c18 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -36,7 +36,7 @@ django-allauth==0.52.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.14.0  # https://github.com/django-crispy-forms/django-crispy-forms
 crispy-bootstrap5==0.7  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
-django-compressor==4.1  # https://github.com/django-compressor/django-compressor
+django-compressor==4.3  # https://github.com/django-compressor/django-compressor
 {%- endif %}
 django-redis==5.2.0  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == 'y' %}

From 3601d2a843f600ba5c6763825cce177c74b9b5ed Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 7 Jan 2023 02:23:16 +0000
Subject: [PATCH 2464/2840] Release 2023.01.06

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index eb5f7b48f..e84c56136 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.01.06
+
+### Changed
+- Add `.git` to `.dockerignore` ([#4054](https://github.com/cookiecutter/cookiecutter-django/pull/4054))
+- Fix link and add non-Docker commands to testing page in the docs ([#4036](https://github.com/cookiecutter/cookiecutter-django/pull/4036))
+### Updated
+- Update tox to 4.2.3 ([#4051](https://github.com/cookiecutter/cookiecutter-django/pull/4051))
+
 ## 2023.01.04
 
 ### Changed
diff --git a/setup.py b/setup.py
index ba0475913..6275646be 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.01.04"
+version = "2023.01.06"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 56143f7a5f8a6296cdc3b21dd5ec73f36875105b Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 7 Jan 2023 08:27:47 -0500
Subject: [PATCH 2465/2840] Update isort to 5.11.4 (#4058)

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

diff --git a/requirements.txt b/requirements.txt
index 5db12aac8..9d42222c7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==22.12.0
-isort==5.11.3
+isort==5.11.4
 flake8==6.0.0
 flake8-isort==6.0.0
 pre-commit==2.21.0

From f294c276ad8109ecdca8d0be9e3cb16fb75739a7 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 7 Jan 2023 08:29:18 -0500
Subject: [PATCH 2466/2840] Update django-storages to 1.13.2 (#4057)

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

diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index b7d73819b..04889fc27 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -17,11 +17,11 @@ hiredis==2.1.0  # https://github.com/redis/hiredis-py
 # Django
 # ------------------------------------------------------------------------------
 {%- if cookiecutter.cloud_provider == 'AWS' %}
-django-storages[boto3]==1.13.1  # https://github.com/jschneier/django-storages
+django-storages[boto3]==1.13.2  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
-django-storages[google]==1.13.1  # https://github.com/jschneier/django-storages
+django-storages[google]==1.13.2  # https://github.com/jschneier/django-storages
 {%- elif cookiecutter.cloud_provider == 'Azure' %}
-django-storages[azure]==1.13.1  # https://github.com/jschneier/django-storages
+django-storages[azure]==1.13.2  # https://github.com/jschneier/django-storages
 {%- endif %}
 {%- if cookiecutter.mail_service == 'Mailgun' %}
 django-anymail[mailgun]==9.0  # https://github.com/anymail/django-anymail

From 5aecf924abd2661ab98db9c47434044f855e8669 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 7 Jan 2023 08:34:22 -0500
Subject: [PATCH 2467/2840] Update tox to 4.2.6 (#4064)

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

diff --git a/requirements.txt b/requirements.txt
index 9d42222c7..bc164293d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==2.21.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.2.3
+tox==4.2.6
 pytest==7.2.0
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From f6023ab21e8de386e847d03df2e6e90126ee6af6 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sun, 8 Jan 2023 02:28:02 +0000
Subject: [PATCH 2468/2840] Release 2023.01.07

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e84c56136..f6ac1a9d4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.01.07
+
+### Updated
+- Update tox to 4.2.6 ([#4064](https://github.com/cookiecutter/cookiecutter-django/pull/4064))
+- Update django-storages to 1.13.2 ([#4057](https://github.com/cookiecutter/cookiecutter-django/pull/4057))
+- Update isort to 5.11.4 ([#4058](https://github.com/cookiecutter/cookiecutter-django/pull/4058))
+- Update rcssmin to 1.1.1 ([#4060](https://github.com/cookiecutter/cookiecutter-django/pull/4060))
+- Update django-compressor to 4.3 ([#4063](https://github.com/cookiecutter/cookiecutter-django/pull/4063))
+
 ## 2023.01.06
 
 ### Changed
diff --git a/setup.py b/setup.py
index 6275646be..91e605619 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.01.06"
+version = "2023.01.07"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 3e050c0f5b4f948734ecab11d51f626456fda5cd Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 8 Jan 2023 06:10:04 -0500
Subject: [PATCH 2469/2840] Update coverage from 7.0.3 to 7.0.4 (#4067)

---
 {{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 0bb99c1a6..b9b4d2008 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==6.0.0  # https://github.com/PyCQA/flake8
 flake8-isort==6.0.0  # https://github.com/gforcada/flake8-isort
-coverage==7.0.3  # https://github.com/nedbat/coveragepy
+coverage==7.0.4  # https://github.com/nedbat/coveragepy
 black==22.12.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From ce25e18a24a6acacfcafb86681dcf880adf6ff1b Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 8 Jan 2023 06:10:19 -0500
Subject: [PATCH 2470/2840] Update redis from 4.4.0 to 4.4.1 (#4068)

---
 {{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 c4e809112..3a389eb08 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -12,7 +12,7 @@ argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==6.3.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==4.4.0  # https://github.com/redis/redis-py
+redis==4.4.1  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.1.0  # https://github.com/redis/hiredis-py
 {%- endif %}

From e23fe10add86836e6a78d2d1d9f402a19ea5d76a Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Mon, 9 Jan 2023 02:24:37 +0000
Subject: [PATCH 2471/2840] Release 2023.01.08

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f6ac1a9d4..75cfa9795 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 -->
 
+## 2023.01.08
+
+### Updated
+- Update redis to 4.4.1 ([#4068](https://github.com/cookiecutter/cookiecutter-django/pull/4068))
+- Update coverage to 7.0.4 ([#4067](https://github.com/cookiecutter/cookiecutter-django/pull/4067))
+
 ## 2023.01.07
 
 ### Updated
diff --git a/setup.py b/setup.py
index 91e605619..ff9990b7b 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.01.07"
+version = "2023.01.08"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 629785e1d4e43771e80c7b29375203852b95c06f Mon Sep 17 00:00:00 2001
From: Pamela Fox <pamela.fox@gmail.com>
Date: Tue, 10 Jan 2023 00:57:05 -0800
Subject: [PATCH 2472/2840] Add .venv to exclude (#4069)

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

diff --git a/{{cookiecutter.project_slug}}/setup.cfg b/{{cookiecutter.project_slug}}/setup.cfg
index b99bba644..7ee60215a 100644
--- a/{{cookiecutter.project_slug}}/setup.cfg
+++ b/{{cookiecutter.project_slug}}/setup.cfg
@@ -1,10 +1,10 @@
 [flake8]
 max-line-length = 120
-exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv
+exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv,.venv
 
 [pycodestyle]
 max-line-length = 120
-exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv
+exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv,.venv
 
 [isort]
 line_length = 88

From 98ca314904baffc259c856d846bdc8030c4c6c7a Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 10 Jan 2023 08:21:58 -0500
Subject: [PATCH 2473/2840] Update hiredis to 2.1.1 (#4070)

---
 {{cookiecutter.project_slug}}/requirements/base.txt       | 2 +-
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 3a389eb08..06be3c65c 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -14,7 +14,7 @@ whitenoise==6.3.0  # https://github.com/evansd/whitenoise
 {%- endif %}
 redis==4.4.1  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
-hiredis==2.1.0  # https://github.com/redis/hiredis-py
+hiredis==2.1.1  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
 celery==5.2.7  # pyup: < 6.0  # https://github.com/celery/celery
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 04889fc27..ce3e9f3fe 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.12.1  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
-hiredis==2.1.0  # https://github.com/redis/hiredis-py
+hiredis==2.1.1  # https://github.com/redis/hiredis-py
 {%- endif %}
 
 # Django

From c4291e7522648dbf43f5d38956afc061ddaf8131 Mon Sep 17 00:00:00 2001
From: Pamela Fox <pamela.fox@gmail.com>
Date: Tue, 10 Jan 2023 15:11:53 -0800
Subject: [PATCH 2474/2840] Add dump.rdb to gitignore (#4062)

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

diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore
index ede26ef72..acc484307 100644
--- a/{{cookiecutter.project_slug}}/.gitignore
+++ b/{{cookiecutter.project_slug}}/.gitignore
@@ -326,6 +326,9 @@ Session.vim
 # Auto-generated tag files
 tags
 
+# Redis dump file
+dump.rdb
+
 ### Project template
 {%- if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'n' %}
 MailHog

From 7b93aac85748df72cdadc0828532bb1c3ddf748b Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 11 Jan 2023 02:42:18 +0000
Subject: [PATCH 2475/2840] Release 2023.01.10

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 75cfa9795..ecd6023af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.01.10
+
+### Changed
+- Add dump.rdb to gitignore ([#4062](https://github.com/cookiecutter/cookiecutter-django/pull/4062))
+### Fixed
+- Exclude `.venv` from code style checks ([#4069](https://github.com/cookiecutter/cookiecutter-django/pull/4069))
+### Updated
+- Update hiredis to 2.1.1 ([#4070](https://github.com/cookiecutter/cookiecutter-django/pull/4070))
+
 ## 2023.01.08
 
 ### Updated
diff --git a/setup.py b/setup.py
index ff9990b7b..397500054 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.01.08"
+version = "2023.01.10"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 470eb70069e504940c273832dce040af843d69d4 Mon Sep 17 00:00:00 2001
From: Pamela Fox <pamela.fox@gmail.com>
Date: Wed, 11 Jan 2023 09:38:38 -0800
Subject: [PATCH 2476/2840] Update Celery instructions (#4061)

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 docs/developing-locally.rst | 27 ++++++++++++++++++++++-----
 1 file changed, 22 insertions(+), 5 deletions(-)

diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index e1c946268..2b9438059 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -141,15 +141,32 @@ In production, we have Mailgun_ configured to have your back!
 Celery
 ------
 
-If the project is configured to use Celery as a task scheduler then by default tasks are set to run on the main thread
-when developing locally. If you have the appropriate setup on your local machine then set the following
-in ``config/settings/local.py``::
+If the project is configured to use Celery as a task scheduler then, by default, tasks are set to run on the main thread when developing locally instead of getting sent to a broker. However, if you have Redis setup on your local machine, you can set the following in ``config/settings/local.py``::
 
     CELERY_TASK_ALWAYS_EAGER = False
 
-To run Celery locally, make sure redis-server is installed (instructions are available at https://redis.io/topics/quickstart), run the server in one terminal with `redis-server`, and then start celery in another terminal with the following command::
+Next, make sure `redis-server` is installed (per the `Getting started with Redis`_ guide) and run the server in one terminal::
 
-    celery -A config.celery_app worker --loglevel=info
+    $ redis-server
+
+Start the Celery worker by running the following command in another terminal::
+
+    $ celery -A config.celery_app worker --loglevel=info
+
+That Celery worker should be running whenever your app is running, typically as a background process,
+so that it can pick up any tasks that get queued. Learn more from the `Celery Workers Guide`_.
+
+The project comes with a simple task for manual testing purposes, inside `<project_slug>/users/tasks.py`. To queue that task locally, start the Django shell, import the task, and call `delay()` on it::
+
+    $ python manage.py shell
+    >> from <project_slug>.users.tasks import get_users_count
+    >> get_users_count.delay()
+
+You can also use Django admin to queue up tasks, thanks to the `django-celerybeat`_ package.
+
+.. _Getting started with Redis guide: https://redis.io/docs/getting-started/
+.. _Celery Workers Guide: https://docs.celeryq.dev/en/stable/userguide/workers.html
+.. _django-celerybeat: https://django-celery-beat.readthedocs.io/en/latest/
 
 
 Sass Compilation & Live Reloading

From f690119cd99903e3db62718f4534f3fe03e57163 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 11 Jan 2023 17:18:03 -0500
Subject: [PATCH 2477/2840] Update tox to 4.2.7 (#4073)

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

diff --git a/requirements.txt b/requirements.txt
index bc164293d..4a604db16 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==2.21.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.2.6
+tox==4.2.7
 pytest==7.2.0
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From 541c1dce9e5abf52076e39671b930efe9c834117 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 12 Jan 2023 02:41:37 +0000
Subject: [PATCH 2478/2840] Release 2023.01.11

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ecd6023af..2cb53128c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.01.11
+
+### Changed
+- Update Celery instructions in the documentation ([#4061](https://github.com/cookiecutter/cookiecutter-django/pull/4061))
+### Updated
+- Update tox to 4.2.7 ([#4073](https://github.com/cookiecutter/cookiecutter-django/pull/4073))
+
 ## 2023.01.10
 
 ### Changed
diff --git a/setup.py b/setup.py
index 397500054..5b1bc3b26 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.01.10"
+version = "2023.01.11"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From fe6e6e85cbcd6dbb78d3427a6c971a74fecd5223 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 12 Jan 2023 13:28:26 -0500
Subject: [PATCH 2479/2840] Update sentry-sdk to 1.13.0 (#4074)

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

From f50a2a5b0f5d9aa03a815be0e0c577f40983e67c Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 13 Jan 2023 02:46:24 +0000
Subject: [PATCH 2480/2840] Release 2023.01.12

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2cb53128c..5269ac14d 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 -->
 
+## 2023.01.12
+
+### Updated
+- Update sentry-sdk to 1.13.0 ([#4074](https://github.com/cookiecutter/cookiecutter-django/pull/4074))
+
 ## 2023.01.11
 
 ### Changed
diff --git a/setup.py b/setup.py
index 5b1bc3b26..765459067 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.01.11"
+version = "2023.01.12"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 54df65c7779d7e0764645acd529ba5673d0090fe Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 15 Jan 2023 06:32:56 -0500
Subject: [PATCH 2481/2840] Update pytz from 2022.7 to 2022.7.1 (#4078)

---
 {{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 06be3c65c..38f8daabf 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,4 +1,4 @@
-pytz==2022.7  # https://github.com/stub42/pytz
+pytz==2022.7.1  # https://github.com/stub42/pytz
 python-slugify==7.0.0  # https://github.com/un33k/python-slugify
 Pillow==9.4.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}

From 5d07f3bb7ef142b7bd7a4d7e7f062775896ea021 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 15 Jan 2023 06:33:58 -0500
Subject: [PATCH 2482/2840] Update pytest to 7.2.1 (#4077)

* Update pytest from 7.2.0 to 7.2.1

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

diff --git a/requirements.txt b/requirements.txt
index 4a604db16..627cfebe5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,7 +13,7 @@ pre-commit==2.21.0
 # Testing
 # ------------------------------------------------------------------------------
 tox==4.2.7
-pytest==7.2.0
+pytest==7.2.1
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2
 pyyaml==6.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index b9b4d2008..89abc0a0e 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -15,7 +15,7 @@ watchfiles==0.18.1  # https://github.com/samuelcolvin/watchfiles
 # ------------------------------------------------------------------------------
 mypy==0.982  # https://github.com/python/mypy
 django-stubs==1.13.1  # https://github.com/typeddjango/django-stubs
-pytest==7.2.0  # https://github.com/pytest-dev/pytest
+pytest==7.2.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.6  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
 djangorestframework-stubs==1.8.0  # https://github.com/typeddjango/djangorestframework-stubs

From 3f53a2695b0824a1ccd1b62e866568fce53a2c08 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Mon, 16 Jan 2023 02:26:38 +0000
Subject: [PATCH 2483/2840] Release 2023.01.15

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5269ac14d..00698a012 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 -->
 
+## 2023.01.15
+
+### Updated
+- Update pytest to 7.2.1 ([#4077](https://github.com/cookiecutter/cookiecutter-django/pull/4077))
+- Update pytz to 2022.7.1 ([#4078](https://github.com/cookiecutter/cookiecutter-django/pull/4078))
+
 ## 2023.01.12
 
 ### Updated
diff --git a/setup.py b/setup.py
index 765459067..cdbbc6929 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.01.12"
+version = "2023.01.15"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 52af00670683ac20d42c4119580ab4a2fbe0109d Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 17 Jan 2023 04:38:25 -0500
Subject: [PATCH 2484/2840] Update tox to 4.3.3 (#4081)

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

diff --git a/requirements.txt b/requirements.txt
index 627cfebe5..5dc9d97ab 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==2.21.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.2.7
+tox==4.3.3
 pytest==7.2.1
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From 23b41967a854e023d0a63fa502ba13fba81ada8b Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 18 Jan 2023 02:27:46 +0000
Subject: [PATCH 2485/2840] Release 2023.01.17

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00698a012..344978d0a 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 -->
 
+## 2023.01.17
+
+### Updated
+- Update tox to 4.3.3 ([#4081](https://github.com/cookiecutter/cookiecutter-django/pull/4081))
+
 ## 2023.01.15
 
 ### Updated
diff --git a/setup.py b/setup.py
index cdbbc6929..1b0f44843 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.01.15"
+version = "2023.01.17"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From be8aa5c73dc88259e819534a3bdb71f9364e82b9 Mon Sep 17 00:00:00 2001
From: Pamela Fox <pamela.fox@gmail.com>
Date: Thu, 19 Jan 2023 14:45:56 -0800
Subject: [PATCH 2486/2840] Add sourcemaps support to Gulp (#4089)

fixes https://github.com/cookiecutter/cookiecutter-django/issues/4045
---
 {{cookiecutter.project_slug}}/.gitignore  | 1 +
 {{cookiecutter.project_slug}}/gulpfile.js | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore
index acc484307..17e9249c0 100644
--- a/{{cookiecutter.project_slug}}/.gitignore
+++ b/{{cookiecutter.project_slug}}/.gitignore
@@ -346,4 +346,5 @@ project.css
 project.min.css
 vendors.js
 *.min.js
+*.min.js.map
 {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/gulpfile.js b/{{cookiecutter.project_slug}}/gulpfile.js
index 680e3672e..40d367bcd 100644
--- a/{{cookiecutter.project_slug}}/gulpfile.js
+++ b/{{cookiecutter.project_slug}}/gulpfile.js
@@ -85,13 +85,13 @@ function scripts() {
 
 // Vendor Javascript minification
 function vendorScripts() {
-  return src(paths.vendorsJs)
+  return src(paths.vendorsJs, { sourcemaps: true })
     .pipe(concat('vendors.js'))
     .pipe(dest(paths.js))
     .pipe(plumber()) // Checks for errors
     .pipe(uglify()) // Minifies the js
     .pipe(rename({ suffix: '.min' }))
-    .pipe(dest(paths.js))
+    .pipe(dest(paths.js, { sourcemaps: '.' }))
 }
 
 // Image compression

From f4ab7bf671221195e5cd7241f2b551beff40594a Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 19 Jan 2023 18:10:06 -0500
Subject: [PATCH 2487/2840] Update tox to 4.3.5 (#4087)

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

diff --git a/requirements.txt b/requirements.txt
index 5dc9d97ab..6d0f15b64 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==2.21.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.3.3
+tox==4.3.5
 pytest==7.2.1
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From 502d978e222f25f73f294067c5e4b0e655c04e73 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 19 Jan 2023 18:54:31 -0500
Subject: [PATCH 2488/2840] Update requests from 2.28.1 to 2.28.2 (#4090)

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

diff --git a/requirements.txt b/requirements.txt
index 6d0f15b64..add5fb030 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -23,4 +23,4 @@ pyyaml==6.0
 PyGithub==1.57
 gitpython==3.1.30
 jinja2==3.1.2
-requests==2.28.1
+requests==2.28.2

From 4576c70a5d902e9495fd58f5cd91f2badd7070e1 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 19 Jan 2023 18:55:31 -0500
Subject: [PATCH 2489/2840] Update redis from 4.4.1 to 4.4.2 (#4091)

---
 {{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 38f8daabf..6c29d5d2d 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -12,7 +12,7 @@ argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==6.3.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==4.4.1  # https://github.com/redis/redis-py
+redis==4.4.2  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.1.1  # https://github.com/redis/hiredis-py
 {%- endif %}

From c5b0db3c635ffaf2d601c536cf3be0f5016dc4e3 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 19 Jan 2023 18:56:01 -0500
Subject: [PATCH 2490/2840] Update coverage from 7.0.4 to 7.0.5 (#4092)

---
 {{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 89abc0a0e..6560033ef 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==6.0.0  # https://github.com/PyCQA/flake8
 flake8-isort==6.0.0  # https://github.com/gforcada/flake8-isort
-coverage==7.0.4  # https://github.com/nedbat/coveragepy
+coverage==7.0.5  # https://github.com/nedbat/coveragepy
 black==22.12.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From e5db124479b1004e339555a746c60489213812ac Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 20 Jan 2023 02:28:57 +0000
Subject: [PATCH 2491/2840] Release 2023.01.19

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 344978d0a..c383e84f5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,16 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.01.19
+
+### Fixed
+- Add sourcemaps support to Gulp ([#4089](https://github.com/cookiecutter/cookiecutter-django/pull/4089))
+### Updated
+- Update coverage to 7.0.5 ([#4092](https://github.com/cookiecutter/cookiecutter-django/pull/4092))
+- Update redis to 4.4.2 ([#4091](https://github.com/cookiecutter/cookiecutter-django/pull/4091))
+- Update requests to 2.28.2 ([#4090](https://github.com/cookiecutter/cookiecutter-django/pull/4090))
+- Update tox to 4.3.5 ([#4087](https://github.com/cookiecutter/cookiecutter-django/pull/4087))
+
 ## 2023.01.17
 
 ### Updated
diff --git a/setup.py b/setup.py
index 1b0f44843..53c2d0709 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.01.17"
+version = "2023.01.19"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 403298fcdcfbef64b897a4f9d0d3e23d4605fe7c Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 21 Jan 2023 11:55:33 -0500
Subject: [PATCH 2492/2840] Update django-stubs from 1.13.1 to 1.13.2 (#4093)

---
 {{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 6560033ef..7436d32b9 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -14,7 +14,7 @@ watchfiles==0.18.1  # https://github.com/samuelcolvin/watchfiles
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.982  # https://github.com/python/mypy
-django-stubs==1.13.1  # https://github.com/typeddjango/django-stubs
+django-stubs==1.13.2  # https://github.com/typeddjango/django-stubs
 pytest==7.2.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.6  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}

From 4d087f98be29dd95832fd693411ea339413eecf1 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sun, 22 Jan 2023 02:28:22 +0000
Subject: [PATCH 2493/2840] Release 2023.01.21

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c383e84f5..6f347395a 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 -->
 
+## 2023.01.21
+
+### Updated
+- Update django-stubs to 1.13.2 ([#4093](https://github.com/cookiecutter/cookiecutter-django/pull/4093))
+
 ## 2023.01.19
 
 ### Fixed
diff --git a/setup.py b/setup.py
index 53c2d0709..d1e91c223 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.01.19"
+version = "2023.01.21"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 6a601208ea30e2d1d9c5188d08bc4ff4567a0de3 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 22 Jan 2023 09:54:59 -0500
Subject: [PATCH 2494/2840] Update django-compressor from 4.3 to 4.3.1 (#4094)

---
 {{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 6c29d5d2d..b695d5af8 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -36,7 +36,7 @@ django-allauth==0.52.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.14.0  # https://github.com/django-crispy-forms/django-crispy-forms
 crispy-bootstrap5==0.7  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
-django-compressor==4.3  # https://github.com/django-compressor/django-compressor
+django-compressor==4.3.1  # https://github.com/django-compressor/django-compressor
 {%- endif %}
 django-redis==5.2.0  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == 'y' %}

From ca18b6dc7c58b04b1dc3270e29132109e6c46fe6 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Mon, 23 Jan 2023 02:25:09 +0000
Subject: [PATCH 2495/2840] Release 2023.01.22

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6f347395a..494a67075 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 -->
 
+## 2023.01.22
+
+### Updated
+- Update django-compressor to 4.3.1 ([#4094](https://github.com/cookiecutter/cookiecutter-django/pull/4094))
+
 ## 2023.01.21
 
 ### Updated
diff --git a/setup.py b/setup.py
index d1e91c223..17ef3ffe5 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.01.21"
+version = "2023.01.22"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From e2a7647d3c2327dc4335358ba7a315de5c4d6c18 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 23 Jan 2023 12:21:21 -0500
Subject: [PATCH 2496/2840] Update sentry-sdk to 1.14.0 (#4096)

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

From 0cd6a66a262d26c4c84aeb3cc49de2e8a35b331f Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 24 Jan 2023 02:23:48 +0000
Subject: [PATCH 2497/2840] Release 2023.01.23

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 494a67075..a2187d744 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 -->
 
+## 2023.01.23
+
+### Updated
+- Update sentry-sdk to 1.14.0 ([#4096](https://github.com/cookiecutter/cookiecutter-django/pull/4096))
+
 ## 2023.01.22
 
 ### Updated
diff --git a/setup.py b/setup.py
index 17ef3ffe5..20df0c815 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.01.22"
+version = "2023.01.23"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 3361c75fbcf3305cd00bf4790838a5a75a215b97 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 24 Jan 2023 05:43:45 -0500
Subject: [PATCH 2498/2840] Update pre-commit to 3.0.0 (#4098)

* Update pre-commit from 2.21.0 to 3.0.0

* Update pre-commit from 2.21.0 to 3.0.0
---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index add5fb030..44e403020 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ black==22.12.0
 isort==5.11.4
 flake8==6.0.0
 flake8-isort==6.0.0
-pre-commit==2.21.0
+pre-commit==3.0.0
 
 # Testing
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 7436d32b9..782846f82 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -36,7 +36,7 @@ pylint-django==2.5.3  # 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.21.0  # https://github.com/pre-commit/pre-commit
+pre-commit==3.0.0  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From 030b00177a98359ff4e81049ee05d6ca7aad67f9 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 25 Jan 2023 02:24:52 +0000
Subject: [PATCH 2499/2840] Release 2023.01.24

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2187d744..32cb28daa 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 -->
 
+## 2023.01.24
+
+### Updated
+- Update pre-commit to 3.0.0 ([#4098](https://github.com/cookiecutter/cookiecutter-django/pull/4098))
+
 ## 2023.01.23
 
 ### Updated
diff --git a/setup.py b/setup.py
index 20df0c815..0453c33ba 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.01.23"
+version = "2023.01.24"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 2dc964a8e3feb443b7c19a99ecd174e1b9230adf Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 25 Jan 2023 03:50:58 -0500
Subject: [PATCH 2500/2840] Update coverage from 7.0.5 to 7.1.0 (#4100)

---
 {{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 782846f82..447104dae 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==6.0.0  # https://github.com/PyCQA/flake8
 flake8-isort==6.0.0  # https://github.com/gforcada/flake8-isort
-coverage==7.0.5  # https://github.com/nedbat/coveragepy
+coverage==7.1.0  # https://github.com/nedbat/coveragepy
 black==22.12.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From dfd8164ef82512e7ee62f5954a78af93fc72bc18 Mon Sep 17 00:00:00 2001
From: Patrick Tran <patrick.tran06@gmail.com>
Date: Wed, 25 Jan 2023 04:50:41 -0800
Subject: [PATCH 2501/2840] Update postgres and redis to point to mini tiers
 (#4099)

* Update postgres and redis to point to mini tiers

* Update deployment-on-heroku.rst

* Update deployment-on-heroku.rst
---
 docs/deployment-on-heroku.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/docs/deployment-on-heroku.rst b/docs/deployment-on-heroku.rst
index e239b6593..71fb45dda 100644
--- a/docs/deployment-on-heroku.rst
+++ b/docs/deployment-on-heroku.rst
@@ -12,13 +12,13 @@ Run these commands to deploy the project to Heroku:
 
     heroku create --buildpack heroku/python
 
-    heroku addons:create heroku-postgresql:hobby-dev
+    heroku addons:create heroku-postgresql:mini
     # On Windows use double quotes for the time zone, e.g.
     # heroku pg:backups schedule --at "02:00 America/Los_Angeles" DATABASE_URL
     heroku pg:backups schedule --at '02:00 America/Los_Angeles' DATABASE_URL
     heroku pg:promote DATABASE_URL
 
-    heroku addons:create heroku-redis:hobby-dev
+    heroku addons:create heroku-redis:mini
 
     # Assuming you chose Mailgun as mail service (see below for others)
     heroku addons:create mailgun:starter
@@ -125,4 +125,4 @@ which runs Gulp in cookiecutter-django.
 
 If things don't work, please refer to the Heroku docs.
 
-.. _multiple buildpacks: https://devcenter.heroku.com/articles/using-multiple-buildpacks-for-an-app
\ No newline at end of file
+.. _multiple buildpacks: https://devcenter.heroku.com/articles/using-multiple-buildpacks-for-an-app

From cb99f0d2115df1df2deb8716e79e6611309a10bd Mon Sep 17 00:00:00 2001
From: luzfcb <luzfcb@users.noreply.github.com>
Date: Wed, 25 Jan 2023 12:51:16 +0000
Subject: [PATCH 2502/2840] 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 34c84979d..9d60e5da1 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1347,5 +1347,10 @@
     "name": "Robin",
     "github_login": "Kaffeetasse",
     "twitter_username": ""
+  },
+  {
+    "name": "Patrick Tran",
+    "github_login": "theptrk",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 718d58c57..3d85b68ac 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1475,6 +1475,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Patrick Tran</td>
+    <td>
+      <a href="https://github.com/theptrk">theptrk</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Pawan Chaurasia</td>
     <td>

From 70014c2b45b5f794a4fd4c82cb73ad52255d17ce Mon Sep 17 00:00:00 2001
From: tildebox <61698441+tildebox@users.noreply.github.com>
Date: Wed, 25 Jan 2023 23:55:08 +0100
Subject: [PATCH 2503/2840] Rename ROOT_DIR to BASE_DIR (#4086)

Co-authored-by: example <example@example.com>
Fix https://github.com/cookiecutter/cookiecutter-django/issues/4075
---
 tests/test_cookiecutter_generation.py                  |  4 ++--
 {{cookiecutter.project_slug}}/config/asgi.py           |  4 ++--
 {{cookiecutter.project_slug}}/config/settings/base.py  | 10 +++++-----
 {{cookiecutter.project_slug}}/config/wsgi.py           |  4 ++--
 .../merge_production_dotenvs_in_dotenv.py              |  6 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 6219f75ef..3a881cc64 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -134,11 +134,11 @@ def _fixture_id(ctx):
     return "-".join(f"{key}:{value}" for key, value in ctx.items())
 
 
-def build_files_list(root_dir):
+def build_files_list(base_dir):
     """Build a list containing absolute paths to the generated files."""
     return [
         os.path.join(dirpath, file_path)
-        for dirpath, subdirs, files in os.walk(root_dir)
+        for dirpath, subdirs, files in os.walk(base_dir)
         for file_path in files
     ]
 
diff --git a/{{cookiecutter.project_slug}}/config/asgi.py b/{{cookiecutter.project_slug}}/config/asgi.py
index 8c99bbf53..65e76ca0a 100644
--- a/{{cookiecutter.project_slug}}/config/asgi.py
+++ b/{{cookiecutter.project_slug}}/config/asgi.py
@@ -15,8 +15,8 @@ from django.core.asgi import get_asgi_application
 
 # This allows easy placement of apps within the interior
 # {{ cookiecutter.project_slug }} directory.
-ROOT_DIR = Path(__file__).resolve(strict=True).parent.parent
-sys.path.append(str(ROOT_DIR / "{{ cookiecutter.project_slug }}"))
+BASE_DIR = Path(__file__).resolve(strict=True).parent.parent
+sys.path.append(str(BASE_DIR / "{{ cookiecutter.project_slug }}"))
 
 # If DJANGO_SETTINGS_MODULE is unset, default to the local settings
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "config.settings.local")
diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 6bf6a6e5c..44b03fa03 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -5,15 +5,15 @@ from pathlib import Path
 
 import environ
 
-ROOT_DIR = Path(__file__).resolve(strict=True).parent.parent.parent
+BASE_DIR = Path(__file__).resolve(strict=True).parent.parent.parent
 # {{ cookiecutter.project_slug }}/
-APPS_DIR = ROOT_DIR / "{{ cookiecutter.project_slug }}"
+APPS_DIR = BASE_DIR / "{{ cookiecutter.project_slug }}"
 env = environ.Env()
 
 READ_DOT_ENV_FILE = env.bool("DJANGO_READ_DOT_ENV_FILE", default=False)
 if READ_DOT_ENV_FILE:
     # OS environment variables take precedence over variables from .env
-    env.read_env(str(ROOT_DIR / ".env"))
+    env.read_env(str(BASE_DIR / ".env"))
 
 # GENERAL
 # ------------------------------------------------------------------------------
@@ -33,7 +33,7 @@ USE_I18N = True
 # https://docs.djangoproject.com/en/dev/ref/settings/#use-tz
 USE_TZ = True
 # https://docs.djangoproject.com/en/dev/ref/settings/#locale-paths
-LOCALE_PATHS = [str(ROOT_DIR / "locale")]
+LOCALE_PATHS = [str(BASE_DIR / "locale")]
 
 # DATABASES
 # ------------------------------------------------------------------------------
@@ -159,7 +159,7 @@ MIDDLEWARE = [
 # STATIC
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#static-root
-STATIC_ROOT = str(ROOT_DIR / "staticfiles")
+STATIC_ROOT = str(BASE_DIR / "staticfiles")
 # https://docs.djangoproject.com/en/dev/ref/settings/#static-url
 STATIC_URL = "/static/"
 # https://docs.djangoproject.com/en/dev/ref/contrib/staticfiles/#std:setting-STATICFILES_DIRS
diff --git a/{{cookiecutter.project_slug}}/config/wsgi.py b/{{cookiecutter.project_slug}}/config/wsgi.py
index a7de581ca..3fd809ef3 100644
--- a/{{cookiecutter.project_slug}}/config/wsgi.py
+++ b/{{cookiecutter.project_slug}}/config/wsgi.py
@@ -21,8 +21,8 @@ from django.core.wsgi import get_wsgi_application
 
 # This allows easy placement of apps within the interior
 # {{ cookiecutter.project_slug }} directory.
-ROOT_DIR = Path(__file__).resolve(strict=True).parent.parent
-sys.path.append(str(ROOT_DIR / "{{ cookiecutter.project_slug }}"))
+BASE_DIR = Path(__file__).resolve(strict=True).parent.parent
+sys.path.append(str(BASE_DIR / "{{ cookiecutter.project_slug }}"))
 # We defer to a DJANGO_SETTINGS_MODULE already in the environment. This breaks
 # if running multiple sites in the same mod_wsgi process. To fix this, use
 # mod_wsgi daemon mode with each site in its own daemon process, or use
diff --git a/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py b/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py
index d702a5f67..e5f82504a 100644
--- a/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py
+++ b/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py
@@ -4,13 +4,13 @@ from pathlib import Path
 
 import pytest
 
-ROOT_DIR_PATH = Path(__file__).parent.resolve()
-PRODUCTION_DOTENVS_DIR_PATH = ROOT_DIR_PATH / ".envs" / ".production"
+BASE_DIR_PATH = Path(__file__).parent.resolve()
+PRODUCTION_DOTENVS_DIR_PATH = BASE_DIR_PATH / ".envs" / ".production"
 PRODUCTION_DOTENV_FILE_PATHS = [
     PRODUCTION_DOTENVS_DIR_PATH / ".django",
     PRODUCTION_DOTENVS_DIR_PATH / ".postgres",
 ]
-DOTENV_FILE_PATH = ROOT_DIR_PATH / ".env"
+DOTENV_FILE_PATH = BASE_DIR_PATH / ".env"
 
 
 def merge(

From 56f6ba922d8c3f3151f2e2a6b6b430706e958181 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 25 Jan 2023 23:40:00 +0000
Subject: [PATCH 2504/2840] 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 9d60e5da1..0f923e027 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1352,5 +1352,10 @@
     "name": "Patrick Tran",
     "github_login": "theptrk",
     "twitter_username": ""
+  },
+  {
+    "name": "tildebox",
+    "github_login": "tildebox",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 3d85b68ac..57194bca3 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1741,6 +1741,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>tildebox</td>
+    <td>
+      <a href="https://github.com/tildebox">tildebox</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Tim Claessens</td>
     <td>

From ef461f9231a4509175d2ef510fb40dd7ec840883 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 26 Jan 2023 02:25:13 +0000
Subject: [PATCH 2505/2840] Release 2023.01.25

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32cb28daa..5b1b47b52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.01.25
+
+### Changed
+- Rename ROOT_DIR to BASE_DIR ([#4086](https://github.com/cookiecutter/cookiecutter-django/pull/4086))
+- Update postgres and redis to point to mini tiers ([#4099](https://github.com/cookiecutter/cookiecutter-django/pull/4099))
+### Updated
+- Update coverage to 7.1.0 ([#4100](https://github.com/cookiecutter/cookiecutter-django/pull/4100))
+
 ## 2023.01.24
 
 ### Updated
diff --git a/setup.py b/setup.py
index 0453c33ba..9dd893f97 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.01.24"
+version = "2023.01.25"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 7fcdeeae88ad998b652c518c86e91aed13e6a6dd Mon Sep 17 00:00:00 2001
From: tildebox <61698441+tildebox@users.noreply.github.com>
Date: Thu, 26 Jan 2023 09:50:33 +0100
Subject: [PATCH 2506/2840] Rename BASE_DIR_PATH to BASE_DIR (#4102)

Co-authored-by: example <example@example.com>
---
 .../merge_production_dotenvs_in_dotenv.py                   | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py b/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py
index e5f82504a..80780ead5 100644
--- a/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py
+++ b/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py
@@ -4,13 +4,13 @@ from pathlib import Path
 
 import pytest
 
-BASE_DIR_PATH = Path(__file__).parent.resolve()
-PRODUCTION_DOTENVS_DIR_PATH = BASE_DIR_PATH / ".envs" / ".production"
+BASE_DIR = Path(__file__).parent.resolve()
+PRODUCTION_DOTENVS_DIR_PATH = BASE_DIR / ".envs" / ".production"
 PRODUCTION_DOTENV_FILE_PATHS = [
     PRODUCTION_DOTENVS_DIR_PATH / ".django",
     PRODUCTION_DOTENVS_DIR_PATH / ".postgres",
 ]
-DOTENV_FILE_PATH = BASE_DIR_PATH / ".env"
+DOTENV_FILE_PATH = BASE_DIR / ".env"
 
 
 def merge(

From 099e49b7284e8f74f9ddf2c8a485d2cb3056246f Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 26 Jan 2023 05:40:44 -0500
Subject: [PATCH 2507/2840] Update tox to 4.4.2 (#4101)

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

diff --git a/requirements.txt b/requirements.txt
index 44e403020..62e005a5b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==3.0.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.3.5
+tox==4.4.2
 pytest==7.2.1
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From 80405234c8e8ee16adb579a8e2d0b595efd505b3 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 26 Jan 2023 15:21:47 -0500
Subject: [PATCH 2508/2840] Update pre-commit to 3.0.1 (#4104)

---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 62e005a5b..ab9c8c8b8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ black==22.12.0
 isort==5.11.4
 flake8==6.0.0
 flake8-isort==6.0.0
-pre-commit==3.0.0
+pre-commit==3.0.1
 
 # Testing
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 447104dae..609b49789 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -36,7 +36,7 @@ pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}
-pre-commit==3.0.0  # https://github.com/pre-commit/pre-commit
+pre-commit==3.0.1  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From 8ba930cd488f82989412f440ae3632a8751b706b Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 27 Jan 2023 02:27:06 +0000
Subject: [PATCH 2509/2840] Release 2023.01.26

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 5b1b47b52..32b3850fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.01.26
+
+### Changed
+- Rename BASE_DIR_PATH to BASE_DIR ([#4102](https://github.com/cookiecutter/cookiecutter-django/pull/4102))
+### Updated
+- Update pre-commit to 3.0.1 ([#4104](https://github.com/cookiecutter/cookiecutter-django/pull/4104))
+- Update tox to 4.4.2 ([#4101](https://github.com/cookiecutter/cookiecutter-django/pull/4101))
+
 ## 2023.01.25
 
 ### Changed
diff --git a/setup.py b/setup.py
index 9dd893f97..8e98d5142 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.01.25"
+version = "2023.01.26"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 900473777d9a80bf3e127d9b9b959a2257bb3202 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 27 Jan 2023 15:34:29 -0500
Subject: [PATCH 2510/2840] Update django-stubs to 1.14.0 (#4103)

---
 {{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 609b49789..ef0342a32 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -14,7 +14,7 @@ watchfiles==0.18.1  # https://github.com/samuelcolvin/watchfiles
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.982  # https://github.com/python/mypy
-django-stubs==1.13.2  # https://github.com/typeddjango/django-stubs
+django-stubs==1.14.0  # https://github.com/typeddjango/django-stubs
 pytest==7.2.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.6  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}

From 0f635887b40e862769cec781a3a3f9fd85ddec7a Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 28 Jan 2023 02:26:35 +0000
Subject: [PATCH 2511/2840] Release 2023.01.27

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 32b3850fa..a55da25e5 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 -->
 
+## 2023.01.27
+
+### Updated
+- Update django-stubs to 1.14.0 ([#4103](https://github.com/cookiecutter/cookiecutter-django/pull/4103))
+
 ## 2023.01.26
 
 ### Changed
diff --git a/setup.py b/setup.py
index 8e98d5142..5adbbc664 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.01.26"
+version = "2023.01.27"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From c0e83b104cd0713c8be80d55cda95d821f14a58d Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 28 Jan 2023 15:10:45 +0000
Subject: [PATCH 2512/2840] Refactor `merge_production_dotenvs_in_dotenv.py`
 (#4105)

---
 hooks/post_gen_project.py                     |  1 +
 .../merge_production_dotenvs_in_dotenv.py     | 67 ++++---------------
 ...test_merge_production_dotenvs_in_dotenv.py | 34 ++++++++++
 3 files changed, 48 insertions(+), 54 deletions(-)
 create mode 100644 {{cookiecutter.project_slug}}/tests/test_merge_production_dotenvs_in_dotenv.py

diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index 9c3d946c1..5655b61f9 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -293,6 +293,7 @@ def set_flags_in_settings_files():
 def remove_envs_and_associated_files():
     shutil.rmtree(".envs")
     os.remove("merge_production_dotenvs_in_dotenv.py")
+    shutil.rmtree("tests")
 
 
 def remove_celery_compose_dirs():
diff --git a/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py b/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py
index 80780ead5..35139fb2e 100644
--- a/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py
+++ b/{{cookiecutter.project_slug}}/merge_production_dotenvs_in_dotenv.py
@@ -2,66 +2,25 @@ import os
 from collections.abc import Sequence
 from pathlib import Path
 
-import pytest
-
 BASE_DIR = Path(__file__).parent.resolve()
-PRODUCTION_DOTENVS_DIR_PATH = BASE_DIR / ".envs" / ".production"
-PRODUCTION_DOTENV_FILE_PATHS = [
-    PRODUCTION_DOTENVS_DIR_PATH / ".django",
-    PRODUCTION_DOTENVS_DIR_PATH / ".postgres",
+PRODUCTION_DOTENVS_DIR = BASE_DIR / ".envs" / ".production"
+PRODUCTION_DOTENV_FILES = [
+    PRODUCTION_DOTENVS_DIR / ".django",
+    PRODUCTION_DOTENVS_DIR / ".postgres",
 ]
-DOTENV_FILE_PATH = BASE_DIR / ".env"
+DOTENV_FILE = BASE_DIR / ".env"
 
 
 def merge(
-    output_file_path: str, merged_file_paths: Sequence[str], append_linesep: bool = True
+    output_file: Path,
+    files_to_merge: Sequence[Path],
 ) -> None:
-    with open(output_file_path, "w") as output_file:
-        for merged_file_path in merged_file_paths:
-            with open(merged_file_path) as merged_file:
-                merged_file_content = merged_file.read()
-                output_file.write(merged_file_content)
-                if append_linesep:
-                    output_file.write(os.linesep)
-
-
-def main():
-    merge(DOTENV_FILE_PATH, PRODUCTION_DOTENV_FILE_PATHS)
-
-
-@pytest.mark.parametrize("merged_file_count", range(3))
-@pytest.mark.parametrize("append_linesep", [True, False])
-def test_merge(tmpdir_factory, merged_file_count: int, append_linesep: bool):
-    tmp_dir_path = Path(str(tmpdir_factory.getbasetemp()))
-
-    output_file_path = tmp_dir_path / ".env"
-
-    expected_output_file_content = ""
-    merged_file_paths = []
-    for i in range(merged_file_count):
-        merged_file_ord = i + 1
-
-        merged_filename = f".service{merged_file_ord}"
-        merged_file_path = tmp_dir_path / merged_filename
-
-        merged_file_content = merged_filename * merged_file_ord
-
-        with open(merged_file_path, "w+") as file:
-            file.write(merged_file_content)
-
-        expected_output_file_content += merged_file_content
-        if append_linesep:
-            expected_output_file_content += os.linesep
-
-        merged_file_paths.append(merged_file_path)
-
-    merge(output_file_path, merged_file_paths, append_linesep)
-
-    with open(output_file_path) as output_file:
-        actual_output_file_content = output_file.read()
-
-    assert actual_output_file_content == expected_output_file_content
+    merged_content = ""
+    for merge_file in files_to_merge:
+        merged_content += merge_file.read_text()
+        merged_content += os.linesep
+    output_file.write_text(merged_content)
 
 
 if __name__ == "__main__":
-    main()
+    merge(DOTENV_FILE, PRODUCTION_DOTENV_FILES)
diff --git a/{{cookiecutter.project_slug}}/tests/test_merge_production_dotenvs_in_dotenv.py b/{{cookiecutter.project_slug}}/tests/test_merge_production_dotenvs_in_dotenv.py
new file mode 100644
index 000000000..c0e68f60a
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/tests/test_merge_production_dotenvs_in_dotenv.py
@@ -0,0 +1,34 @@
+from pathlib import Path
+
+import pytest
+
+from merge_production_dotenvs_in_dotenv import merge
+
+
+@pytest.mark.parametrize(
+    ("input_contents", "expected_output"),
+    [
+        ([], ""),
+        ([""], "\n"),
+        (["JANE=doe"], "JANE=doe\n"),
+        (["SEP=true", "AR=ator"], "SEP=true\nAR=ator\n"),
+        (["A=0", "B=1", "C=2"], "A=0\nB=1\nC=2\n"),
+        (["X=x\n", "Y=y", "Z=z\n"], "X=x\n\nY=y\nZ=z\n\n"),
+    ],
+)
+def test_merge(
+    tmp_path: Path,
+    input_contents: list[str],
+    expected_output: str,
+):
+    output_file = tmp_path / ".env"
+
+    files_to_merge = []
+    for num, input_content in enumerate(input_contents, start=1):
+        merge_file = tmp_path / f".service{num}"
+        merge_file.write_text(input_content)
+        files_to_merge.append(merge_file)
+
+    merge(output_file, files_to_merge)
+
+    assert output_file.read_text() == expected_output

From c09fa55b367b11ffcbce7d1875b8aade5b0f9c11 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sat, 28 Jan 2023 17:47:29 +0000
Subject: [PATCH 2513/2840] Auto-update pre-commit hooks (#4108)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                               | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index ca86e7eb5..0617dd66c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -21,7 +21,7 @@ repos:
       - id: black
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.11.4
+    rev: 5.12.0
     hooks:
       - id: isort
 
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index c1aaf0d9f..a273bdf17 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -21,7 +21,7 @@ repos:
       - id: black
 
   - repo: https://github.com/PyCQA/isort
-    rev: 5.11.4
+    rev: 5.12.0
     hooks:
       - id: isort
 

From fdf9ba27f1a0aa73a7a9686506efcb763ffc9fee Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 28 Jan 2023 13:52:00 -0500
Subject: [PATCH 2514/2840] Update isort to 5.12.0 (#4109)

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

diff --git a/requirements.txt b/requirements.txt
index ab9c8c8b8..2b7c69d33 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -5,7 +5,7 @@ binaryornot==0.4.4
 # Code quality
 # ------------------------------------------------------------------------------
 black==22.12.0
-isort==5.11.4
+isort==5.12.0
 flake8==6.0.0
 flake8-isort==6.0.0
 pre-commit==3.0.1

From 8584bafdfed9f5aa31945e4bfd800e664b2a6137 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sun, 29 Jan 2023 02:28:47 +0000
Subject: [PATCH 2515/2840] Release 2023.01.28

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a55da25e5..0c317f025 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.01.28
+
+### Changed
+- Refactor `merge_production_dotenvs_in_dotenv.py` ([#4105](https://github.com/cookiecutter/cookiecutter-django/pull/4105))
+### Updated
+- Update isort to 5.12.0 ([#4109](https://github.com/cookiecutter/cookiecutter-django/pull/4109))
+- Auto-update pre-commit hooks ([#4108](https://github.com/cookiecutter/cookiecutter-django/pull/4108))
+
 ## 2023.01.27
 
 ### Updated
diff --git a/setup.py b/setup.py
index 5adbbc664..f8321406d 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.01.27"
+version = "2023.01.28"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 977ffd91a3d389bda19d680ed26f24b63c341fe2 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sun, 29 Jan 2023 11:45:13 +0000
Subject: [PATCH 2516/2840] Remove BrokenLinkEmailsMiddleware (#4112)

---
 {{cookiecutter.project_slug}}/config/settings/base.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 44b03fa03..3d93ffb43 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -152,7 +152,6 @@ MIDDLEWARE = [
     "django.middleware.csrf.CsrfViewMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
-    "django.middleware.common.BrokenLinkEmailsMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
 ]
 

From cbb0e19de75eed12cfa84ca4e6d6e8a34ebe926e Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sun, 29 Jan 2023 12:12:12 +0000
Subject: [PATCH 2517/2840] Add Webpack support (#3623)

* Add support for Webpack as frontend pipeline

* Rename CI jobs

* Fix a couple of issues with Webpack + Docker

* Don't include Boostrap CSS from CDN with Webpack

* Rename variable

* Set publicPath in prod webpack config

* Fix removal of SASS files in post-gen hooks

* Add Webpack to readme usage section

* Run Django + Webpack dev server concurrently without Docker

* Fix async runserver command with Gulp/Webpack

* Upgrade django-webpack-loader to 1.5.0

* Pass variables required by Webpack at build time

* Upgrade django-webpack-loader to 1.7.0

* Add missing condition

* Add support for Azure Storage + Webpack

* Whitespaces

* Rename ROOT_DIR -> BASE_DIR

* Rename jobs

* Bump django-webpack-loader to latest

* Document limitation of Docker + Webpack + no Whitenoise

* Update section on custom Bootstrap compilation in generated readme
---
 .github/workflows/ci.yml                      |  22 ++--
 README.md                                     |   3 +-
 cookiecutter.json                             |   3 +-
 docs/deployment-on-heroku.rst                 |   8 +-
 docs/deployment-with-docker.rst               |  26 ++++
 docs/developing-locally.rst                   |   2 +-
 docs/project-generation-options.rst           |   6 +-
 docs/troubleshooting.rst                      |  12 +-
 hooks/post_gen_project.py                     | 111 +++++++++++++++++-
 tests/test_bare.sh                            |   6 +-
 tests/test_cookiecutter_generation.py         |   1 +
 tests/test_docker.sh                          |   6 +
 {{cookiecutter.project_slug}}/.gitignore      |   4 +
 .../docker_compose_up_django.xml              |   2 +-
 .../.idea/{{cookiecutter.project_slug}}.iml   |   2 +-
 {{cookiecutter.project_slug}}/README.md       |   7 +-
 .../compose/production/django/Dockerfile      |  18 ++-
 .../config/settings/base.py                   |  16 +++
 .../config/settings/local.py                  |   8 +-
 {{cookiecutter.project_slug}}/gulpfile.js     |   4 +-
 {{cookiecutter.project_slug}}/local.yml       |   4 +-
 {{cookiecutter.project_slug}}/package.json    |  29 ++++-
 {{cookiecutter.project_slug}}/production.yml  |  13 ++
 .../requirements/base.txt                     |   7 +-
 .../webpack/common.config.js                  |  55 +++++++++
 .../webpack/dev.config.js                     |  20 ++++
 .../webpack/prod.config.js                    |  28 +++++
 .../static/js/project.js                      |   4 +
 .../static/js/vendors.js                      |   2 +
 .../static/sass/project.scss                  |   2 +-
 .../templates/base.html                       |  17 ++-
 31 files changed, 399 insertions(+), 49 deletions(-)
 create mode 100644 {{cookiecutter.project_slug}}/webpack/common.config.js
 create mode 100644 {{cookiecutter.project_slug}}/webpack/dev.config.js
 create mode 100644 {{cookiecutter.project_slug}}/webpack/prod.config.js
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/js/vendors.js

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index d466f4032..08ac54d86 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
           - windows-latest
           - macOS-latest
 
-    name: "Run tests"
+    name: "pytest ${{ matrix.os }}"
     runs-on: ${{ matrix.os }}
     steps:
       - uses: actions/checkout@v3
@@ -49,10 +49,14 @@ jobs:
         script:
           - name: Basic
             args: ""
-          - name: Extended
-            args: "use_celery=y use_drf=y frontend_pipeline=Gulp"
+          - name: Celery & DRF
+            args: "use_celery=y use_drf=y"
+          - name: Gulp
+            args: "frontend_pipeline=Gulp"
+          - name: Webpack
+            args: "frontend_pipeline=Webpack"
 
-    name: "${{ matrix.script.name }} Docker"
+    name: "Docker ${{ matrix.script.name }}"
     runs-on: ubuntu-latest
     env:
       DOCKER_BUILDKIT: 1
@@ -74,12 +78,14 @@ jobs:
       fail-fast: false
       matrix:
         script:
-          - name: With Celery
+          - name: Celery
             args: "use_celery=y frontend_pipeline='Django Compressor'"
-          - name: With Gulp
-            args: "frontend_pipeline='Gulp'"
+          - name: Gulp
+            args: "frontend_pipeline=Gulp"
+          - name: Webpack
+            args: "frontend_pipeline=Webpack"
 
-    name: "${{ matrix.script.name }} Bare metal"
+    name: "Bare metal ${{ matrix.script.name }}"
     runs-on: ubuntu-latest
     services:
       redis:
diff --git a/README.md b/README.md
index d8fc58ec4..0697862c5 100644
--- a/README.md
+++ b/README.md
@@ -27,7 +27,7 @@ production-ready Django projects quickly.
 -   Registration via [django-allauth](https://github.com/pennersr/django-allauth)
 -   Comes with custom user model ready to go
 -   Optional basic ASGI setup for Websockets
--   Optional custom static build using Gulp and livereload
+-   Optional custom static build using Gulp or Webpack
 -   Send emails via [Anymail](https://github.com/anymail/django-anymail) (using [Mailgun](http://www.mailgun.com/) by default or Amazon SES if AWS is selected cloud provider, but switchable)
 -   Media storage using Amazon S3, Google Cloud Storage or Azure Storage
 -   Docker support using [docker-compose](https://github.com/docker/compose) for development and production (using [Traefik](https://traefik.io/) with [LetsEncrypt](https://letsencrypt.org/) support)
@@ -149,6 +149,7 @@ Answer the prompts with your own desired [options](http://cookiecutter-django.re
     1 - None
     2 - Django Compressor
     3 - Gulp
+    4 - Webpack
     Choose from 1, 2, 3, 4 [1]: 1
     use_celery [n]: y
     use_mailhog [n]: n
diff --git a/cookiecutter.json b/cookiecutter.json
index 970411013..cf4da9a45 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -46,7 +46,8 @@
   "frontend_pipeline": [
     "None",
     "Django Compressor",
-    "Gulp"
+    "Gulp",
+    "Webpack"
   ],
   "use_celery": "n",
   "use_mailhog": "n",
diff --git a/docs/deployment-on-heroku.rst b/docs/deployment-on-heroku.rst
index 71fb45dda..71c6e11b2 100644
--- a/docs/deployment-on-heroku.rst
+++ b/docs/deployment-on-heroku.rst
@@ -109,10 +109,10 @@ Or add the DSN for your account, if you already have one:
 .. _Sentry add-on: https://elements.heroku.com/addons/sentry
 
 
-Gulp & Bootstrap compilation
-++++++++++++++++++++++++++++
+Gulp or Webpack
++++++++++++++++
 
-If you've opted for Gulp, you'll most likely need to setup
+If you've opted for Gulp or Webpack as frontend pipeline, you'll most likely need to setup
 your app to use `multiple buildpacks`_: one for Python & one for Node.js:
 
 .. code-block:: bash
@@ -121,7 +121,7 @@ your app to use `multiple buildpacks`_: one for Python & one for Node.js:
 
 At time of writing, this should do the trick: during deployment,
 the Heroku should run ``npm install`` and then ``npm build``,
-which runs Gulp in cookiecutter-django.
+which run the SASS compilation & JS bundling.
 
 If things don't work, please refer to the Heroku docs.
 
diff --git a/docs/deployment-with-docker.rst b/docs/deployment-with-docker.rst
index fcce7e6f5..a431679bf 100644
--- a/docs/deployment-with-docker.rst
+++ b/docs/deployment-with-docker.rst
@@ -84,6 +84,32 @@ You can read more about this feature and how to configure it, at `Automatic HTTP
 
 .. _Automatic HTTPS: https://docs.traefik.io/https/acme/
 
+.. _webpack-whitenoise-limitation:
+
+Webpack without Whitenoise limitation
+-------------------------------------
+
+If you opt for Webpack without Whitenoise, Webpack needs to know the static URL at build time, when running ``docker-compose build`` (See ``webpack/prod.config.js``). Depending on your setup, this URL may come from the following environment variables:
+
+- ``AWS_STORAGE_BUCKET_NAME``
+- ``DJANGO_AWS_S3_CUSTOM_DOMAIN``
+- ``DJANGO_GCP_STORAGE_BUCKET_NAME``
+- ``DJANGO_AZURE_CONTAINER_NAME``
+
+The Django settings are getting these values at runtime via the ``.envs/.production/.django`` file , but Docker does not read this file at build time, it only look for a ``.env`` in the root of the project. Failing to pass the values correctly will result in a page without CSS styles nor javascript.
+
+To solve this, you can either:
+
+1. merge all the env files into ``.env`` by running::
+
+     merge_production_dotenvs_in_dotenv.py
+
+2. create a ``.env`` file in the root of the project with just variables you need. You'll need to also define them in ``.envs/.production/.django`` (hence duplicating them).
+3. set these variables when running the build command::
+
+     DJANGO_AWS_S3_CUSTOM_DOMAIN=example.com docker-compose -f production.yml build``.
+
+None of these options are ideal, we're open to suggestions on how to improve this. If you think you have one, please open an issue or a pull request.
 
 (Optional) Postgres Data Volume Modifications
 ---------------------------------------------
diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index 2b9438059..fb66536fc 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -172,7 +172,7 @@ You can also use Django admin to queue up tasks, thanks to the `django-celerybea
 Sass Compilation & Live Reloading
 ---------------------------------
 
-If you've opted for Gulp as front-end pipeline, the project comes configured with `Sass`_ compilation and `live reloading`_. As you change you Sass/JS source files, the task runner will automatically rebuild the corresponding CSS and JS assets and reload them in your browser without refreshing the page.
+If you've opted for Gulp or Webpack as front-end pipeline, the project comes configured with `Sass`_ compilation and `live reloading`_. As you change you Sass/JS source files, the task runner will automatically rebuild the corresponding CSS and JS assets and reload them in your browser without refreshing the page.
 
 #. Make sure that `Node.js`_ v16 is installed on your machine.
 #. In the project root, install the JS dependencies with::
diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index 0560badd3..d4ad8a9aa 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -95,7 +95,10 @@ frontend_pipeline:
 
     1. None
     2. `Django Compressor`_
-    3. `Gulp`_: support Bootstrap recompilation with real-time variables alteration.
+    3. `Gulp`_
+    4. `Webpack`_
+
+Both Gulp and Webpack support Bootstrap recompilation with real-time variables alteration.
 
 use_celery:
     Indicates whether the project should be configured to use Celery_.
@@ -145,6 +148,7 @@ debug:
 .. _PostgreSQL: https://www.postgresql.org/docs/
 
 .. _Gulp: https://github.com/gulpjs/gulp
+.. _Webpack: https://webpack.js.org
 
 .. _AWS: https://aws.amazon.com/s3/
 .. _GCP: https://cloud.google.com/storage/
diff --git a/docs/troubleshooting.rst b/docs/troubleshooting.rst
index ba8ab53e6..293e9b652 100644
--- a/docs/troubleshooting.rst
+++ b/docs/troubleshooting.rst
@@ -1,5 +1,5 @@
 Troubleshooting
-=====================================
+===============
 
 This page contains some advice about errors and problems commonly encountered during the development of Cookiecutter Django applications.
 
@@ -38,6 +38,16 @@ To fix this, you can either:
 .. _rm: https://docs.docker.com/engine/reference/commandline/volume_rm/
 .. _prune: https://docs.docker.com/v17.09/engine/reference/commandline/system_prune/
 
+Variable is not set. Defaulting to a blank string
+-------------------------------------------------
+
+Example::
+
+    WARN[0000] The "DJANGO_AWS_STORAGE_BUCKET_NAME" variable is not set. Defaulting to a blank string.
+    WARN[0000] The "DJANGO_AWS_S3_CUSTOM_DOMAIN" variable is not set. Defaulting to a blank string.
+
+You have probably opted for Docker + Webpack without Whitenoise. This is a know limitation of the combination, which needs a little bit of manual intervention. See the :ref:`dedicated section about it <webpack-whitenoise-limitation>`.
+
 Others
 ------
 
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index 5655b61f9..b64bbbafd 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -10,6 +10,7 @@ TODO: restrict Cookiecutter Django project initialization to
 """
 from __future__ import print_function
 
+import json
 import os
 import random
 import shutil
@@ -87,15 +88,30 @@ def remove_heroku_build_hooks():
     shutil.rmtree("bin")
 
 
+def remove_sass_files():
+    shutil.rmtree(os.path.join("{{cookiecutter.project_slug}}", "static", "sass"))
+
+
 def remove_gulp_files():
     file_names = ["gulpfile.js"]
     for file_name in file_names:
         os.remove(file_name)
-    remove_sass_files()
 
 
-def remove_sass_files():
-    shutil.rmtree(os.path.join("{{cookiecutter.project_slug}}", "static", "sass"))
+def remove_webpack_files():
+    shutil.rmtree("webpack")
+    remove_vendors_js()
+
+
+def remove_vendors_js():
+    vendors_js_path = os.path.join(
+        "{{ cookiecutter.project_slug }}",
+        "static",
+        "js",
+        "vendors.js",
+    )
+    if os.path.exists(vendors_js_path):
+        os.remove(vendors_js_path)
 
 
 def remove_packagejson_file():
@@ -104,6 +120,83 @@ def remove_packagejson_file():
         os.remove(file_name)
 
 
+def update_package_json(remove_dev_deps=None, remove_keys=None, scripts=None):
+    remove_dev_deps = remove_dev_deps or []
+    remove_keys = remove_keys or []
+    scripts = scripts or {}
+    with open("package.json", mode="r") as fd:
+        content = json.load(fd)
+    for package_name in remove_dev_deps:
+        content["devDependencies"].pop(package_name)
+    for key in remove_keys:
+        content.pop(key)
+    content["scripts"].update(scripts)
+    with open("package.json", mode="w") as fd:
+        json.dump(content, fd, ensure_ascii=False, indent=2)
+        fd.write("\n")
+
+
+def handle_js_runner(choice, use_docker, use_async):
+    if choice == "Gulp":
+        update_package_json(
+            remove_dev_deps=[
+                "@babel/core",
+                "@babel/preset-env",
+                "babel-loader",
+                "concurrently",
+                "css-loader",
+                "mini-css-extract-plugin",
+                "postcss-loader",
+                "postcss-preset-env",
+                "sass-loader",
+                "webpack",
+                "webpack-bundle-tracker",
+                "webpack-cli",
+                "webpack-dev-server",
+                "webpack-merge",
+            ],
+            remove_keys=["babel"],
+            scripts={
+                "dev": "gulp",
+                "build": "gulp generate-assets",
+            },
+        )
+        remove_webpack_files()
+    elif choice == "Webpack":
+        scripts = {
+            "dev": "webpack serve --config webpack/dev.config.js",
+            "build": "webpack --config webpack/prod.config.js",
+        }
+        remove_dev_deps = [
+            "browser-sync",
+            "cssnano",
+            "gulp",
+            "gulp-imagemin",
+            "gulp-plumber",
+            "gulp-postcss",
+            "gulp-rename",
+            "gulp-sass",
+            "gulp-uglify-es",
+        ]
+        if not use_docker:
+            dev_django_cmd = (
+                "uvicorn config.asgi:application --reload"
+                if use_async
+                else "python manage.py runserver_plus"
+            )
+            scripts.update(
+                {
+                    "dev": "concurrently npm:dev:*",
+                    "dev:webpack": "webpack serve --config webpack/dev.config.js",
+                    "dev:django": dev_django_cmd,
+                }
+            )
+        else:
+            remove_dev_deps.append("concurrently")
+        update_package_json(remove_dev_deps=remove_dev_deps, scripts=scripts)
+        remove_gulp_files()
+
+
 def remove_celery_files():
     file_names = [
         os.path.join("config", "celery_app.py"),
@@ -384,13 +477,21 @@ def main():
         if "{{ cookiecutter.keep_local_envs_in_vcs }}".lower() == "y":
             append_to_gitignore_file("!.envs/.local/")
 
-    if "{{ cookiecutter.frontend_pipeline }}" != "Gulp":
+    if "{{ cookiecutter.frontend_pipeline }}" in ["None", "Django Compressor"]:
         remove_gulp_files()
+        remove_webpack_files()
+        remove_sass_files()
         remove_packagejson_file()
         if "{{ cookiecutter.use_docker }}".lower() == "y":
             remove_node_dockerfile()
+    else:
+        handle_js_runner(
+            "{{ cookiecutter.frontend_pipeline }}",
+            use_docker=("{{ cookiecutter.use_docker }}".lower() == "y"),
+            use_async=("{{ cookiecutter.use_async }}".lower() == "y"),
+        )
 
-    if "{{ cookiecutter.cloud_provider}}" == "None":
+    if "{{ cookiecutter.cloud_provider }}" == "None":
         print(
             WARNING + "You chose not to use a cloud provider, "
             "media files won't be served in production." + TERMINATOR
diff --git a/tests/test_bare.sh b/tests/test_bare.sh
index 05da9328b..afd12fec8 100755
--- a/tests/test_bare.sh
+++ b/tests/test_bare.sh
@@ -32,13 +32,11 @@ pytest
 # Make sure the check doesn't raise any warnings
 python manage.py check --fail-level WARNING
 
+# Run npm build script if package.json is present
 if [ -f "package.json" ]
 then
     npm install
-    if [ -f "gulpfile.js" ]
-    then
-        npm run build
-    fi
+    npm run build
 fi
 
 # Generate the HTML for the documentation
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 3a881cc64..5608bf884 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -101,6 +101,7 @@ SUPPORTED_COMBINATIONS = [
     {"frontend_pipeline": "None"},
     {"frontend_pipeline": "Django Compressor"},
     {"frontend_pipeline": "Gulp"},
+    {"frontend_pipeline": "Webpack"},
     {"use_celery": "y"},
     {"use_celery": "n"},
     {"use_mailhog": "y"},
diff --git a/tests/test_docker.sh b/tests/test_docker.sh
index b3663bd2c..28d232896 100755
--- a/tests/test_docker.sh
+++ b/tests/test_docker.sh
@@ -41,3 +41,9 @@ docker-compose -f local.yml run django python manage.py check --fail-level WARNI
 
 # Generate the HTML for the documentation
 docker-compose -f local.yml run docs make html
+
+# Run npm build script if package.json is present
+if [ -f "package.json" ]
+then
+    docker-compose -f local.yml run node npm run build
+fi
diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore
index 17e9249c0..19bb2bc07 100644
--- a/{{cookiecutter.project_slug}}/.gitignore
+++ b/{{cookiecutter.project_slug}}/.gitignore
@@ -348,3 +348,7 @@ vendors.js
 *.min.js
 *.min.js.map
 {%- endif %}
+{%- if cookiecutter.frontend_pipeline == 'Webpack' %}
+{{ cookiecutter.project_slug }}/static/webpack_bundles/
+webpack-stats.json
+{%- endif %}
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/docker_compose_up_django.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/docker_compose_up_django.xml
index ad3b6a35a..e84c5ffdd 100644
--- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/docker_compose_up_django.xml
+++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/docker_compose_up_django.xml
@@ -10,7 +10,7 @@
             <option value="celeryworker"/>
             <option value="celerybeat"/>
             {%- endif %}
-            {%- if cookiecutter.frontend_pipeline == 'Gulp' %}
+            {%- if cookiecutter.frontend_pipeline in ['Gulp', 'Webpack'] %}
             <option value="node"/>
             {%- endif %}
           </list>
diff --git a/{{cookiecutter.project_slug}}/.idea/{{cookiecutter.project_slug}}.iml b/{{cookiecutter.project_slug}}/.idea/{{cookiecutter.project_slug}}.iml
index 98759fa1b..fe1aeae52 100644
--- a/{{cookiecutter.project_slug}}/.idea/{{cookiecutter.project_slug}}.iml
+++ b/{{cookiecutter.project_slug}}/.idea/{{cookiecutter.project_slug}}.iml
@@ -13,7 +13,7 @@
     </facet>
   </component>
   <component name="NewModuleRootManager">
-    {% if cookiecutter.frontend_pipeline == 'Gulp' %}
+    {% if cookiecutter.frontend_pipeline in ['Gulp', 'Webpack'] %}
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/node_modules" />
     </content>
diff --git a/{{cookiecutter.project_slug}}/README.md b/{{cookiecutter.project_slug}}/README.md
index f7c29fb22..16ee6d1fe 100644
--- a/{{cookiecutter.project_slug}}/README.md
+++ b/{{cookiecutter.project_slug}}/README.md
@@ -128,13 +128,14 @@ See detailed [cookiecutter-django Heroku documentation](http://cookiecutter-djan
 See detailed [cookiecutter-django Docker documentation](http://cookiecutter-django.readthedocs.io/en/latest/deployment-with-docker.html).
 
 {%- endif %}
-{%- if cookiecutter.frontend_pipeline == 'Gulp' %}
+{%- if cookiecutter.frontend_pipeline in ['Gulp', 'Webpack'] %}
+
 ### Custom Bootstrap Compilation
 
 The generated CSS is set up with automatic Bootstrap recompilation with variables of your choice.
 Bootstrap v5 is installed using npm and customised by tweaking your variables in `static/sass/custom_bootstrap_vars`.
 
-You can find a list of available variables [in the bootstrap source](https://github.com/twbs/bootstrap/blob/main/scss/_variables.scss), or get explanations on them in the [Bootstrap docs](https://getbootstrap.com/docs/5.1/customize/sass/).
+You can find a list of available variables [in the bootstrap source](https://github.com/twbs/bootstrap/blob/v5.1.3/scss/_variables.scss), or get explanations on them in the [Bootstrap docs](https://getbootstrap.com/docs/5.1/customize/sass/).
 
-Bootstrap's javascript as well as its dependencies is concatenated into a single file: `static/js/vendors.js`.
+Bootstrap's javascript as well as its dependencies are concatenated into a single file: `static/js/vendors.js`.
 {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index 4652f0898..ef80441ba 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -1,6 +1,6 @@
 ARG PYTHON_VERSION=3.10-slim-bullseye
 
-{% if cookiecutter.frontend_pipeline == 'Gulp' -%}
+{% if cookiecutter.frontend_pipeline in ['Gulp', 'Webpack'] -%}
 FROM node:16-bullseye-slim as client-builder
 
 ARG APP_HOME=/app
@@ -9,6 +9,20 @@ WORKDIR ${APP_HOME}
 COPY ./package.json ${APP_HOME}
 RUN npm install && npm cache clean --force
 COPY . ${APP_HOME}
+{%- if cookiecutter.frontend_pipeline == 'Webpack' and cookiecutter.use_whitenoise == 'n' %}
+{%- if cookiecutter.cloud_provider == 'AWS' %}
+ARG DJANGO_AWS_STORAGE_BUCKET_NAME
+ENV DJANGO_AWS_STORAGE_BUCKET_NAME=${DJANGO_AWS_STORAGE_BUCKET_NAME}
+ARG DJANGO_AWS_S3_CUSTOM_DOMAIN
+ENV DJANGO_AWS_S3_CUSTOM_DOMAIN=${DJANGO_AWS_S3_CUSTOM_DOMAIN}
+{%- elif cookiecutter.cloud_provider == 'GCP' %}
+ARG DJANGO_GCP_STORAGE_BUCKET_NAME
+ENV DJANGO_GCP_STORAGE_BUCKET_NAME=${DJANGO_GCP_STORAGE_BUCKET_NAME}
+{%- elif cookiecutter.cloud_provider == 'Azure' %}
+ARG DJANGO_AZURE_ACCOUNT_NAME
+ENV DJANGO_AZURE_ACCOUNT_NAME=${DJANGO_AZURE_ACCOUNT_NAME}
+{%- endif %}
+{%- endif %}
 RUN npm run build
 
 {%- endif %}
@@ -99,7 +113,7 @@ RUN chmod +x /start-flower
 
 
 # copy application code to WORKDIR
-{%- if cookiecutter.frontend_pipeline == 'Gulp' %}
+{%- if cookiecutter.frontend_pipeline in ['Gulp', 'Webpack'] %}
 COPY --from=client-builder --chown=django:django ${APP_HOME} ${APP_HOME}
 {% else %}
 COPY --chown=django:django . ${APP_HOME}
diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 3d93ffb43..cc77b864a 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -87,6 +87,9 @@ THIRD_PARTY_APPS = [
     "corsheaders",
     "drf_spectacular",
 {%- endif %}
+{%- if cookiecutter.frontend_pipeline == 'Webpack' %}
+    "webpack_loader",
+{%- endif %}
 ]
 
 LOCAL_APPS = [
@@ -355,6 +358,19 @@ SPECTACULAR_SETTINGS = {
     "VERSION": "1.0.0",
     "SERVE_PERMISSIONS": ["rest_framework.permissions.IsAdminUser"],
 }
+{%- endif %}
+{%- if cookiecutter.frontend_pipeline == 'Webpack' %}
+# django-webpack-loader
+# ------------------------------------------------------------------------------
+WEBPACK_LOADER = {
+    "DEFAULT": {
+        "CACHE": not DEBUG,
+        "STATS_FILE": BASE_DIR / "webpack-stats.json",
+        "POLL_INTERVAL": 0.1,
+        "IGNORE": [r".+\.hot-update.js", r".+\.map"],
+    }
+}
+
 {%- endif %}
 # Your stuff...
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py
index a5fe0f71c..7220c5e4c 100644
--- a/{{cookiecutter.project_slug}}/config/settings/local.py
+++ b/{{cookiecutter.project_slug}}/config/settings/local.py
@@ -69,7 +69,7 @@ if env("USE_DOCKER") == "yes":
 
     hostname, _, ips = socket.gethostbyname_ex(socket.gethostname())
     INTERNAL_IPS += [".".join(ip.split(".")[:-1] + ["1"]) for ip in ips]
-    {%- if cookiecutter.frontend_pipeline == 'Gulp' %}
+    {%- if cookiecutter.frontend_pipeline in ['Gulp', 'Webpack'] %}
     try:
         _, _, ips = socket.gethostbyname_ex("node")
         INTERNAL_IPS.extend(ips)
@@ -94,6 +94,12 @@ CELERY_TASK_ALWAYS_EAGER = True
 # https://docs.celeryq.dev/en/stable/userguide/configuration.html#task-eager-propagates
 CELERY_TASK_EAGER_PROPAGATES = True
 
+{%- endif %}
+{%- if cookiecutter.frontend_pipeline == 'Webpack' %}
+# django-webpack-loader
+# ------------------------------------------------------------------------------
+WEBPACK_LOADER["DEFAULT"]["CACHE"] = not DEBUG  # noqa F405
+
 {%- endif %}
 # Your stuff...
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/gulpfile.js b/{{cookiecutter.project_slug}}/gulpfile.js
index 40d367bcd..fa3636eab 100644
--- a/{{cookiecutter.project_slug}}/gulpfile.js
+++ b/{{cookiecutter.project_slug}}/gulpfile.js
@@ -10,6 +10,7 @@ const pjson = require('./package.json')
 const autoprefixer = require('autoprefixer')
 const browserSync = require('browser-sync').create()
 const concat = require('gulp-concat')
+const tildeImporter = require('node-sass-tilde-importer');
 const cssnano = require ('cssnano')
 const imagemin = require('gulp-imagemin')
 const pixrem = require('pixrem')
@@ -27,7 +28,6 @@ function pathsConfig(appName) {
   const vendorsRoot = 'node_modules'
 
   return {
-    bootstrapSass: `${vendorsRoot}/bootstrap/scss`,
     vendorsJs: [
       `${vendorsRoot}/@popperjs/core/dist/umd/popper.js`,
       `${vendorsRoot}/bootstrap/dist/js/bootstrap.js`,
@@ -61,8 +61,8 @@ function styles() {
 
   return src(`${paths.sass}/project.scss`)
     .pipe(sass({
+      importer: tildeImporter,
       includePaths: [
-        paths.bootstrapSass,
         paths.sass
       ]
     }).on('error', sass.logError))
diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index 38b9d77d3..66ca3b0ef 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -105,7 +105,7 @@ services:
     command: /start-flower
 
   {%- endif %}
-  {%- if cookiecutter.frontend_pipeline == 'Gulp' %}
+  {%- if cookiecutter.frontend_pipeline in ['Gulp', 'Webpack'] %}
 
   node:
     build:
@@ -122,7 +122,9 @@ services:
     command: npm run dev
     ports:
       - "3000:3000"
+      {%- if cookiecutter.frontend_pipeline == 'Gulp' %}
       # Expose browsersync UI: https://www.browsersync.io/docs/options/#option-ui
       - "3001:3001"
+      {%- endif %}
 
   {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json
index bff0a34af..8137aa51b 100644
--- a/{{cookiecutter.project_slug}}/package.json
+++ b/{{cookiecutter.project_slug}}/package.json
@@ -1,13 +1,17 @@
 {
   "name": "{{cookiecutter.project_slug}}",
   "version": "{{ cookiecutter.version }}",
-  "dependencies": {},
   "devDependencies": {
-    "bootstrap": "^5.1.3",
-    "gulp-concat": "^2.6.1",
+    "@babel/core": "^7.16.5",
+    "@babel/preset-env": "^7.16.5",
     "@popperjs/core": "^2.10.2",
     "autoprefixer": "^10.4.0",
+    "babel-loader": "^8.2.3",
+    "bootstrap": "^5.1.3",
     "browser-sync": "^2.27.7",
+    "css-loader": "^6.5.1",
+    "gulp-concat": "^2.6.1",
+    "concurrently": "^7.0.0",
     "cssnano": "^5.0.11",
     "gulp": "^4.0.2",
     "gulp-imagemin": "^7.1.0",
@@ -16,9 +20,19 @@
     "gulp-rename": "^2.0.0",
     "gulp-sass": "^5.0.0",
     "gulp-uglify-es": "^3.0.0",
+    "mini-css-extract-plugin": "^2.4.5",
+    "node-sass-tilde-importer": "^1.0.2",
     "pixrem": "^5.0.0",
     "postcss": "^8.3.11",
-    "sass": "^1.43.4"
+    "postcss-loader": "^6.2.1",
+    "postcss-preset-env": "^7.0.2",
+    "sass": "^1.43.4",
+    "sass-loader": "^12.4.0",
+    "webpack": "^5.65.0",
+    "webpack-bundle-tracker": "^1.4.0",
+    "webpack-cli": "^4.9.1",
+    "webpack-dev-server": "^4.6.0",
+    "webpack-merge": "^5.8.0"
   },
   "engines": {
     "node": "16"
@@ -26,8 +40,11 @@
   "browserslist": [
     "last 2 versions"
   ],
+  "babel": {
+    "presets": ["@babel/preset-env"]
+  },
   "scripts": {
-    "dev": "gulp",
-    "build": "gulp generate-assets"
+    "dev": "",
+    "build": ""
   }
 }
diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index cc4c9bca1..45c8b3c1d 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -10,6 +10,19 @@ services:
     build:
       context: .
       dockerfile: ./compose/production/django/Dockerfile
+      {%- if cookiecutter.frontend_pipeline == 'Webpack' and cookiecutter.use_whitenoise == 'n' %}
+      args:
+        # These variable can be defined in an .env file in the root of the repo
+        {%- if cookiecutter.cloud_provider == 'AWS' %}
+        DJANGO_AWS_STORAGE_BUCKET_NAME: ${DJANGO_AWS_STORAGE_BUCKET_NAME}
+        DJANGO_AWS_S3_CUSTOM_DOMAIN: ${DJANGO_AWS_S3_CUSTOM_DOMAIN}
+        {%- elif cookiecutter.cloud_provider == 'GCP' %}
+        DJANGO_GCP_STORAGE_BUCKET_NAME: ${DJANGO_GCP_STORAGE_BUCKET_NAME}
+        {%- elif cookiecutter.cloud_provider == 'Azure' %}
+        DJANGO_AZURE_ACCOUNT_NAME: ${DJANGO_AZURE_ACCOUNT_NAME}
+        {%- endif %}
+      {%- endif %}
+
     image: {{ cookiecutter.project_slug }}_production_django
     depends_on:
       - postgres
diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index b695d5af8..46c1e79fc 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -42,7 +42,10 @@ django-redis==5.2.0  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == 'y' %}
 # Django REST Framework
 djangorestframework==3.14.0  # https://github.com/encode/django-rest-framework
-django-cors-headers==3.13.0 # https://github.com/adamchainz/django-cors-headers
+django-cors-headers==3.13.0  # https://github.com/adamchainz/django-cors-headers
 # DRF-spectacular for api documentation
-drf-spectacular==0.25.1  # https://github.com/tfranzel/drf-spectacular 
+drf-spectacular==0.25.1  # https://github.com/tfranzel/drf-spectacular
+{%- endif %}
+{%- if cookiecutter.frontend_pipeline == 'Webpack' %}
+django-webpack-loader==1.8.0  # https://github.com/django-webpack/django-webpack-loader
 {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/webpack/common.config.js b/{{cookiecutter.project_slug}}/webpack/common.config.js
new file mode 100644
index 000000000..41efb1c77
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/webpack/common.config.js
@@ -0,0 +1,55 @@
+const path = require('path');
+const BundleTracker = require('webpack-bundle-tracker');
+const MiniCssExtractPlugin = require('mini-css-extract-plugin');
+
+module.exports = {
+  target: "web",
+  context: path.join(__dirname, '../'),
+  entry: {
+    'project': path.resolve(__dirname, '../{{cookiecutter.project_slug}}/static/js/project'),
+    'vendors': path.resolve(__dirname, '../{{cookiecutter.project_slug}}/static/js/vendors'),
+  },
+  output: {
+    path: path.resolve(__dirname, '../{{cookiecutter.project_slug}}/static/webpack_bundles/'),
+    publicPath: '/static/webpack_bundles/',
+    filename: 'js/[name]-[fullhash].js',
+    chunkFilename: 'js/[name]-[hash].js',
+  },
+  plugins: [
+    new BundleTracker({filename: path.resolve(__dirname, '../webpack-stats.json')}),
+    new MiniCssExtractPlugin({ filename: 'css/[name].[contenthash].css' }),
+  ],
+  module: {
+    rules: [
+      // we pass the output from babel loader to react-hot loader
+      {
+        test: /\.js$/,
+        loader: 'babel-loader',
+      },
+      {
+        test: /\.s?css$/i,
+        use: [
+          MiniCssExtractPlugin.loader,
+          'css-loader',
+          {
+            loader: 'postcss-loader',
+            options: {
+              postcssOptions: {
+                plugins: [
+                  'postcss-preset-env',
+                  'autoprefixer',
+                  'pixrem',
+                ],
+              },
+            },
+          },
+          'sass-loader',
+        ],
+      },
+    ],
+  },
+  resolve: {
+    modules: ['node_modules'],
+    extensions: ['.js', '.jsx'],
+  },
+};
diff --git a/{{cookiecutter.project_slug}}/webpack/dev.config.js b/{{cookiecutter.project_slug}}/webpack/dev.config.js
new file mode 100644
index 000000000..c2f14abb1
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/webpack/dev.config.js
@@ -0,0 +1,20 @@
+const { merge } = require('webpack-merge');
+const commonConfig = require('./common.config');
+
+module.exports = merge(commonConfig, {
+  mode: 'development',
+  devtool: 'inline-source-map',
+  devServer: {
+    port: 3000,
+    proxy: {
+      {%- if cookiecutter.use_docker == 'n' %}
+      '/': 'http://0.0.0.0:8000',
+      {%- else %}
+      '/': 'http://django:8000',
+      {%- endif %}
+    },
+    // We need hot=false (Disable HMR) to set liveReload=true
+    hot: false,
+    liveReload: true,
+  },
+});
diff --git a/{{cookiecutter.project_slug}}/webpack/prod.config.js b/{{cookiecutter.project_slug}}/webpack/prod.config.js
new file mode 100644
index 000000000..b9c2186e5
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/webpack/prod.config.js
@@ -0,0 +1,28 @@
+const { merge } = require('webpack-merge');
+const commonConfig = require('./common.config');
+
+// This variable should mirror the one from config/settings/production.py
+{%- if cookiecutter.use_whitenoise == 'n' %}
+{%- if cookiecutter.cloud_provider == 'AWS' %}
+const s3BucketName = process.env.DJANGO_AWS_STORAGE_BUCKET_NAME;
+const awsS3Domain = process.env.DJANGO_AWS_S3_CUSTOM_DOMAIN ?
+    process.env.DJANGO_AWS_S3_CUSTOM_DOMAIN
+    : `${s3BucketName}.s3.amazonaws.com`;
+const staticUrl = `https://${awsS3Domain}/static/`;
+{%- elif cookiecutter.cloud_provider == 'GCP' %}
+const staticUrl = `https://storage.googleapis.com/${process.env.DJANGO_GCP_STORAGE_BUCKET_NAME}/static/`;
+{%- elif cookiecutter.cloud_provider == 'Azure' %}
+const staticUrl = `https://${process.env.DJANGO_AZURE_ACCOUNT_NAME}.blob.core.windows.net/static/`;
+{%- endif %}
+{%- else %}
+const staticUrl = '/static/';
+{%- endif %}
+
+module.exports = merge(commonConfig, {
+  mode: 'production',
+  devtool: 'source-map',
+  bail: true,
+  output: {
+    publicPath: `${staticUrl}webpack_bundles/`,
+  },
+});
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/js/project.js b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/js/project.js
index d26d23b9b..62770f1c9 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/js/project.js
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/js/project.js
@@ -1 +1,5 @@
+{%- if cookiecutter.frontend_pipeline == 'Webpack' %}
+import '../sass/project.scss';
+{%- endif %}
+
 /* Project specific Javascript goes here. */
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/js/vendors.js b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/js/vendors.js
new file mode 100644
index 000000000..093840f87
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/js/vendors.js
@@ -0,0 +1,2 @@
+import '@popperjs/core';
+import 'bootstrap';
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss
index 370096bb3..c9511e720 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss
@@ -1,5 +1,5 @@
 @import "custom_bootstrap_vars";
-@import "bootstrap";
+@import "~bootstrap/scss/bootstrap";
 
 
 // project specific CSS goes here
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
index 58aca7208..05cc449db 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -1,4 +1,8 @@
-{% raw %}{% load static i18n {% endraw %}{% if cookiecutter.frontend_pipeline == 'Django Compressor' %}compress{% endif %}{% raw %}%}<!DOCTYPE html>
+{% raw %}{% load static i18n {% endraw %}
+{%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}compress
+{%- endif %}{% raw %}%}{% endraw %}
+{%- if cookiecutter.frontend_pipeline == 'Webpack' %}{% raw %}{% load render_bundle from webpack_loader %}{% endraw %}
+{%- endif %}{% raw %}<!DOCTYPE html>
 {% get_current_language as LANGUAGE_CODE %}
 <html lang="{{ LANGUAGE_CODE }}">
   <head>
@@ -13,7 +17,7 @@
 
     {% block css %}
     {%- endraw %}
-    {%- if cookiecutter.frontend_pipeline != 'Gulp' %}
+    {%- if cookiecutter.frontend_pipeline in ['None', 'Django Compressor'] %}
     {%- raw %}
     <!-- Latest compiled and minified Bootstrap CSS -->
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.3/css/bootstrap.min.css" integrity="sha512-GQGU0fMMi238uA+a/bdWJfpUGKUkBdgfFdgBm72SUQ6BeyWjoY/ton0tEjH+OSH9iP4Dfh+7HM0I9f5eR0L/4w==" crossorigin="anonymous" referrerpolicy="no-referrer" />
@@ -31,6 +35,8 @@
     {% endcompress %}
     {%- endraw %}{% elif cookiecutter.frontend_pipeline == 'Gulp' %}{% raw %}
     <link href="{% static 'css/project.min.css' %}" rel="stylesheet">
+    {%- endraw %}{% elif cookiecutter.frontend_pipeline == "Webpack" %}{% raw %}
+    {% render_bundle 'project' 'css' %}
     {%- endraw %}{% endif %}{% raw %}
     {% endblock %}
     <!-- Le javascript
@@ -38,8 +44,11 @@
     {# Placed at the top of the document so pages load faster with defer #}
     {% block javascript %}
       {%- endraw %}{% if cookiecutter.frontend_pipeline == 'Gulp' %}{% raw %}
-      <!-- Vendor dependencies bundled as one file-->
+      <!-- Vendor dependencies bundled as one file -->
       <script defer src="{% static 'js/vendors.min.js' %}"></script>
+      {%- endraw %}{% elif cookiecutter.frontend_pipeline == "Webpack" %}{% raw %}
+      <!-- Vendor dependencies bundled as one file -->
+      {% render_bundle 'vendors' 'js' attrs='defer' %}
       {%- endraw %}{% else %}{% raw %}
       <!-- Bootstrap JS -->
       <script defer src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.3/js/bootstrap.min.js" integrity="sha512-OvBgP9A2JBgiRad/mM36mkzXSXaJE9BEIENnVEmeZdITvwT09xnxLtT4twkCa8m/loMbPHsvPl0T8lRGVBwjlQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
@@ -55,6 +64,8 @@
       {% endcompress %}
       {%- endraw %}{% elif cookiecutter.frontend_pipeline == 'Gulp' %}{% raw %}
       <script defer src="{% static 'js/project.min.js' %}"></script>
+      {%- endraw %}{% elif cookiecutter.frontend_pipeline == "Webpack" %}{% raw %}
+      {% render_bundle 'project' 'js' attrs='defer' %}
       {%- endraw %}{% endif %}{% raw %}
 
     {% endblock javascript %}

From 3bca38c78d77ecdd9b1ae9af52b373c4277a9c1a Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Mon, 30 Jan 2023 13:05:29 +0000
Subject: [PATCH 2518/2840] Release 2023.01.29

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0c317f025..b501ac597 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 -->
 
+## 2023.01.29
+
+### Changed
+- Add Webpack support  ([#3623](https://github.com/cookiecutter/cookiecutter-django/pull/3623))
+- Remove `BrokenLinkEmailsMiddleware` ([#4112](https://github.com/cookiecutter/cookiecutter-django/pull/4112))
+
 ## 2023.01.28
 
 ### Changed
diff --git a/setup.py b/setup.py
index f8321406d..4182d2047 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.01.28"
+version = "2023.01.29"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 119df8c61b02673051c6dbc2cfb27ee666031a2f Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 2 Feb 2023 06:25:41 -0500
Subject: [PATCH 2519/2840] Update black to 23.1.0 (#4120)

* Update black from 22.12.0 to 23.1.0

* Update black from 22.12.0 to 23.1.0

* Update code style according to newer version of black

* Update black pre-commit hook (#4122)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>

---------

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                                        | 2 +-
 requirements.txt                                               | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml          | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt           | 2 +-
 .../{{cookiecutter.project_slug}}/users/admin.py               | 1 -
 .../{{cookiecutter.project_slug}}/users/tests/factories.py     | 1 -
 .../{{cookiecutter.project_slug}}/users/views.py               | 3 ---
 7 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 0617dd66c..438de52b4 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -16,7 +16,7 @@ repos:
         exclude: hooks/
 
   - repo: https://github.com/psf/black
-    rev: 22.12.0
+    rev: 23.1.0
     hooks:
       - id: black
 
diff --git a/requirements.txt b/requirements.txt
index 2b7c69d33..08c1568dc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-black==22.12.0
+black==23.1.0
 isort==5.12.0
 flake8==6.0.0
 flake8-isort==6.0.0
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index a273bdf17..a8cdb1357 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -16,7 +16,7 @@ repos:
         args: [--py310-plus]
 
   - repo: https://github.com/psf/black
-    rev: 22.12.0
+    rev: 23.1.0
     hooks:
       - id: black
 
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index ef0342a32..a64b073d1 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -31,7 +31,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 flake8==6.0.0  # https://github.com/PyCQA/flake8
 flake8-isort==6.0.0  # https://github.com/gforcada/flake8-isort
 coverage==7.1.0  # https://github.com/nedbat/coveragepy
-black==22.12.0  # https://github.com/psf/black
+black==23.1.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py
index 6675f483a..ff492a57f 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py
@@ -10,7 +10,6 @@ User = get_user_model()
 
 @admin.register(User)
 class UserAdmin(auth_admin.UserAdmin):
-
     form = UserAdminChangeForm
     add_form = UserAdminCreationForm
     fieldsets = (
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
index e30476227..36f963438 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
@@ -7,7 +7,6 @@ from factory.django import DjangoModelFactory
 
 
 class UserFactory(DjangoModelFactory):
-
     username = Faker("user_name")
     email = Faker("email")
     name = Faker("name")
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
index baa04a0d4..488c294d0 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
@@ -9,7 +9,6 @@ User = get_user_model()
 
 
 class UserDetailView(LoginRequiredMixin, DetailView):
-
     model = User
     slug_field = "username"
     slug_url_kwarg = "username"
@@ -19,7 +18,6 @@ user_detail_view = UserDetailView.as_view()
 
 
 class UserUpdateView(LoginRequiredMixin, SuccessMessageMixin, UpdateView):
-
     model = User
     fields = ["name"]
     success_message = _("Information successfully updated")
@@ -38,7 +36,6 @@ user_update_view = UserUpdateView.as_view()
 
 
 class UserRedirectView(LoginRequiredMixin, RedirectView):
-
     permanent = False
 
     def get_redirect_url(self):

From 3150813bdb75283583d9e7f7e92f9990c231f0c3 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 2 Feb 2023 06:28:16 -0500
Subject: [PATCH 2520/2840] Update pre-commit to 3.0.3 (#4121)

* Update pre-commit from 3.0.1 to 3.0.3

* Update pre-commit from 3.0.1 to 3.0.3
---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 08c1568dc..6e458e6be 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ black==23.1.0
 isort==5.12.0
 flake8==6.0.0
 flake8-isort==6.0.0
-pre-commit==3.0.1
+pre-commit==3.0.3
 
 # Testing
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index a64b073d1..9a45f5c7e 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -36,7 +36,7 @@ pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}
-pre-commit==3.0.1  # https://github.com/pre-commit/pre-commit
+pre-commit==3.0.3  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From ac3e5da6c1efce35644df26aed7ea4dfa88ec0db Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 2 Feb 2023 06:30:25 -0500
Subject: [PATCH 2521/2840] Update python-slugify to 8.0.0 (#4111)

---
 {{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 46c1e79fc..0aa17a5f9 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,5 +1,5 @@
 pytz==2022.7.1  # https://github.com/stub42/pytz
-python-slugify==7.0.0  # https://github.com/un33k/python-slugify
+python-slugify==8.0.0  # https://github.com/un33k/python-slugify
 Pillow==9.4.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
 {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %}

From 76a987ac563db5383e7bda5ded4367f88652eb64 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 3 Feb 2023 02:29:58 +0000
Subject: [PATCH 2522/2840] Release 2023.02.02

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b501ac597..85bccefd4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.02.02
+
+### Updated
+- Update python-slugify to 8.0.0 ([#4111](https://github.com/cookiecutter/cookiecutter-django/pull/4111))
+- Update pre-commit to 3.0.3 ([#4121](https://github.com/cookiecutter/cookiecutter-django/pull/4121))
+- Update black to 23.1.0 ([#4120](https://github.com/cookiecutter/cookiecutter-django/pull/4120))
+- Update black pre-commit hook ([#4122](https://github.com/cookiecutter/cookiecutter-django/pull/4122))
+
 ## 2023.01.29
 
 ### Changed
diff --git a/setup.py b/setup.py
index 4182d2047..cc0e60d8f 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.01.29"
+version = "2023.02.02"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 3f05da0ee77551520ddbbb4d11681ee6f504dccf Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 3 Feb 2023 13:54:51 -0500
Subject: [PATCH 2523/2840] Update pre-commit to 3.0.4 (#4127)

* Update pre-commit from 3.0.3 to 3.0.4

* Update pre-commit from 3.0.3 to 3.0.4
---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 6e458e6be..6c554aaae 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ black==23.1.0
 isort==5.12.0
 flake8==6.0.0
 flake8-isort==6.0.0
-pre-commit==3.0.3
+pre-commit==3.0.4
 
 # Testing
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 9a45f5c7e..8905ddb76 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -36,7 +36,7 @@ pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}
-pre-commit==3.0.3  # https://github.com/pre-commit/pre-commit
+pre-commit==3.0.4  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From d4865711ecc231cc3a29930fa7acd490d243c85e Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 4 Feb 2023 02:22:36 +0000
Subject: [PATCH 2524/2840] Release 2023.02.03

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 85bccefd4..0451b1ead 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 -->
 
+## 2023.02.03
+
+### Updated
+- Update pre-commit to 3.0.4 ([#4127](https://github.com/cookiecutter/cookiecutter-django/pull/4127))
+
 ## 2023.02.02
 
 ### Updated
diff --git a/setup.py b/setup.py
index cc0e60d8f..b180a6eca 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.02.02"
+version = "2023.02.03"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 1f300e0ca26285ef541dfa06e185213ba52afb29 Mon Sep 17 00:00:00 2001
From: duffn <3457341+duffn@users.noreply.github.com>
Date: Sun, 5 Feb 2023 03:00:28 -0700
Subject: [PATCH 2525/2840] Add note about which service to request when
 running locally with Docker & Webpack or Gulp (#4130)

* Add note about running Webpack locally with Docker

* Add note about running Gulp locally with Docker
---
 docs/developing-locally-docker.rst | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index a7d77e108..935e86020 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -213,6 +213,11 @@ By default, it's enabled both in local and production environments (``local.yml`
 
 .. _`Flower`: https://github.com/mher/flower
 
+Using Webpack or Gulp
+~~~~~~~~~~~~~~~~~~~~~
+
+When using Webpack or Gulp as the ``frontend_pipeline`` option, you should access your application at the address of the ``node`` service in order to see your correct styles. This is http://localhost:3000 by default. When using any of the other ``frontend_pipeline`` options, you should use the address of the ``django`` service, http://localhost:8000.
+
 Developing locally with HTTPS
 -----------------------------
 

From 170cd6fe18e0627354167e29258bdfebe6f53bb1 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sun, 5 Feb 2023 10:01:04 +0000
Subject: [PATCH 2526/2840] 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 0f923e027..7920e8caf 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1357,5 +1357,10 @@
     "name": "tildebox",
     "github_login": "tildebox",
     "twitter_username": ""
+  },
+  {
+    "name": "duffn",
+    "github_login": "duffn",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 57194bca3..85b1ae88f 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -705,6 +705,13 @@ Listed in alphabetical order.
     </td>
     <td>dudanogueira</td>
   </tr>
+  <tr>
+    <td>duffn</td>
+    <td>
+      <a href="https://github.com/duffn">duffn</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Dónal Adams</td>
     <td>

From 1f65656dafeb9f3ac8a4a3951afb55b090ac91dd Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sun, 5 Feb 2023 10:03:22 +0000
Subject: [PATCH 2527/2840] Ignore some changes and group documentation changes
 into their own section (#4125)

---
 scripts/update_changelog.py | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/update_changelog.py b/scripts/update_changelog.py
index b50d25066..57d915a4b 100644
--- a/scripts/update_changelog.py
+++ b/scripts/update_changelog.py
@@ -82,14 +82,20 @@ def group_pulls_by_change_type(
     grouped_pulls = {
         "Changed": [],
         "Fixed": [],
+        "Documentation": [],
         "Updated": [],
     }
     for pull in pull_requests_list:
         label_names = {label.name for label in pull.labels}
+        if "project infrastructure" in label_names:
+            # Don't mention it in the changelog
+            continue
         if "update" in label_names:
             group_name = "Updated"
         elif "bug" in label_names:
             group_name = "Fixed"
+        elif "docs" in label_names:
+            group_name = "Documentation"
         else:
             group_name = "Changed"
         grouped_pulls[group_name].append(pull)

From 1de268d87bcd96a54e42c1c3350e512d4b13121d Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Mon, 6 Feb 2023 02:25:10 +0000
Subject: [PATCH 2528/2840] Release 2023.02.05

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 0451b1ead..3389bf883 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 -->
 
+## 2023.02.05
+
+### Documentation
+- Add note about which service to request when running locally with Docker &amp; Webpack or Gulp ([#4130](https://github.com/cookiecutter/cookiecutter-django/pull/4130))
+
 ## 2023.02.03
 
 ### Updated
diff --git a/setup.py b/setup.py
index b180a6eca..4a45827d8 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.02.03"
+version = "2023.02.05"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From c24fa1f6c4c1de0e50d0a3a7a90b21eb1c1f6282 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 6 Feb 2023 09:46:39 -0500
Subject: [PATCH 2529/2840] Update django-webpack-loader to 1.8.1 (#4132)

---
 {{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 0aa17a5f9..865d625e8 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -47,5 +47,5 @@ django-cors-headers==3.13.0  # https://github.com/adamchainz/django-cors-headers
 drf-spectacular==0.25.1  # https://github.com/tfranzel/drf-spectacular
 {%- endif %}
 {%- if cookiecutter.frontend_pipeline == 'Webpack' %}
-django-webpack-loader==1.8.0  # https://github.com/django-webpack/django-webpack-loader
+django-webpack-loader==1.8.1  # https://github.com/django-webpack/django-webpack-loader
 {%- endif %}

From d76c3de4e67a2a856478b133e316d9888b73b8fb Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 6 Feb 2023 10:09:22 -0500
Subject: [PATCH 2530/2840] Update django to 4.0.9 (#4134)

---
 {{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 865d625e8..dc87f7b88 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,7 +29,7 @@ uvicorn[standard]==0.20.0  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==4.0.8  # pyup: < 4.1  # https://www.djangoproject.com/
+django==4.0.9  # pyup: < 4.1  # https://www.djangoproject.com/
 django-environ==0.9.0  # https://github.com/joke2k/django-environ
 django-model-utils==4.3.1  # https://github.com/jazzband/django-model-utils
 django-allauth==0.52.0  # https://github.com/pennersr/django-allauth

From 4080e9a86df8c0ba080cc7fe3b54df0f7a4e74f0 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 6 Feb 2023 16:16:48 +0000
Subject: [PATCH 2531/2840] Fix django-webpack-loader setup when running tests
 (#4128)

* Add an integration test

This should cover the problem raised for webpack loader issues

* Add a DummyWebpackLoader for running tests

* Replace DummyWebpackLoader by the one from webpack_loader package

* Fix post-gen hook

* Remove integration test
---
 {{cookiecutter.project_slug}}/config/settings/test.py | 8 ++++++++
 1 file changed, 8 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/config/settings/test.py b/{{cookiecutter.project_slug}}/config/settings/test.py
index 198b5aa5d..587b99324 100644
--- a/{{cookiecutter.project_slug}}/config/settings/test.py
+++ b/{{cookiecutter.project_slug}}/config/settings/test.py
@@ -29,5 +29,13 @@ EMAIL_BACKEND = "django.core.mail.backends.locmem.EmailBackend"
 # ------------------------------------------------------------------------------
 TEMPLATES[0]["OPTIONS"]["debug"] = True  # type: ignore # noqa F405
 
+{%- if cookiecutter.frontend_pipeline == 'Webpack' %}
+# django-webpack-loader
+# ------------------------------------------------------------------------------
+WEBPACK_LOADER["DEFAULT"][  # noqa F405
+    "LOADER_CLASS"
+] = "webpack_loader.loader.FakeWebpackLoader"
+
+{%- endif %}
 # Your stuff...
 # ------------------------------------------------------------------------------

From 8810677961ecc78fa8728fc894fcb02af9ff5a3e Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 6 Feb 2023 11:22:44 -0500
Subject: [PATCH 2532/2840] Update tox to 4.4.4 (#4133)

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

diff --git a/requirements.txt b/requirements.txt
index 6c554aaae..64695482d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==3.0.4
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.4.2
+tox==4.4.4
 pytest==7.2.1
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From 5bc4bed95208e9b9139fab63327edb101219b9e9 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 6 Feb 2023 18:33:08 +0000
Subject: [PATCH 2533/2840] Change `RequestFactory` to `APIRequestFactory` in
 tests for API views (#4110)

---
 .../users/tests/test_drf_views.py                 | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
index 4d163bf08..10ad100f1 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
@@ -1,22 +1,27 @@
-from django.test import RequestFactory
+import pytest
+from rest_framework.test import APIRequestFactory
 
 from {{ cookiecutter.project_slug }}.users.api.views import UserViewSet
 from {{ cookiecutter.project_slug }}.users.models import User
 
 
 class TestUserViewSet:
-    def test_get_queryset(self, user: User, rf: RequestFactory):
+    @pytest.fixture
+    def api_rf(self) -> APIRequestFactory:
+        return APIRequestFactory()
+
+    def test_get_queryset(self, user: User, api_rf: APIRequestFactory):
         view = UserViewSet()
-        request = rf.get("/fake-url/")
+        request = api_rf.get("/fake-url/")
         request.user = user
 
         view.request = request
 
         assert user in view.get_queryset()
 
-    def test_me(self, user: User, rf: RequestFactory):
+    def test_me(self, user: User, api_rf: APIRequestFactory):
         view = UserViewSet()
-        request = rf.get("/fake-url/")
+        request = api_rf.get("/fake-url/")
         request.user = user
 
         view.request = request

From 9be5544464995fb34700014e49ed0da1380c67fd Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 6 Feb 2023 14:13:12 -0500
Subject: [PATCH 2534/2840] Update hiredis to 2.2.1 (#4123)

* Update hiredis from 2.1.1 to 2.2.1

* Update hiredis from 2.1.1 to 2.2.1
---
 {{cookiecutter.project_slug}}/requirements/base.txt       | 2 +-
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index dc87f7b88..de53d9084 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -14,7 +14,7 @@ whitenoise==6.3.0  # https://github.com/evansd/whitenoise
 {%- endif %}
 redis==4.4.2  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
-hiredis==2.1.1  # https://github.com/redis/hiredis-py
+hiredis==2.2.1  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
 celery==5.2.7  # pyup: < 6.0  # https://github.com/celery/celery
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 6936adffd..8cdd85faf 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.14.0  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
-hiredis==2.1.1  # https://github.com/redis/hiredis-py
+hiredis==2.2.1  # https://github.com/redis/hiredis-py
 {%- endif %}
 
 # Django

From 86eec800b820d165c4ab1adb1b1f9fe95a1e9899 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Mon, 6 Feb 2023 14:38:51 -0500
Subject: [PATCH 2535/2840] Added AWS ECS Full Deployment Article to README
 (#2630)

* Added AWS ECS Full Deployment Article

* Just for a refresher

* Add AWS ECS Full Deployment Article by Andrew Chen Wang

---------

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 0697862c5..40d44f570 100644
--- a/README.md
+++ b/README.md
@@ -234,6 +234,7 @@ experience better.
 ## Articles
 
 -   [Cookiecutter Django With Amazon RDS](https://haseeburrehman.com/posts/cookiecutter-django-with-amazon-rds/) - Apr, 2, 2021
+-   [Complete Walkthrough: Blue/Green Deployment to AWS ECS using GitHub actions](https://github.com/Andrew-Chen-Wang/cookiecutter-django-ecs-github) - June 10, 2020
 -   [Using cookiecutter-django with Google Cloud Storage](https://ahhda.github.io/cloud/gce/django/2019/03/12/using-django-cookiecutter-cloud-storage.html) - Mar. 12, 2019
 -   [cookiecutter-django with Nginx, Route 53 and ELB](https://msaizar.com/blog/cookiecutter-django-nginx-route-53-and-elb/) - Feb. 12, 2018
 -   [cookiecutter-django and Amazon RDS](https://msaizar.com/blog/cookiecutter-django-and-amazon-rds/) - Feb. 7, 2018

From d41d2a36064aba1b0915c5840786425f03d9a0e1 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 6 Feb 2023 20:41:47 +0000
Subject: [PATCH 2536/2840] Update template docker images using Dependabot
 (#4124)

---
 .github/dependabot.yml | 53 ++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 53 insertions(+)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 8922cd450..d95192f33 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -18,3 +18,56 @@ updates:
       interval: "daily"
     labels:
       - "update"
+
+  # Enable version updates for Docker
+  # We need to specify each Dockerfile in a separate entry because Dependabot doesn't
+  # support wildcards or recursively checking subdirectories. Check this issue for updates:
+  # https://github.com/dependabot/dependabot-core/issues/2178
+  - package-ecosystem: "docker"
+    directory: "{{cookiecutter.project_slug}}/compose/local/django/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "update"
+
+  - package-ecosystem: "docker"
+    directory: "{{cookiecutter.project_slug}}/compose/local/docs/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "update"
+
+  - package-ecosystem: "docker"
+    directory: "{{cookiecutter.project_slug}}/compose/local/node/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "update"
+
+  - package-ecosystem: "docker"
+    directory: "{{cookiecutter.project_slug}}/compose/production/aws/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "update"
+
+  - package-ecosystem: "docker"
+    directory: "{{cookiecutter.project_slug}}/compose/production/django/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "update"
+
+  - package-ecosystem: "docker"
+    directory: "{{cookiecutter.project_slug}}/compose/production/postgres/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "update"
+
+  - package-ecosystem: "docker"
+    directory: "{{cookiecutter.project_slug}}/compose/production/traefik/"
+    schedule:
+      interval: "daily"
+    labels:
+      - "update"

From 1567564158e5a5218bf659c4310f27548ac3d0ec Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 7 Feb 2023 02:39:47 +0000
Subject: [PATCH 2537/2840] Release 2023.02.06

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3389bf883..e2f5252f8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,20 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.02.06
+
+### Changed
+- Change `RequestFactory` to `APIRequestFactory` in tests for API views ([#4110](https://github.com/cookiecutter/cookiecutter-django/pull/4110))
+### Fixed
+- Fix django-webpack-loader setup when running tests ([#4128](https://github.com/cookiecutter/cookiecutter-django/pull/4128))
+### Documentation
+- Added AWS ECS Full Deployment Article to README ([#2630](https://github.com/cookiecutter/cookiecutter-django/pull/2630))
+### Updated
+- Update hiredis to 2.2.1 ([#4123](https://github.com/cookiecutter/cookiecutter-django/pull/4123))
+- Update tox to 4.4.4 ([#4133](https://github.com/cookiecutter/cookiecutter-django/pull/4133))
+- Update django to 4.0.9 ([#4134](https://github.com/cookiecutter/cookiecutter-django/pull/4134))
+- Update django-webpack-loader to 1.8.1 ([#4132](https://github.com/cookiecutter/cookiecutter-django/pull/4132))
+
 ## 2023.02.05
 
 ### Documentation
diff --git a/setup.py b/setup.py
index 4a45827d8..8eff57a38 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.02.05"
+version = "2023.02.06"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From dc68912c07b649d40f7ecd2f7ec45b1a10deb3c6 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 7 Feb 2023 09:20:32 -0500
Subject: [PATCH 2538/2840] Update sentry-sdk to 1.15.0 (#4141)

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

From fade9bd0acdf58282356f3462d7edb8f543a9659 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 7 Feb 2023 12:43:11 -0500
Subject: [PATCH 2539/2840] Update redis to 4.5.0 (#4142)

---
 {{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 de53d9084..519efdfd2 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -12,7 +12,7 @@ argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==6.3.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==4.4.2  # https://github.com/redis/redis-py
+redis==4.5.0  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.2.1  # https://github.com/redis/hiredis-py
 {%- endif %}

From 2db71965cab5d624a5a83b39ff49f42c41ce62a2 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Feb 2023 20:35:46 +0000
Subject: [PATCH 2540/2840] Bump webpack-cli from 4.10.0 to 5.0.1 in
 /{{cookiecutter.project_slug}} (#4118)

Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 4.10.0 to 5.0.1.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/webpack-cli@4.10.0...webpack-cli@5.0.1)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json
index 8137aa51b..6488bcfb8 100644
--- a/{{cookiecutter.project_slug}}/package.json
+++ b/{{cookiecutter.project_slug}}/package.json
@@ -30,7 +30,7 @@
     "sass-loader": "^12.4.0",
     "webpack": "^5.65.0",
     "webpack-bundle-tracker": "^1.4.0",
-    "webpack-cli": "^4.9.1",
+    "webpack-cli": "^5.0.1",
     "webpack-dev-server": "^4.6.0",
     "webpack-merge": "^5.8.0"
   },

From 3d4fa2fcae2e9e75ae560a3cf10caf8f55dbfcbc Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Feb 2023 20:36:36 +0000
Subject: [PATCH 2541/2840] Bump postcss-loader from 6.2.1 to 7.0.2 (#4114)

Bumps [postcss-loader](https://github.com/webpack-contrib/postcss-loader) from 6.2.1 to 7.0.2.
- [Release notes](https://github.com/webpack-contrib/postcss-loader/releases)
- [Changelog](https://github.com/webpack-contrib/postcss-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/postcss-loader/compare/v6.2.1...v7.0.2)

---
updated-dependencies:
- dependency-name: postcss-loader
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json
index 6488bcfb8..fd464b548 100644
--- a/{{cookiecutter.project_slug}}/package.json
+++ b/{{cookiecutter.project_slug}}/package.json
@@ -24,7 +24,7 @@
     "node-sass-tilde-importer": "^1.0.2",
     "pixrem": "^5.0.0",
     "postcss": "^8.3.11",
-    "postcss-loader": "^6.2.1",
+    "postcss-loader": "^7.0.2",
     "postcss-preset-env": "^7.0.2",
     "sass": "^1.43.4",
     "sass-loader": "^12.4.0",

From a3cfb0f0e8e305a79ea4d93692e1c780efbc4d35 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Feb 2023 20:38:45 +0000
Subject: [PATCH 2542/2840] Bump babel-loader from 8.3.0 to 9.1.2 (#4117)

Bumps [babel-loader](https://github.com/babel/babel-loader) from 8.3.0 to 9.1.2.
- [Release notes](https://github.com/babel/babel-loader/releases)
- [Changelog](https://github.com/babel/babel-loader/blob/main/CHANGELOG.md)
- [Commits](https://github.com/babel/babel-loader/compare/v8.3.0...v9.1.2)

---
updated-dependencies:
- dependency-name: babel-loader
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json
index fd464b548..ece347ab5 100644
--- a/{{cookiecutter.project_slug}}/package.json
+++ b/{{cookiecutter.project_slug}}/package.json
@@ -6,7 +6,7 @@
     "@babel/preset-env": "^7.16.5",
     "@popperjs/core": "^2.10.2",
     "autoprefixer": "^10.4.0",
-    "babel-loader": "^8.2.3",
+    "babel-loader": "^9.1.2",
     "bootstrap": "^5.1.3",
     "browser-sync": "^2.27.7",
     "css-loader": "^6.5.1",

From ff9da7ec1bd84f23abb162bee41d4ee8e7772c52 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Feb 2023 20:47:49 +0000
Subject: [PATCH 2543/2840] Bump sass-loader from 12.6.0 to 13.2.0 (#4116)

Bumps [sass-loader](https://github.com/webpack-contrib/sass-loader) from 12.6.0 to 13.2.0.
- [Release notes](https://github.com/webpack-contrib/sass-loader/releases)
- [Changelog](https://github.com/webpack-contrib/sass-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/sass-loader/compare/v12.6.0...v13.2.0)

---
updated-dependencies:
- dependency-name: sass-loader
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json
index ece347ab5..db475baf1 100644
--- a/{{cookiecutter.project_slug}}/package.json
+++ b/{{cookiecutter.project_slug}}/package.json
@@ -27,7 +27,7 @@
     "postcss-loader": "^7.0.2",
     "postcss-preset-env": "^7.0.2",
     "sass": "^1.43.4",
-    "sass-loader": "^12.4.0",
+    "sass-loader": "^13.2.0",
     "webpack": "^5.65.0",
     "webpack-bundle-tracker": "^1.4.0",
     "webpack-cli": "^5.0.1",

From e81b483944aa0351db66cb6ddffa77e389b8150a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 7 Feb 2023 20:57:51 +0000
Subject: [PATCH 2544/2840] Bump postcss-preset-env from 7.8.3 to 8.0.1 (#4115)

Bumps [postcss-preset-env](https://github.com/csstools/postcss-plugins/tree/HEAD/plugin-packs/postcss-preset-env) from 7.8.3 to 8.0.1.
- [Release notes](https://github.com/csstools/postcss-plugins/releases)
- [Changelog](https://github.com/csstools/postcss-plugins/blob/main/plugin-packs/postcss-preset-env/CHANGELOG.md)
- [Commits](https://github.com/csstools/postcss-plugins/commits/HEAD/plugin-packs/postcss-preset-env)

---
updated-dependencies:
- dependency-name: postcss-preset-env
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json
index db475baf1..90ac63763 100644
--- a/{{cookiecutter.project_slug}}/package.json
+++ b/{{cookiecutter.project_slug}}/package.json
@@ -25,7 +25,7 @@
     "pixrem": "^5.0.0",
     "postcss": "^8.3.11",
     "postcss-loader": "^7.0.2",
-    "postcss-preset-env": "^7.0.2",
+    "postcss-preset-env": "^8.0.1",
     "sass": "^1.43.4",
     "sass-loader": "^13.2.0",
     "webpack": "^5.65.0",

From aee68f3e8ac659f83856955c70eae89403d3ea34 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 7 Feb 2023 17:58:44 -0500
Subject: [PATCH 2545/2840] Update sphinx-rtd-theme from 1.1.1 to 1.2.0 (#4145)

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

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 2cc8302a2..1758de93e 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,2 +1,2 @@
 sphinx==5.3.0
-sphinx-rtd-theme==1.1.1
+sphinx-rtd-theme==1.2.0

From 82bf46a64fc471062770e76fe26546637adc7ae3 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 8 Feb 2023 02:47:46 +0000
Subject: [PATCH 2546/2840] Release 2023.02.07

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e2f5252f8..4514aa535 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 -->
 
+## 2023.02.07
+
+### Updated
+- Bump postcss-preset-env from 7.8.3 to 8.0.1 ([#4115](https://github.com/cookiecutter/cookiecutter-django/pull/4115))
+- Bump sass-loader from 12.6.0 to 13.2.0 ([#4116](https://github.com/cookiecutter/cookiecutter-django/pull/4116))
+- Bump babel-loader from 8.3.0 to 9.1.2 ([#4117](https://github.com/cookiecutter/cookiecutter-django/pull/4117))
+- Bump postcss-loader from 6.2.1 to 7.0.2 ([#4114](https://github.com/cookiecutter/cookiecutter-django/pull/4114))
+- Bump webpack-cli from 4.10.0 to 5.0.1 ([#4118](https://github.com/cookiecutter/cookiecutter-django/pull/4118))
+- Update redis to 4.5.0 ([#4142](https://github.com/cookiecutter/cookiecutter-django/pull/4142))
+- Update sentry-sdk to 1.15.0 ([#4141](https://github.com/cookiecutter/cookiecutter-django/pull/4141))
+
 ## 2023.02.06
 
 ### Changed
diff --git a/setup.py b/setup.py
index 8eff57a38..0715594da 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.02.06"
+version = "2023.02.07"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 379522507aac76f0d81c1f8d3772e66cb83cbdb3 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 8 Feb 2023 12:50:04 -0500
Subject: [PATCH 2547/2840] Update redis to 4.5.1 (#4147)

---
 {{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 519efdfd2..9bcdf31bf 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -12,7 +12,7 @@ argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==6.3.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==4.5.0  # https://github.com/redis/redis-py
+redis==4.5.1  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.2.1  # https://github.com/redis/hiredis-py
 {%- endif %}

From b448a3ceaf0ef657df050a1e96297456a1325ede Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 8 Feb 2023 12:50:44 -0500
Subject: [PATCH 2548/2840] Update tox to 4.4.5 (#4146)

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

diff --git a/requirements.txt b/requirements.txt
index 64695482d..15c7c8c0a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==3.0.4
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.4.4
+tox==4.4.5
 pytest==7.2.1
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From c1ed81a8cf5f1d252dc064f5add7c280c6f5215b Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 8 Feb 2023 17:51:29 +0000
Subject: [PATCH 2549/2840] Replace linting job by pre-commit.ci (#4143)

---
 .github/workflows/ci.yml | 11 -----------
 README.md                |  4 +++-
 2 files changed, 3 insertions(+), 12 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 08ac54d86..ec2577e82 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -9,17 +9,6 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  lint:
-    runs-on: ubuntu-latest
-    steps:
-      - uses: actions/checkout@v3
-      - uses: actions/setup-python@v4
-        with:
-          python-version: "3.10"
-          cache: pip
-      - name: Run pre-commit
-        uses: pre-commit/action@v3.0.0
-
   tests:
     strategy:
       fail-fast: false
diff --git a/README.md b/README.md
index 40d44f570..7ab0b7e15 100644
--- a/README.md
+++ b/README.md
@@ -2,10 +2,12 @@
 
 [![Build Status](https://img.shields.io/github/actions/workflow/status/cookiecutter/cookiecutter-django/ci.yml?branch=master)](https://github.com/cookiecutter/cookiecutter-django/actions/workflows/ci.yml?query=branch%3Amaster)
 [![Documentation Status](https://readthedocs.org/projects/cookiecutter-django/badge/?version=latest)](https://cookiecutter-django.readthedocs.io/en/latest/?badge=latest)
+[![pre-commit.ci status](https://results.pre-commit.ci/badge/github/cookiecutter/cookiecutter-django/master.svg)](https://results.pre-commit.ci/latest/github/cookiecutter/cookiecutter-django/master)
+[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)
+
 [![Updates](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/shield.svg)](https://pyup.io/repos/github/cookiecutter/cookiecutter-django/)
 [![Join our Discord](https://img.shields.io/badge/Discord-cookiecutter-5865F2?style=flat&logo=discord&logoColor=white)](https://discord.gg/uFXweDQc5a)
 [![Code Helpers Badge](https://www.codetriage.com/cookiecutter/cookiecutter-django/badges/users.svg)](https://www.codetriage.com/cookiecutter/cookiecutter-django)
-[![Code style: black](https://img.shields.io/badge/code%20style-black-000000.svg)](https://github.com/ambv/black)
 
 Powered by [Cookiecutter](https://github.com/cookiecutter/cookiecutter), Cookiecutter Django is a framework for jumpstarting
 production-ready Django projects quickly.

From 9eb480f60fb1f1325fa2273935c45f9caadaaba8 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 8 Feb 2023 18:31:25 -0500
Subject: [PATCH 2550/2840] Update sphinx to 6.1.3 (#4148)

* Update sphinx from 5.3.0 to 6.1.3

* Update sphinx from 5.3.0 to 6.1.3
---
 docs/requirements.txt                                | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 1758de93e..0982f3d25 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,2 +1,2 @@
-sphinx==5.3.0
+sphinx==6.1.3
 sphinx-rtd-theme==1.2.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 8905ddb76..daafb6054 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -23,7 +23,7 @@ djangorestframework-stubs==1.8.0  # https://github.com/typeddjango/djangorestfra
 
 # Documentation
 # ------------------------------------------------------------------------------
-sphinx==5.3.0  # https://github.com/sphinx-doc/sphinx
+sphinx==6.1.3  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From 4998a0cab7e72ad7d64c2c25a825bdcd4355e0fc Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 9 Feb 2023 02:48:42 +0000
Subject: [PATCH 2551/2840] Release 2023.02.08

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4514aa535..c975b4987 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 -->
 
+## 2023.02.08
+
+### Updated
+- Update sphinx to 6.1.3 ([#4148](https://github.com/cookiecutter/cookiecutter-django/pull/4148))
+- Update redis to 4.5.1 ([#4147](https://github.com/cookiecutter/cookiecutter-django/pull/4147))
+
 ## 2023.02.07
 
 ### Updated
diff --git a/setup.py b/setup.py
index 0715594da..4bc6e081d 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.02.07"
+version = "2023.02.08"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 3c71b54e4cf620d4a92cf6c088245055d8c57e4c Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 9 Feb 2023 04:35:41 -0500
Subject: [PATCH 2552/2840] Update mypy to 0.991 (#4106)

* Update mypy from 0.982 to 0.991

* Ignore type error in test

* Don't build on non-master branch pushes by default

* Ignore type error in DRF view test

---------

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
---
 .github/workflows/ci.yml                                        | 1 +
 {{cookiecutter.project_slug}}/requirements/local.txt            | 2 +-
 .../{{cookiecutter.project_slug}}/users/tests/test_drf_views.py | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index ec2577e82..c31be1b7a 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,6 +2,7 @@ name: CI
 
 on:
   push:
+    branches: [ "master", "main" ]
   pull_request:
 
 concurrency:
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index daafb6054..00c15d3cb 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -13,7 +13,7 @@ watchfiles==0.18.1  # https://github.com/samuelcolvin/watchfiles
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.982  # https://github.com/python/mypy
+mypy==0.991  # https://github.com/python/mypy
 django-stubs==1.14.0  # https://github.com/typeddjango/django-stubs
 pytest==7.2.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.6  # https://github.com/Frozenball/pytest-sugar
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
index 10ad100f1..7828e49cd 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
@@ -26,7 +26,7 @@ class TestUserViewSet:
 
         view.request = request
 
-        response = view.me(request)
+        response = view.me(request)  # type: ignore
 
         assert response.data == {
             "username": user.username,

From 0fe1fb9ca18d68341788932a9be9d485109fe220 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 9 Feb 2023 21:56:57 +0000
Subject: [PATCH 2553/2840] Remove unused pip cache paths in GHA & add a note
 for pre-commit.ci (#4151)

* Remove unused pip caching paths in GHA

* Add note about pre-commit.ci for open source
---
 {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
index 0790187bd..3c8ea8780 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -31,10 +31,10 @@ jobs:
         with:
           python-version: "3.10"
           cache: pip
-          cache-dependency-path: |
-            requirements/base.txt
-            requirements/local.txt
 
+      {%- if cookiecutter.open_source_license != 'Not open source' %}
+      # Consider using pre-commit.ci for open source project
+      {%- endif %}
       - name: Run pre-commit
         uses: pre-commit/action@v2.0.3
 

From 7af2d73a8c529cd34de864a8555be1012ec666c2 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 10 Feb 2023 02:53:14 +0000
Subject: [PATCH 2554/2840] Release 2023.02.09

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c975b4987..2b88bc869 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.02.09
+
+### Changed
+- Remove unused pip cache paths in GHA &amp; add a note for pre-commit.ci ([#4151](https://github.com/cookiecutter/cookiecutter-django/pull/4151))
+### Updated
+- Update mypy to 0.991 ([#4106](https://github.com/cookiecutter/cookiecutter-django/pull/4106))
+
 ## 2023.02.08
 
 ### Updated
diff --git a/setup.py b/setup.py
index 4bc6e081d..858d20691 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.02.08"
+version = "2023.02.09"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 95e73006044517714b83c094c269278d0ff40df6 Mon Sep 17 00:00:00 2001
From: Delphine LEMIRE <delphine.lemire@gmail.com>
Date: Fri, 17 Feb 2023 14:42:02 +0100
Subject: [PATCH 2555/2840] Update version of github actions on the template
 project (#4167)

---
 {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
index 3c8ea8780..5a149820a 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -27,7 +27,7 @@ jobs:
         uses: actions/checkout@v3
 
       - name: Set up Python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v4
         with:
           python-version: "3.10"
           cache: pip
@@ -36,7 +36,7 @@ jobs:
       # Consider using pre-commit.ci for open source project
       {%- endif %}
       - name: Run pre-commit
-        uses: pre-commit/action@v2.0.3
+        uses: pre-commit/action@v3.0.0
 
   # With no caching at all the entire ci process takes 4m 30s to complete!
   pytest:
@@ -85,7 +85,7 @@ jobs:
       {%- else %}
 
       - name: Set up Python
-        uses: actions/setup-python@v3
+        uses: actions/setup-python@v4
         with:
           python-version: "3.10"
           cache: pip

From 414122e52408c1dd11fb3d2690120bcb7d91b483 Mon Sep 17 00:00:00 2001
From: luzfcb <luzfcb@users.noreply.github.com>
Date: Fri, 17 Feb 2023 13:42:38 +0000
Subject: [PATCH 2556/2840] 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 7920e8caf..b97140005 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1362,5 +1362,10 @@
     "name": "duffn",
     "github_login": "duffn",
     "twitter_username": ""
+  },
+  {
+    "name": "Delphine LEMIRE",
+    "github_login": "DelphineLemire",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 85b1ae88f..0670ff448 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -642,6 +642,13 @@ Listed in alphabetical order.
     </td>
     <td>jangeador</td>
   </tr>
+  <tr>
+    <td>Delphine LEMIRE</td>
+    <td>
+      <a href="https://github.com/DelphineLemire">DelphineLemire</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Demetris Stavrou</td>
     <td>

From 4aa56cb31a1397ffcea855527d1c37d7c64cccca Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 18 Feb 2023 02:27:13 +0000
Subject: [PATCH 2557/2840] Release 2023.02.17

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2b88bc869..23604fd77 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 -->
 
+## 2023.02.17
+
+### Changed
+- Update version of github actions on the template project ([#4167](https://github.com/cookiecutter/cookiecutter-django/pull/4167))
+
 ## 2023.02.09
 
 ### Changed
diff --git a/setup.py b/setup.py
index 858d20691..c7566ba70 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.02.09"
+version = "2023.02.17"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 2d9dceb0fb24146416989b7b8497c054a9676cfc Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 25 Feb 2023 06:16:20 -0500
Subject: [PATCH 2558/2840] Update hiredis to 2.2.2 (#4156)

* Update hiredis from 2.2.1 to 2.2.2

* Update hiredis from 2.2.1 to 2.2.2
---
 {{cookiecutter.project_slug}}/requirements/base.txt       | 2 +-
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 9bcdf31bf..bc9b553f9 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -14,7 +14,7 @@ whitenoise==6.3.0  # https://github.com/evansd/whitenoise
 {%- endif %}
 redis==4.5.1  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
-hiredis==2.2.1  # https://github.com/redis/hiredis-py
+hiredis==2.2.2  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
 celery==5.2.7  # pyup: < 6.0  # https://github.com/celery/celery
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 06917d8dd..7cee00d5d 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.15.0  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
-hiredis==2.2.1  # https://github.com/redis/hiredis-py
+hiredis==2.2.2  # https://github.com/redis/hiredis-py
 {%- endif %}
 
 # Django

From b46447c8db1068b2e9ea1a1538295af27dfe7036 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 25 Feb 2023 06:16:56 -0500
Subject: [PATCH 2559/2840] Update sh to 2.0.2 (#4157)

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

diff --git a/requirements.txt b/requirements.txt
index 15c7c8c0a..2e165efa6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 cookiecutter==2.1.1
-sh==1.14.3; sys_platform != "win32"
+sh==2.0.2; sys_platform != "win32"
 binaryornot==0.4.4
 
 # Code quality

From 1767190a1ac1b9e9eb0ae61480859528f903428e Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 25 Feb 2023 06:17:46 -0500
Subject: [PATCH 2560/2840] Update django to 4.0.10 (#4159)

---
 {{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 bc9b553f9..d06bc8cb9 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,7 +29,7 @@ uvicorn[standard]==0.20.0  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==4.0.9  # pyup: < 4.1  # https://www.djangoproject.com/
+django==4.0.10  # pyup: < 4.1  # https://www.djangoproject.com/
 django-environ==0.9.0  # https://github.com/joke2k/django-environ
 django-model-utils==4.3.1  # https://github.com/jazzband/django-model-utils
 django-allauth==0.52.0  # https://github.com/pennersr/django-allauth

From ab149684b148d8e08be1f61a616db53e7c2cf454 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 25 Feb 2023 06:18:16 -0500
Subject: [PATCH 2561/2840] Update coverage to 7.2.0 (#4177)

---
 {{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 00c15d3cb..80ced4b64 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==6.0.0  # https://github.com/PyCQA/flake8
 flake8-isort==6.0.0  # https://github.com/gforcada/flake8-isort
-coverage==7.1.0  # https://github.com/nedbat/coveragepy
+coverage==7.2.0  # https://github.com/nedbat/coveragepy
 black==23.1.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From aa6d0bc2ad3968bed47bd17c79932dbf48763b33 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 25 Feb 2023 06:18:38 -0500
Subject: [PATCH 2562/2840] Update werkzeug to 2.2.3 (#4160)

---
 {{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 80ced4b64..6918fab8b 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,6 +1,6 @@
 -r base.txt
 
-Werkzeug[watchdog]==2.2.2 # https://github.com/pallets/werkzeug
+Werkzeug[watchdog]==2.2.3 # https://github.com/pallets/werkzeug
 ipdb==0.13.11  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.9.5  # https://github.com/psycopg/psycopg2

From a756fbe4bb1b6188667ff3ea2740a6a0e9760596 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 25 Feb 2023 06:19:07 -0500
Subject: [PATCH 2563/2840] Update gitpython to 3.1.31 (#4165)

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

diff --git a/requirements.txt b/requirements.txt
index 2e165efa6..f07004c2a 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,6 +21,6 @@ pyyaml==6.0
 # Scripting
 # ------------------------------------------------------------------------------
 PyGithub==1.57
-gitpython==3.1.30
+gitpython==3.1.31
 jinja2==3.1.2
 requests==2.28.2

From 4e649af5f0cc208655f75721d45d87ef03f5bb80 Mon Sep 17 00:00:00 2001
From: Delphine LEMIRE <delphine.lemire@gmail.com>
Date: Sat, 25 Feb 2023 12:31:07 +0100
Subject: [PATCH 2564/2840] Disable caching for linter job on GitHub actions
 (#4166)

* FIX: Uptade Template ci.yml linter requirements

* Disable unused cache for lint job

---------

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/.github/workflows/ci.yml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
index 5a149820a..89d83f257 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -30,7 +30,6 @@ jobs:
         uses: actions/setup-python@v4
         with:
           python-version: "3.10"
-          cache: pip
 
       {%- if cookiecutter.open_source_license != 'Not open source' %}
       # Consider using pre-commit.ci for open source project

From 2c84ec1c5573577a03590e9b8b2e25525f9704a0 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 25 Feb 2023 06:44:39 -0500
Subject: [PATCH 2565/2840] Update tox to 4.4.6 (#4173)

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

diff --git a/requirements.txt b/requirements.txt
index f07004c2a..f74ac007d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==3.0.4
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.4.5
+tox==4.4.6
 pytest==7.2.1
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From 8bd7667f19e335af7f59b68103c7b1c1bf357419 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 25 Feb 2023 06:46:34 -0500
Subject: [PATCH 2566/2840] Update mypy to 1.0.1 (#4168)

---
 {{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 6918fab8b..86247343c 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -13,7 +13,7 @@ watchfiles==0.18.1  # https://github.com/samuelcolvin/watchfiles
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==0.991  # https://github.com/python/mypy
+mypy==1.0.1  # https://github.com/python/mypy
 django-stubs==1.14.0  # https://github.com/typeddjango/django-stubs
 pytest==7.2.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.6  # https://github.com/Frozenball/pytest-sugar

From 64a66c332a4b642994335bc7127688142adafcf4 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 25 Feb 2023 06:47:29 -0500
Subject: [PATCH 2567/2840] Update pre-commit to 3.1.0 (#4176)

* Update pre-commit from 3.0.4 to 3.1.0

* Update pre-commit from 3.0.4 to 3.1.0
---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index f74ac007d..fda102826 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ black==23.1.0
 isort==5.12.0
 flake8==6.0.0
 flake8-isort==6.0.0
-pre-commit==3.0.4
+pre-commit==3.1.0
 
 # Testing
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 86247343c..e1927d06e 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -36,7 +36,7 @@ pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}
-pre-commit==3.0.4  # https://github.com/pre-commit/pre-commit
+pre-commit==3.1.0  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From 7739f41f774616996b319465807d9c46a4d359f9 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 25 Feb 2023 06:47:48 -0500
Subject: [PATCH 2568/2840] Update python-slugify to 8.0.1 (#4178)

---
 {{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 d06bc8cb9..42188dd39 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,5 +1,5 @@
 pytz==2022.7.1  # https://github.com/stub42/pytz
-python-slugify==8.0.0  # https://github.com/un33k/python-slugify
+python-slugify==8.0.1  # https://github.com/un33k/python-slugify
 Pillow==9.4.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
 {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %}

From bee85e445429bf4b301e4b77b65bb6cade3df270 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 25 Feb 2023 06:48:00 -0500
Subject: [PATCH 2569/2840] Update django-cors-headers to 3.14.0 (#4181)

---
 {{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 42188dd39..75a97340b 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -42,7 +42,7 @@ django-redis==5.2.0  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == 'y' %}
 # Django REST Framework
 djangorestframework==3.14.0  # https://github.com/encode/django-rest-framework
-django-cors-headers==3.13.0  # https://github.com/adamchainz/django-cors-headers
+django-cors-headers==3.14.0  # https://github.com/adamchainz/django-cors-headers
 # DRF-spectacular for api documentation
 drf-spectacular==0.25.1  # https://github.com/tfranzel/drf-spectacular
 {%- endif %}

From 972b927a2c85cbc3353121fe8df644e35eafbb1e Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 25 Feb 2023 06:51:16 -0500
Subject: [PATCH 2570/2840] Update django-crispy-forms to 2.0 (#4158)

---
 {{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 75a97340b..7de2c4410 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -33,7 +33,7 @@ django==4.0.10  # pyup: < 4.1  # https://www.djangoproject.com/
 django-environ==0.9.0  # https://github.com/joke2k/django-environ
 django-model-utils==4.3.1  # https://github.com/jazzband/django-model-utils
 django-allauth==0.52.0  # https://github.com/pennersr/django-allauth
-django-crispy-forms==1.14.0  # https://github.com/django-crispy-forms/django-crispy-forms
+django-crispy-forms==2.0  # https://github.com/django-crispy-forms/django-crispy-forms
 crispy-bootstrap5==0.7  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
 django-compressor==4.3.1  # https://github.com/django-compressor/django-compressor

From c2059693d8788efd89f5cad909f2d7815e047547 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 25 Feb 2023 06:53:08 -0500
Subject: [PATCH 2571/2840] Update django-stubs to 1.15.0 (#4183)

---
 {{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 e1927d06e..6335b52b9 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -14,7 +14,7 @@ watchfiles==0.18.1  # https://github.com/samuelcolvin/watchfiles
 # Testing
 # ------------------------------------------------------------------------------
 mypy==1.0.1  # https://github.com/python/mypy
-django-stubs==1.14.0  # https://github.com/typeddjango/django-stubs
+django-stubs==1.15.0  # https://github.com/typeddjango/django-stubs
 pytest==7.2.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.6  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}

From 961ec7df6bf07f6ae0346adfdb90899f4845ef41 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 25 Feb 2023 06:53:35 -0500
Subject: [PATCH 2572/2840] Update whitenoise to 6.4.0 (#4180)

---
 {{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 7de2c4410..ac6f876f8 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -10,7 +10,7 @@ rcssmin==1.1.1  # https://github.com/ndparker/rcssmin
 {%- endif %}
 argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
-whitenoise==6.3.0  # https://github.com/evansd/whitenoise
+whitenoise==6.4.0  # https://github.com/evansd/whitenoise
 {%- endif %}
 redis==4.5.1  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}

From 6433fc7b2b32b5c864c7b363eed9a73488bcace5 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 25 Feb 2023 06:53:59 -0500
Subject: [PATCH 2573/2840] Update pygithub to 1.58.0 (#4182)

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

diff --git a/requirements.txt b/requirements.txt
index fda102826..564e70596 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -20,7 +20,7 @@ pyyaml==6.0
 
 # Scripting
 # ------------------------------------------------------------------------------
-PyGithub==1.57
+PyGithub==1.58.0
 gitpython==3.1.31
 jinja2==3.1.2
 requests==2.28.2

From ad1edba7110dcaef8adbde440b5424cdfa878ae9 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 25 Feb 2023 07:02:35 -0500
Subject: [PATCH 2574/2840] Update djangorestframework-stubs to 1.9.1 (#4184)

---
 {{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 6335b52b9..27fa30b36 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -18,7 +18,7 @@ django-stubs==1.15.0  # https://github.com/typeddjango/django-stubs
 pytest==7.2.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.6  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
-djangorestframework-stubs==1.8.0  # https://github.com/typeddjango/djangorestframework-stubs
+djangorestframework-stubs==1.9.1  # https://github.com/typeddjango/djangorestframework-stubs
 {%- endif %}
 
 # Documentation

From b74af5b1d1005fa7ee1bbf27761a32e82b86a496 Mon Sep 17 00:00:00 2001
From: Hoai-Thu Vuong <thuvh@users.noreply.github.com>
Date: Sat, 25 Feb 2023 19:09:52 +0700
Subject: [PATCH 2575/2840] Add instuction to run celery beat (#4162)

* add instuction to run celery beat

* Extend explanations for celery beat

---------

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/README.md | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/README.md b/{{cookiecutter.project_slug}}/README.md
index 16ee6d1fe..83f9a7e48 100644
--- a/{{cookiecutter.project_slug}}/README.md
+++ b/{{cookiecutter.project_slug}}/README.md
@@ -63,6 +63,20 @@ celery -A config.celery_app worker -l info
 
 Please note: For Celery's import magic to work, it is important *where* the celery commands are run. If you are in the same folder with *manage.py*, you should be right.
 
+To run [periodic tasks](https://docs.celeryq.dev/en/stable/userguide/periodic-tasks.html), you'll need to start the celery beat scheduler service. You can start it as a standalone process:
+
+``` bash
+cd {{cookiecutter.project_slug}}
+celery -A config.celery_app beat
+```
+
+or you can embed the beat service inside a worker with the `-B` option (not recommended for production use):
+
+``` bash
+cd {{cookiecutter.project_slug}}
+celery -A config.celery_app worker -B -l info
+```
+
 {%- endif %}
 {%- if cookiecutter.use_mailhog == "y" %}
 

From 52bdda5bc05a35f8b0c326b1f2a4fbd4f212f2bf Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 25 Feb 2023 12:10:26 +0000
Subject: [PATCH 2576/2840] 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 b97140005..30bc0107e 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1367,5 +1367,10 @@
     "name": "Delphine LEMIRE",
     "github_login": "DelphineLemire",
     "twitter_username": ""
+  },
+  {
+    "name": "Hoai-Thu Vuong",
+    "github_login": "thuvh",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 0670ff448..8a541c945 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -915,6 +915,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Hoai-Thu Vuong</td>
+    <td>
+      <a href="https://github.com/thuvh">thuvh</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Howie Zhao</td>
     <td>

From eeb02c2198cb455bb53d58b1c81bb42fa5943678 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 25 Feb 2023 12:33:30 +0000
Subject: [PATCH 2577/2840] Run linting with pre-commit on GitLab (#4150)

* Run linting with pre-commit on GitLab

* Update tests
---
 tests/test_cookiecutter_generation.py        |  6 ++++--
 {{cookiecutter.project_slug}}/.gitlab-ci.yml | 22 +++++++++++---------
 2 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 5608bf884..7628e5e1d 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -232,7 +232,7 @@ def test_travis_invokes_pytest(cookies, context, use_docker, expected_test_scrip
         ("y", "docker-compose -f local.yml run django pytest"),
     ],
 )
-def test_gitlab_invokes_flake8_and_pytest(
+def test_gitlab_invokes_precommit_and_pytest(
     cookies, context, use_docker, expected_test_script
 ):
     context.update({"ci_tool": "Gitlab", "use_docker": use_docker})
@@ -246,7 +246,9 @@ def test_gitlab_invokes_flake8_and_pytest(
     with open(f"{result.project_path}/.gitlab-ci.yml") as gitlab_yml:
         try:
             gitlab_config = yaml.safe_load(gitlab_yml)
-            assert gitlab_config["flake8"]["script"] == ["flake8"]
+            assert gitlab_config["precommit"]["script"] == [
+                "pre-commit run --show-diff-on-failure --color=always --all-files"
+            ]
             assert gitlab_config["pytest"]["script"] == [expected_test_script]
         except yaml.YAMLError as e:
             pytest.fail(e)
diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
index dbb65fb73..7892ad63a 100644
--- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml
+++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
@@ -7,21 +7,26 @@ variables:
   POSTGRES_PASSWORD: ''
   POSTGRES_DB: 'test_{{ cookiecutter.project_slug }}'
   POSTGRES_HOST_AUTH_METHOD: trust
-  {% if cookiecutter.use_celery == 'y' -%}
+  {%- if cookiecutter.use_celery == 'y' %}
   CELERY_BROKER_URL: 'redis://redis:6379/0'
   {%- endif %}
 
-flake8:
+precommit:
   stage: lint
-  image: python:3.10-alpine
+  image: python:3.10
+  variables:
+    PRE_COMMIT_HOME: ${CI_PROJECT_DIR}/.cache/pre-commit
+  cache:
+    paths:
+      - ${PRE_COMMIT_HOME}
   before_script:
-    - pip install -q flake8
+    - pip install -q pre-commit
   script:
-    - flake8
+    - pre-commit run --show-diff-on-failure --color=always --all-files
 
 pytest:
   stage: test
-  {% if cookiecutter.use_docker == 'y' -%}
+  {%- if cookiecutter.use_docker == 'y' %}
   image: docker/compose:1.29.2
   tags:
     - docker
@@ -34,7 +39,7 @@ pytest:
     - docker-compose -f local.yml up -d
   script:
     - docker-compose -f local.yml run django pytest
-  {%- else -%}
+  {%- else %}
   image: python:3.10
   tags:
     - python
@@ -42,11 +47,8 @@ pytest:
     - postgres:{{ cookiecutter.postgresql_version }}
   variables:
     DATABASE_URL: pgsql://$POSTGRES_USER:$POSTGRES_PASSWORD@postgres/$POSTGRES_DB
-
   before_script:
     - pip install -r requirements/local.txt
-
   script:
     - pytest
   {%- endif %}
-

From 757c9f45e294806b5db98ccf2b55e202f4407625 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sat, 25 Feb 2023 12:44:24 +0000
Subject: [PATCH 2578/2840] Bump garland/aws-cli-docker from 1.15.47 to
 1.16.140 (#4136)

Bumps garland/aws-cli-docker from 1.15.47 to 1.16.140.

---
updated-dependencies:
- dependency-name: garland/aws-cli-docker
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/compose/production/aws/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile
index 8282047b3..4d1ecbb20 100644
--- a/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/aws/Dockerfile
@@ -1,4 +1,4 @@
-FROM garland/aws-cli-docker:1.15.47
+FROM garland/aws-cli-docker:1.16.140
 
 COPY ./compose/production/aws/maintenance /usr/local/bin/maintenance
 COPY ./compose/production/postgres/maintenance/_sourced /usr/local/bin/maintenance/_sourced

From dc78797c7440b179346c4eb978b0bb98cd40466f Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sun, 26 Feb 2023 02:32:42 +0000
Subject: [PATCH 2579/2840] Release 2023.02.25

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 23604fd77..17cdfdf49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,29 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.02.25
+
+### Changed
+- Run linting with pre-commit on GitLab ([#4150](https://github.com/cookiecutter/cookiecutter-django/pull/4150))
+### Fixed
+- Disable caching for linter job on GitHub actions ([#4166](https://github.com/cookiecutter/cookiecutter-django/pull/4166))
+### Documentation
+- Add instuction to run celery beat ([#4162](https://github.com/cookiecutter/cookiecutter-django/pull/4162))
+### Updated
+- Bump garland/aws-cli-docker from 1.15.47 to 1.16.140 ([#4136](https://github.com/cookiecutter/cookiecutter-django/pull/4136))
+- Update djangorestframework-stubs to 1.9.1 ([#4184](https://github.com/cookiecutter/cookiecutter-django/pull/4184))
+- Update whitenoise to 6.4.0 ([#4180](https://github.com/cookiecutter/cookiecutter-django/pull/4180))
+- Update django-stubs to 1.15.0 ([#4183](https://github.com/cookiecutter/cookiecutter-django/pull/4183))
+- Update django-crispy-forms to 2.0 ([#4158](https://github.com/cookiecutter/cookiecutter-django/pull/4158))
+- Update django-cors-headers to 3.14.0 ([#4181](https://github.com/cookiecutter/cookiecutter-django/pull/4181))
+- Update python-slugify to 8.0.1 ([#4178](https://github.com/cookiecutter/cookiecutter-django/pull/4178))
+- Update pre-commit to 3.1.0 ([#4176](https://github.com/cookiecutter/cookiecutter-django/pull/4176))
+- Update mypy to 1.0.1 ([#4168](https://github.com/cookiecutter/cookiecutter-django/pull/4168))
+- Update werkzeug to 2.2.3 ([#4160](https://github.com/cookiecutter/cookiecutter-django/pull/4160))
+- Update coverage to 7.2.0 ([#4177](https://github.com/cookiecutter/cookiecutter-django/pull/4177))
+- Update django to 4.0.10 ([#4159](https://github.com/cookiecutter/cookiecutter-django/pull/4159))
+- Update hiredis to 2.2.2 ([#4156](https://github.com/cookiecutter/cookiecutter-django/pull/4156))
+
 ## 2023.02.17
 
 ### Changed
diff --git a/setup.py b/setup.py
index c7566ba70..f486da1f3 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.02.17"
+version = "2023.02.25"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 9665b067d731fdd0fe884c138f667be25ed6221d Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 26 Feb 2023 15:07:25 -0500
Subject: [PATCH 2580/2840] Update coverage to 7.2.1 (#4186)

---
 {{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 27fa30b36..bd61e1a19 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==6.0.0  # https://github.com/PyCQA/flake8
 flake8-isort==6.0.0  # https://github.com/gforcada/flake8-isort
-coverage==7.2.0  # https://github.com/nedbat/coveragepy
+coverage==7.2.1  # https://github.com/nedbat/coveragepy
 black==23.1.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 2bbec96f31b92909fd4a1cf73b31c17007a76a51 Mon Sep 17 00:00:00 2001
From: Delphine LEMIRE <delphine.lemire@gmail.com>
Date: Sun, 26 Feb 2023 21:33:45 +0100
Subject: [PATCH 2581/2840] Fix readthedocs config file for generated project
 (#4172)

* FIX: Uptade Template ci.yml linter requirements

* IMPROVMENT_FIX: Template CI actions up to date

* FIX: template readthedocs instructions

* Update ci.yml

* Update readthedocs config file

* Update {{cookiecutter.project_slug}}/.readthedocs.yml

---------

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/.readthedocs.yml | 16 ++++++++++++----
 1 file changed, 12 insertions(+), 4 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/.readthedocs.yml b/{{cookiecutter.project_slug}}/.readthedocs.yml
index e943a5fa9..08d7f9c24 100644
--- a/{{cookiecutter.project_slug}}/.readthedocs.yml
+++ b/{{cookiecutter.project_slug}}/.readthedocs.yml
@@ -1,12 +1,20 @@
+# Read the Docs configuration file
+# See https://docs.readthedocs.io/en/stable/config-file/v2.html for details
+
+# Required
 version: 2
 
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.10"
+
+# Build documentation in the docs/ directory with Sphinx
 sphinx:
   configuration: docs/conf.py
 
-build:
-  image: testing
-
+# Python requirements required to build your docs
 python:
-  version: 3.10
   install:
     - requirements: requirements/local.txt

From 6a1aa159b602a35c9367af960b715eba538179aa Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Sun, 26 Feb 2023 20:47:54 +0000
Subject: [PATCH 2582/2840] Bump traefik from v2.2.11 to 2.9.8 (#4164)

Bumps traefik from v2.2.11 to 2.9.8.

---
updated-dependencies:
- dependency-name: traefik
  dependency-type: direct:production
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../compose/production/traefik/Dockerfile                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
index aa879052b..2365c4c49 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
@@ -1,4 +1,4 @@
-FROM traefik:v2.2.11
+FROM traefik:2.9.8
 RUN mkdir -p /etc/traefik/acme \
   && touch /etc/traefik/acme/acme.json \
   && chmod 600 /etc/traefik/acme/acme.json

From 2e7b717d1a46b765bbf58f97ad95a5e6982817a5 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Mon, 27 Feb 2023 02:30:14 +0000
Subject: [PATCH 2583/2840] Release 2023.02.26

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 17cdfdf49..53b630e49 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.02.26
+
+### Changed
+- Fix readthedocs config file for generated project ([#4172](https://github.com/cookiecutter/cookiecutter-django/pull/4172))
+### Updated
+- Bump traefik from v2.2.11 to 2.9.8 ([#4164](https://github.com/cookiecutter/cookiecutter-django/pull/4164))
+- Update coverage to 7.2.1 ([#4186](https://github.com/cookiecutter/cookiecutter-django/pull/4186))
+
 ## 2023.02.25
 
 ### Changed
diff --git a/setup.py b/setup.py
index f486da1f3..4b3f9ca3a 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.02.25"
+version = "2023.02.26"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From af2e4cb26a37cb622fb72cb0a8b86ec941bc731b Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 27 Feb 2023 09:09:51 -0500
Subject: [PATCH 2584/2840] Update sentry-sdk to 1.16.0 (#4187)

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

From 94455f4d1f1d7789c3e58742ee9134d070ca7111 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 28 Feb 2023 02:29:32 +0000
Subject: [PATCH 2585/2840] Release 2023.02.27

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 53b630e49..1cd1362a7 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 -->
 
+## 2023.02.27
+
+### Updated
+- Update sentry-sdk to 1.16.0 ([#4187](https://github.com/cookiecutter/cookiecutter-django/pull/4187))
+
 ## 2023.02.26
 
 ### Changed
diff --git a/setup.py b/setup.py
index 4b3f9ca3a..cd99d6773 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.02.26"
+version = "2023.02.27"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 6706128924ca2135b001b5141d911d6cb7a74bf1 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 28 Feb 2023 04:28:12 -0500
Subject: [PATCH 2586/2840] Update pre-commit to 3.1.1 (#4188)

* Update pre-commit from 3.1.0 to 3.1.1

* Update pre-commit from 3.1.0 to 3.1.1
---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 564e70596..15380e3cb 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ black==23.1.0
 isort==5.12.0
 flake8==6.0.0
 flake8-isort==6.0.0
-pre-commit==3.1.0
+pre-commit==3.1.1
 
 # Testing
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index bd61e1a19..73163150b 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -36,7 +36,7 @@ pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}
-pre-commit==3.1.0  # https://github.com/pre-commit/pre-commit
+pre-commit==3.1.1  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From 4bf202ee5971fe08d521d8bacd59c62586b47bd2 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 1 Mar 2023 02:33:48 +0000
Subject: [PATCH 2587/2840] Release 2023.02.28

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1cd1362a7..1d05a30f9 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 -->
 
+## 2023.02.28
+
+### Updated
+- Update pre-commit to 3.1.1 ([#4188](https://github.com/cookiecutter/cookiecutter-django/pull/4188))
+
 ## 2023.02.27
 
 ### Updated
diff --git a/setup.py b/setup.py
index cd99d6773..7e2bfa625 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.02.27"
+version = "2023.02.28"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From c4b8bbb0c789e73e92c6dcb3c4a3d92e9bba1254 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 4 Mar 2023 13:21:32 -0500
Subject: [PATCH 2588/2840] Update drf-spectacular to 0.26.0 (#4192)

---
 {{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 ac6f876f8..18630c7b8 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -44,7 +44,7 @@ django-redis==5.2.0  # https://github.com/jazzband/django-redis
 djangorestframework==3.14.0  # https://github.com/encode/django-rest-framework
 django-cors-headers==3.14.0  # https://github.com/adamchainz/django-cors-headers
 # DRF-spectacular for api documentation
-drf-spectacular==0.25.1  # https://github.com/tfranzel/drf-spectacular
+drf-spectacular==0.26.0  # https://github.com/tfranzel/drf-spectacular
 {%- endif %}
 {%- if cookiecutter.frontend_pipeline == 'Webpack' %}
 django-webpack-loader==1.8.1  # https://github.com/django-webpack/django-webpack-loader

From 46868bed26f812be90a361dcd48ff68c912aa16a Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 4 Mar 2023 13:21:53 -0500
Subject: [PATCH 2589/2840] Update pytest to 7.2.2 (#4191)

* Update pytest from 7.2.1 to 7.2.2

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

diff --git a/requirements.txt b/requirements.txt
index 15380e3cb..5a65d6160 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,7 +13,7 @@ pre-commit==3.1.1
 # Testing
 # ------------------------------------------------------------------------------
 tox==4.4.6
-pytest==7.2.1
+pytest==7.2.2
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2
 pyyaml==6.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 73163150b..e1ab2dc29 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -15,7 +15,7 @@ watchfiles==0.18.1  # https://github.com/samuelcolvin/watchfiles
 # ------------------------------------------------------------------------------
 mypy==1.0.1  # https://github.com/python/mypy
 django-stubs==1.15.0  # https://github.com/typeddjango/django-stubs
-pytest==7.2.1  # https://github.com/pytest-dev/pytest
+pytest==7.2.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.6  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
 djangorestframework-stubs==1.9.1  # https://github.com/typeddjango/djangorestframework-stubs

From 06369bfd4cab9470617d665bded585935a17388f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arkadiusz=20Micha=C5=82=20Ry=C5=9B?=
 <6430069+arrys@users.noreply.github.com>
Date: Sat, 4 Mar 2023 19:36:11 +0100
Subject: [PATCH 2590/2840] Add option to serve media files locally using nginx
 (#2457)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add option to serve media files locally using nginx

* Fix nginx media location and storage issue

* Fix traefik django-media typo

* Add certresolver property to web-media-router

* Add trailing slash in nginx configuration to avoid path traversal exploits

* Remove autoindexing from nginx configuration so nginx uses its default off setting

* Use nginx to serve media files if cloud provider is None

* Add back warning about lack of media files without Docker or Cloud providers

* Update documentation

* Fix typos and rephrase

Co-authored-by: Arkadiusz Ryś <arkadiusz.michal.rys@gmail.com>

---------

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 README.md                                     |  2 +-
 docs/deployment-with-docker.rst               |  4 ++++
 docs/project-generation-options.rst           |  2 +-
 hooks/post_gen_project.py                     |  7 +++++--
 .../compose/production/nginx/Dockerfile       |  2 ++
 .../compose/production/nginx/default.conf     |  7 +++++++
 .../compose/production/traefik/traefik.yml    | 19 +++++++++++++++++++
 {{cookiecutter.project_slug}}/production.yml  | 18 ++++++++++++++++++
 8 files changed, 57 insertions(+), 4 deletions(-)
 create mode 100644 {{cookiecutter.project_slug}}/compose/production/nginx/Dockerfile
 create mode 100644 {{cookiecutter.project_slug}}/compose/production/nginx/default.conf

diff --git a/README.md b/README.md
index 7ab0b7e15..aaeb25828 100644
--- a/README.md
+++ b/README.md
@@ -31,7 +31,7 @@ production-ready Django projects quickly.
 -   Optional basic ASGI setup for Websockets
 -   Optional custom static build using Gulp or Webpack
 -   Send emails via [Anymail](https://github.com/anymail/django-anymail) (using [Mailgun](http://www.mailgun.com/) by default or Amazon SES if AWS is selected cloud provider, but switchable)
--   Media storage using Amazon S3, Google Cloud Storage or Azure Storage
+-   Media storage using Amazon S3, Google Cloud Storage, Azure Storage or nginx
 -   Docker support using [docker-compose](https://github.com/docker/compose) for development and production (using [Traefik](https://traefik.io/) with [LetsEncrypt](https://letsencrypt.org/) support)
 -   [Procfile](https://devcenter.heroku.com/articles/procfile) for deploying to Heroku
 -   Instructions for deploying to [PythonAnywhere](https://www.pythonanywhere.com/)
diff --git a/docs/deployment-with-docker.rst b/docs/deployment-with-docker.rst
index a431679bf..c1b8c6d7b 100644
--- a/docs/deployment-with-docker.rst
+++ b/docs/deployment-with-docker.rst
@@ -187,3 +187,7 @@ For status check, run::
 
     supervisorctl status
 
+Media files without cloud provider
+----------------------------------
+
+If you chose no cloud provider and Docker, the media files will be served by an nginx service, from a ``production_django_media`` volume. Make sure to keep this around to avoid losing any media files.
diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index d4ad8a9aa..9b379f12c 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -69,7 +69,7 @@ cloud_provider:
     3. Azure_
     4. None
 
-    Note that if you choose no cloud provider, media files won't work.
+    If you choose no cloud provider and docker, the production stack will serve the media files via an nginx Docker service. Without Docker, the media files won't work.
 
 mail_service:
     Select an email service that Django-Anymail provides
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index b64bbbafd..dbc367175 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -491,9 +491,12 @@ def main():
             use_async=("{{ cookiecutter.use_async }}".lower() == "y"),
         )
 
-    if "{{ cookiecutter.cloud_provider }}" == "None":
+    if (
+        "{{ cookiecutter.cloud_provider }}" == "None"
+        and "{{ cookiecutter.use_docker }}".lower() == "n"
+    ):
         print(
-            WARNING + "You chose not to use a cloud provider, "
+            WARNING + "You chose to not use any cloud providers nor Docker, "
             "media files won't be served in production." + TERMINATOR
         )
         remove_storages_module()
diff --git a/{{cookiecutter.project_slug}}/compose/production/nginx/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/nginx/Dockerfile
new file mode 100644
index 000000000..911b16f71
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/compose/production/nginx/Dockerfile
@@ -0,0 +1,2 @@
+FROM nginx:1.17.8-alpine
+COPY ./compose/production/nginx/default.conf /etc/nginx/conf.d/default.conf
diff --git a/{{cookiecutter.project_slug}}/compose/production/nginx/default.conf b/{{cookiecutter.project_slug}}/compose/production/nginx/default.conf
new file mode 100644
index 000000000..aafdd5bee
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/compose/production/nginx/default.conf
@@ -0,0 +1,7 @@
+server {
+	listen       80;
+	server_name  localhost;
+	location /media/ {
+		alias /usr/share/nginx/media/;
+	}
+}
diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
index cc183cd6c..ea57f4a51 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
@@ -57,6 +57,18 @@ http:
         # https://docs.traefik.io/master/routing/routers/#certresolver
         certResolver: letsencrypt
     {%- endif %}
+    {%- if cookiecutter.cloud_provider == 'None' %}
+
+    web-media-router:
+      rule: "Host(`{{ cookiecutter.domain_name }}`) && PathPrefix(`/media/`)"
+      entryPoints:
+        - web-secure
+      middlewares:
+        - csrf
+      service: django-media
+      tls:
+        certResolver: letsencrypt
+    {%- endif %}
 
   middlewares:
     csrf:
@@ -77,6 +89,13 @@ http:
         servers:
           - url: http://flower:5555
     {%- endif %}
+    {%- if cookiecutter.cloud_provider == 'None' %}
+
+    django-media:
+      loadBalancer:
+        servers:
+          - url: http://nginx:80
+    {%- endif %}
 
 providers:
   # https://docs.traefik.io/master/providers/file/
diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index 45c8b3c1d..4e9b9e048 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -4,6 +4,9 @@ volumes:
   production_postgres_data: {}
   production_postgres_data_backups: {}
   production_traefik: {}
+  {%- if cookiecutter.cloud_provider == 'None' %}
+  production_django_media: {}
+  {%- endif %}
 
 services:
   django:{% if cookiecutter.use_celery == 'y' %} &django{% endif %}
@@ -24,6 +27,10 @@ services:
       {%- endif %}
 
     image: {{ cookiecutter.project_slug }}_production_django
+    {%- if cookiecutter.cloud_provider == 'None' %}
+    volumes:
+      - production_django_media:/app/{{ cookiecutter.project_slug }}/media
+    {%- endif %}
     depends_on:
       - postgres
       - redis
@@ -89,3 +96,14 @@ services:
     volumes:
       - production_postgres_data_backups:/backups:z
   {%- endif %}
+  {%- if cookiecutter.cloud_provider == 'None' %}
+  nginx:
+    build:
+      context: .
+      dockerfile: ./compose/production/nginx/Dockerfile
+    image: {{ cookiecutter.project_slug }}_local_nginx
+    depends_on:
+      - django
+    volumes:
+      - production_django_media:/usr/share/nginx/media:ro
+  {%- endif %}

From b5a043551d1304957a8077840b99c54236d103e0 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 4 Mar 2023 18:36:44 +0000
Subject: [PATCH 2591/2840] 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 30bc0107e..c15476cc3 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1372,5 +1372,10 @@
     "name": "Hoai-Thu Vuong",
     "github_login": "thuvh",
     "twitter_username": ""
+  },
+  {
+    "name": "Arkadiusz Michał Ryś",
+    "github_login": "arrys",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 8a541c945..af99445d4 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -292,6 +292,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Arkadiusz Michał Ryś</td>
+    <td>
+      <a href="https://github.com/arrys">arrys</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Arnav Choudhury</td>
     <td>

From 6e782bff33a2422a3b0cfbf1be46f5fc1e47f1a6 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 4 Mar 2023 18:45:25 +0000
Subject: [PATCH 2592/2840] Include contributing page to the docs (#4144)

* Add MyST parser

* Include contributing page to the docs
---
 docs/conf.py          | 4 ++--
 docs/contributing.md  | 3 +++
 docs/index.rst        | 1 +
 docs/requirements.txt | 1 +
 4 files changed, 7 insertions(+), 2 deletions(-)
 create mode 100644 docs/contributing.md

diff --git a/docs/conf.py b/docs/conf.py
index b53e6a7e7..b1a97750a 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -23,13 +23,13 @@ now = datetime.now()
 
 # Add any Sphinx extension module names here, as strings. They can be extensions
 # coming with Sphinx (named 'sphinx.ext.*') or your custom ones.
-extensions = []
+extensions = ["myst_parser"]
 
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ["_templates"]
 
 # The suffix of source filenames.
-source_suffix = ".rst"
+source_suffix = [".rst", ".md"]
 
 # The encoding of source files.
 # source_encoding = 'utf-8-sig'
diff --git a/docs/contributing.md b/docs/contributing.md
new file mode 100644
index 000000000..66c1f98d3
--- /dev/null
+++ b/docs/contributing.md
@@ -0,0 +1,3 @@
+```{include} ../CONTRIBUTING.md
+
+```
diff --git a/docs/index.rst b/docs/index.rst
index dae641d10..da5186487 100644
--- a/docs/index.rst
+++ b/docs/index.rst
@@ -27,6 +27,7 @@ Contents
    websocket
    faq
    troubleshooting
+   contributing
 
 Indices and tables
 ------------------
diff --git a/docs/requirements.txt b/docs/requirements.txt
index 0982f3d25..d86ecffa9 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,2 +1,3 @@
 sphinx==6.1.3
 sphinx-rtd-theme==1.2.0
+myst-parser==0.19.0

From 6e7355a8c9a44926bc8456f722c9ed542ef8a7da Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 4 Mar 2023 13:57:53 -0500
Subject: [PATCH 2593/2840] Update myst-parser to 0.19.1 (#4193)

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

diff --git a/docs/requirements.txt b/docs/requirements.txt
index d86ecffa9..661e9c02a 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,3 +1,3 @@
 sphinx==6.1.3
 sphinx-rtd-theme==1.2.0
-myst-parser==0.19.0
+myst-parser==0.19.1

From d6e3f41adb571209de5bdd01b3a0de6d03455dfb Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sun, 5 Mar 2023 02:34:22 +0000
Subject: [PATCH 2594/2840] Release 2023.03.04

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1d05a30f9..c06100e04 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 -->
 
+## 2023.03.04
+
+### Changed
+- Add option to serve media files locally using nginx ([#2457](https://github.com/cookiecutter/cookiecutter-django/pull/2457))
+### Documentation
+- Include contributing page to the docs ([#4144](https://github.com/cookiecutter/cookiecutter-django/pull/4144))
+### Updated
+- Update myst-parser to 0.19.1 ([#4193](https://github.com/cookiecutter/cookiecutter-django/pull/4193))
+- Update pytest to 7.2.2 ([#4191](https://github.com/cookiecutter/cookiecutter-django/pull/4191))
+- Update drf-spectacular to 0.26.0 ([#4192](https://github.com/cookiecutter/cookiecutter-django/pull/4192))
+
 ## 2023.02.28
 
 ### Updated
diff --git a/setup.py b/setup.py
index 7e2bfa625..cd6170bb5 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.02.28"
+version = "2023.03.04"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 305364f5ad7852cd983be608dd1f625ef05c1aaf Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 7 Mar 2023 15:39:49 -0500
Subject: [PATCH 2595/2840] Update django-environ to 0.10.0 (#4195)

---
 {{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 18630c7b8..1550be1bb 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -30,7 +30,7 @@ uvicorn[standard]==0.20.0  # https://github.com/encode/uvicorn
 # Django
 # ------------------------------------------------------------------------------
 django==4.0.10  # pyup: < 4.1  # https://www.djangoproject.com/
-django-environ==0.9.0  # https://github.com/joke2k/django-environ
+django-environ==0.10.0  # https://github.com/joke2k/django-environ
 django-model-utils==4.3.1  # https://github.com/jazzband/django-model-utils
 django-allauth==0.52.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==2.0  # https://github.com/django-crispy-forms/django-crispy-forms

From c326c3476b992da2ed289d808ff7d5e1db11c087 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 7 Mar 2023 15:40:09 -0500
Subject: [PATCH 2596/2840] Update mypy to 1.1.1 (#4196)

---
 {{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 e1ab2dc29..e0928bc21 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -13,7 +13,7 @@ watchfiles==0.18.1  # https://github.com/samuelcolvin/watchfiles
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==1.0.1  # https://github.com/python/mypy
+mypy==1.1.1  # https://github.com/python/mypy
 django-stubs==1.15.0  # https://github.com/typeddjango/django-stubs
 pytest==7.2.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.6  # https://github.com/Frozenball/pytest-sugar

From c19957604a212a0aeb5f71c86b087e749ba19216 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 7 Mar 2023 15:40:54 -0500
Subject: [PATCH 2597/2840] Update myst-parser to 1.0.0 (#4197)

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

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 661e9c02a..c16401c84 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,3 +1,3 @@
 sphinx==6.1.3
 sphinx-rtd-theme==1.2.0
-myst-parser==0.19.1
+myst-parser==1.0.0

From e6014675d276396d20c9fd6b836ab0d4e827292d Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 8 Mar 2023 02:31:52 +0000
Subject: [PATCH 2598/2840] Release 2023.03.07

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c06100e04..4a678abce 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 -->
 
+## 2023.03.07
+
+### Updated
+- Update mypy to 1.1.1 ([#4196](https://github.com/cookiecutter/cookiecutter-django/pull/4196))
+- Update django-environ to 0.10.0 ([#4195](https://github.com/cookiecutter/cookiecutter-django/pull/4195))
+
 ## 2023.03.04
 
 ### Changed
diff --git a/setup.py b/setup.py
index cd6170bb5..46fe6e06f 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.03.04"
+version = "2023.03.07"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From a5d8b4be8864b72c78ef9c257b46837ca0bcc51d Mon Sep 17 00:00:00 2001
From: mpsantos <mpsantos@gmail.com>
Date: Thu, 9 Mar 2023 07:43:50 -0300
Subject: [PATCH 2599/2840] Fix the omit configuration for coverage (#4201)

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

diff --git a/{{cookiecutter.project_slug}}/setup.cfg b/{{cookiecutter.project_slug}}/setup.cfg
index 7ee60215a..e282af36a 100644
--- a/{{cookiecutter.project_slug}}/setup.cfg
+++ b/{{cookiecutter.project_slug}}/setup.cfg
@@ -35,6 +35,6 @@ ignore_errors = True
 
 [coverage:run]
 include = {{cookiecutter.project_slug}}/**
-omit = *migrations*, *tests*
+omit = */migrations/*, */tests/*
 plugins =
     django_coverage_plugin

From 7aba8c4e95e817fe17227318d053e3a07422c0df Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Thu, 9 Mar 2023 10:44:26 +0000
Subject: [PATCH 2600/2840] 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 c15476cc3..e84337123 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1377,5 +1377,10 @@
     "name": "Arkadiusz Michał Ryś",
     "github_login": "arrys",
     "twitter_username": ""
+  },
+  {
+    "name": "mpsantos",
+    "github_login": "mpsantos",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index af99445d4..f78278e34 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1440,6 +1440,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>mpsantos</td>
+    <td>
+      <a href="https://github.com/mpsantos">mpsantos</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Naveen</td>
     <td>

From 522d5219f68b6c7da40d13243ed481072640d2d5 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 9 Mar 2023 12:25:14 -0500
Subject: [PATCH 2601/2840] Update ipdb to 0.13.13 (#4202)

---
 {{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 e0928bc21..218cdcaad 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,7 +1,7 @@
 -r base.txt
 
 Werkzeug[watchdog]==2.2.3 # https://github.com/pallets/werkzeug
-ipdb==0.13.11  # https://github.com/gotcha/ipdb
+ipdb==0.13.13  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.9.5  # https://github.com/psycopg/psycopg2
 {%- else %}

From a3781084c1a6d24a52428d15fe6140c09aca58db Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 10 Mar 2023 02:32:50 +0000
Subject: [PATCH 2602/2840] Release 2023.03.09

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4a678abce..00daff8e2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.03.09
+
+### Fixed
+- Fix the omit configuration for coverage ([#4201](https://github.com/cookiecutter/cookiecutter-django/pull/4201))
+### Updated
+- Update ipdb to 0.13.13 ([#4202](https://github.com/cookiecutter/cookiecutter-django/pull/4202))
+
 ## 2023.03.07
 
 ### Updated
diff --git a/setup.py b/setup.py
index 46fe6e06f..e6f1f0b65 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.03.07"
+version = "2023.03.09"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 1840ed7b395c482a792c1f5f60ac2da6d26441c6 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 13 Mar 2023 03:21:15 -0500
Subject: [PATCH 2603/2840] Update tox to 4.4.7 (#4207)

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

diff --git a/requirements.txt b/requirements.txt
index 5a65d6160..b2e7cedb4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==3.1.1
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.4.6
+tox==4.4.7
 pytest==7.2.2
 pytest-cookies==0.6.1
 pytest-instafail==0.4.2

From d588f71dff05538fca4b4ac9a195cffe2dfc4a70 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 13 Mar 2023 03:21:59 -0500
Subject: [PATCH 2604/2840] Update django-anymail to 9.1 (#4206)

---
 .../requirements/production.txt                | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 3d725fae7..c79f98431 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -24,21 +24,21 @@ django-storages[google]==1.13.2  # https://github.com/jschneier/django-storages
 django-storages[azure]==1.13.2  # https://github.com/jschneier/django-storages
 {%- endif %}
 {%- if cookiecutter.mail_service == 'Mailgun' %}
-django-anymail[mailgun]==9.0  # https://github.com/anymail/django-anymail
+django-anymail[mailgun]==9.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
-django-anymail[amazon_ses]==9.0  # https://github.com/anymail/django-anymail
+django-anymail[amazon_ses]==9.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
-django-anymail[mailjet]==9.0  # https://github.com/anymail/django-anymail
+django-anymail[mailjet]==9.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
-django-anymail[mandrill]==9.0  # https://github.com/anymail/django-anymail
+django-anymail[mandrill]==9.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
-django-anymail[postmark]==9.0  # https://github.com/anymail/django-anymail
+django-anymail[postmark]==9.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
-django-anymail[sendgrid]==9.0  # https://github.com/anymail/django-anymail
+django-anymail[sendgrid]==9.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
-django-anymail[sendinblue]==9.0  # https://github.com/anymail/django-anymail
+django-anymail[sendinblue]==9.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
-django-anymail[sparkpost]==9.0  # https://github.com/anymail/django-anymail
+django-anymail[sparkpost]==9.1  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
-django-anymail==9.0  # https://github.com/anymail/django-anymail
+django-anymail==9.1  # https://github.com/anymail/django-anymail
 {%- endif %}

From ef73440c223b9459f8c59bf910c13ef741a58aa2 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 13 Mar 2023 03:23:58 -0500
Subject: [PATCH 2605/2840] Update uvicorn to 0.21.0 (#4203)

---
 {{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 1550be1bb..f8ef0f150 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -24,7 +24,7 @@ flower==1.2.0  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn[standard]==0.20.0  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.21.0  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django

From fe947fabfbd4f767ef74e34e42a6e3c256523c7b Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 14 Mar 2023 02:17:49 +0000
Subject: [PATCH 2606/2840] Release 2023.03.13

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 00daff8e2..b938ecc05 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.03.13
+
+### Updated
+- Update uvicorn to 0.21.0 ([#4203](https://github.com/cookiecutter/cookiecutter-django/pull/4203))
+- Update django-anymail to 9.1 ([#4206](https://github.com/cookiecutter/cookiecutter-django/pull/4206))
+- Update tox to 4.4.7 ([#4207](https://github.com/cookiecutter/cookiecutter-django/pull/4207))
+
 ## 2023.03.09
 
 ### Fixed
diff --git a/setup.py b/setup.py
index e6f1f0b65..cf45c28eb 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.03.09"
+version = "2023.03.13"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From f08c81eb2ce23d9a79a619ae08d372782d44473e Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 14 Mar 2023 08:22:37 -0500
Subject: [PATCH 2607/2840] Update django-celery-beat from 2.4.0 to 2.5.0
 (#4208)

---
 {{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 f8ef0f150..e94221728 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -18,7 +18,7 @@ hiredis==2.2.2  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
 celery==5.2.7  # pyup: < 6.0  # https://github.com/celery/celery
-django-celery-beat==2.4.0  # https://github.com/celery/django-celery-beat
+django-celery-beat==2.5.0  # https://github.com/celery/django-celery-beat
 {%- if cookiecutter.use_docker == 'y' %}
 flower==1.2.0  # https://github.com/mher/flower
 {%- endif %}

From 6e078fad858d9095bce2f50fb69c7810dceb4c6d Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 15 Mar 2023 02:23:03 +0000
Subject: [PATCH 2608/2840] Release 2023.03.14

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index b938ecc05..8457fa646 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 -->
 
+## 2023.03.14
+
+### Updated
+- Update django-celery-beat to 2.5.0 ([#4208](https://github.com/cookiecutter/cookiecutter-django/pull/4208))
+
 ## 2023.03.13
 
 ### Updated
diff --git a/setup.py b/setup.py
index cf45c28eb..762673d9a 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.03.13"
+version = "2023.03.14"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From c56088406c4c928e8e8c9f9e3b923000c5e7b4f9 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 16 Mar 2023 08:30:32 -0500
Subject: [PATCH 2609/2840] Update django-allauth from 0.52.0 to 0.53.0 (#4210)

---
 {{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 e94221728..ff85377e5 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -32,7 +32,7 @@ uvicorn[standard]==0.21.0  # https://github.com/encode/uvicorn
 django==4.0.10  # pyup: < 4.1  # https://www.djangoproject.com/
 django-environ==0.10.0  # https://github.com/joke2k/django-environ
 django-model-utils==4.3.1  # https://github.com/jazzband/django-model-utils
-django-allauth==0.52.0  # https://github.com/pennersr/django-allauth
+django-allauth==0.53.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==2.0  # https://github.com/django-crispy-forms/django-crispy-forms
 crispy-bootstrap5==0.7  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}

From 5cd58ce160c8348c73acca5b05d75b68c3f6c369 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 16 Mar 2023 10:37:33 -0500
Subject: [PATCH 2610/2840] Update uvicorn to 0.21.1 (#4211)

---
 {{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 ff85377e5..2fff9561f 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -24,7 +24,7 @@ flower==1.2.0  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn[standard]==0.21.0  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.21.1  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django

From d90f16b6479327f6e4acd7695acec29ac241b2f1 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 16 Mar 2023 16:05:02 +0000
Subject: [PATCH 2611/2840] Pin base Python Docker images to bugfix (#4194)

* Pin base Python Docker images to bugfix

Fix #1810

* Skip major & minor versions of Docker images in Dependabot

* Remove argument for docs Docker image

* Update Dependabot config of generated project
---
 .github/dependabot.yml                        |  9 +++++
 .../.github/dependabot.yml                    | 40 +++++++++++--------
 .../compose/local/django/Dockerfile           |  4 +-
 .../compose/local/docs/Dockerfile             |  4 +-
 .../compose/production/django/Dockerfile      |  4 +-
 5 files changed, 35 insertions(+), 26 deletions(-)

diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index d95192f33..d308ff96a 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -27,6 +27,9 @@ updates:
     directory: "{{cookiecutter.project_slug}}/compose/local/django/"
     schedule:
       interval: "daily"
+    ignore:
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major", "version-update:semver-minor"]
     labels:
       - "update"
 
@@ -34,6 +37,9 @@ updates:
     directory: "{{cookiecutter.project_slug}}/compose/local/docs/"
     schedule:
       interval: "daily"
+    ignore:
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major", "version-update:semver-minor"]
     labels:
       - "update"
 
@@ -55,6 +61,9 @@ updates:
     directory: "{{cookiecutter.project_slug}}/compose/production/django/"
     schedule:
       interval: "daily"
+    ignore:
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major", "version-update:semver-minor"]
     labels:
       - "update"
 
diff --git a/{{cookiecutter.project_slug}}/.github/dependabot.yml b/{{cookiecutter.project_slug}}/.github/dependabot.yml
index 420a63cdc..3f4eefe94 100644
--- a/{{cookiecutter.project_slug}}/.github/dependabot.yml
+++ b/{{cookiecutter.project_slug}}/.github/dependabot.yml
@@ -6,7 +6,7 @@ updates:
   # Update GitHub actions in workflows
   - package-ecosystem: "github-actions"
     directory: "/"
-    # Check for updates to GitHub Actions every weekday
+    # Every weekday
     schedule:
       interval: "daily"
 
@@ -19,55 +19,61 @@ updates:
   - package-ecosystem: "docker"
     # Look for a `Dockerfile` in the `compose/local/django` directory
     directory: "compose/local/django/"
-    # Check for updates to GitHub Actions every weekday
+    # Every weekday
     schedule:
       interval: "daily"
+    # Ignore minor version updates (3.10 -> 3.11) but update patch versions
+    ignore:
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major", "version-update:semver-minor"]
 
-  # Enable version updates for Docker
   - package-ecosystem: "docker"
     # Look for a `Dockerfile` in the `compose/local/docs` directory
     directory: "compose/local/docs/"
-    # Check for updates to GitHub Actions every weekday
+    # Every weekday
     schedule:
       interval: "daily"
+    # Ignore minor version updates (3.10 -> 3.11) but update patch versions
+    ignore:
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major", "version-update:semver-minor"]
 
-  # Enable version updates for Docker
   - package-ecosystem: "docker"
     # Look for a `Dockerfile` in the `compose/local/node` directory
     directory: "compose/local/node/"
-    # Check for updates to GitHub Actions every weekday
+    # Every weekday
     schedule:
       interval: "daily"
 
-  # Enable version updates for Docker
   - package-ecosystem: "docker"
     # Look for a `Dockerfile` in the `compose/production/aws` directory
     directory: "compose/production/aws/"
-    # Check for updates to GitHub Actions every weekday
+    # Every weekday
     schedule:
       interval: "daily"
 
-  # Enable version updates for Docker
   - package-ecosystem: "docker"
     # Look for a `Dockerfile` in the `compose/production/django` directory
     directory: "compose/production/django/"
-    # Check for updates to GitHub Actions every weekday
+    # Every weekday
     schedule:
       interval: "daily"
+    # Ignore minor version updates (3.10 -> 3.11) but update patch versions
+    ignore:
+      - dependency-name: "*"
+        update-types: ["version-update:semver-major", "version-update:semver-minor"]
 
-  # Enable version updates for Docker
   - package-ecosystem: "docker"
     # Look for a `Dockerfile` in the `compose/production/postgres` directory
     directory: "compose/production/postgres/"
-    # Check for updates to GitHub Actions every weekday
+    # Every weekday
     schedule:
       interval: "daily"
 
-  # Enable version updates for Docker
   - package-ecosystem: "docker"
     # Look for a `Dockerfile` in the `compose/production/traefik` directory
     directory: "compose/production/traefik/"
-    # Check for updates to GitHub Actions every weekday
+    # Every weekday
     schedule:
       interval: "daily"
 
@@ -78,7 +84,7 @@ updates:
     # Look for a `requirements.txt` in the `root` directory
     # also 'setup.cfg', 'runtime.txt' and 'requirements/*.txt'
     directory: "/"
-    # Check for updates to GitHub Actions every weekday
+    # Every weekday
     schedule:
       interval: "daily"
 
@@ -86,9 +92,9 @@ updates:
 
   # Enable version updates for javascript/npm
   - package-ecosystem: "npm"
-    # Look for a `packages.json' in the `root` directory
+    # Look for a `packages.json` in the `root` directory
     directory: "/"
-    # Check for updates to GitHub Actions every weekday
+    # Every weekday
     schedule:
       interval: "daily"
 
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index 3ea6b2d4c..36659d31d 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -1,7 +1,5 @@
-ARG PYTHON_VERSION=3.10-slim-bullseye
-
 # define an alias for the specfic python version used in this file.
-FROM python:${PYTHON_VERSION} as python
+FROM python:3.10.9-slim-bullseye as python
 
 # Python build stage
 FROM python as python-build-stage
diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
index c45d18c95..f52e34d26 100644
--- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
@@ -1,7 +1,5 @@
-ARG PYTHON_VERSION=3.10-slim-bullseye
-
 # define an alias for the specfic python version used in this file.
-FROM python:${PYTHON_VERSION} as python
+FROM python:3.10.9-slim-bullseye as python
 
 
 # Python build stage
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index ef80441ba..ac4ca7714 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -1,5 +1,3 @@
-ARG PYTHON_VERSION=3.10-slim-bullseye
-
 {% if cookiecutter.frontend_pipeline in ['Gulp', 'Webpack'] -%}
 FROM node:16-bullseye-slim as client-builder
 
@@ -28,7 +26,7 @@ RUN npm run build
 {%- endif %}
 
 # define an alias for the specfic python version used in this file.
-FROM python:${PYTHON_VERSION} as python
+FROM python:3.10.9-slim-bullseye as python
 
 # Python build stage
 FROM python as python-build-stage

From 6554049a8751f8c541f358d7ec8ea9c7612112a9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Mar 2023 16:35:28 +0000
Subject: [PATCH 2612/2840] Bump Docker python image from 3.10.9-slim-bullseye
 to 3.10.10-slim-bullseye for local Django service (#4212)

Bumps python from 3.10.9-slim-bullseye to 3.10.10-slim-bullseye.

---
updated-dependencies:
- dependency-name: python
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/compose/local/django/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index 36659d31d..4be394f72 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -1,5 +1,5 @@
 # define an alias for the specfic python version used in this file.
-FROM python:3.10.9-slim-bullseye as python
+FROM python:3.10.10-slim-bullseye as python
 
 # Python build stage
 FROM python as python-build-stage

From 96950f2191094edb890ca5f02f97d191d895636e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Mar 2023 16:35:57 +0000
Subject: [PATCH 2613/2840] Bump Docker python image from 3.10.9-slim-bullseye
 to 3.10.10-slim-bullseye for docs (#4213)

Bumps python from 3.10.9-slim-bullseye to 3.10.10-slim-bullseye.

---
updated-dependencies:
- dependency-name: python
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/compose/local/docs/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
index f52e34d26..587b8d3ae 100644
--- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
@@ -1,5 +1,5 @@
 # define an alias for the specfic python version used in this file.
-FROM python:3.10.9-slim-bullseye as python
+FROM python:3.10.10-slim-bullseye as python
 
 
 # Python build stage

From 160510132187e2fd269bca4c798671fff30da456 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 16 Mar 2023 17:13:53 +0000
Subject: [PATCH 2614/2840] Bump Docker python image from 3.10.9 to 3.10.10 on
 production Django (#4214)

Bumps python from 3.10.9-slim-bullseye to 3.10.10-slim-bullseye.

---
updated-dependencies:
- dependency-name: python
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../compose/production/django/Dockerfile                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index ac4ca7714..8ca35f180 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -26,7 +26,7 @@ RUN npm run build
 {%- endif %}
 
 # define an alias for the specfic python version used in this file.
-FROM python:3.10.9-slim-bullseye as python
+FROM python:3.10.10-slim-bullseye as python
 
 # Python build stage
 FROM python as python-build-stage

From 73628a5f48193435480b07f1acc99eaab7ec1595 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 16 Mar 2023 12:15:46 -0500
Subject: [PATCH 2615/2840] Update sentry-sdk to 1.17.0 (#4215)

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

From 9ac1abe194dd2080f80b104f70e5e89d34eaf313 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 16 Mar 2023 12:16:04 -0500
Subject: [PATCH 2616/2840] Update coverage to 7.2.2 (#4218)

---
 {{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 218cdcaad..b160eed22 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==6.0.0  # https://github.com/PyCQA/flake8
 flake8-isort==6.0.0  # https://github.com/gforcada/flake8-isort
-coverage==7.2.1  # https://github.com/nedbat/coveragepy
+coverage==7.2.2  # https://github.com/nedbat/coveragepy
 black==23.1.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From dcea8f1e7bde5e1faf6bd788f0141c53c2dffcd9 Mon Sep 17 00:00:00 2001
From: Hoai-Thu Vuong <thuvh@users.noreply.github.com>
Date: Fri, 17 Mar 2023 00:17:02 +0700
Subject: [PATCH 2617/2840] Trim leading and trailing space in `domain_name`
 and `email` (#4163)

* remove trailing space in domain_name and email

* Add test for leading and trailing spaces removals

* Move magic string and add a comment explaining its role

---------

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
---
 cookiecutter.json                     |  2 +-
 hooks/pre_gen_project.py              |  8 ++++++++
 tests/test_cookiecutter_generation.py | 21 ++++++++++++++++++++-
 3 files changed, 29 insertions(+), 2 deletions(-)

diff --git a/cookiecutter.json b/cookiecutter.json
index cf4da9a45..b24ce4286 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -4,7 +4,7 @@
   "description": "Behold My Awesome Project!",
   "author_name": "Daniel Roy Greenfeld",
   "domain_name": "example.com",
-  "email": "{{ cookiecutter.author_name.lower()|replace(' ', '-') }}@example.com",
+  "email": "{{ cookiecutter.author_name.lower() | trim() |replace(' ', '-') }}@{{ cookiecutter.domain_name.lower() | trim() }}",
   "version": "0.1.0",
   "open_source_license": [
     "MIT",
diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py
index c3eef1e43..4f4378f58 100644
--- a/hooks/pre_gen_project.py
+++ b/hooks/pre_gen_project.py
@@ -17,6 +17,14 @@ INFO = "\x1b[1;33m [INFO]: "
 HINT = "\x1b[3;33m"
 SUCCESS = "\x1b[1;32m [SUCCESS]: "
 
+# The content of this string is evaluated by Jinja, and plays an important role.
+# It updates the cookiecutter context to trim leading and trailing spaces
+# from domain/email values
+"""
+{{ cookiecutter.update({ "domain_name": cookiecutter.domain_name | trim }) }}
+{{ cookiecutter.update({ "email": cookiecutter.email | trim }) }}
+"""
+
 project_slug = "{{ cookiecutter.project_slug }}"
 if hasattr(project_slug, "isidentifier"):
     assert (
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 7628e5e1d..eb6c4710f 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -319,10 +319,29 @@ def test_error_if_incompatible(cookies, context, invalid_context):
     ],
 )
 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_path}/docs/index.rst") as f:
         has_pycharm_docs = "pycharm/configuration" in f.read()
         assert has_pycharm_docs is pycharm_docs_exist
+
+
+def test_trim_domain_email(cookies, context):
+    """Check that leading and trailing spaces are trimmed in domain and email."""
+    context.update(
+        {
+            "use_docker": "y",
+            "domain_name": "   example.com   ",
+            "email": "  me@example.com  ",
+        }
+    )
+    result = cookies.bake(extra_context=context)
+
+    assert result.exit_code == 0
+
+    prod_django_env = result.project_path / ".envs" / ".production" / ".django"
+    assert "DJANGO_ALLOWED_HOSTS=.example.com" in prod_django_env.read_text()
+
+    base_settings = result.project_path / "config" / "settings" / "base.py"
+    assert '"me@example.com"' in base_settings.read_text()

From d4a3887e2d1565e7e48608d4ef3443cccf470eeb Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 16 Mar 2023 12:29:41 -0500
Subject: [PATCH 2618/2840] Update django-stubs to 1.16.0 (#4216)

---
 {{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 b160eed22..c81d4ee07 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -14,7 +14,7 @@ watchfiles==0.18.1  # https://github.com/samuelcolvin/watchfiles
 # Testing
 # ------------------------------------------------------------------------------
 mypy==1.1.1  # https://github.com/python/mypy
-django-stubs==1.15.0  # https://github.com/typeddjango/django-stubs
+django-stubs==1.16.0  # https://github.com/typeddjango/django-stubs
 pytest==7.2.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.6  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}

From 52b1a59b7f4257dae387c01a3126d2506472066a Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 16 Mar 2023 12:30:17 -0500
Subject: [PATCH 2619/2840] Update djangorestframework-stubs to 1.10.0 (#4217)

---
 {{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 c81d4ee07..1760bdcfe 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -18,7 +18,7 @@ django-stubs==1.16.0  # https://github.com/typeddjango/django-stubs
 pytest==7.2.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.6  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
-djangorestframework-stubs==1.9.1  # https://github.com/typeddjango/djangorestframework-stubs
+djangorestframework-stubs==1.10.0  # https://github.com/typeddjango/djangorestframework-stubs
 {%- endif %}
 
 # Documentation

From d53a51c9b3d37a90a931b1faa1ab152c91ba2a57 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 17 Mar 2023 02:21:28 +0000
Subject: [PATCH 2620/2840] Release 2023.03.16

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8457fa646..061dd01c4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,23 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.03.16
+
+### Changed
+- Pin base Python Docker images to bugfix ([#4194](https://github.com/cookiecutter/cookiecutter-django/pull/4194))
+### Fixed
+- Trim leading and trailing space in `domain_name` and `email` ([#4163](https://github.com/cookiecutter/cookiecutter-django/pull/4163))
+### Updated
+- Update djangorestframework-stubs to 1.10.0 ([#4217](https://github.com/cookiecutter/cookiecutter-django/pull/4217))
+- Update django-stubs to 1.16.0 ([#4216](https://github.com/cookiecutter/cookiecutter-django/pull/4216))
+- Update coverage to 7.2.2 ([#4218](https://github.com/cookiecutter/cookiecutter-django/pull/4218))
+- Update sentry-sdk to 1.17.0 ([#4215](https://github.com/cookiecutter/cookiecutter-django/pull/4215))
+- Bump Docker python image from 3.10.9 to 3.10.10 on production Django ([#4214](https://github.com/cookiecutter/cookiecutter-django/pull/4214))
+- Bump Docker python image from 3.10.9-slim-bullseye to 3.10.10-slim-bullseye for docs ([#4213](https://github.com/cookiecutter/cookiecutter-django/pull/4213))
+- Bump Docker python image from 3.10.9-slim-bullseye to 3.10.10-slim-bullseye for local Django service ([#4212](https://github.com/cookiecutter/cookiecutter-django/pull/4212))
+- Update uvicorn to 0.21.1 ([#4211](https://github.com/cookiecutter/cookiecutter-django/pull/4211))
+- Update django-allauth to 0.53.0 ([#4210](https://github.com/cookiecutter/cookiecutter-django/pull/4210))
+
 ## 2023.03.14
 
 ### Updated
diff --git a/setup.py b/setup.py
index 762673d9a..bb49aa4b4 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.03.14"
+version = "2023.03.16"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From d78fe734da8f8721593d215a9e2b378c737e062b Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 18 Mar 2023 05:37:38 -0500
Subject: [PATCH 2621/2840] Update pre-commit to 3.2.0 (#4219)

* Update pre-commit from 3.1.1 to 3.2.0

* Update pre-commit from 3.1.1 to 3.2.0
---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index b2e7cedb4..a20ddaa56 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ black==23.1.0
 isort==5.12.0
 flake8==6.0.0
 flake8-isort==6.0.0
-pre-commit==3.1.1
+pre-commit==3.2.0
 
 # Testing
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 1760bdcfe..65cbfc8c0 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -36,7 +36,7 @@ pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}
-pre-commit==3.1.1  # https://github.com/pre-commit/pre-commit
+pre-commit==3.2.0  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From b32f579ad82ce905ebfd68f6f674f4364b667e8c Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 18 Mar 2023 05:46:31 -0500
Subject: [PATCH 2622/2840] Update pygithub from 1.58.0 to 1.58.1 (#4220)

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

diff --git a/requirements.txt b/requirements.txt
index a20ddaa56..466975b66 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -20,7 +20,7 @@ pyyaml==6.0
 
 # Scripting
 # ------------------------------------------------------------------------------
-PyGithub==1.58.0
+PyGithub==1.58.1
 gitpython==3.1.31
 jinja2==3.1.2
 requests==2.28.2

From b159194897f75fa2fa062169ad252e7215cedb3d Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 18 Mar 2023 17:36:31 -0500
Subject: [PATCH 2623/2840] Update drf-spectacular from 0.26.0 to 0.26.1
 (#4221)

---
 {{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 2fff9561f..0b29caa89 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -44,7 +44,7 @@ django-redis==5.2.0  # https://github.com/jazzband/django-redis
 djangorestframework==3.14.0  # https://github.com/encode/django-rest-framework
 django-cors-headers==3.14.0  # https://github.com/adamchainz/django-cors-headers
 # DRF-spectacular for api documentation
-drf-spectacular==0.26.0  # https://github.com/tfranzel/drf-spectacular
+drf-spectacular==0.26.1  # https://github.com/tfranzel/drf-spectacular
 {%- endif %}
 {%- if cookiecutter.frontend_pipeline == 'Webpack' %}
 django-webpack-loader==1.8.1  # https://github.com/django-webpack/django-webpack-loader

From 641ffb5bd427eab89bfcfda7de51c777a46f7628 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sun, 19 Mar 2023 02:29:01 +0000
Subject: [PATCH 2624/2840] Release 2023.03.18

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 061dd01c4..8aea65acb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.03.18
+
+### Updated
+- Update drf-spectacular to 0.26.1 ([#4221](https://github.com/cookiecutter/cookiecutter-django/pull/4221))
+- Update pygithub to 1.58.1 ([#4220](https://github.com/cookiecutter/cookiecutter-django/pull/4220))
+- Update pre-commit to 3.2.0 ([#4219](https://github.com/cookiecutter/cookiecutter-django/pull/4219))
+
 ## 2023.03.16
 
 ### Changed
diff --git a/setup.py b/setup.py
index bb49aa4b4..c4e337020 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.03.16"
+version = "2023.03.18"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 93165c4859fa99072e49878316c29c8aa208086b Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 20 Mar 2023 07:11:01 -0500
Subject: [PATCH 2625/2840] Update redis to 4.5.2 (#4222)

---
 {{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 0b29caa89..d093c48d2 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -12,7 +12,7 @@ argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==6.4.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==4.5.1  # https://github.com/redis/redis-py
+redis==4.5.2  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.2.2  # https://github.com/redis/hiredis-py
 {%- endif %}

From 95ec685983876611828c577bead28eb09b73e70a Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 20 Mar 2023 07:11:18 -0500
Subject: [PATCH 2626/2840] Update django-allauth to 0.53.1 (#4223)

---
 {{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 d093c48d2..bb25c87e7 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -32,7 +32,7 @@ uvicorn[standard]==0.21.1  # https://github.com/encode/uvicorn
 django==4.0.10  # pyup: < 4.1  # https://www.djangoproject.com/
 django-environ==0.10.0  # https://github.com/joke2k/django-environ
 django-model-utils==4.3.1  # https://github.com/jazzband/django-model-utils
-django-allauth==0.53.0  # https://github.com/pennersr/django-allauth
+django-allauth==0.53.1  # https://github.com/pennersr/django-allauth
 django-crispy-forms==2.0  # https://github.com/django-crispy-forms/django-crispy-forms
 crispy-bootstrap5==0.7  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}

From 386330de0e3752884691a1ff23aa76e02aa70581 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 20 Mar 2023 16:46:33 -0500
Subject: [PATCH 2627/2840] Update sh from 2.0.2 to 2.0.3 (#4224)

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

diff --git a/requirements.txt b/requirements.txt
index 466975b66..85012dcb0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 cookiecutter==2.1.1
-sh==2.0.2; sys_platform != "win32"
+sh==2.0.3; sys_platform != "win32"
 binaryornot==0.4.4
 
 # Code quality

From ba0a6afa8156bd0dd62dcb167860f7f764f2c36b Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 21 Mar 2023 02:17:59 +0000
Subject: [PATCH 2628/2840] Release 2023.03.20

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 8aea65acb..123471e1f 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 -->
 
+## 2023.03.20
+
+### Updated
+- Update django-allauth to 0.53.1 ([#4223](https://github.com/cookiecutter/cookiecutter-django/pull/4223))
+- Update redis to 4.5.2 ([#4222](https://github.com/cookiecutter/cookiecutter-django/pull/4222))
+
 ## 2023.03.18
 
 ### Updated
diff --git a/setup.py b/setup.py
index c4e337020..43b269032 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.03.18"
+version = "2023.03.20"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 8eb30dfae3ece511df113515979132217f4944a6 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 22 Mar 2023 15:33:08 -0500
Subject: [PATCH 2629/2840] Update pytest-cookies from 0.6.1 to 0.7.0 (#4226)

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

diff --git a/requirements.txt b/requirements.txt
index 85012dcb0..672d40b02 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,7 +14,7 @@ pre-commit==3.2.0
 # ------------------------------------------------------------------------------
 tox==4.4.7
 pytest==7.2.2
-pytest-cookies==0.6.1
+pytest-cookies==0.7.0
 pytest-instafail==0.4.2
 pyyaml==6.0
 

From 3533b4dd93fae6068438d72119eb4bc0839229d1 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 22 Mar 2023 15:34:03 -0500
Subject: [PATCH 2630/2840] Update redis from 4.5.2 to 4.5.3 (#4227)

---
 {{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 bb25c87e7..911b44b3f 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -12,7 +12,7 @@ argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==6.4.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==4.5.2  # https://github.com/redis/redis-py
+redis==4.5.3  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.2.2  # https://github.com/redis/hiredis-py
 {%- endif %}

From 9c23bb0194581c2dbd0a4d581a5bdf22640bc627 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 23 Mar 2023 02:18:47 +0000
Subject: [PATCH 2631/2840] Release 2023.03.22

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 123471e1f..6563022af 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 -->
 
+## 2023.03.22
+
+### Updated
+- Update redis to 4.5.3 ([#4227](https://github.com/cookiecutter/cookiecutter-django/pull/4227))
+
 ## 2023.03.20
 
 ### Updated
diff --git a/setup.py b/setup.py
index 43b269032..fe04abc05 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.03.20"
+version = "2023.03.22"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 68133e83547a24f3460846c43ec07f38f0b52469 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 23 Mar 2023 17:15:43 +0000
Subject: [PATCH 2632/2840] Bump traefik from 2.9.8 to 2.9.9 (#4225)

Bumps traefik from 2.9.8 to 2.9.9.

---
updated-dependencies:
- dependency-name: traefik
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../compose/production/traefik/Dockerfile                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
index 2365c4c49..2b146cc63 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
@@ -1,4 +1,4 @@
-FROM traefik:2.9.8
+FROM traefik:2.9.9
 RUN mkdir -p /etc/traefik/acme \
   && touch /etc/traefik/acme/acme.json \
   && chmod 600 /etc/traefik/acme/acme.json

From c2b7e65d81f72fc3d3492a43e6348d1f9ca949e3 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 24 Mar 2023 02:19:52 +0000
Subject: [PATCH 2633/2840] Release 2023.03.23

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6563022af..07fa9122a 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 -->
 
+## 2023.03.23
+
+### Updated
+- Bump traefik from 2.9.8 to 2.9.9 ([#4225](https://github.com/cookiecutter/cookiecutter-django/pull/4225))
+
 ## 2023.03.22
 
 ### Updated
diff --git a/setup.py b/setup.py
index fe04abc05..8ec8f4281 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.03.22"
+version = "2023.03.23"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From ad9ea8823293467aa67b1770b65844a53fbf36a9 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 25 Mar 2023 09:58:44 -0500
Subject: [PATCH 2634/2840] Update pytz from 2022.7.1 to 2023.2 (#4228)

---
 {{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 911b44b3f..463008e09 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,4 +1,4 @@
-pytz==2022.7.1  # https://github.com/stub42/pytz
+pytz==2023.2  # https://github.com/stub42/pytz
 python-slugify==8.0.1  # https://github.com/un33k/python-slugify
 Pillow==9.4.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}

From 2517d037ded11082207085952d7d2cd7165759e5 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sun, 26 Mar 2023 02:22:45 +0000
Subject: [PATCH 2635/2840] Release 2023.03.25

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 07fa9122a..91b07b4e1 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 -->
 
+## 2023.03.25
+
+### Updated
+- Update pytz to 2023.2 ([#4228](https://github.com/cookiecutter/cookiecutter-django/pull/4228))
+
 ## 2023.03.23
 
 ### Updated
diff --git a/setup.py b/setup.py
index 8ec8f4281..503028691 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.03.23"
+version = "2023.03.25"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 8156efd583a1daef98f098db6a8946fef8d1894f Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 26 Mar 2023 12:44:19 -0500
Subject: [PATCH 2636/2840] Update pre-commit to 3.2.1 (#4229)

* Update pre-commit from 3.2.0 to 3.2.1

* Update pre-commit from 3.2.0 to 3.2.1
---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 672d40b02..658f39cb1 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ black==23.1.0
 isort==5.12.0
 flake8==6.0.0
 flake8-isort==6.0.0
-pre-commit==3.2.0
+pre-commit==3.2.1
 
 # Testing
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 65cbfc8c0..5baf9111d 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -36,7 +36,7 @@ pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}
-pre-commit==3.2.0  # https://github.com/pre-commit/pre-commit
+pre-commit==3.2.1  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From 3ca2c87a17b62428190a9076d9bf8c71524eecd2 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 26 Mar 2023 17:55:44 -0500
Subject: [PATCH 2637/2840] Update tox from 4.4.7 to 4.4.8 (#4231)

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

diff --git a/requirements.txt b/requirements.txt
index 658f39cb1..c4ab1014e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==3.2.1
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.4.7
+tox==4.4.8
 pytest==7.2.2
 pytest-cookies==0.7.0
 pytest-instafail==0.4.2

From b1d06f32a06b8317fa392206308d96712c2d561c Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Mon, 27 Mar 2023 02:19:11 +0000
Subject: [PATCH 2638/2840] Release 2023.03.26

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 91b07b4e1..92bc1b70f 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 -->
 
+## 2023.03.26
+
+### Updated
+- Update pre-commit to 3.2.1 ([#4229](https://github.com/cookiecutter/cookiecutter-django/pull/4229))
+
 ## 2023.03.25
 
 ### Updated
diff --git a/setup.py b/setup.py
index 503028691..b3312a217 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.03.25"
+version = "2023.03.26"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 6475dffbd8bae9ac4774139955ca33caa2cc8fd2 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 27 Mar 2023 18:00:22 -0500
Subject: [PATCH 2639/2840] Update watchfiles from 0.18.1 to 0.19.0 (#4232)

---
 {{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 5baf9111d..a9de59141 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.5  # https://github.com/psycopg/psycopg2
 psycopg2-binary==2.9.5  # https://github.com/psycopg/psycopg2
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %}
-watchfiles==0.18.1  # https://github.com/samuelcolvin/watchfiles
+watchfiles==0.19.0  # https://github.com/samuelcolvin/watchfiles
 {%- endif %}
 
 # Testing

From 53029732824ea9e411e7a9ae4fe9fe0b8446ae64 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 28 Mar 2023 02:20:35 +0000
Subject: [PATCH 2640/2840] Release 2023.03.27

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 92bc1b70f..4767aa20e 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 -->
 
+## 2023.03.27
+
+### Updated
+- Update watchfiles to 0.19.0 ([#4232](https://github.com/cookiecutter/cookiecutter-django/pull/4232))
+
 ## 2023.03.26
 
 ### Updated
diff --git a/setup.py b/setup.py
index b3312a217..66349a791 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.03.26"
+version = "2023.03.27"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From d77b33df434dcda80735a128b6ed6ccdf1a05e0b Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Tue, 28 Mar 2023 23:38:48 +0100
Subject: [PATCH 2641/2840] Update code of conduct link

---
 CODE_OF_CONDUCT.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md
index 8a5fc4158..a7b21223b 100644
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -1,3 +1,3 @@
 ## Code of Conduct
 
-Everyone who interacts in the Cookiecutter project's codebase, issue trackers, chat rooms, and mailing lists is expected to follow the [PyPA Code of Conduct](https://www.pypa.io/en/latest/code-of-conduct/).
+Everyone who interacts in the Cookiecutter project's codebase, issue trackers, chat rooms, and mailing lists is expected to follow the [PSF Code of Conduct](https://www.python.org/psf/conduct/)

From 43c32961e5bf794765379f0d9f5c5e2b968b5625 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 29 Mar 2023 10:53:29 -0500
Subject: [PATCH 2642/2840] Update black to 23.3.0 (#4236)

* Update black from 23.1.0 to 23.3.0

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

diff --git a/requirements.txt b/requirements.txt
index c4ab1014e..4b45e7f81 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -4,7 +4,7 @@ binaryornot==0.4.4
 
 # Code quality
 # ------------------------------------------------------------------------------
-black==23.1.0
+black==23.3.0
 isort==5.12.0
 flake8==6.0.0
 flake8-isort==6.0.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index a9de59141..0b3a39d97 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -31,7 +31,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 flake8==6.0.0  # https://github.com/PyCQA/flake8
 flake8-isort==6.0.0  # https://github.com/gforcada/flake8-isort
 coverage==7.2.2  # https://github.com/nedbat/coveragepy
-black==23.1.0  # https://github.com/psf/black
+black==23.3.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery

From fffc2a2fa60e38a25fd646436b60c737fe921d27 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Wed, 29 Mar 2023 16:53:39 +0100
Subject: [PATCH 2643/2840] Auto-update pre-commit hooks (#4235)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                               | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 438de52b4..2dc0f81cb 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -16,7 +16,7 @@ repos:
         exclude: hooks/
 
   - repo: https://github.com/psf/black
-    rev: 23.1.0
+    rev: 23.3.0
     hooks:
       - id: black
 
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index a8cdb1357..073df732e 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -16,7 +16,7 @@ repos:
         args: [--py310-plus]
 
   - repo: https://github.com/psf/black
-    rev: 23.1.0
+    rev: 23.3.0
     hooks:
       - id: black
 

From 4ed32dde32ffa0f08a246fdc27b35317623ff21e Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 29 Mar 2023 10:54:44 -0500
Subject: [PATCH 2644/2840] Update pytz to 2023.3 (#4238)

---
 {{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 463008e09..d040f45d7 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,4 +1,4 @@
-pytz==2023.2  # https://github.com/stub42/pytz
+pytz==2023.3  # https://github.com/stub42/pytz
 python-slugify==8.0.1  # https://github.com/un33k/python-slugify
 Pillow==9.4.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}

From 694a29794ddc2d11aba5fdf98943eac8a926b18a Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 29 Mar 2023 12:30:37 -0500
Subject: [PATCH 2645/2840] Update redis to 4.5.4 (#4239)

---
 {{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 d040f45d7..1a3766e6e 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -12,7 +12,7 @@ argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==6.4.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==4.5.3  # https://github.com/redis/redis-py
+redis==4.5.4  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.2.2  # https://github.com/redis/hiredis-py
 {%- endif %}

From 6c702a50de2fec1e069f8405c27b2ad5da76c65a Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 30 Mar 2023 02:21:03 +0000
Subject: [PATCH 2646/2840] Release 2023.03.29

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4767aa20e..c339a19b5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.03.29
+
+### Updated
+- Update redis to 4.5.4 ([#4239](https://github.com/cookiecutter/cookiecutter-django/pull/4239))
+- Update pytz to 2023.3 ([#4238](https://github.com/cookiecutter/cookiecutter-django/pull/4238))
+- Update black to 23.3.0 ([#4236](https://github.com/cookiecutter/cookiecutter-django/pull/4236))
+
 ## 2023.03.27
 
 ### Updated
diff --git a/setup.py b/setup.py
index 66349a791..695baf8bc 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.03.27"
+version = "2023.03.29"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 58de1db4a0c716106e44e247f5a8502d5dde7189 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 1 Apr 2023 06:32:09 -0500
Subject: [PATCH 2647/2840] Update django-allauth from 0.53.1 to 0.54.0 (#4241)

---
 {{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 1a3766e6e..392b49abf 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -32,7 +32,7 @@ uvicorn[standard]==0.21.1  # https://github.com/encode/uvicorn
 django==4.0.10  # pyup: < 4.1  # https://www.djangoproject.com/
 django-environ==0.10.0  # https://github.com/joke2k/django-environ
 django-model-utils==4.3.1  # https://github.com/jazzband/django-model-utils
-django-allauth==0.53.1  # https://github.com/pennersr/django-allauth
+django-allauth==0.54.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==2.0  # https://github.com/django-crispy-forms/django-crispy-forms
 crispy-bootstrap5==0.7  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}

From 28f05920cf407c63e7361d1ffb5c0d7ccf31b0f8 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 1 Apr 2023 06:32:20 -0500
Subject: [PATCH 2648/2840] Update pillow from 9.4.0 to 9.5.0 (#4242)

---
 {{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 392b49abf..fb3559194 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,6 +1,6 @@
 pytz==2023.3  # https://github.com/stub42/pytz
 python-slugify==8.0.1  # https://github.com/un33k/python-slugify
-Pillow==9.4.0  # https://github.com/python-pillow/Pillow
+Pillow==9.5.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
 {%- if cookiecutter.windows == 'y' and cookiecutter.use_docker == 'n' %}
 rcssmin==1.1.0 --install-option="--without-c-extensions"  # https://github.com/ndparker/rcssmin

From cf7f919d422fb910fb3cdfba2bd38b25812b5607 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 1 Apr 2023 06:32:32 -0500
Subject: [PATCH 2649/2840] Update pytest-instafail from 0.4.2 to 0.5.0 (#4240)

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

diff --git a/requirements.txt b/requirements.txt
index 4b45e7f81..d635f79a9 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -15,7 +15,7 @@ pre-commit==3.2.1
 tox==4.4.8
 pytest==7.2.2
 pytest-cookies==0.7.0
-pytest-instafail==0.4.2
+pytest-instafail==0.5.0
 pyyaml==6.0
 
 # Scripting

From 9642181b28ef2c9d778e6f1361336f5a16d4cdfb Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sun, 2 Apr 2023 02:18:05 +0000
Subject: [PATCH 2650/2840] Release 2023.04.01

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c339a19b5..2008354ab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.04.01
+
+### Updated
+- Update pytest-instafail to 0.5.0 ([#4240](https://github.com/cookiecutter/cookiecutter-django/pull/4240))
+- Update pillow to 9.5.0 ([#4242](https://github.com/cookiecutter/cookiecutter-django/pull/4242))
+- Update django-allauth to 0.54.0 ([#4241](https://github.com/cookiecutter/cookiecutter-django/pull/4241))
+
 ## 2023.03.29
 
 ### Updated
diff --git a/setup.py b/setup.py
index 695baf8bc..52ec07456 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.03.29"
+version = "2023.04.01"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 3db64512c81a7d045e4b89fb6076c50afd7d9ee7 Mon Sep 17 00:00:00 2001
From: Adin Hodovic <hodovicadin@gmail.com>
Date: Mon, 3 Apr 2023 15:34:45 +0200
Subject: [PATCH 2651/2840] fix: Syntax for ignoring specific errors (#4250)

Noticed when started using pygrep-hooks. Syntax is noqa: code with a colon.
---
 .../config/settings/local.py                       | 10 +++++-----
 .../config/settings/production.py                  | 14 ++++++++------
 .../config/settings/test.py                        |  4 ++--
 .../{{cookiecutter.project_slug}}/users/apps.py    |  2 +-
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py
index 7220c5e4c..09d3bb9fa 100644
--- a/{{cookiecutter.project_slug}}/config/settings/local.py
+++ b/{{cookiecutter.project_slug}}/config/settings/local.py
@@ -47,15 +47,15 @@ EMAIL_BACKEND = env(
 # WhiteNoise
 # ------------------------------------------------------------------------------
 # http://whitenoise.evans.io/en/latest/django.html#using-whitenoise-in-development
-INSTALLED_APPS = ["whitenoise.runserver_nostatic"] + INSTALLED_APPS  # noqa F405
+INSTALLED_APPS = ["whitenoise.runserver_nostatic"] + INSTALLED_APPS  # noqa: F405
 {% endif %}
 
 # django-debug-toolbar
 # ------------------------------------------------------------------------------
 # https://django-debug-toolbar.readthedocs.io/en/latest/installation.html#prerequisites
-INSTALLED_APPS += ["debug_toolbar"]  # noqa F405
+INSTALLED_APPS += ["debug_toolbar"]  # noqa: F405
 # https://django-debug-toolbar.readthedocs.io/en/latest/installation.html#middleware
-MIDDLEWARE += ["debug_toolbar.middleware.DebugToolbarMiddleware"]  # noqa F405
+MIDDLEWARE += ["debug_toolbar.middleware.DebugToolbarMiddleware"]  # noqa: F405
 # https://django-debug-toolbar.readthedocs.io/en/latest/configuration.html#debug-toolbar-config
 DEBUG_TOOLBAR_CONFIG = {
     "DISABLE_PANELS": ["debug_toolbar.panels.redirects.RedirectsPanel"],
@@ -82,7 +82,7 @@ if env("USE_DOCKER") == "yes":
 # django-extensions
 # ------------------------------------------------------------------------------
 # https://django-extensions.readthedocs.io/en/latest/installation_instructions.html#configuration
-INSTALLED_APPS += ["django_extensions"]  # noqa F405
+INSTALLED_APPS += ["django_extensions"]  # noqa: F405
 {% if cookiecutter.use_celery == 'y' -%}
 
 # Celery
@@ -98,7 +98,7 @@ CELERY_TASK_EAGER_PROPAGATES = True
 {%- if cookiecutter.frontend_pipeline == 'Webpack' %}
 # django-webpack-loader
 # ------------------------------------------------------------------------------
-WEBPACK_LOADER["DEFAULT"]["CACHE"] = not DEBUG  # noqa F405
+WEBPACK_LOADER["DEFAULT"]["CACHE"] = not DEBUG  # noqa: F405
 
 {%- endif %}
 # Your stuff...
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 5de0529e2..d5760147c 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -2,8 +2,10 @@
 import logging
 
 import sentry_sdk
+
 {%- if cookiecutter.use_celery == 'y' %}
 from sentry_sdk.integrations.celery import CeleryIntegration
+
 {%- endif %}
 from sentry_sdk.integrations.django import DjangoIntegration
 from sentry_sdk.integrations.logging import LoggingIntegration
@@ -22,7 +24,7 @@ ALLOWED_HOSTS = env.list("DJANGO_ALLOWED_HOSTS", default=["{{ cookiecutter.domai
 
 # DATABASES
 # ------------------------------------------------------------------------------
-DATABASES["default"]["CONN_MAX_AGE"] = env.int("CONN_MAX_AGE", default=60)  # noqa F405
+DATABASES["default"]["CONN_MAX_AGE"] = env.int("CONN_MAX_AGE", default=60)  # noqa: F405
 
 # CACHES
 # ------------------------------------------------------------------------------
@@ -68,7 +70,7 @@ SECURE_CONTENT_TYPE_NOSNIFF = env.bool(
 # STORAGES
 # ------------------------------------------------------------------------------
 # https://django-storages.readthedocs.io/en/latest/#installation
-INSTALLED_APPS += ["storages"]  # noqa F405
+INSTALLED_APPS += ["storages"]  # noqa: F405
 {%- endif -%}
 {% if cookiecutter.cloud_provider == 'AWS' %}
 # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
@@ -159,7 +161,7 @@ ADMIN_URL = env("DJANGO_ADMIN_URL")
 # Anymail
 # ------------------------------------------------------------------------------
 # https://anymail.readthedocs.io/en/stable/installation/#installing-anymail
-INSTALLED_APPS += ["anymail"]  # noqa F405
+INSTALLED_APPS += ["anymail"]  # noqa: F405
 # https://docs.djangoproject.com/en/dev/ref/settings/#email-backend
 # https://anymail.readthedocs.io/en/stable/installation/#anymail-settings-reference
 {%- if cookiecutter.mail_service == 'Mailgun' %}
@@ -241,7 +243,7 @@ COMPRESS_STORAGE = "compressor.storage.GzipCompressorFileStorage"
 COMPRESS_STORAGE = STATICFILES_STORAGE
 {%- endif %}
 # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_URL
-COMPRESS_URL = STATIC_URL{% if cookiecutter.use_whitenoise == 'y' or cookiecutter.cloud_provider == 'None' %}  # noqa F405{% endif %}
+COMPRESS_URL = STATIC_URL{% if cookiecutter.use_whitenoise == 'y' or cookiecutter.cloud_provider == 'None' %}  # noqa: F405{% endif %}
 {%- if cookiecutter.use_whitenoise == 'y' %}
 # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_OFFLINE
 COMPRESS_OFFLINE = True  # Offline compression is required when using Whitenoise
@@ -259,7 +261,7 @@ COMPRESS_FILTERS = {
 # Collectfast
 # ------------------------------------------------------------------------------
 # https://github.com/antonagestam/collectfast#installation
-INSTALLED_APPS = ["collectfast"] + INSTALLED_APPS  # noqa F405
+INSTALLED_APPS = ["collectfast"] + INSTALLED_APPS  # noqa: F405
 {% endif %}
 # LOGGING
 # ------------------------------------------------------------------------------
@@ -373,7 +375,7 @@ sentry_sdk.init(
 # django-rest-framework
 # -------------------------------------------------------------------------------
 # Tools that generate code samples can use SERVERS to point to the correct domain
-SPECTACULAR_SETTINGS["SERVERS"] = [  # noqa F405
+SPECTACULAR_SETTINGS["SERVERS"] = [  # noqa: F405
     {"url": "https://{{ cookiecutter.domain_name }}", "description": "Production server"}
 ]
 
diff --git a/{{cookiecutter.project_slug}}/config/settings/test.py b/{{cookiecutter.project_slug}}/config/settings/test.py
index 587b99324..7941c7413 100644
--- a/{{cookiecutter.project_slug}}/config/settings/test.py
+++ b/{{cookiecutter.project_slug}}/config/settings/test.py
@@ -27,12 +27,12 @@ EMAIL_BACKEND = "django.core.mail.backends.locmem.EmailBackend"
 
 # DEBUGGING FOR TEMPLATES
 # ------------------------------------------------------------------------------
-TEMPLATES[0]["OPTIONS"]["debug"] = True  # type: ignore # noqa F405
+TEMPLATES[0]["OPTIONS"]["debug"] = True  # type: ignore # noqa: F405
 
 {%- if cookiecutter.frontend_pipeline == 'Webpack' %}
 # django-webpack-loader
 # ------------------------------------------------------------------------------
-WEBPACK_LOADER["DEFAULT"][  # noqa F405
+WEBPACK_LOADER["DEFAULT"][  # noqa: F405
     "LOADER_CLASS"
 ] = "webpack_loader.loader.FakeWebpackLoader"
 
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/apps.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/apps.py
index 2241e5eb5..92e7a74ec 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/apps.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/apps.py
@@ -8,6 +8,6 @@ class UsersConfig(AppConfig):
 
     def ready(self):
         try:
-            import {{ cookiecutter.project_slug }}.users.signals  # noqa F401
+            import {{ cookiecutter.project_slug }}.users.signals  # noqa: F401
         except ImportError:
             pass

From 1c74c8724e5167636c5f64bafaa7554780c707bf Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 3 Apr 2023 08:47:54 -0500
Subject: [PATCH 2652/2840] Update psycopg2 to 2.9.6 (#4248)

* Update psycopg2 from 2.9.5 to 2.9.6

* Update psycopg2 from 2.9.5 to 2.9.6
---
 {{cookiecutter.project_slug}}/requirements/local.txt      | 2 +-
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 0b3a39d97..7998a908c 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -3,7 +3,7 @@
 Werkzeug[watchdog]==2.2.3 # https://github.com/pallets/werkzeug
 ipdb==0.13.13  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
-psycopg2==2.9.5  # https://github.com/psycopg/psycopg2
+psycopg2==2.9.6  # https://github.com/psycopg/psycopg2
 {%- else %}
 psycopg2-binary==2.9.5  # https://github.com/psycopg/psycopg2
 {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 2104d9ad4..7d3634d4b 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -3,7 +3,7 @@
 -r base.txt
 
 gunicorn==20.1.0  # https://github.com/benoitc/gunicorn
-psycopg2==2.9.5  # https://github.com/psycopg/psycopg2
+psycopg2==2.9.6  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}

From 4641830430fa375af314f105bdaa8e5d1a0a5248 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 3 Apr 2023 08:48:04 -0500
Subject: [PATCH 2653/2840] Update psycopg2-binary from 2.9.5 to 2.9.6 (#4249)

---
 {{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 7998a908c..8c0c0e156 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -5,7 +5,7 @@ ipdb==0.13.13  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.9.6  # https://github.com/psycopg/psycopg2
 {%- else %}
-psycopg2-binary==2.9.5  # https://github.com/psycopg/psycopg2
+psycopg2-binary==2.9.6  # https://github.com/psycopg/psycopg2
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' or cookiecutter.use_celery == 'y' %}
 watchfiles==0.19.0  # https://github.com/samuelcolvin/watchfiles

From 1cba3b62e04a79d61cde9e90b2987ba3630a03c6 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 4 Apr 2023 02:18:27 +0000
Subject: [PATCH 2654/2840] Release 2023.04.03

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2008354ab..872748fd3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,14 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.04.03
+
+### Changed
+- fix: Syntax for ignoring specific noqa errors ([#4250](https://github.com/cookiecutter/cookiecutter-django/pull/4250))
+### Updated
+- Update psycopg2-binary to 2.9.6 ([#4249](https://github.com/cookiecutter/cookiecutter-django/pull/4249))
+- Update psycopg2 to 2.9.6 ([#4248](https://github.com/cookiecutter/cookiecutter-django/pull/4248))
+
 ## 2023.04.01
 
 ### Updated
diff --git a/setup.py b/setup.py
index 52ec07456..334bd2906 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.04.01"
+version = "2023.04.03"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From e13f7afcb832588a65bcce6da8b950075dad13db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Arkadiusz=20Micha=C5=82=20Ry=C5=9B?=
 <6430069+arrys@users.noreply.github.com>
Date: Tue, 4 Apr 2023 11:25:06 +0200
Subject: [PATCH 2655/2840] Fix traefik rule priority for media router (#4244)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Add option to serve media files locally using nginx

* Fix nginx media location and storage issue

* Fix traefik django-media typo

* Add certresolver property to web-media-router

* Add trailing slash in nginx configuration to avoid path traversal exploits

* Remove autoindexing from nginx configuration so nginx uses its default off setting

* Use nginx to serve media files if cloud provider is None

* Add back warning about lack of media files without Docker or Cloud providers

* Update documentation

* Fix typos and rephrase

Co-authored-by: Arkadiusz Ryś <arkadiusz.michal.rys@gmail.com>

* Change Traefik media router rule generation to force priority

The web-secure-router could end up having priority over the web-media-router when the www subdomain was used.
This fix adds the www subdomain to the web-media-router if it's also present in the web-secure-router rule.
Traefik looks at the length of rules to determine priority when no explicit priority is set.
The web-media-router needs to always have priority over the web-secure-router in order for the media files to be served.

* Add space to Traefik rule

---------

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 .../compose/production/traefik/traefik.yml                    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
index ea57f4a51..85d9572b9 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
@@ -60,7 +60,11 @@ http:
     {%- if cookiecutter.cloud_provider == 'None' %}
 
     web-media-router:
+      {%- if cookiecutter.domain_name.count('.') == 1 %}
+      rule: "(Host(`{{ cookiecutter.domain_name }}`) || Host(`www.{{ cookiecutter.domain_name }}`)) && PathPrefix(`/media/`)"
+      {%- else %}
       rule: "Host(`{{ cookiecutter.domain_name }}`) && PathPrefix(`/media/`)"
+      {%- endif %}
       entryPoints:
         - web-secure
       middlewares:

From f55b30bb29350ec011bb35b02a8fc84f8fb8602e Mon Sep 17 00:00:00 2001
From: Morten Kaae <37534541+MortenKaae@users.noreply.github.com>
Date: Tue, 4 Apr 2023 11:31:08 +0200
Subject: [PATCH 2656/2840] Remove deprecated security setting (#4247)

* Remove deprecated setting

* Update documentation
---
 docs/settings.rst                                     | 1 -
 {{cookiecutter.project_slug}}/config/settings/base.py | 2 --
 2 files changed, 3 deletions(-)

diff --git a/docs/settings.rst b/docs/settings.rst
index 4691adbbd..6dacb7404 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -22,7 +22,6 @@ DATABASE_URL                            DATABASES                   auto w/ Dock
 DJANGO_ADMIN_URL                        n/a                         'admin/'                                       raises error
 DJANGO_DEBUG                            DEBUG                       True                                           False
 DJANGO_SECRET_KEY                       SECRET_KEY                  auto-generated                                 raises error
-DJANGO_SECURE_BROWSER_XSS_FILTER        SECURE_BROWSER_XSS_FILTER   n/a                                            True
 DJANGO_SECURE_SSL_REDIRECT              SECURE_SSL_REDIRECT         n/a                                            True
 DJANGO_SECURE_CONTENT_TYPE_NOSNIFF      SECURE_CONTENT_TYPE_NOSNIFF n/a                                            True
 DJANGO_SECURE_FRAME_DENY                SECURE_FRAME_DENY           n/a                                            True
diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index cc77b864a..441fe4a2c 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -225,8 +225,6 @@ FIXTURE_DIRS = (str(APPS_DIR / "fixtures"),)
 SESSION_COOKIE_HTTPONLY = True
 # https://docs.djangoproject.com/en/dev/ref/settings/#csrf-cookie-httponly
 CSRF_COOKIE_HTTPONLY = True
-# https://docs.djangoproject.com/en/dev/ref/settings/#secure-browser-xss-filter
-SECURE_BROWSER_XSS_FILTER = True
 # https://docs.djangoproject.com/en/dev/ref/settings/#x-frame-options
 X_FRAME_OPTIONS = "DENY"
 

From 6fdc2623e9093859ea02816eec63baad4a2e41aa Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 4 Apr 2023 09:31:36 +0000
Subject: [PATCH 2657/2840] 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 e84337123..ca5762fe8 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1382,5 +1382,10 @@
     "name": "mpsantos",
     "github_login": "mpsantos",
     "twitter_username": ""
+  },
+  {
+    "name": "Morten Kaae",
+    "github_login": "MortenKaae",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index f78278e34..7d9ee7756 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1426,6 +1426,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Morten Kaae</td>
+    <td>
+      <a href="https://github.com/MortenKaae">MortenKaae</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>mozillazg</td>
     <td>

From d7783f5c5546906f74a1f8d0d354447d9478e9ce Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 4 Apr 2023 07:42:17 -0500
Subject: [PATCH 2658/2840] Update django-debug-toolbar from 3.8.1 to 4.0.0
 (#4251)

---
 {{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 8c0c0e156..9503b19d4 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -42,7 +42,7 @@ pre-commit==3.2.1  # https://github.com/pre-commit/pre-commit
 # ------------------------------------------------------------------------------
 factory-boy==3.2.1  # https://github.com/FactoryBoy/factory_boy
 
-django-debug-toolbar==3.8.1  # https://github.com/jazzband/django-debug-toolbar
+django-debug-toolbar==4.0.0  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.2.1  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==3.0.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.5.2  # https://github.com/pytest-dev/pytest-django

From e05122e4b357d526f04034ba10bf16300ac9c5c3 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 4 Apr 2023 15:31:01 -0500
Subject: [PATCH 2659/2840] Update sentry-sdk to 1.19.0 (#4254)

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

From f93a9f78d9a249718acd20e297fb02b177353912 Mon Sep 17 00:00:00 2001
From: Jelmer <info@jelmert.nl>
Date: Tue, 4 Apr 2023 22:42:53 +0200
Subject: [PATCH 2660/2840] Replace `runserver_plus` with `runserver` (#4255)

* Replace runserver_plus with runserver since it is not compatible with django >= 4.1

* Replace runserver_plus with runserver in post_gen_hooks

---------

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
---
 hooks/post_gen_project.py                     |  2 +-
 .../runConfigurations/runserver_plus.xml      | 33 -------------------
 .../compose/local/django/start                |  2 +-
 3 files changed, 2 insertions(+), 35 deletions(-)
 delete mode 100644 {{cookiecutter.project_slug}}/.idea/runConfigurations/runserver_plus.xml

diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index dbc367175..b28bb0166 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -182,7 +182,7 @@ def handle_js_runner(choice, use_docker, use_async):
             dev_django_cmd = (
                 "uvicorn config.asgi:application --reload"
                 if use_async
-                else "python manage.py runserver_plus"
+                else "python manage.py runserver"
             )
             scripts.update(
                 {
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/runserver_plus.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/runserver_plus.xml
deleted file mode 100644
index 242f861a6..000000000
--- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/runserver_plus.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="runserver_plus" type="Python.DjangoServer" factoryName="Django server" singleton="true">
-    <module name="{{ cookiecutter.project_slug }}" />
-    <option name="INTERPRETER_OPTIONS" value="" />
-    <option name="PARENT_ENVS" value="true" />
-    <envs>
-      <env name="PYTHONUNBUFFERED" value="1" />
-      <env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
-    </envs>
-    <option name="SDK_HOME" value="" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="true" />
-    <option name="ADD_CONTENT_ROOTS" value="true" />
-    <option name="ADD_SOURCE_ROOTS" value="true" />
-    <PathMappingSettings>
-      <option name="pathMappings">
-        <list>
-          <mapping local-root="$PROJECT_DIR$" remote-root="/app" />
-        </list>
-      </option>
-    </PathMappingSettings>
-    <option name="launchJavascriptDebuger" value="false" />
-    <option name="port" value="8000" />
-    <option name="host" value="0.0.0.0" />
-    <option name="additionalOptions" value="" />
-    <option name="browserUrl" value="" />
-    <option name="runTestServer" value="false" />
-    <option name="runNoReload" value="false" />
-    <option name="useCustomRunCommand" value="true" />
-    <option name="customRunCommand" value="runserver_plus" />
-    <method />
-  </configuration>
-</component>
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start b/{{cookiecutter.project_slug}}/compose/local/django/start
index ec57dc8e4..6415d7fb4 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/start
@@ -9,5 +9,5 @@ python manage.py migrate
 {%- if cookiecutter.use_async == 'y' %}
 exec uvicorn config.asgi:application --host 0.0.0.0 --reload --reload-include '*.html'
 {%- else %}
-exec python manage.py runserver_plus 0.0.0.0:8000
+exec python manage.py runserver 0.0.0.0:8000
 {%- endif %}

From a07b4b31125534bff0689355b72fe124925b80f1 Mon Sep 17 00:00:00 2001
From: Jelmer <info@jelmert.nl>
Date: Tue, 4 Apr 2023 23:10:17 +0200
Subject: [PATCH 2661/2840] Upgrade to Django 4.1 (#4028)

* Upgrade to Django 4.1

* Bump django-environ back to 0.10.0

---------

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
---
 README.md                                           | 2 +-
 setup.py                                            | 2 +-
 {{cookiecutter.project_slug}}/requirements/base.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index aaeb25828..d951c7a21 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ production-ready Django projects quickly.
 
 ## Features
 
--   For Django 4.0
+-   For Django 4.1
 -   Works with Python 3.10
 -   Renders Django projects with 100% starting test coverage
 -   Twitter [Bootstrap](https://github.com/twbs/bootstrap) v5
diff --git a/setup.py b/setup.py
index 334bd2906..8155fd234 100644
--- a/setup.py
+++ b/setup.py
@@ -27,7 +27,7 @@ setup(
     classifiers=[
         "Development Status :: 4 - Beta",
         "Environment :: Console",
-        "Framework :: Django :: 4.0",
+        "Framework :: Django :: 4.1",
         "Intended Audience :: Developers",
         "Natural Language :: English",
         "License :: OSI Approved :: BSD License",
diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index fb3559194..6cce06457 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,7 +29,7 @@ uvicorn[standard]==0.21.1  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==4.0.10  # pyup: < 4.1  # https://www.djangoproject.com/
+django==4.1.7  # pyup: < 4.2  # https://www.djangoproject.com/
 django-environ==0.10.0  # https://github.com/joke2k/django-environ
 django-model-utils==4.3.1  # https://github.com/jazzband/django-model-utils
 django-allauth==0.54.0  # https://github.com/pennersr/django-allauth

From c415c47bfb9527261c2228550634e8d599c88f8c Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 5 Apr 2023 02:10:28 +0000
Subject: [PATCH 2662/2840] Release 2023.04.04

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 872748fd3..af38a3e38 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,18 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.04.04
+
+### Changed
+- Upgrade to Django 4.1 ([#4028](https://github.com/cookiecutter/cookiecutter-django/pull/4028))
+- Remove deprecated security setting ([#4247](https://github.com/cookiecutter/cookiecutter-django/pull/4247))
+### Fixed
+- Replace `runserver_plus` with `runserver` ([#4255](https://github.com/cookiecutter/cookiecutter-django/pull/4255))
+- Fix traefik rule priority for media router ([#4244](https://github.com/cookiecutter/cookiecutter-django/pull/4244))
+### Updated
+- Update sentry-sdk to 1.19.0 ([#4254](https://github.com/cookiecutter/cookiecutter-django/pull/4254))
+- Update django-debug-toolbar to 4.0.0 ([#4251](https://github.com/cookiecutter/cookiecutter-django/pull/4251))
+
 ## 2023.04.03
 
 ### Changed
diff --git a/setup.py b/setup.py
index 8155fd234..c01cf9684 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.04.03"
+version = "2023.04.04"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 82b5137a93cb7ea98cf5163c2762b12eabfadbd9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 5 Apr 2023 10:32:38 +0100
Subject: [PATCH 2663/2840] Bump peter-evans/create-pull-request from 4 to 5
 (#4257)

Bumps [peter-evans/create-pull-request](https://github.com/peter-evans/create-pull-request) from 4 to 5.
- [Release notes](https://github.com/peter-evans/create-pull-request/releases)
- [Commits](https://github.com/peter-evans/create-pull-request/compare/v4...v5)

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

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.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 1708e8b82..c822da30d 100644
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -37,7 +37,7 @@ jobs:
         run: pre-commit autoupdate
 
       - name: Create Pull Request
-        uses: peter-evans/create-pull-request@v4
+        uses: peter-evans/create-pull-request@v5
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
           branch: update/pre-commit-autoupdate

From ddd8f1c45d72ce147a940d5e532bf065dcf8a7b2 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 5 Apr 2023 08:57:17 -0500
Subject: [PATCH 2664/2840] Update pre-commit to 3.2.2 (#4259)

* Update pre-commit from 3.2.1 to 3.2.2

* Update pre-commit from 3.2.1 to 3.2.2
---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index d635f79a9..dfd303729 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ black==23.3.0
 isort==5.12.0
 flake8==6.0.0
 flake8-isort==6.0.0
-pre-commit==3.2.1
+pre-commit==3.2.2
 
 # Testing
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 9503b19d4..4195114ec 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -36,7 +36,7 @@ pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}
-pre-commit==3.2.1  # https://github.com/pre-commit/pre-commit
+pre-commit==3.2.2  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From 782cee375685456f16f82a63cbf635fa100940b6 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 5 Apr 2023 08:57:59 -0500
Subject: [PATCH 2665/2840] Update django to 4.1.8 (#4258)

---
 {{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 6cce06457..0fdee1f86 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -29,7 +29,7 @@ uvicorn[standard]==0.21.1  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==4.1.7  # pyup: < 4.2  # https://www.djangoproject.com/
+django==4.1.8  # pyup: < 4.2  # https://www.djangoproject.com/
 django-environ==0.10.0  # https://github.com/joke2k/django-environ
 django-model-utils==4.3.1  # https://github.com/jazzband/django-model-utils
 django-allauth==0.54.0  # https://github.com/pennersr/django-allauth

From a607284e1ff92093533ea1d7feedd40f0ead3b49 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 5 Apr 2023 21:32:05 +0100
Subject: [PATCH 2666/2840] Update indent for nginx config file (#4260)

---
 {{cookiecutter.project_slug}}/.editorconfig            |  2 +-
 .../compose/production/nginx/default.conf              | 10 +++++-----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/.editorconfig b/{{cookiecutter.project_slug}}/.editorconfig
index 6a9a5c45d..c0ce34260 100644
--- a/{{cookiecutter.project_slug}}/.editorconfig
+++ b/{{cookiecutter.project_slug}}/.editorconfig
@@ -22,6 +22,6 @@ trim_trailing_whitespace = false
 [Makefile]
 indent_style = tab
 
-[nginx.conf]
+[default.conf]
 indent_style = space
 indent_size = 2
diff --git a/{{cookiecutter.project_slug}}/compose/production/nginx/default.conf b/{{cookiecutter.project_slug}}/compose/production/nginx/default.conf
index aafdd5bee..562dba86c 100644
--- a/{{cookiecutter.project_slug}}/compose/production/nginx/default.conf
+++ b/{{cookiecutter.project_slug}}/compose/production/nginx/default.conf
@@ -1,7 +1,7 @@
 server {
-	listen       80;
-	server_name  localhost;
-	location /media/ {
-		alias /usr/share/nginx/media/;
-	}
+  listen       80;
+  server_name  localhost;
+  location /media/ {
+    alias /usr/share/nginx/media/;
+  }
 }

From d9efb28da3209b6209b80046f7b62df84eeac248 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 5 Apr 2023 17:53:48 -0500
Subject: [PATCH 2667/2840] Update tox from 4.4.8 to 4.4.11 (#4262)

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

diff --git a/requirements.txt b/requirements.txt
index dfd303729..24c4307be 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==3.2.2
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.4.8
+tox==4.4.11
 pytest==7.2.2
 pytest-cookies==0.7.0
 pytest-instafail==0.5.0

From 606e0a768531951db7a69939995367d08b5aa1ab Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 6 Apr 2023 02:17:42 +0000
Subject: [PATCH 2668/2840] Release 2023.04.05

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index af38a3e38..43841c8a3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.04.05
+
+### Changed
+- Update indent for nginx config file ([#4260](https://github.com/cookiecutter/cookiecutter-django/pull/4260))
+### Updated
+- Update tox to 4.4.11 ([#4262](https://github.com/cookiecutter/cookiecutter-django/pull/4262))
+- Update django to 4.1.8 ([#4258](https://github.com/cookiecutter/cookiecutter-django/pull/4258))
+- Update pre-commit to 3.2.2 ([#4259](https://github.com/cookiecutter/cookiecutter-django/pull/4259))
+
 ## 2023.04.04
 
 ### Changed
diff --git a/setup.py b/setup.py
index c01cf9684..3e94895d0 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.04.04"
+version = "2023.04.05"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 73b16539d4308853edc1d9e92a880061c13b7965 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Fri, 7 Apr 2023 08:33:13 +0100
Subject: [PATCH 2669/2840] Upgrade traefik to 2.9.10 (#4267)

---
updated-dependencies:
- dependency-name: traefik
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../compose/production/traefik/Dockerfile                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
index 2b146cc63..7b053059d 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
@@ -1,4 +1,4 @@
-FROM traefik:2.9.9
+FROM traefik:2.9.10
 RUN mkdir -p /etc/traefik/acme \
   && touch /etc/traefik/acme/acme.json \
   && chmod 600 /etc/traefik/acme/acme.json

From a905fb25f7bf6580b74b604656f96952f3067908 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 8 Apr 2023 02:14:38 +0000
Subject: [PATCH 2670/2840] Release 2023.04.07

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 43841c8a3..9c8c39c2f 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 -->
 
+## 2023.04.07
+
+### Updated
+- Upgrade traefik to 2.9.10 ([#4267](https://github.com/cookiecutter/cookiecutter-django/pull/4267))
+
 ## 2023.04.05
 
 ### Changed
diff --git a/setup.py b/setup.py
index 3e94895d0..c844f0954 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.04.05"
+version = "2023.04.07"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From ea1b6861312224404a9c00b70361f005ecf23eda Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 10 Apr 2023 05:09:01 -0500
Subject: [PATCH 2671/2840] Update pytest to 7.3.0 (#4268)

* Update pytest from 7.2.2 to 7.3.0

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

diff --git a/requirements.txt b/requirements.txt
index 24c4307be..0dc82fc75 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,7 +13,7 @@ pre-commit==3.2.2
 # Testing
 # ------------------------------------------------------------------------------
 tox==4.4.11
-pytest==7.2.2
+pytest==7.3.0
 pytest-cookies==0.7.0
 pytest-instafail==0.5.0
 pyyaml==6.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 4195114ec..298328947 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -15,7 +15,7 @@ watchfiles==0.19.0  # https://github.com/samuelcolvin/watchfiles
 # ------------------------------------------------------------------------------
 mypy==1.1.1  # https://github.com/python/mypy
 django-stubs==1.16.0  # https://github.com/typeddjango/django-stubs
-pytest==7.2.2  # https://github.com/pytest-dev/pytest
+pytest==7.3.0  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.6  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
 djangorestframework-stubs==1.10.0  # https://github.com/typeddjango/djangorestframework-stubs

From 436233e8ba4c26770d60fad95718f288eff9a837 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 10 Apr 2023 09:36:59 -0500
Subject: [PATCH 2672/2840] Update pytest-sugar from 0.9.6 to 0.9.7 (#4269)

---
 {{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 298328947..a11238013 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -16,7 +16,7 @@ watchfiles==0.19.0  # https://github.com/samuelcolvin/watchfiles
 mypy==1.1.1  # https://github.com/python/mypy
 django-stubs==1.16.0  # https://github.com/typeddjango/django-stubs
 pytest==7.3.0  # https://github.com/pytest-dev/pytest
-pytest-sugar==0.9.6  # https://github.com/Frozenball/pytest-sugar
+pytest-sugar==0.9.7  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
 djangorestframework-stubs==1.10.0  # https://github.com/typeddjango/djangorestframework-stubs
 {%- endif %}

From e37192a08155fe61b8e393f1d62a756a3c84ee6f Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 11 Apr 2023 02:17:41 +0000
Subject: [PATCH 2673/2840] Release 2023.04.10

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9c8c39c2f..d51abdb58 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 -->
 
+## 2023.04.10
+
+### Updated
+- Update pytest-sugar to 0.9.7 ([#4269](https://github.com/cookiecutter/cookiecutter-django/pull/4269))
+- Update pytest to 7.3.0 ([#4268](https://github.com/cookiecutter/cookiecutter-django/pull/4268))
+
 ## 2023.04.07
 
 ### Updated
diff --git a/setup.py b/setup.py
index c844f0954..8d26629f0 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.04.07"
+version = "2023.04.10"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 3ddfda45b83e50cf6bb84bd8e85ae24978193f4d Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 13 Apr 2023 18:38:50 -0500
Subject: [PATCH 2674/2840] Update tox from 4.4.11 to 4.4.12 (#4271)

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

diff --git a/requirements.txt b/requirements.txt
index 0dc82fc75..c336c648d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==3.2.2
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.4.11
+tox==4.4.12
 pytest==7.3.0
 pytest-cookies==0.7.0
 pytest-instafail==0.5.0

From 2571f4a994504ee8fe773ddab3c734dfeac2d880 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 14 Apr 2023 02:17:00 +0000
Subject: [PATCH 2675/2840] Release 2023.04.13

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d51abdb58..415b29a2e 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 -->
 
+## 2023.04.13
+
+### Updated
+- Update tox to 4.4.12 ([#4271](https://github.com/cookiecutter/cookiecutter-django/pull/4271))
+
 ## 2023.04.10
 
 ### Updated
diff --git a/setup.py b/setup.py
index 8d26629f0..d168cd13a 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.04.10"
+version = "2023.04.13"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 2ad3858e26a28c00f0da5792d200d5ae5a773ab6 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 15 Apr 2023 04:02:54 -0500
Subject: [PATCH 2676/2840] Update pytest to 7.3.1 (#4272)

* Update pytest from 7.3.0 to 7.3.1

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

diff --git a/requirements.txt b/requirements.txt
index c336c648d..cc729cf64 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,7 +13,7 @@ pre-commit==3.2.2
 # Testing
 # ------------------------------------------------------------------------------
 tox==4.4.12
-pytest==7.3.0
+pytest==7.3.1
 pytest-cookies==0.7.0
 pytest-instafail==0.5.0
 pyyaml==6.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index a11238013..a867b0673 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -15,7 +15,7 @@ watchfiles==0.19.0  # https://github.com/samuelcolvin/watchfiles
 # ------------------------------------------------------------------------------
 mypy==1.1.1  # https://github.com/python/mypy
 django-stubs==1.16.0  # https://github.com/typeddjango/django-stubs
-pytest==7.3.0  # https://github.com/pytest-dev/pytest
+pytest==7.3.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.7  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
 djangorestframework-stubs==1.10.0  # https://github.com/typeddjango/djangorestframework-stubs

From 42c30dafcb587baa71710eae6058ce2e824d1f38 Mon Sep 17 00:00:00 2001
From: Jelmer <info@jelmert.nl>
Date: Sat, 15 Apr 2023 12:42:33 +0200
Subject: [PATCH 2677/2840] Upgrade Python to version 3.11 (Faster CPython)
 (#4256)

* Upgrade Python to version 3.11 (Faster CPython)

* Update pyupgrade config for Python 3.11

* Update tox env to Python 3.11

* Update to latest Python 3.11.3

* Add a note about lack of support in PythonAnywhere

* Rephrase note

* Fix casing

---------

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 .github/workflows/ci.yml                                    | 6 +++---
 .github/workflows/django-issue-checker.yml                  | 2 +-
 .github/workflows/pre-commit-autoupdate.yml                 | 2 +-
 .github/workflows/update-changelog.yml                      | 2 +-
 .github/workflows/update-contributors.yml                   | 2 +-
 .pre-commit-config.yaml                                     | 2 +-
 CONTRIBUTING.md                                             | 4 ++--
 README.md                                                   | 2 +-
 docs/deployment-on-pythonanywhere.rst                       | 1 +
 docs/developing-locally.rst                                 | 4 ++--
 hooks/pre_gen_project.py                                    | 2 +-
 setup.py                                                    | 2 +-
 tox.ini                                                     | 2 +-
 {{cookiecutter.project_slug}}/.github/workflows/ci.yml      | 4 ++--
 {{cookiecutter.project_slug}}/.gitlab-ci.yml                | 4 ++--
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml       | 2 +-
 {{cookiecutter.project_slug}}/.readthedocs.yml              | 2 +-
 {{cookiecutter.project_slug}}/.travis.yml                   | 4 ++--
 .../compose/local/django/Dockerfile                         | 2 +-
 {{cookiecutter.project_slug}}/compose/local/docs/Dockerfile | 2 +-
 .../compose/production/django/Dockerfile                    | 3 +--
 {{cookiecutter.project_slug}}/runtime.txt                   | 2 +-
 {{cookiecutter.project_slug}}/setup.cfg                     | 2 +-
 23 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c31be1b7a..714cd8ac9 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -25,7 +25,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.11"
           cache: pip
       - name: Install dependencies
         run: pip install -r requirements.txt
@@ -56,7 +56,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.11"
           cache: pip
       - name: Install dependencies
         run: pip install -r requirements.txt
@@ -98,7 +98,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.11"
           cache: pip
           cache-dependency-path: |
             requirements.txt
diff --git a/.github/workflows/django-issue-checker.yml b/.github/workflows/django-issue-checker.yml
index fd250604f..cbfea922d 100644
--- a/.github/workflows/django-issue-checker.yml
+++ b/.github/workflows/django-issue-checker.yml
@@ -19,7 +19,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.11"
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml
index c822da30d..9e5232dcd 100644
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -24,7 +24,7 @@ jobs:
       - uses: actions/checkout@v3
       - uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.11"
 
       - name: Install pre-commit
         run: pip install pre-commit
diff --git a/.github/workflows/update-changelog.yml b/.github/workflows/update-changelog.yml
index 27113a89f..f48f297aa 100644
--- a/.github/workflows/update-changelog.yml
+++ b/.github/workflows/update-changelog.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.11"
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 83c651a46..2aea8003b 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -22,7 +22,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.11"
       - name: Install dependencies
         run: |
           python -m pip install --upgrade pip
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 2dc0f81cb..34bcc6a22 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -12,7 +12,7 @@ repos:
     rev: v3.3.1
     hooks:
       - id: pyupgrade
-        args: [--py310-plus]
+        args: [--py311-plus]
         exclude: hooks/
 
   - repo: https://github.com/psf/black
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 69bce6f2e..5c4ca6044 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -33,9 +33,9 @@ To run all tests using various versions of python in virtualenvs defined in tox.
 It is possible to test with a specific version of python. To do this, the command
 is:
 
-    $ tox -e py310
+    $ tox -e py311
 
-This will run pytest with the python3.10 interpreter, for example.
+This will run pytest with the python3.11 interpreter, for example.
 
 To run a particular test with tox for against your current Python version:
 
diff --git a/README.md b/README.md
index d951c7a21..10bf57c29 100644
--- a/README.md
+++ b/README.md
@@ -20,7 +20,7 @@ production-ready Django projects quickly.
 ## Features
 
 -   For Django 4.1
--   Works with Python 3.10
+-   Works with Python 3.11
 -   Renders Django projects with 100% starting test coverage
 -   Twitter [Bootstrap](https://github.com/twbs/bootstrap) v5
 -   [12-Factor](http://12factor.net/) based settings via [django-environ](https://github.com/joke2k/django-environ)
diff --git a/docs/deployment-on-pythonanywhere.rst b/docs/deployment-on-pythonanywhere.rst
index 7984d7b5e..2fa6a960c 100644
--- a/docs/deployment-on-pythonanywhere.rst
+++ b/docs/deployment-on-pythonanywhere.rst
@@ -37,6 +37,7 @@ Make sure your project is fully committed and pushed up to Bitbucket or Github o
     mkvirtualenv --python=/usr/bin/python3.10 my-project-name
     pip install -r requirements/production.txt  # may take a few minutes
 
+.. note:: We're creating the virtualenv using Python 3.10 (``--python=/usr/bin/python3.10```), although Cookiecutter Django generates a project for Python 3.11. This is because, at time of writing, PythonAnywhere only supports Python 3.10. It shouldn't be a problem, but if is, you may try changing the Python version to 3.11 and see if it works. If it does, please let us know, or even better, submit a pull request to update this section.
 
 Setting environment variables in the console
 --------------------------------------------
diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index fb66536fc..b8655a84c 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -9,7 +9,7 @@ Setting Up Development Environment
 
 Make sure to have the following on your host:
 
-* Python 3.10
+* Python 3.11
 * PostgreSQL_.
 * Redis_, if using Celery
 * Cookiecutter_
@@ -18,7 +18,7 @@ First things first.
 
 #. Create a virtualenv: ::
 
-    $ python3.10 -m venv <virtual env path>
+    $ python3.11 -m venv <virtual env path>
 
 #. Activate the virtualenv you have just created: ::
 
diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py
index 4f4378f58..d067954db 100644
--- a/hooks/pre_gen_project.py
+++ b/hooks/pre_gen_project.py
@@ -44,7 +44,7 @@ if "{{ cookiecutter.use_docker }}".lower() == "n":
     if python_major_version == 2:
         print(
             WARNING + "You're running cookiecutter under Python 2, but the generated "
-            "project requires Python 3.10+. Do you want to proceed (y/n)? " + TERMINATOR
+            "project requires Python 3.11+. Do you want to proceed (y/n)? " + TERMINATOR
         )
         yes_options, no_options = frozenset(["y"]), frozenset(["n"])
         while True:
diff --git a/setup.py b/setup.py
index d168cd13a..3f20e29ca 100644
--- a/setup.py
+++ b/setup.py
@@ -33,7 +33,7 @@ setup(
         "License :: OSI Approved :: BSD License",
         "Programming Language :: Python",
         "Programming Language :: Python :: 3",
-        "Programming Language :: Python :: 3.10",
+        "Programming Language :: Python :: 3.11",
         "Programming Language :: Python :: Implementation :: CPython",
         "Topic :: Software Development",
     ],
diff --git a/tox.ini b/tox.ini
index 0400e4f91..f0c22d48e 100644
--- a/tox.ini
+++ b/tox.ini
@@ -1,6 +1,6 @@
 [tox]
 skipsdist = true
-envlist = py310,black-template
+envlist = py311,black-template
 
 [testenv]
 deps = -rrequirements.txt
diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
index 89d83f257..497d0dd29 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -29,7 +29,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.11"
 
       {%- if cookiecutter.open_source_license != 'Not open source' %}
       # Consider using pre-commit.ci for open source project
@@ -86,7 +86,7 @@ jobs:
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.10"
+          python-version: "3.11"
           cache: pip
           cache-dependency-path: |
             requirements/base.txt
diff --git a/{{cookiecutter.project_slug}}/.gitlab-ci.yml b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
index 7892ad63a..a312a41ae 100644
--- a/{{cookiecutter.project_slug}}/.gitlab-ci.yml
+++ b/{{cookiecutter.project_slug}}/.gitlab-ci.yml
@@ -13,7 +13,7 @@ variables:
 
 precommit:
   stage: lint
-  image: python:3.10
+  image: python:3.11
   variables:
     PRE_COMMIT_HOME: ${CI_PROJECT_DIR}/.cache/pre-commit
   cache:
@@ -40,7 +40,7 @@ pytest:
   script:
     - docker-compose -f local.yml run django pytest
   {%- else %}
-  image: python:3.10
+  image: python:3.11
   tags:
     - python
   services:
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index 073df732e..542187429 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -13,7 +13,7 @@ repos:
     rev: v3.3.1
     hooks:
       - id: pyupgrade
-        args: [--py310-plus]
+        args: [--py311-plus]
 
   - repo: https://github.com/psf/black
     rev: 23.3.0
diff --git a/{{cookiecutter.project_slug}}/.readthedocs.yml b/{{cookiecutter.project_slug}}/.readthedocs.yml
index 08d7f9c24..44512245e 100644
--- a/{{cookiecutter.project_slug}}/.readthedocs.yml
+++ b/{{cookiecutter.project_slug}}/.readthedocs.yml
@@ -8,7 +8,7 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.10"
+    python: "3.11"
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
diff --git a/{{cookiecutter.project_slug}}/.travis.yml b/{{cookiecutter.project_slug}}/.travis.yml
index 326d78392..5e5f92ff5 100644
--- a/{{cookiecutter.project_slug}}/.travis.yml
+++ b/{{cookiecutter.project_slug}}/.travis.yml
@@ -2,7 +2,7 @@ dist: focal
 
 language: python
 python:
-  - "3.10"
+  - "3.11"
 
 services:
   - {% if cookiecutter.use_docker == 'y' %}docker{% else %}postgresql{% endif %}
@@ -37,7 +37,7 @@ jobs:
         - sudo apt-get install -qq libsqlite3-dev libxml2 libxml2-dev libssl-dev libbz2-dev wget curl llvm
       language: python
       python:
-        - "3.10"
+        - "3.11"
       install:
         - pip install -r requirements/local.txt
       script:
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index 4be394f72..1d5c14afc 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -1,5 +1,5 @@
 # define an alias for the specfic python version used in this file.
-FROM python:3.10.10-slim-bullseye as python
+FROM python:3.11.3-slim-bullseye as python
 
 # Python build stage
 FROM python as python-build-stage
diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
index 587b8d3ae..f8bcc35bd 100644
--- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
@@ -1,5 +1,5 @@
 # define an alias for the specfic python version used in this file.
-FROM python:3.10.10-slim-bullseye as python
+FROM python:3.11.3-slim-bullseye as python
 
 
 # Python build stage
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index 8ca35f180..84c702db0 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -24,9 +24,8 @@ ENV DJANGO_AZURE_ACCOUNT_NAME=${DJANGO_AZURE_ACCOUNT_NAME}
 RUN npm run build
 
 {%- endif %}
-
 # define an alias for the specfic python version used in this file.
-FROM python:3.10.10-slim-bullseye as python
+FROM python:3.11.3-slim-bullseye as python
 
 # Python build stage
 FROM python as python-build-stage
diff --git a/{{cookiecutter.project_slug}}/runtime.txt b/{{cookiecutter.project_slug}}/runtime.txt
index 69b0ccfc8..afe12ad1b 100644
--- a/{{cookiecutter.project_slug}}/runtime.txt
+++ b/{{cookiecutter.project_slug}}/runtime.txt
@@ -1 +1 @@
-python-3.10.8
+python-3.11.3
diff --git a/{{cookiecutter.project_slug}}/setup.cfg b/{{cookiecutter.project_slug}}/setup.cfg
index e282af36a..ab191732b 100644
--- a/{{cookiecutter.project_slug}}/setup.cfg
+++ b/{{cookiecutter.project_slug}}/setup.cfg
@@ -18,7 +18,7 @@ force_grid_wrap = 0
 use_parentheses = true
 
 [mypy]
-python_version = 3.10
+python_version = 3.11
 check_untyped_defs = True
 ignore_missing_imports = True
 warn_unused_ignores = True

From 1783257ed378c1e59a32d96c32be8235ebb54d45 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Sat, 15 Apr 2023 06:53:15 -0400
Subject: [PATCH 2678/2840] Add username_type option (#3958)

* Add username_type option

* Update docs

Signed-off-by: Andrew-Chen-Wang <acwangpython@gmail.com>

* Fix errors and lint

Signed-off-by: Andrew-Chen-Wang <acwangpython@gmail.com>

* Try linting again

* Try linting again

* Handle signup

* Fix url reverse in template

* Fix migration file

* Remove extra line in factories

* E2E tests for email username

* Fix style in users api views and serializers

* Fix style in users api views and serializers

* Add conditions for fields in UserAdminCreationForm

* Consistent Jinja tag conditions

* Fix more empty lines issues

* Tweak options order

* Test username email

* Fix code style

* Fix kwargs to reverse user details view

* Remove comment in template

* Fix error messages dict in user form

* Fix line wrapping

* Move custom manager into a separate module and add tests

---------

Signed-off-by: Andrew-Chen-Wang <acwangpython@gmail.com>
Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 .github/workflows/ci.yml                      |  6 +-
 README.md                                     |  4 ++
 cookiecutter.json                             |  1 +
 docs/project-generation-options.rst           |  7 +++
 hooks/post_gen_project.py                     | 21 +++++++
 tests/test_cookiecutter_generation.py         |  2 +
 .../config/settings/base.py                   |  8 ++-
 .../templates/base.html                       |  3 +-
 .../templates/users/user_detail.html          |  4 +-
 .../templates/users/user_form.html            |  4 +-
 .../users/admin.py                            | 19 ++++++-
 .../users/api/serializers.py                  |  8 +++
 .../users/api/views.py                        |  4 ++
 .../users/forms.py                            | 17 +++++-
 .../users/managers.py                         | 34 ++++++++++++
 .../users/migrations/0001_initial.py          | 15 +++++
 .../users/models.py                           | 25 +++++++--
 .../users/tests/factories.py                  |  4 +-
 .../users/tests/test_admin.py                 | 12 ++++
 .../users/tests/test_drf_urls.py              |  8 +++
 .../users/tests/test_drf_views.py             |  6 +-
 .../users/tests/test_forms.py                 |  9 +++
 .../users/tests/test_managers.py              | 55 +++++++++++++++++++
 .../users/tests/test_models.py                |  4 ++
 .../users/tests/test_urls.py                  |  5 ++
 .../users/tests/test_views.py                 | 16 ++++++
 .../users/urls.py                             |  4 ++
 .../users/views.py                            |  9 +++
 28 files changed, 296 insertions(+), 18 deletions(-)
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/managers.py
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_managers.py

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 714cd8ac9..8100270bb 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -38,7 +38,7 @@ jobs:
       matrix:
         script:
           - name: Basic
-            args: ""
+            args: "ci_tool=Gitlab"
           - name: Celery & DRF
             args: "use_celery=y use_drf=y"
           - name: Gulp
@@ -73,7 +73,9 @@ jobs:
           - name: Gulp
             args: "frontend_pipeline=Gulp"
           - name: Webpack
-            args: "frontend_pipeline=Webpack"
+            args: "frontend_pipeline=Webpack use_heroku=y"
+          - name: Email Username
+            args: "username_type=email ci_tool=Github"
 
     name: "Bare metal ${{ matrix.script.name }}"
     runs-on: ubuntu-latest
diff --git a/README.md b/README.md
index 10bf57c29..4216c2d4e 100644
--- a/README.md
+++ b/README.md
@@ -118,6 +118,10 @@ Answer the prompts with your own desired [options](http://cookiecutter-django.re
     4 - Apache Software License 2.0
     5 - Not open source
     Choose from 1, 2, 3, 4, 5 [1]: 1
+    Select username_type:
+    1 - username
+    2 - email
+    Choose from 1, 2 [1]: 1
     timezone [UTC]: America/Los_Angeles
     windows [n]: n
     use_pycharm [n]: y
diff --git a/cookiecutter.json b/cookiecutter.json
index b24ce4286..c9ad19394 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -13,6 +13,7 @@
     "Apache Software License 2.0",
     "Not open source"
   ],
+  "username_type": ["username", "email"],
   "timezone": "UTC",
   "windows": "n",
   "use_pycharm": "n",
diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index 9b379f12c..a1d788173 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -24,6 +24,13 @@ author_name:
 email:
     The email address you want to identify yourself in the project.
 
+username_type:
+    The type of username you want to use in the project. This can be either
+    ``username`` or ``email``. If you choose ``username``, the ``email`` field
+    will be included. If you choose ``email``, the ``username`` field will be
+    excluded. It is best practice to always include an email field, so there is
+    no option for having just the ``username`` field.
+
 domain_name:
     The domain name you plan to use for your project once it goes live.
     Note that it can be safely changed later on whenever you need to.
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index b28bb0166..22cda531d 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -45,6 +45,24 @@ def remove_gplv3_files():
         os.remove(file_name)
 
 
+def remove_custom_user_manager_files():
+    os.remove(
+        os.path.join(
+            "{{cookiecutter.project_slug}}",
+            "users",
+            "managers.py",
+        )
+    )
+    os.remove(
+        os.path.join(
+            "{{cookiecutter.project_slug}}",
+            "users",
+            "tests",
+            "test_managers.py",
+        )
+    )
+
+
 def remove_pycharm_files():
     idea_dir_path = ".idea"
     if os.path.exists(idea_dir_path):
@@ -441,6 +459,9 @@ def main():
     if "{{ cookiecutter.open_source_license}}" != "GPLv3":
         remove_gplv3_files()
 
+    if "{{ cookiecutter.username_type }}" == "username":
+        remove_custom_user_manager_files()
+
     if "{{ cookiecutter.use_pycharm }}".lower() == "n":
         remove_pycharm_files()
 
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index eb6c4710f..cb5a99cdb 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -36,6 +36,8 @@ def context():
 
 
 SUPPORTED_COMBINATIONS = [
+    {"username_type": "username"},
+    {"username_type": "email"},
     {"open_source_license": "MIT"},
     {"open_source_license": "BSD"},
     {"open_source_license": "GPLv3"},
diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 441fe4a2c..dbb396c65 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -312,9 +312,15 @@ CELERY_TASK_SEND_SENT_EVENT = True
 # ------------------------------------------------------------------------------
 ACCOUNT_ALLOW_REGISTRATION = env.bool("DJANGO_ACCOUNT_ALLOW_REGISTRATION", True)
 # https://django-allauth.readthedocs.io/en/latest/configuration.html
-ACCOUNT_AUTHENTICATION_METHOD = "username"
+ACCOUNT_AUTHENTICATION_METHOD = "{{cookiecutter.username_type}}"
 # https://django-allauth.readthedocs.io/en/latest/configuration.html
 ACCOUNT_EMAIL_REQUIRED = True
+{%- if cookiecutter.username_type == "email" %}
+# https://django-allauth.readthedocs.io/en/latest/configuration.html
+ACCOUNT_USERNAME_REQUIRED = False
+# https://django-allauth.readthedocs.io/en/latest/configuration.html
+ACCOUNT_USER_MODEL_USERNAME_FIELD = None
+{%- endif %}
 # https://django-allauth.readthedocs.io/en/latest/configuration.html
 ACCOUNT_EMAIL_VERIFICATION = "mandatory"
 # https://django-allauth.readthedocs.io/en/latest/configuration.html
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
index 05cc449db..ad51a6e18 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -92,8 +92,7 @@
               </li>
               {% 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  %}">{% translate "My Profile" %}</a>
+                  <a class="nav-link" href="{% endraw %}{% if cookiecutter.username_type == "email" %}{% raw %}{% url 'users:detail' request.user.pk %}{% endraw %}{% else %}{% raw %}{% url 'users:detail' request.user.username %}{% endraw %}{% endif %}{% raw %}">{% translate "My Profile" %}</a>
                 </li>
                 <li class="nav-item">
                   {# URL provided by django-allauth/account/urls.py #}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_detail.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_detail.html
index eed39ca3a..ee2c4aee9 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_detail.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_detail.html
@@ -1,7 +1,7 @@
 {% raw %}{% extends "base.html" %}
 {% load static %}
 
-{% block title %}User: {{ object.username }}{% endblock %}
+{% block title %}User: {% endraw %}{% if cookiecutter.username_type == "email" %}{% raw %}{{ object.name }}{% endraw %}{% else %}{% raw %}{{ object.username }}{% endraw %}{% endif %}{% raw %}{% endblock %}
 
 {% block content %}
 <div class="container">
@@ -9,7 +9,7 @@
   <div class="row">
     <div class="col-sm-12">
 
-      <h2>{{ object.username }}</h2>
+      <h2>{% endraw %}{% if cookiecutter.username_type == "email" %}{% raw %}{{ object.name }}{% endraw %}{% else %}{% raw %}{{ object.username }}{% endraw %}{% endif %}{% raw %}</h2>
       {% if object.name %}
         <p>{{ object.name }}</p>
       {% endif %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_form.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_form.html
index 53e14a530..65401624a 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_form.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_form.html
@@ -1,10 +1,10 @@
 {% raw %}{% extends "base.html" %}
 {% load crispy_forms_tags %}
 
-{% block title %}{{ user.username }}{% endblock %}
+{% block title %}{% endraw %}{% if cookiecutter.username_type == "email" %}{% raw %}{{ user.name }}{% endraw %}{% else %}{% raw %}{{ user.username }}{% endraw %}{% endif %}{% raw %}{% endblock %}
 
 {% block content %}
-  <h1>{{ user.username }}</h1>
+  <h1>{% endraw %}{% if cookiecutter.username_type == "email" %}{% raw %}{{ user.name }}{% endraw %}{% else %}{% raw %}{{ user.username }}{% endraw %}{% endif %}{% raw %}</h1>
   <form class="form-horizontal" method="post" action="{% url 'users:update' %}">
     {% csrf_token %}
     {{ form|crispy }}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py
index ff492a57f..d81c0a3b0 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py
@@ -13,8 +13,13 @@ class UserAdmin(auth_admin.UserAdmin):
     form = UserAdminChangeForm
     add_form = UserAdminCreationForm
     fieldsets = (
+        {%- if cookiecutter.username_type == "email" %}
+        (None, {"fields": ("email", "password")}),
+        (_("Personal info"), {"fields": ("name",)}),
+        {%- else %}
         (None, {"fields": ("username", "password")}),
         (_("Personal info"), {"fields": ("name", "email")}),
+        {%- endif %}
         (
             _("Permissions"),
             {
@@ -29,5 +34,17 @@ class UserAdmin(auth_admin.UserAdmin):
         ),
         (_("Important dates"), {"fields": ("last_login", "date_joined")}),
     )
-    list_display = ["username", "name", "is_superuser"]
+    list_display = ["{{cookiecutter.username_type}}", "name", "is_superuser"]
     search_fields = ["name"]
+    {%- if cookiecutter.username_type == "email" %}
+    ordering = ["id"]
+    add_fieldsets = (
+        (
+            None,
+            {
+                "classes": ("wide",),
+                "fields": ("email", "password1", "password2"),
+            },
+        ),
+    )
+    {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py
index b5ccabba1..b497ddcf0 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py
@@ -7,8 +7,16 @@ User = get_user_model()
 class UserSerializer(serializers.ModelSerializer):
     class Meta:
         model = User
+        {%- if cookiecutter.username_type == "email" %}
+        fields = ["name", "url"]
+
+        extra_kwargs = {
+            "url": {"view_name": "api:user-detail", "lookup_field": "pk"}
+        }
+        {%- else %}
         fields = ["username", "name", "url"]
 
         extra_kwargs = {
             "url": {"view_name": "api:user-detail", "lookup_field": "username"}
         }
+        {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/views.py
index 98bb04e7b..508431e4c 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/views.py
@@ -13,7 +13,11 @@ User = get_user_model()
 class UserViewSet(RetrieveModelMixin, ListModelMixin, UpdateModelMixin, GenericViewSet):
     serializer_class = UserSerializer
     queryset = User.objects.all()
+    {%- if cookiecutter.username_type == "email" %}
+    lookup_field = "pk"
+    {%- else %}
     lookup_field = "username"
+    {%- endif %}
 
     def get_queryset(self, *args, **kwargs):
         assert isinstance(self.request.user.id, int)
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
index 6e1dd9d32..ac5b647d3 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
@@ -2,6 +2,9 @@ from allauth.account.forms import SignupForm
 from allauth.socialaccount.forms import SignupForm as SocialSignupForm
 from django.contrib.auth import forms as admin_forms
 from django.contrib.auth import get_user_model
+{%- if cookiecutter.username_type == "email" %}
+from django.forms import EmailField
+{%- endif %}
 from django.utils.translation import gettext_lazy as _
 
 User = get_user_model()
@@ -10,6 +13,9 @@ User = get_user_model()
 class UserAdminChangeForm(admin_forms.UserChangeForm):
     class Meta(admin_forms.UserChangeForm.Meta):
         model = User
+        {%- if cookiecutter.username_type == "email" %}
+        field_classes = {"email": EmailField}
+        {%- endif %}
 
 
 class UserAdminCreationForm(admin_forms.UserCreationForm):
@@ -20,10 +26,17 @@ class UserAdminCreationForm(admin_forms.UserCreationForm):
 
     class Meta(admin_forms.UserCreationForm.Meta):
         model = User
-
+        {%- if cookiecutter.username_type == "email" %}
+        fields = ("email",)
+        field_classes = {"email": EmailField}
         error_messages = {
-            "username": {"unique": _("This username has already been taken.")}
+            "email": {"unique": _("This email has already been taken.")},
         }
+        {%- else %}
+        error_messages = {
+            "username": {"unique": _("This username has already been taken.")},
+        }
+        {%- endif %}
 
 
 class UserSignupForm(SignupForm):
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/managers.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/managers.py
new file mode 100644
index 000000000..017ab14e7
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/managers.py
@@ -0,0 +1,34 @@
+from django.contrib.auth.hashers import make_password
+from django.contrib.auth.models import UserManager as DjangoUserManager
+
+
+class UserManager(DjangoUserManager):
+    """Custom manager for the User model."""
+
+    def _create_user(self, email: str, password: str | None, **extra_fields):
+        """
+        Create and save a user with the given email and password.
+        """
+        if not email:
+            raise ValueError("The given email must be set")
+        email = self.normalize_email(email)
+        user = self.model(email=email, **extra_fields)
+        user.password = make_password(password)
+        user.save(using=self._db)
+        return user
+
+    def create_user(self, email: str, password: str | None = None, **extra_fields):
+        extra_fields.setdefault("is_staff", False)
+        extra_fields.setdefault("is_superuser", False)
+        return self._create_user(email, password, **extra_fields)
+
+    def create_superuser(self, email: str, password: str | None = None, **extra_fields):
+        extra_fields.setdefault("is_staff", True)
+        extra_fields.setdefault("is_superuser", True)
+
+        if extra_fields.get("is_staff") is not True:
+            raise ValueError("Superuser must have is_staff=True.")
+        if extra_fields.get("is_superuser") is not True:
+            raise ValueError("Superuser must have is_superuser=True.")
+
+        return self._create_user(email, password, **extra_fields)
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py
index acd18512f..58a439c5d 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/migrations/0001_initial.py
@@ -3,6 +3,8 @@ import django.contrib.auth.validators
 from django.db import migrations, models
 import django.utils.timezone
 
+import {{cookiecutter.project_slug}}.users.models
+
 
 class Migration(migrations.Migration):
 
@@ -40,6 +42,7 @@ class Migration(migrations.Migration):
                         verbose_name="superuser status",
                     ),
                 ),
+                {%- if cookiecutter.username_type == "username" -%}
                 (
                     "username",
                     models.CharField(
@@ -61,6 +64,14 @@ class Migration(migrations.Migration):
                         blank=True, max_length=254, verbose_name="email address"
                     ),
                 ),
+                {%- else %}
+                (
+                    "email",
+                    models.EmailField(
+                        unique=True, max_length=254, verbose_name="email address"
+                    ),
+                ),
+                {%- endif %}
                 (
                     "is_staff",
                     models.BooleanField(
@@ -118,7 +129,11 @@ class Migration(migrations.Migration):
                 "abstract": False,
             },
             managers=[
+                {%- if cookiecutter.username_type == "email" %}
+                ("objects", {{cookiecutter.project_slug}}.users.models.UserManager()),
+                {%- else %}
                 ("objects", django.contrib.auth.models.UserManager()),
+                {%- endif %}
             ],
         ),
     ]
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
index 1f6f61bc0..1e4807510 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
@@ -1,7 +1,11 @@
 from django.contrib.auth.models import AbstractUser
-from django.db.models import CharField
+from django.db.models import CharField{% if cookiecutter.username_type == "email" %}, EmailField{% endif %}
 from django.urls import reverse
 from django.utils.translation import gettext_lazy as _
+{%- if cookiecutter.username_type == "email" %}
+
+from {{ cookiecutter.project_slug }}.users.managers import UserManager
+{%- endif %}
 
 
 class User(AbstractUser):
@@ -11,16 +15,29 @@ class User(AbstractUser):
     check forms.SignupForm and forms.SocialSignupForms accordingly.
     """
 
-    #: First and last name do not cover name patterns around the globe
+    # First and last name do not cover name patterns around the globe
     name = CharField(_("Name of User"), blank=True, max_length=255)
     first_name = None  # type: ignore
     last_name = None  # type: ignore
+    {%- if cookiecutter.username_type == "email" %}
+    email = EmailField(_("email address"), unique=True)
+    username = None  # type: ignore
 
-    def get_absolute_url(self):
-        """Get url for user's detail view.
+    USERNAME_FIELD = "email"
+    REQUIRED_FIELDS = []
+
+    objects = UserManager()
+    {%- endif %}
+
+    def get_absolute_url(self) -> str:
+        """Get URL for user's detail view.
 
         Returns:
             str: URL for user detail.
 
         """
+        {%- if cookiecutter.username_type == "email" %}
+        return reverse("users:detail", kwargs={"pk": self.id})
+        {%- else %}
         return reverse("users:detail", kwargs={"username": self.username})
+        {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
index 36f963438..4b86f7985 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
@@ -7,7 +7,9 @@ from factory.django import DjangoModelFactory
 
 
 class UserFactory(DjangoModelFactory):
+    {%- if cookiecutter.username_type == "username" %}
     username = Faker("user_name")
+    {%- endif %}
     email = Faker("email")
     name = Faker("name")
 
@@ -29,4 +31,4 @@ class UserFactory(DjangoModelFactory):
 
     class Meta:
         model = get_user_model()
-        django_get_or_create = ["username"]
+        django_get_or_create = ["{{cookiecutter.username_type}}"]
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py
index a370784fc..2991d18a9 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py
@@ -22,16 +22,28 @@ class TestUserAdmin:
         response = admin_client.post(
             url,
             data={
+                {%- if cookiecutter.username_type == "email" %}
+                "email": "new-admin@example.com",
+                {%- else %}
                 "username": "test",
+                {%- endif %}
                 "password1": "My_R@ndom-P@ssw0rd",
                 "password2": "My_R@ndom-P@ssw0rd",
             },
         )
         assert response.status_code == 302
+        {%- if cookiecutter.username_type == "email" %}
+        assert User.objects.filter(email="new-admin@example.com").exists()
+        {%- else %}
         assert User.objects.filter(username="test").exists()
+        {%- endif %}
 
     def test_view_user(self, admin_client):
+        {%- if cookiecutter.username_type == "email" %}
+        user = User.objects.get(email="admin@example.com")
+        {%- else %}
         user = User.objects.get(username="admin")
+        {%- endif %}
         url = reverse("admin:users_user_change", kwargs={"object_id": user.pk})
         response = admin_client.get(url)
         assert response.status_code == 200
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_urls.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_urls.py
index 7d9c444d3..3fcfe4d05 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_urls.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_urls.py
@@ -4,11 +4,19 @@ from {{ cookiecutter.project_slug }}.users.models import User
 
 
 def test_user_detail(user: User):
+    {%- if cookiecutter.username_type == "email" %}
+    assert (
+        reverse("api:user-detail", kwargs={"pk": user.pk})
+        == f"/api/users/{user.pk}/"
+    )
+    assert resolve(f"/api/users/{user.pk}/").view_name == "api:user-detail"
+    {%- else %}
     assert (
         reverse("api:user-detail", kwargs={"username": user.username})
         == f"/api/users/{user.username}/"
     )
     assert resolve(f"/api/users/{user.username}/").view_name == "api:user-detail"
+    {%- endif %}
 
 
 def test_user_list():
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
index 7828e49cd..90e84dc7d 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_views.py
@@ -29,7 +29,11 @@ class TestUserViewSet:
         response = view.me(request)  # type: ignore
 
         assert response.data == {
+            {%- if cookiecutter.username_type == "email" %}
+            "url": f"http://testserver/api/users/{user.pk}/",
+            {%- else %}
             "username": user.username,
-            "name": user.name,
             "url": f"http://testserver/api/users/{user.username}/",
+            {%- endif %}
+            "name": user.name,
         }
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
index 261f88c8c..023aad056 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
@@ -24,7 +24,11 @@ class TestUserAdminCreationForm:
         # hence cannot be created.
         form = UserAdminCreationForm(
             {
+                {%- if cookiecutter.username_type == "email" %}
+                "email": user.email,
+                {%- else %}
                 "username": user.username,
+                {%- endif %}
                 "password1": user.password,
                 "password2": user.password,
             }
@@ -32,5 +36,10 @@ class TestUserAdminCreationForm:
 
         assert not form.is_valid()
         assert len(form.errors) == 1
+        {%- if cookiecutter.username_type == "email" %}
+        assert "email" in form.errors
+        assert form.errors["email"][0] == _("This email has already been taken.")
+        {%- else %}
         assert "username" in form.errors
         assert form.errors["username"][0] == _("This username has already been taken.")
+        {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_managers.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_managers.py
new file mode 100644
index 000000000..f25af4ee2
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_managers.py
@@ -0,0 +1,55 @@
+from io import StringIO
+
+import pytest
+from django.core.management import call_command
+
+from {{ cookiecutter.project_slug }}.users.models import User
+
+
+@pytest.mark.django_db
+class TestUserManager:
+    def test_create_user(self):
+        user = User.objects.create_user(
+            email="john@example.com",
+            password="something-r@nd0m!",
+        )
+        assert user.email == "john@example.com"
+        assert not user.is_staff
+        assert not user.is_superuser
+        assert user.check_password("something-r@nd0m!")
+        assert user.username is None
+
+    def test_create_superuser(self):
+        user = User.objects.create_superuser(
+            email="admin@example.com",
+            password="something-r@nd0m!",
+        )
+        assert user.email == "admin@example.com"
+        assert user.is_staff
+        assert user.is_superuser
+        assert user.username is None
+
+    def test_create_superuser_username_ignored(self):
+        user = User.objects.create_superuser(
+            email="test@example.com",
+            password="something-r@nd0m!",
+        )
+        assert user.username is None
+
+
+@pytest.mark.django_db
+def test_createsuperuser_command():
+    """Ensure createsuperuser command works with our custom manager."""
+    out = StringIO()
+    command_result = call_command(
+        "createsuperuser",
+        "--email",
+        "henry@example.com",
+        interactive=False,
+        stdout=out,
+    )
+
+    assert command_result is None
+    assert out.getvalue() == "Superuser created successfully.\n"
+    user = User.objects.get(email="henry@example.com")
+    assert not user.has_usable_password()
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_models.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_models.py
index b09bcdf0b..76d89ce3f 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_models.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_models.py
@@ -2,4 +2,8 @@ from {{ cookiecutter.project_slug }}.users.models import User
 
 
 def test_user_get_absolute_url(user: User):
+    {%- if cookiecutter.username_type == "email" %}
+    assert user.get_absolute_url() == f"/users/{user.pk}/"
+    {%- else %}
     assert user.get_absolute_url() == f"/users/{user.username}/"
+    {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
index 7cd056db5..062d7dc88 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
@@ -4,11 +4,16 @@ from {{ cookiecutter.project_slug }}.users.models import User
 
 
 def test_detail(user: User):
+    {%- if cookiecutter.username_type == "email" %}
+    assert reverse("users:detail", kwargs={"pk": user.pk}) == f"/users/{user.pk}/"
+    assert resolve(f"/users/{user.pk}/").view_name == "users:detail"
+    {%- else %}
     assert (
         reverse("users:detail", kwargs={"username": user.username})
         == f"/users/{user.username}/"
     )
     assert resolve(f"/users/{user.username}/").view_name == "users:detail"
+    {%- endif %}
 
 
 def test_update():
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
index d968d7ec9..0cd0021ff 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
@@ -39,7 +39,11 @@ class TestUserUpdateView:
 
         view.request = request
 
+        {%- if cookiecutter.username_type == "email" %}
+        assert view.get_success_url() == f"/users/{user.pk}/"
+        {%- else %}
         assert view.get_success_url() == f"/users/{user.username}/"
+        {%- endif %}
 
     def test_get_object(self, user: User, rf: RequestFactory):
         view = UserUpdateView()
@@ -79,7 +83,11 @@ class TestUserRedirectView:
 
         view.request = request
 
+        {%- if cookiecutter.username_type == "email" %}
+        assert view.get_redirect_url() == f"/users/{user.pk}/"
+        {%- else %}
         assert view.get_redirect_url() == f"/users/{user.username}/"
+        {%- endif %}
 
 
 class TestUserDetailView:
@@ -87,7 +95,11 @@ class TestUserDetailView:
         request = rf.get("/fake-url/")
         request.user = UserFactory()
 
+        {%- if cookiecutter.username_type == "email" %}
+        response = user_detail_view(request, pk=user.pk)
+        {%- else %}
         response = user_detail_view(request, username=user.username)
+        {%- endif %}
 
         assert response.status_code == 200
 
@@ -95,7 +107,11 @@ class TestUserDetailView:
         request = rf.get("/fake-url/")
         request.user = AnonymousUser()
 
+        {%- if cookiecutter.username_type == "email" %}
+        response = user_detail_view(request, pk=user.pk)
+        {%- else %}
         response = user_detail_view(request, username=user.username)
+        {%- endif %}
         login_url = reverse(settings.LOGIN_URL)
 
         assert isinstance(response, HttpResponseRedirect)
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py
index 8c8c7e2ea..0ffca17aa 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py
@@ -10,5 +10,9 @@ app_name = "users"
 urlpatterns = [
     path("~redirect/", view=user_redirect_view, name="redirect"),
     path("~update/", view=user_update_view, name="update"),
+    {%- if cookiecutter.username_type == "email" %}
+    path("<int:pk>/", view=user_detail_view, name="detail"),
+    {%- else %}
     path("<str:username>/", view=user_detail_view, name="detail"),
+    {%- endif %}
 ]
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
index 488c294d0..8e868f78d 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
@@ -10,8 +10,13 @@ User = get_user_model()
 
 class UserDetailView(LoginRequiredMixin, DetailView):
     model = User
+    {%- if cookiecutter.username_type == "email" %}
+    slug_field = "id"
+    slug_url_kwarg = "id"
+    {%- else %}
     slug_field = "username"
     slug_url_kwarg = "username"
+    {%- endif %}
 
 
 user_detail_view = UserDetailView.as_view()
@@ -39,7 +44,11 @@ class UserRedirectView(LoginRequiredMixin, RedirectView):
     permanent = False
 
     def get_redirect_url(self):
+        {%- if cookiecutter.username_type == "email" %}
+        return reverse("users:detail", kwargs={"pk": self.request.user.pk})
+        {%- else %}
         return reverse("users:detail", kwargs={"username": self.request.user.username})
+        {%- endif %}
 
 
 user_redirect_view = UserRedirectView.as_view()

From 0dcc4c4b4cfb8b3a3a7e59c6f7cc5b2794baa943 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 15 Apr 2023 12:15:15 +0100
Subject: [PATCH 2679/2840] Add more pre-commit hooks (#4266)

* Add more hooks from pre-commit-hooks repo

* Add pre-commit hook for prettier

* Format with prettier

* Remove check-docstring-first hook

* Run prettier in the template

* Tweak formatting of dependabot file

* Fix formatting of GitHub files for prettier

* More format fixes of ci.yml
---
 .github/CONTRIBUTORS-template.md              |  10 +-
 .github/ISSUE_TEMPLATE/bug.md                 |  68 ++++----
 .github/ISSUE_TEMPLATE/paid-support.md        |   6 +-
 .github/PULL_REQUEST_TEMPLATE.md              |   1 -
 .github/changelog-template.md                 |   9 +-
 .github/dependabot.yml                        |  12 +-
 .github/workflows/ci.yml                      |   2 +-
 .github/workflows/pre-commit-autoupdate.yml   |   4 +-
 .github/workflows/update-contributors.yml     |   2 +-
 .pre-commit-config.yaml                       |  16 +-
 CONTRIBUTORS.md                               |  10 +-
 README.md                                     | 113 ++++++-------
 cookiecutter.json                             |  29 +---
 docs/generate-project-block.rst               |   1 -
 .../.github/dependabot.yml                    |  78 +++++----
 .../.github/workflows/ci.yml                  |  28 ++--
 .../.pre-commit-config.yaml                   |  19 ++-
 .../.readthedocs.yml                          |   2 +-
 {{cookiecutter.project_slug}}/README.md       |  14 +-
 .../compose/production/traefik/traefik.yml    |  20 +--
 {{cookiecutter.project_slug}}/gulpfile.js     | 158 +++++++++---------
 {{cookiecutter.project_slug}}/local.yml       |  10 +-
 {{cookiecutter.project_slug}}/production.yml  |   6 +-
 .../webpack/common.config.js                  |  21 +--
 .../webpack/prod.config.js                    |   6 +-
 .../static/js/project.js                      |   4 +-
 .../static/sass/project.scss                  |  17 +-
 27 files changed, 343 insertions(+), 323 deletions(-)

diff --git a/.github/CONTRIBUTORS-template.md b/.github/CONTRIBUTORS-template.md
index d8ba28c63..bc0928478 100644
--- a/.github/CONTRIBUTORS-template.md
+++ b/.github/CONTRIBUTORS-template.md
@@ -22,8 +22,8 @@ accept and merge pull requests.
   {%- endfor %}
 </table>
 
-*Audrey is also the creator of Cookiecutter. Audrey and Daniel are on
-the Cookiecutter core team.*
+_Audrey is also the creator of Cookiecutter. Audrey and Daniel are on
+the Cookiecutter core team._
 
 ## Other Contributors
 
@@ -51,6 +51,6 @@ Listed in alphabetical order.
 The following haven't provided code directly, but have provided
 guidance and advice.
 
--   Jannis Leidel
--   Nate Aune
--   Barry Morrison
+- Jannis Leidel
+- Nate Aune
+- Barry Morrison
diff --git a/.github/ISSUE_TEMPLATE/bug.md b/.github/ISSUE_TEMPLATE/bug.md
index e984493d8..0e5ec12c4 100644
--- a/.github/ISSUE_TEMPLATE/bug.md
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -12,41 +12,47 @@ labels: bug
 
 <!-- To assist you best, please include commands that you've run, options you've selected and any relevant logs -->
 
-* Host system configuration:
-    * Version of cookiecutter CLI (get it with `cookiecutter --version`):
-    * OS name and version:
+- Host system configuration:
 
-      On Linux, run
-      ```bash
-      lsb_release -a 2> /dev/null || cat /etc/redhat-release 2> /dev/null || cat /etc/*-release 2> /dev/null || cat /etc/issue 2> /dev/null
-      ```
+  - Version of cookiecutter CLI (get it with `cookiecutter --version`):
+  - OS name and version:
 
-      On MacOs, run
-      ```bash
-      sw_vers
-      ```
+    On Linux, run
 
-      On Windows, via CMD, run
-      ```
-      systeminfo | findstr /B /C:"OS Name" /C:"OS Version"
-      ```
-
-
-      ```bash
-      # Insert here the OS name and version
-
-      ```
-
-    * Python version, run `python3 -V`:
-    * Docker version (if using Docker), run `docker --version`:
-    * docker-compose version (if using Docker), run `docker-compose --version`:
-    * ...
-* Options selected and/or [replay file](https://cookiecutter.readthedocs.io/en/latest/advanced/replay.html):
-  On Linux and MacOS: `cat ${HOME}/.cookiecutter_replay/cookiecutter-django.json`
-  (Please, take care to remove sensitive information)
-    ```json
-    # Insert here the replay file content
+    ```bash
+    lsb_release -a 2> /dev/null || cat /etc/redhat-release 2> /dev/null || cat /etc/*-release 2> /dev/null || cat /etc/issue 2> /dev/null
     ```
+
+    On MacOs, run
+
+    ```bash
+    sw_vers
+    ```
+
+    On Windows, via CMD, run
+
+    ```
+    systeminfo | findstr /B /C:"OS Name" /C:"OS Version"
+    ```
+
+    ```bash
+    # Insert here the OS name and version
+
+    ```
+
+  - Python version, run `python3 -V`:
+  - Docker version (if using Docker), run `docker --version`:
+  - docker-compose version (if using Docker), run `docker-compose --version`:
+  - ...
+
+- Options selected and/or [replay file](https://cookiecutter.readthedocs.io/en/latest/advanced/replay.html):
+  On Linux and macOS: `cat ${HOME}/.cookiecutter_replay/cookiecutter-django.json`
+  (Please, take care to remove sensitive information)
+
+```json
+
+```
+
 <summary>
 Logs:
 <details>
diff --git a/.github/ISSUE_TEMPLATE/paid-support.md b/.github/ISSUE_TEMPLATE/paid-support.md
index 9f997a8c8..f4e7578a8 100644
--- a/.github/ISSUE_TEMPLATE/paid-support.md
+++ b/.github/ISSUE_TEMPLATE/paid-support.md
@@ -5,8 +5,8 @@ about: Ask Core Team members to help you out
 
 Provided your question goes beyond [regular support](https://github.com/cookiecutter/cookiecutter-django/issues/new?template=question.md), and/or the task at hand is of timely/high priority nature use the below information to reach out for contributors directly.
 
-* Daniel Roy Greenfeld, Project Lead ([GitHub](https://github.com/pydanny), [Patreon](https://www.patreon.com/danielroygreenfeld)): expertise in Django and AWS ELB.
+- Bruno Alla, Core Developer ([GitHub](https://github.com/sponsors/browniebroke)).
 
-* Nikita Shupeyko, Core Developer ([GitHub](https://github.com/webyneter)): expertise in Python/Django, hands-on DevOps and frontend experience.
+- Daniel Roy Greenfeld, Project Lead ([GitHub](https://github.com/pydanny), [Patreon](https://www.patreon.com/danielroygreenfeld)): expertise in Django and AWS ELB.
 
-* Bruno Alla, Core Developer ([GitHub](https://github.com/sponsors/browniebroke)).
+- Nikita Shupeyko, Core Developer ([GitHub](https://github.com/webyneter)): expertise in Python/Django, hands-on DevOps and frontend experience.
diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md
index 10b66e266..2b197873f 100644
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -1,6 +1,5 @@
 <!-- Thank you for helping us out: your efforts mean a great deal to the project and the community as a whole! -->
 
-
 ## Description
 
 <!-- What's it you're proposing? -->
diff --git a/.github/changelog-template.md b/.github/changelog-template.md
index 50aab38e1..64bb71790 100644
--- a/.github/changelog-template.md
+++ b/.github/changelog-template.md
@@ -1,8 +1,11 @@
 {%- for change_type, pulls in grouped_pulls.items() %}
 {%- if pulls %}
+
 ### {{ change_type }}
+
 {%- for pull_request in pulls %}
+
 - {{ pull_request.title }} ([#{{ pull_request.number }}]({{ pull_request.html_url }}))
-{%- endfor -%}
-{% endif -%}
-{% endfor -%}
+  {%- endfor -%}
+  {% endif -%}
+  {% endfor -%}
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index d308ff96a..7642a3f2d 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -29,7 +29,9 @@ updates:
       interval: "daily"
     ignore:
       - dependency-name: "*"
-        update-types: ["version-update:semver-major", "version-update:semver-minor"]
+        update-types:
+          - "version-update:semver-major"
+          - "version-update:semver-minor"
     labels:
       - "update"
 
@@ -39,7 +41,9 @@ updates:
       interval: "daily"
     ignore:
       - dependency-name: "*"
-        update-types: ["version-update:semver-major", "version-update:semver-minor"]
+        update-types:
+          - "version-update:semver-major"
+          - "version-update:semver-minor"
     labels:
       - "update"
 
@@ -63,7 +67,9 @@ updates:
       interval: "daily"
     ignore:
       - dependency-name: "*"
-        update-types: ["version-update:semver-major", "version-update:semver-minor"]
+        update-types:
+          - "version-update:semver-major"
+          - "version-update:semver-minor"
     labels:
       - "update"
 
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 8100270bb..c7cdda633 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -2,7 +2,7 @@ name: CI
 
 on:
   push:
-    branches: [ "master", "main" ]
+    branches: ["master", "main"]
   pull_request:
 
 concurrency:
diff --git a/.github/workflows/pre-commit-autoupdate.yml b/.github/workflows/pre-commit-autoupdate.yml
index 9e5232dcd..75bfe0a20 100644
--- a/.github/workflows/pre-commit-autoupdate.yml
+++ b/.github/workflows/pre-commit-autoupdate.yml
@@ -16,8 +16,8 @@ jobs:
     # Disables this workflow from running in a repository that is not part of the indicated organization/user
     if: github.repository_owner == 'cookiecutter'
     permissions:
-      contents: write  # for peter-evans/create-pull-request to create branch
-      pull-requests: write  # for peter-evans/create-pull-request to create a PR
+      contents: write # for peter-evans/create-pull-request to create branch
+      pull-requests: write # for peter-evans/create-pull-request to create a PR
 
     runs-on: ubuntu-latest
     steps:
diff --git a/.github/workflows/update-contributors.yml b/.github/workflows/update-contributors.yml
index 2aea8003b..78d72c241 100644
--- a/.github/workflows/update-contributors.yml
+++ b/.github/workflows/update-contributors.yml
@@ -13,7 +13,7 @@ jobs:
     # Disables this workflow from running in a repository that is not part of the indicated organization/user
     if: github.repository_owner == 'cookiecutter'
     permissions:
-      contents: write  # for stefanzweifel/git-auto-commit-action to push code in repo
+      contents: write # for stefanzweifel/git-auto-commit-action to push code in repo
 
     runs-on: ubuntu-latest
     steps:
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 34bcc6a22..d0b2f16b5 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,4 +1,4 @@
-exclude: "{{cookiecutter.project_slug}}"
+exclude: "{{cookiecutter.project_slug}}|.github/contributors.json|CHANGELOG.md"
 default_stages: [commit]
 
 repos:
@@ -6,7 +6,21 @@ repos:
     rev: v4.4.0
     hooks:
       - id: trailing-whitespace
+      - id: end-of-file-fixer
+      - id: check-json
+      - id: check-toml
+      - id: check-xml
       - id: check-yaml
+      - id: debug-statements
+      - id: check-builtin-literals
+      - id: check-case-conflict
+      - id: detect-private-key
+
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: "v3.0.0-alpha.6"
+    hooks:
+      - id: prettier
+        args: ["--tab-width", "2"]
 
   - repo: https://github.com/asottile/pyupgrade
     rev: v3.3.1
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 7d9ee7756..c821674f0 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -76,8 +76,8 @@ accept and merge pull requests.
   </tr>
 </table>
 
-*Audrey is also the creator of Cookiecutter. Audrey and Daniel are on
-the Cookiecutter core team.*
+_Audrey is also the creator of Cookiecutter. Audrey and Daniel are on
+the Cookiecutter core team._
 
 ## Other Contributors
 
@@ -1965,6 +1965,6 @@ Listed in alphabetical order.
 The following haven't provided code directly, but have provided
 guidance and advice.
 
--   Jannis Leidel
--   Nate Aune
--   Barry Morrison
\ No newline at end of file
+- Jannis Leidel
+- Nate Aune
+- Barry Morrison
diff --git a/README.md b/README.md
index 4216c2d4e..90cbe3379 100644
--- a/README.md
+++ b/README.md
@@ -12,58 +12,58 @@
 Powered by [Cookiecutter](https://github.com/cookiecutter/cookiecutter), Cookiecutter Django is a framework for jumpstarting
 production-ready Django projects quickly.
 
--   Documentation: <https://cookiecutter-django.readthedocs.io/en/latest/>
--   See [Troubleshooting](https://cookiecutter-django.readthedocs.io/en/latest/troubleshooting.html) for common errors and obstacles
--   If you have problems with Cookiecutter Django, please open [issues](https://github.com/cookiecutter/cookiecutter-django/issues/new) don't send
-    emails to the maintainers.
+- Documentation: <https://cookiecutter-django.readthedocs.io/en/latest/>
+- See [Troubleshooting](https://cookiecutter-django.readthedocs.io/en/latest/troubleshooting.html) for common errors and obstacles
+- If you have problems with Cookiecutter Django, please open [issues](https://github.com/cookiecutter/cookiecutter-django/issues/new) don't send
+  emails to the maintainers.
 
 ## Features
 
--   For Django 4.1
--   Works with Python 3.11
--   Renders Django projects with 100% starting test coverage
--   Twitter [Bootstrap](https://github.com/twbs/bootstrap) v5
--   [12-Factor](http://12factor.net/) based settings via [django-environ](https://github.com/joke2k/django-environ)
--   Secure by default. We believe in SSL.
--   Optimized development and production settings
--   Registration via [django-allauth](https://github.com/pennersr/django-allauth)
--   Comes with custom user model ready to go
--   Optional basic ASGI setup for Websockets
--   Optional custom static build using Gulp or Webpack
--   Send emails via [Anymail](https://github.com/anymail/django-anymail) (using [Mailgun](http://www.mailgun.com/) by default or Amazon SES if AWS is selected cloud provider, but switchable)
--   Media storage using Amazon S3, Google Cloud Storage, Azure Storage or nginx
--   Docker support using [docker-compose](https://github.com/docker/compose) for development and production (using [Traefik](https://traefik.io/) with [LetsEncrypt](https://letsencrypt.org/) support)
--   [Procfile](https://devcenter.heroku.com/articles/procfile) for deploying to Heroku
--   Instructions for deploying to [PythonAnywhere](https://www.pythonanywhere.com/)
--   Run tests with unittest or pytest
--   Customizable PostgreSQL version
--   Default integration with [pre-commit](https://github.com/pre-commit/pre-commit) for identifying simple issues before submission to code review
+- For Django 4.1
+- Works with Python 3.11
+- Renders Django projects with 100% starting test coverage
+- Twitter [Bootstrap](https://github.com/twbs/bootstrap) v5
+- [12-Factor](http://12factor.net/) based settings via [django-environ](https://github.com/joke2k/django-environ)
+- Secure by default. We believe in SSL.
+- Optimized development and production settings
+- Registration via [django-allauth](https://github.com/pennersr/django-allauth)
+- Comes with custom user model ready to go
+- Optional basic ASGI setup for Websockets
+- Optional custom static build using Gulp or Webpack
+- Send emails via [Anymail](https://github.com/anymail/django-anymail) (using [Mailgun](http://www.mailgun.com/) by default or Amazon SES if AWS is selected cloud provider, but switchable)
+- Media storage using Amazon S3, Google Cloud Storage, Azure Storage or nginx
+- Docker support using [docker-compose](https://github.com/docker/compose) for development and production (using [Traefik](https://traefik.io/) with [LetsEncrypt](https://letsencrypt.org/) support)
+- [Procfile](https://devcenter.heroku.com/articles/procfile) for deploying to Heroku
+- Instructions for deploying to [PythonAnywhere](https://www.pythonanywhere.com/)
+- Run tests with unittest or pytest
+- Customizable PostgreSQL version
+- Default integration with [pre-commit](https://github.com/pre-commit/pre-commit) for identifying simple issues before submission to code review
 
 ## Optional Integrations
 
-*These features can be enabled during initial project setup.*
+_These features can be enabled during initial project setup._
 
--   Serve static files from Amazon S3, Google Cloud Storage, Azure Storage or [Whitenoise](https://whitenoise.readthedocs.io/)
--   Configuration for [Celery](https://docs.celeryq.dev) and [Flower](https://github.com/mher/flower) (the latter in Docker setup only)
--   Integration with [MailHog](https://github.com/mailhog/MailHog) for local email testing
--   Integration with [Sentry](https://sentry.io/welcome/) for error logging
+- Serve static files from Amazon S3, Google Cloud Storage, Azure Storage or [Whitenoise](https://whitenoise.readthedocs.io/)
+- Configuration for [Celery](https://docs.celeryq.dev) and [Flower](https://github.com/mher/flower) (the latter in Docker setup only)
+- Integration with [MailHog](https://github.com/mailhog/MailHog) for local email testing
+- Integration with [Sentry](https://sentry.io/welcome/) for error logging
 
 ## Constraints
 
--   Only maintained 3rd party libraries are used.
--   Uses PostgreSQL everywhere: 10.19 - 14.1 ([MySQL fork](https://github.com/mabdullahadeel/cookiecutter-django-mysql) also available).
--   Environment variables for configuration (This won't work with Apache/mod_wsgi).
+- Only maintained 3rd party libraries are used.
+- Uses PostgreSQL everywhere: 10.19 - 14.1 ([MySQL fork](https://github.com/mabdullahadeel/cookiecutter-django-mysql) also available).
+- Environment variables for configuration (This won't work with Apache/mod_wsgi).
 
 ## Support this Project!
 
 This project is run by volunteers. Please support them in their efforts to maintain and improve Cookiecutter Django:
 
--   Daniel Roy Greenfeld, Project Lead ([GitHub](https://github.com/pydanny), [Patreon](https://www.patreon.com/danielroygreenfeld)): expertise in Django and AWS ELB.
--   Nikita Shupeyko, Core Developer ([GitHub](https://github.com/webyneter)): expertise in Python/Django, hands-on DevOps and frontend experience.
+- Daniel Roy Greenfeld, Project Lead ([GitHub](https://github.com/pydanny), [Patreon](https://www.patreon.com/danielroygreenfeld)): expertise in Django and AWS ELB.
+- Nikita Shupeyko, Core Developer ([GitHub](https://github.com/webyneter)): expertise in Python/Django, hands-on DevOps and frontend experience.
 
 Projects that provide financial support to the maintainers:
 
-------------------------------------------------------------------------
+---
 
 <p align="center">
   <a href="https://www.feldroy.com/products//two-scoops-of-django-3-x"><img src="https://cdn.shopify.com/s/files/1/0304/6901/products/Two-Scoops-of-Django-3-Alpha-Cover_540x_26507b15-e489-470b-8a97-02773dd498d1_1080x.jpg"></a>
@@ -188,14 +188,14 @@ Now take a look at your repo. Don't forget to carefully look at the generated RE
 
 For local development, see the following:
 
--   [Developing locally](http://cookiecutter-django.readthedocs.io/en/latest/developing-locally.html)
--   [Developing locally using docker](http://cookiecutter-django.readthedocs.io/en/latest/developing-locally-docker.html)
+- [Developing locally](http://cookiecutter-django.readthedocs.io/en/latest/developing-locally.html)
+- [Developing locally using docker](http://cookiecutter-django.readthedocs.io/en/latest/developing-locally-docker.html)
 
 ## Community
 
--   Have questions? **Before you ask questions anywhere else**, please post your question on [Stack Overflow](http://stackoverflow.com/questions/tagged/cookiecutter-django) under the *cookiecutter-django* tag. We check there periodically for questions.
--   If you think you found a bug or want to request a feature, please open an [issue](https://github.com/cookiecutter/cookiecutter-django/issues).
--   For anything else, you can chat with us on [Discord](https://discord.gg/uFXweDQc5a).
+- Have questions? **Before you ask questions anywhere else**, please post your question on [Stack Overflow](http://stackoverflow.com/questions/tagged/cookiecutter-django) under the _cookiecutter-django_ tag. We check there periodically for questions.
+- If you think you found a bug or want to request a feature, please open an [issue](https://github.com/cookiecutter/cookiecutter-django/issues).
+- For anything else, you can chat with us on [Discord](https://discord.gg/uFXweDQc5a).
 
 ## For Readers of Two Scoops of Django
 
@@ -203,13 +203,14 @@ You may notice that some elements of this project do not exactly match what we d
 
 ## For PyUp Users
 
-If you are using [PyUp](https://pyup.io) to keep your dependencies updated and secure, use the code *cookiecutter* during checkout to get 15% off every month.
+If you are using [PyUp](https://pyup.io) to keep your dependencies updated and secure, use the code _cookiecutter_ during checkout to get 15% off every month.
 
 ## "Your Stuff"
 
 Scattered throughout the Python and HTML of this project are places marked with "your stuff". This is where third-party libraries are to be integrated with your project.
 
 ## For MySQL users
+
 To get full MySQL support in addition to the default Postgresql, you can use this fork of the cookiecutter-django:
 https://github.com/mabdullahadeel/cookiecutter-django-mysql
 
@@ -219,18 +220,18 @@ Need a stable release? You can find them at <https://github.com/cookiecutter/coo
 
 ## Not Exactly What You Want?
 
-This is what I want. *It might not be what you want.* Don't worry, you have options:
+This is what I want. _It might not be what you want._ Don't worry, you have options:
 
 ### Fork This
 
 If you have differences in your preferred setup, I encourage you to fork this to create your own version.
-Once you have your fork working, let me know and I'll add it to a '*Similar Cookiecutter Templates*' list here.
+Once you have your fork working, let me know and I'll add it to a '_Similar Cookiecutter Templates_' list here.
 It's up to you whether to rename your fork.
 
 If you do rename your fork, I encourage you to submit it to the following places:
 
--   [cookiecutter](https://github.com/cookiecutter/cookiecutter) so it gets listed in the README as a template.
--   The cookiecutter [grid](https://www.djangopackages.com/grids/g/cookiecutters/) on Django Packages.
+- [cookiecutter](https://github.com/cookiecutter/cookiecutter) so it gets listed in the README as a template.
+- The cookiecutter [grid](https://www.djangopackages.com/grids/g/cookiecutters/) on Django Packages.
 
 ### Submit a Pull Request
 
@@ -239,17 +240,17 @@ experience better.
 
 ## Articles
 
--   [Cookiecutter Django With Amazon RDS](https://haseeburrehman.com/posts/cookiecutter-django-with-amazon-rds/) - Apr, 2, 2021
--   [Complete Walkthrough: Blue/Green Deployment to AWS ECS using GitHub actions](https://github.com/Andrew-Chen-Wang/cookiecutter-django-ecs-github) - June 10, 2020
--   [Using cookiecutter-django with Google Cloud Storage](https://ahhda.github.io/cloud/gce/django/2019/03/12/using-django-cookiecutter-cloud-storage.html) - Mar. 12, 2019
--   [cookiecutter-django with Nginx, Route 53 and ELB](https://msaizar.com/blog/cookiecutter-django-nginx-route-53-and-elb/) - Feb. 12, 2018
--   [cookiecutter-django and Amazon RDS](https://msaizar.com/blog/cookiecutter-django-and-amazon-rds/) - Feb. 7, 2018
--   [Using Cookiecutter to Jumpstart a Django Project on Windows with PyCharm](https://joshuahunter.com/posts/using-cookiecutter-to-jumpstart-a-django-project-on-windows-with-pycharm/) - May 19, 2017
--   [Exploring with Cookiecutter](http://www.snowboardingcoder.com/django/2016/12/03/exploring-with-cookiecutter/) - Dec. 3, 2016
--   [Introduction to Cookiecutter-Django](http://krzysztofzuraw.com/blog/2016/django-cookiecutter.html) - Feb. 19, 2016
--   [Django and GitLab - Running Continuous Integration and tests with your FREE account](http://dezoito.github.io/2016/05/11/django-gitlab-continuous-integration-phantomjs.html) - May. 11, 2016
--   [Development and Deployment of Cookiecutter-Django on Fedora](https://realpython.com/blog/python/development-and-deployment-of-cookiecutter-django-on-fedora/) - Jan. 18, 2016
--   [Development and Deployment of Cookiecutter-Django via Docker](https://realpython.com/blog/python/development-and-deployment-of-cookiecutter-django-via-docker/) - Dec. 29, 2015
--   [How to create a Django Application using Cookiecutter and Django 1.8](https://www.swapps.io/blog/how-to-create-a-django-application-using-cookiecutter-and-django-1-8/) - Sept. 12, 2015
+- [Cookiecutter Django With Amazon RDS](https://haseeburrehman.com/posts/cookiecutter-django-with-amazon-rds/) - Apr, 2, 2021
+- [Complete Walkthrough: Blue/Green Deployment to AWS ECS using GitHub actions](https://github.com/Andrew-Chen-Wang/cookiecutter-django-ecs-github) - June 10, 2020
+- [Using cookiecutter-django with Google Cloud Storage](https://ahhda.github.io/cloud/gce/django/2019/03/12/using-django-cookiecutter-cloud-storage.html) - Mar. 12, 2019
+- [cookiecutter-django with Nginx, Route 53 and ELB](https://msaizar.com/blog/cookiecutter-django-nginx-route-53-and-elb/) - Feb. 12, 2018
+- [cookiecutter-django and Amazon RDS](https://msaizar.com/blog/cookiecutter-django-and-amazon-rds/) - Feb. 7, 2018
+- [Using Cookiecutter to Jumpstart a Django Project on Windows with PyCharm](https://joshuahunter.com/posts/using-cookiecutter-to-jumpstart-a-django-project-on-windows-with-pycharm/) - May 19, 2017
+- [Exploring with Cookiecutter](http://www.snowboardingcoder.com/django/2016/12/03/exploring-with-cookiecutter/) - Dec. 3, 2016
+- [Introduction to Cookiecutter-Django](http://krzysztofzuraw.com/blog/2016/django-cookiecutter.html) - Feb. 19, 2016
+- [Django and GitLab - Running Continuous Integration and tests with your FREE account](http://dezoito.github.io/2016/05/11/django-gitlab-continuous-integration-phantomjs.html) - May. 11, 2016
+- [Development and Deployment of Cookiecutter-Django on Fedora](https://realpython.com/blog/python/development-and-deployment-of-cookiecutter-django-on-fedora/) - Jan. 18, 2016
+- [Development and Deployment of Cookiecutter-Django via Docker](https://realpython.com/blog/python/development-and-deployment-of-cookiecutter-django-via-docker/) - Dec. 29, 2015
+- [How to create a Django Application using Cookiecutter and Django 1.8](https://www.swapps.io/blog/how-to-create-a-django-application-using-cookiecutter-and-django-1-8/) - Sept. 12, 2015
 
 Have a blog or online publication? Write about your cookiecutter-django tips and tricks, then send us a pull request with the link.
diff --git a/cookiecutter.json b/cookiecutter.json
index c9ad19394..970a53795 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -18,19 +18,8 @@
   "windows": "n",
   "use_pycharm": "n",
   "use_docker": "n",
-  "postgresql_version": [
-    "14",
-    "13",
-    "12",
-    "11",
-    "10"
-  ],
-  "cloud_provider": [
-    "AWS",
-    "GCP",
-    "Azure",
-    "None"
-  ],
+  "postgresql_version": ["14", "13", "12", "11", "10"],
+  "cloud_provider": ["AWS", "GCP", "Azure", "None"],
   "mail_service": [
     "Mailgun",
     "Amazon SES",
@@ -44,23 +33,13 @@
   ],
   "use_async": "n",
   "use_drf": "n",
-  "frontend_pipeline": [
-    "None",
-    "Django Compressor",
-    "Gulp",
-    "Webpack"
-  ],
+  "frontend_pipeline": ["None", "Django Compressor", "Gulp", "Webpack"],
   "use_celery": "n",
   "use_mailhog": "n",
   "use_sentry": "n",
   "use_whitenoise": "n",
   "use_heroku": "n",
-  "ci_tool": [
-    "None",
-    "Travis",
-    "Gitlab",
-    "Github"
-  ],
+  "ci_tool": ["None", "Travis", "Gitlab", "Github"],
   "keep_local_envs_in_vcs": "y",
   "debug": "n"
 }
diff --git a/docs/generate-project-block.rst b/docs/generate-project-block.rst
index 2842b551d..fca3fe1a8 100644
--- a/docs/generate-project-block.rst
+++ b/docs/generate-project-block.rst
@@ -4,4 +4,3 @@ Generate a new cookiecutter-django project: ::
 
 For more information refer to
 :ref:`Project Generation Options <template-options>`.
-
diff --git a/{{cookiecutter.project_slug}}/.github/dependabot.yml b/{{cookiecutter.project_slug}}/.github/dependabot.yml
index 3f4eefe94..be52c68d5 100644
--- a/{{cookiecutter.project_slug}}/.github/dependabot.yml
+++ b/{{cookiecutter.project_slug}}/.github/dependabot.yml
@@ -4,11 +4,11 @@
 version: 2
 updates:
   # Update GitHub actions in workflows
-  - package-ecosystem: "github-actions"
-    directory: "/"
+  - package-ecosystem: 'github-actions'
+    directory: '/'
     # Every weekday
     schedule:
-      interval: "daily"
+      interval: 'daily'
 
 {%- if cookiecutter.use_docker == 'y' %}
 
@@ -16,86 +16,92 @@ updates:
   # We need to specify each Dockerfile in a separate entry because Dependabot doesn't
   # support wildcards or recursively checking subdirectories. Check this issue for updates:
   # https://github.com/dependabot/dependabot-core/issues/2178
-  - package-ecosystem: "docker"
+  - package-ecosystem: 'docker'
     # Look for a `Dockerfile` in the `compose/local/django` directory
-    directory: "compose/local/django/"
+    directory: 'compose/local/django/'
     # Every weekday
     schedule:
-      interval: "daily"
+      interval: 'daily'
     # Ignore minor version updates (3.10 -> 3.11) but update patch versions
     ignore:
-      - dependency-name: "*"
-        update-types: ["version-update:semver-major", "version-update:semver-minor"]
+      - dependency-name: '*'
+        update-types:
+          - 'version-update:semver-major'
+          - 'version-update:semver-minor'
 
-  - package-ecosystem: "docker"
+  - package-ecosystem: 'docker'
     # Look for a `Dockerfile` in the `compose/local/docs` directory
-    directory: "compose/local/docs/"
+    directory: 'compose/local/docs/'
     # Every weekday
     schedule:
-      interval: "daily"
+      interval: 'daily'
     # Ignore minor version updates (3.10 -> 3.11) but update patch versions
     ignore:
-      - dependency-name: "*"
-        update-types: ["version-update:semver-major", "version-update:semver-minor"]
+      - dependency-name: '*'
+        update-types:
+          - 'version-update:semver-major'
+          - 'version-update:semver-minor'
 
-  - package-ecosystem: "docker"
+  - package-ecosystem: 'docker'
     # Look for a `Dockerfile` in the `compose/local/node` directory
-    directory: "compose/local/node/"
+    directory: 'compose/local/node/'
     # Every weekday
     schedule:
-      interval: "daily"
+      interval: 'daily'
 
-  - package-ecosystem: "docker"
+  - package-ecosystem: 'docker'
     # Look for a `Dockerfile` in the `compose/production/aws` directory
-    directory: "compose/production/aws/"
+    directory: 'compose/production/aws/'
     # Every weekday
     schedule:
-      interval: "daily"
+      interval: 'daily'
 
-  - package-ecosystem: "docker"
+  - package-ecosystem: 'docker'
     # Look for a `Dockerfile` in the `compose/production/django` directory
-    directory: "compose/production/django/"
+    directory: 'compose/production/django/'
     # Every weekday
     schedule:
-      interval: "daily"
+      interval: 'daily'
     # Ignore minor version updates (3.10 -> 3.11) but update patch versions
     ignore:
-      - dependency-name: "*"
-        update-types: ["version-update:semver-major", "version-update:semver-minor"]
+      - dependency-name: '*'
+        update-types:
+          - 'version-update:semver-major'
+          - 'version-update:semver-minor'
 
-  - package-ecosystem: "docker"
+  - package-ecosystem: 'docker'
     # Look for a `Dockerfile` in the `compose/production/postgres` directory
-    directory: "compose/production/postgres/"
+    directory: 'compose/production/postgres/'
     # Every weekday
     schedule:
-      interval: "daily"
+      interval: 'daily'
 
-  - package-ecosystem: "docker"
+  - package-ecosystem: 'docker'
     # Look for a `Dockerfile` in the `compose/production/traefik` directory
-    directory: "compose/production/traefik/"
+    directory: 'compose/production/traefik/'
     # Every weekday
     schedule:
-      interval: "daily"
+      interval: 'daily'
 
 {%- endif %}
 
   # Enable version updates for Python/Pip - Production
-  - package-ecosystem: "pip"
+  - package-ecosystem: 'pip'
     # Look for a `requirements.txt` in the `root` directory
     # also 'setup.cfg', 'runtime.txt' and 'requirements/*.txt'
-    directory: "/"
+    directory: '/'
     # Every weekday
     schedule:
-      interval: "daily"
+      interval: 'daily'
 
 {%- if cookiecutter.frontend_pipeline == 'Gulp' %}
 
   # Enable version updates for javascript/npm
-  - package-ecosystem: "npm"
+  - package-ecosystem: 'npm'
     # Look for a `packages.json` in the `root` directory
-    directory: "/"
+    directory: '/'
     # Every weekday
     schedule:
-      interval: "daily"
+      interval: 'daily'
 
 {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
index 497d0dd29..ac231ee72 100644
--- a/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
+++ b/{{cookiecutter.project_slug}}/.github/workflows/ci.yml
@@ -7,12 +7,12 @@ env:
 
 on:
   pull_request:
-    branches: [ "master", "main" ]
-    paths-ignore: [ "docs/**" ]
+    branches: ['master', 'main']
+    paths-ignore: ['docs/**']
 
   push:
-    branches: [ "master", "main" ]
-    paths-ignore: [ "docs/**" ]
+    branches: ['master', 'main']
+    paths-ignore: ['docs/**']
 
 concurrency:
   group: {% raw %}${{ github.head_ref || github.run_id }}{% endraw %}
@@ -22,14 +22,13 @@ jobs:
   linter:
     runs-on: ubuntu-latest
     steps:
-
       - name: Checkout Code Repository
         uses: actions/checkout@v3
 
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.11"
+          python-version: '3.11'
 
       {%- if cookiecutter.open_source_license != 'Not open source' %}
       # Consider using pre-commit.ci for open source project
@@ -58,35 +57,34 @@ jobs:
 
     env:
       {%- if cookiecutter.use_celery == 'y' %}
-      CELERY_BROKER_URL: "redis://localhost:6379/0"
+      CELERY_BROKER_URL: 'redis://localhost:6379/0'
       {%- endif %}
       # postgres://user:password@host:port/database
-      DATABASE_URL: "postgres://postgres:postgres@localhost:5432/postgres"
+      DATABASE_URL: 'postgres://postgres:postgres@localhost:5432/postgres'
     {%- endif %}
 
     steps:
-
       - name: Checkout Code Repository
         uses: actions/checkout@v3
       {%- if cookiecutter.use_docker == 'y' %}
 
       - name: Build the Stack
-        run:  docker-compose -f local.yml build
+        run: docker-compose -f local.yml build
 
       - name: Run DB Migrations
-        run:  docker-compose -f local.yml run --rm django python manage.py migrate
+        run: docker-compose -f local.yml run --rm django python manage.py migrate
 
       - name: Run Django Tests
-        run:  docker-compose -f local.yml run django pytest
+        run: docker-compose -f local.yml run django pytest
 
       - name: Tear down the Stack
-        run:  docker-compose -f local.yml down
+        run: docker-compose -f local.yml down
       {%- else %}
 
       - name: Set up Python
         uses: actions/setup-python@v4
         with:
-          python-version: "3.11"
+          python-version: '3.11'
           cache: pip
           cache-dependency-path: |
             requirements/base.txt
@@ -98,5 +96,5 @@ jobs:
           pip install -r requirements/local.txt
 
       - name: Test with pytest
-        run:  pytest
+        run: pytest
       {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index 542187429..a7c8fa583 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -1,4 +1,4 @@
-exclude: "^docs/|/migrations/"
+exclude: '^docs/|/migrations/'
 default_stages: [commit]
 
 repos:
@@ -7,7 +7,22 @@ repos:
     hooks:
       - id: trailing-whitespace
       - id: end-of-file-fixer
+      - id: check-json
+      - id: check-toml
+      - id: check-xml
       - id: check-yaml
+      - id: debug-statements
+      - id: check-builtin-literals
+      - id: check-case-conflict
+      - id: check-docstring-first
+      - id: detect-private-key
+
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v3.0.0-alpha.6
+    hooks:
+      - id: prettier
+        args: ['--tab-width', '2', '--single-quote']
+        exclude: {{cookiecutter.project_slug}}/templates/
 
   - repo: https://github.com/asottile/pyupgrade
     rev: v3.3.1
@@ -29,7 +44,7 @@ repos:
     rev: 6.0.0
     hooks:
       - id: flake8
-        args: ["--config=setup.cfg"]
+        args: ['--config=setup.cfg']
         additional_dependencies: [flake8-isort]
 
 # sets up .pre-commit-ci.yaml to ensure pre-commit dependencies stay up to date
diff --git a/{{cookiecutter.project_slug}}/.readthedocs.yml b/{{cookiecutter.project_slug}}/.readthedocs.yml
index 44512245e..d5a8ef661 100644
--- a/{{cookiecutter.project_slug}}/.readthedocs.yml
+++ b/{{cookiecutter.project_slug}}/.readthedocs.yml
@@ -8,7 +8,7 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.11"
+    python: '3.11'
 
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
diff --git a/{{cookiecutter.project_slug}}/README.md b/{{cookiecutter.project_slug}}/README.md
index 83f9a7e48..56853f8f7 100644
--- a/{{cookiecutter.project_slug}}/README.md
+++ b/{{cookiecutter.project_slug}}/README.md
@@ -18,11 +18,11 @@ Moved to [settings](http://cookiecutter-django.readthedocs.io/en/latest/settings
 
 ### Setting Up Your Users
 
--   To create a **normal user account**, just go to Sign Up and fill out the form. Once you submit it, you'll see a "Verify Your E-mail Address" page. Go to your console to see a simulated email verification message. Copy the link into your browser. Now the user's email should be verified and ready to go.
+- To create a **normal user account**, just go to Sign Up and fill out the form. Once you submit it, you'll see a "Verify Your E-mail Address" page. Go to your console to see a simulated email verification message. Copy the link into your browser. Now the user's email should be verified and ready to go.
 
--   To create a **superuser account**, use this command:
+- To create a **superuser account**, use this command:
 
-        $ python manage.py createsuperuser
+      $ python manage.py createsuperuser
 
 For convenience, you can keep your normal user logged in on Chrome and your superuser logged in on Firefox (or similar), so that you can see how the site behaves for both kinds of users.
 
@@ -56,23 +56,23 @@ This app comes with Celery.
 
 To run a celery worker:
 
-``` bash
+```bash
 cd {{cookiecutter.project_slug}}
 celery -A config.celery_app worker -l info
 ```
 
-Please note: For Celery's import magic to work, it is important *where* the celery commands are run. If you are in the same folder with *manage.py*, you should be right.
+Please note: For Celery's import magic to work, it is important _where_ the celery commands are run. If you are in the same folder with _manage.py_, you should be right.
 
 To run [periodic tasks](https://docs.celeryq.dev/en/stable/userguide/periodic-tasks.html), you'll need to start the celery beat scheduler service. You can start it as a standalone process:
 
-``` bash
+```bash
 cd {{cookiecutter.project_slug}}
 celery -A config.celery_app beat
 ```
 
 or you can embed the beat service inside a worker with the `-B` option (not recommended for production use):
 
-``` bash
+```bash
 cd {{cookiecutter.project_slug}}
 celery -A config.celery_app worker -B -l info
 ```
diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
index 85d9572b9..724c95cdf 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/traefik.yml
@@ -4,7 +4,7 @@ log:
 entryPoints:
   web:
     # http
-    address: ":80"
+    address: ':80'
     http:
       # https://docs.traefik.io/routing/entrypoints/#entrypoint
       redirections:
@@ -13,18 +13,18 @@ entryPoints:
 
   web-secure:
     # https
-    address: ":443"
+    address: ':443'
   {%- if cookiecutter.use_celery == 'y' %}
 
   flower:
-    address: ":5555"
+    address: ':5555'
   {%- endif %}
 
 certificatesResolvers:
   letsencrypt:
     # https://docs.traefik.io/master/https/acme/#lets-encrypt
     acme:
-      email: "{{ cookiecutter.email }}"
+      email: '{{ cookiecutter.email }}'
       storage: /etc/traefik/acme/acme.json
       # https://docs.traefik.io/master/https/acme/#httpchallenge
       httpChallenge:
@@ -34,9 +34,9 @@ http:
   routers:
     web-secure-router:
       {%- if cookiecutter.domain_name.count('.') == 1 %}
-      rule: "Host(`{{ cookiecutter.domain_name }}`) || Host(`www.{{ cookiecutter.domain_name }}`)"
+      rule: 'Host(`{{ cookiecutter.domain_name }}`) || Host(`www.{{ cookiecutter.domain_name }}`)'
       {%- else %}
-      rule: "Host(`{{ cookiecutter.domain_name }}`)"
+      rule: 'Host(`{{ cookiecutter.domain_name }}`)'
       {%- endif %}
       entryPoints:
         - web-secure
@@ -49,7 +49,7 @@ http:
     {%- if cookiecutter.use_celery == 'y' %}
 
     flower-secure-router:
-      rule: "Host(`{{ cookiecutter.domain_name }}`)"
+      rule: 'Host(`{{ cookiecutter.domain_name }}`)'
       entryPoints:
         - flower
       service: flower
@@ -61,9 +61,9 @@ http:
 
     web-media-router:
       {%- if cookiecutter.domain_name.count('.') == 1 %}
-      rule: "(Host(`{{ cookiecutter.domain_name }}`) || Host(`www.{{ cookiecutter.domain_name }}`)) && PathPrefix(`/media/`)"
+      rule: '(Host(`{{ cookiecutter.domain_name }}`) || Host(`www.{{ cookiecutter.domain_name }}`)) && PathPrefix(`/media/`)'
       {%- else %}
-      rule: "Host(`{{ cookiecutter.domain_name }}`) && PathPrefix(`/media/`)"
+      rule: 'Host(`{{ cookiecutter.domain_name }}`) && PathPrefix(`/media/`)'
       {%- endif %}
       entryPoints:
         - web-secure
@@ -79,7 +79,7 @@ http:
       # https://docs.traefik.io/master/middlewares/headers/#hostsproxyheaders
       # https://docs.djangoproject.com/en/dev/ref/csrf/#ajax
       headers:
-        hostsProxyHeaders: ["X-CSRFToken"]
+        hostsProxyHeaders: ['X-CSRFToken']
 
   services:
     django:
diff --git a/{{cookiecutter.project_slug}}/gulpfile.js b/{{cookiecutter.project_slug}}/gulpfile.js
index fa3636eab..df434c134 100644
--- a/{{cookiecutter.project_slug}}/gulpfile.js
+++ b/{{cookiecutter.project_slug}}/gulpfile.js
@@ -3,29 +3,29 @@
 ////////////////////////////////
 
 // Gulp and package
-const { src, dest, parallel, series, watch } = require('gulp')
-const pjson = require('./package.json')
+const { src, dest, parallel, series, watch } = require('gulp');
+const pjson = require('./package.json');
 
 // Plugins
-const autoprefixer = require('autoprefixer')
-const browserSync = require('browser-sync').create()
-const concat = require('gulp-concat')
+const autoprefixer = require('autoprefixer');
+const browserSync = require('browser-sync').create();
+const concat = require('gulp-concat');
 const tildeImporter = require('node-sass-tilde-importer');
-const cssnano = require ('cssnano')
-const imagemin = require('gulp-imagemin')
-const pixrem = require('pixrem')
-const plumber = require('gulp-plumber')
-const postcss = require('gulp-postcss')
-const reload = browserSync.reload
-const rename = require('gulp-rename')
-const sass = require('gulp-sass')(require('sass'))
-const spawn = require('child_process').spawn
-const uglify = require('gulp-uglify-es').default
+const cssnano = require('cssnano');
+const imagemin = require('gulp-imagemin');
+const pixrem = require('pixrem');
+const plumber = require('gulp-plumber');
+const postcss = require('gulp-postcss');
+const reload = browserSync.reload;
+const rename = require('gulp-rename');
+const sass = require('gulp-sass')(require('sass'));
+const spawn = require('child_process').spawn;
+const uglify = require('gulp-uglify-es').default;
 
 // Relative paths function
 function pathsConfig(appName) {
-  this.app = `./${pjson.name}`
-  const vendorsRoot = 'node_modules'
+  this.app = `./${pjson.name}`;
+  const vendorsRoot = 'node_modules';
 
   return {
     vendorsJs: [
@@ -39,10 +39,10 @@ function pathsConfig(appName) {
     fonts: `${this.app}/static/fonts`,
     images: `${this.app}/static/images`,
     js: `${this.app}/static/js`,
-  }
+  };
 }
 
-const paths = pathsConfig()
+const paths = pathsConfig();
 
 ////////////////////////////////
 // Tasks
@@ -51,27 +51,27 @@ const paths = pathsConfig()
 // Styles autoprefixing and minification
 function styles() {
   const processCss = [
-      autoprefixer(), // adds vendor prefixes
-      pixrem(),       // add fallbacks for rem units
-  ]
+    autoprefixer(), // adds vendor prefixes
+    pixrem(), // add fallbacks for rem units
+  ];
 
   const minifyCss = [
-      cssnano({ preset: 'default' })   // minify result
-  ]
+    cssnano({ preset: 'default' }), // minify result
+  ];
 
   return src(`${paths.sass}/project.scss`)
-    .pipe(sass({
-      importer: tildeImporter,
-      includePaths: [
-        paths.sass
-      ]
-    }).on('error', sass.logError))
+    .pipe(
+      sass({
+        importer: tildeImporter,
+        includePaths: [paths.sass],
+      }).on('error', sass.logError),
+    )
     .pipe(plumber()) // Checks for errors
     .pipe(postcss(processCss))
     .pipe(dest(paths.css))
     .pipe(rename({ suffix: '.min' }))
     .pipe(postcss(minifyCss)) // Minifies the result
-    .pipe(dest(paths.css))
+    .pipe(dest(paths.css));
 }
 
 // Javascript minification
@@ -80,7 +80,7 @@ function scripts() {
     .pipe(plumber()) // Checks for errors
     .pipe(uglify()) // Minifies the js
     .pipe(rename({ suffix: '.min' }))
-    .pipe(dest(paths.js))
+    .pipe(dest(paths.js));
 }
 
 // Vendor Javascript minification
@@ -91,97 +91,91 @@ function vendorScripts() {
     .pipe(plumber()) // Checks for errors
     .pipe(uglify()) // Minifies the js
     .pipe(rename({ suffix: '.min' }))
-    .pipe(dest(paths.js, { sourcemaps: '.' }))
+    .pipe(dest(paths.js, { sourcemaps: '.' }));
 }
 
 // Image compression
 function imgCompression() {
   return src(`${paths.images}/*`)
     .pipe(imagemin()) // Compresses PNG, JPEG, GIF and SVG images
-    .pipe(dest(paths.images))
+    .pipe(dest(paths.images));
 }
 
 {%- if cookiecutter.use_async == 'y' -%}
 // Run django server
 function asyncRunServer() {
-  const cmd = spawn('gunicorn', [
-      'config.asgi', '-k', 'uvicorn.workers.UvicornWorker', '--reload'
-      ], {stdio: 'inherit'}
-  )
-  cmd.on('close', function(code) {
-    console.log('gunicorn exited with code ' + code)
+  const cmd = spawn(
+    'gunicorn',
+    ['config.asgi', '-k', 'uvicorn.workers.UvicornWorker', '--reload'],
+    {stdio: 'inherit'},
+  );
+  cmd.on('close', function (code) {
+    console.log('gunicorn exited with code ' + code);
   })
 }
 {%- else %}
 // Run django server
 function runServer(cb) {
-  const cmd = spawn('python', ['manage.py', 'runserver'], {stdio: 'inherit'})
-  cmd.on('close', function(code) {
-    console.log('runServer exited with code ' + code)
-    cb(code)
-  })
+  const cmd = spawn('python', ['manage.py', 'runserver'], { stdio: 'inherit' });
+  cmd.on('close', function (code) {
+    console.log('runServer exited with code ' + code);
+    cb(code);
+  });
 }
 {%- endif %}
 
 // Browser sync server for live reload
 function initBrowserSync() {
   browserSync.init(
-    [
-      `${paths.css}/*.css`,
-      `${paths.js}/*.js`,
-      `${paths.templates}/*.html`
-    ], {
+    [`${paths.css}/*.css`, `${paths.js}/*.js`, `${paths.templates}/*.html`],
+    {
       {%- if cookiecutter.use_docker == 'y' %}
       // https://www.browsersync.io/docs/options/#option-open
       // Disable as it doesn't work from inside a container
       open: false,
       {%- endif %}
       // https://www.browsersync.io/docs/options/#option-proxy
-      proxy:  {
+      proxy: {
         {%- if cookiecutter.use_docker == 'n' %}
         target: '127.0.0.1:8000',
         {%- else %}
         target: 'django:8000',
         {%- endif %}
         proxyReq: [
-          function(proxyReq, req) {
-            // Assign proxy "host" header same as current request at Browsersync server
-            proxyReq.setHeader('Host', req.headers.host)
-          }
-        ]
-      }
-    }
-  )
+          function (proxyReq, req) {
+            // Assign proxy 'host' header same as current request at Browsersync server
+            proxyReq.setHeader('Host', req.headers.host);
+          },
+        ],
+      },
+    },
+  );
 }
 
 // Watch
 function watchPaths() {
-  watch(`${paths.sass}/*.scss`{% if cookiecutter.windows == 'y' %}, { usePolling: true }{% endif %}, styles)
-  watch(`${paths.templates}/**/*.html`{% if cookiecutter.windows == 'y' %}, { usePolling: true }{% endif %}).on("change", reload)
-  watch([`${paths.js}/*.js`, `!${paths.js}/*.min.js`]{% if cookiecutter.windows == 'y' %}, { usePolling: true }{% endif %}, scripts).on("change", reload)
+  watch(`${paths.sass}/*.scss`{% if cookiecutter.windows == 'y' %}, { usePolling: true }{% endif %}, styles);
+  watch(`${paths.templates}/**/*.html`{% if cookiecutter.windows == 'y' %}, { usePolling: true }{% endif %}).on('change', reload);
+  watch([`${paths.js}/*.js`, `!${paths.js}/*.min.js`]{% if cookiecutter.windows == 'y' %}, { usePolling: true }{% endif %}, scripts).on(
+    'change',
+    reload,
+  );
 }
 
 // Generate all assets
-const generateAssets = parallel(
-  styles,
-  scripts,
-  vendorScripts,
-  imgCompression
-)
+const generateAssets = parallel(styles, scripts, vendorScripts, imgCompression);
 
 // Set up dev environment
-const dev = parallel(
-  {%- if cookiecutter.use_docker == 'n' %}
-  {%- if cookiecutter.use_async == 'y' %}
-  asyncRunServer,
-  {%- else %}
-  runServer,
-  {%- endif %}
-  {%- endif %}
-  initBrowserSync,
-  watchPaths
-)
+{%- if cookiecutter.use_docker == 'n' %}
+{%- if cookiecutter.use_async == 'y' %}
+const dev = parallel(asyncRunServer, initBrowserSync, watchPaths);
+{%- else %}
+const dev = parallel(runServer, initBrowserSync, watchPaths);
+{%- endif %}
+{%- else %}
+const dev = parallel(initBrowserSync, watchPaths);
+{%- endif %}
 
-exports.default = series(generateAssets, dev)
-exports["generate-assets"] = generateAssets
-exports["dev"] = dev
+exports.default = series(generateAssets, dev);
+exports['generate-assets'] = generateAssets;
+exports['dev'] = dev;
diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index 66ca3b0ef..e55e18d32 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -25,7 +25,7 @@ services:
       - ./.envs/.local/.django
       - ./.envs/.local/.postgres
     ports:
-      - "8000:8000"
+      - '8000:8000'
     command: /start
 
   postgres:
@@ -53,7 +53,7 @@ services:
       - ./config:/app/config:z
       - ./{{ cookiecutter.project_slug }}:/app/{{ cookiecutter.project_slug }}:z
     ports:
-      - "9000:9000"
+      - '9000:9000'
     command: /start-docs
   {%- if cookiecutter.use_mailhog == 'y' %}
 
@@ -101,7 +101,7 @@ services:
     image: {{ cookiecutter.project_slug }}_local_flower
     container_name: {{ cookiecutter.project_slug }}_local_flower
     ports:
-      - "5555:5555"
+      - '5555:5555'
     command: /start-flower
 
   {%- endif %}
@@ -121,10 +121,10 @@ services:
       - /app/node_modules
     command: npm run dev
     ports:
-      - "3000:3000"
+      - '3000:3000'
       {%- if cookiecutter.frontend_pipeline == 'Gulp' %}
       # Expose browsersync UI: https://www.browsersync.io/docs/options/#option-ui
-      - "3001:3001"
+      - '3001:3001'
       {%- endif %}
 
   {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index 4e9b9e048..4d56fbfa8 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -60,10 +60,10 @@ services:
     volumes:
       - production_traefik:/etc/traefik/acme
     ports:
-      - "0.0.0.0:80:80"
-      - "0.0.0.0:443:443"
+      - '0.0.0.0:80:80'
+      - '0.0.0.0:443:443'
       {%- if cookiecutter.use_celery == 'y' %}
-      - "0.0.0.0:5555:5555"
+      - '0.0.0.0:5555:5555'
       {%- endif %}
 
   redis:
diff --git a/{{cookiecutter.project_slug}}/webpack/common.config.js b/{{cookiecutter.project_slug}}/webpack/common.config.js
index 41efb1c77..6aba2bc77 100644
--- a/{{cookiecutter.project_slug}}/webpack/common.config.js
+++ b/{{cookiecutter.project_slug}}/webpack/common.config.js
@@ -3,20 +3,25 @@ const BundleTracker = require('webpack-bundle-tracker');
 const MiniCssExtractPlugin = require('mini-css-extract-plugin');
 
 module.exports = {
-  target: "web",
+  target: 'web',
   context: path.join(__dirname, '../'),
   entry: {
-    'project': path.resolve(__dirname, '../{{cookiecutter.project_slug}}/static/js/project'),
-    'vendors': path.resolve(__dirname, '../{{cookiecutter.project_slug}}/static/js/vendors'),
+    project: path.resolve(__dirname, '../{{cookiecutter.project_slug}}/static/js/project'),
+    vendors: path.resolve(__dirname, '../{{cookiecutter.project_slug}}/static/js/vendors'),
   },
   output: {
-    path: path.resolve(__dirname, '../{{cookiecutter.project_slug}}/static/webpack_bundles/'),
+    path: path.resolve(
+      __dirname,
+      '../{{cookiecutter.project_slug}}/static/webpack_bundles/',
+    ),
     publicPath: '/static/webpack_bundles/',
     filename: 'js/[name]-[fullhash].js',
     chunkFilename: 'js/[name]-[hash].js',
   },
   plugins: [
-    new BundleTracker({filename: path.resolve(__dirname, '../webpack-stats.json')}),
+    new BundleTracker({
+      filename: path.resolve(__dirname, '../webpack-stats.json'),
+    }),
     new MiniCssExtractPlugin({ filename: 'css/[name].[contenthash].css' }),
   ],
   module: {
@@ -35,11 +40,7 @@ module.exports = {
             loader: 'postcss-loader',
             options: {
               postcssOptions: {
-                plugins: [
-                  'postcss-preset-env',
-                  'autoprefixer',
-                  'pixrem',
-                ],
+                plugins: ['postcss-preset-env', 'autoprefixer', 'pixrem'],
               },
             },
           },
diff --git a/{{cookiecutter.project_slug}}/webpack/prod.config.js b/{{cookiecutter.project_slug}}/webpack/prod.config.js
index b9c2186e5..868d26ddd 100644
--- a/{{cookiecutter.project_slug}}/webpack/prod.config.js
+++ b/{{cookiecutter.project_slug}}/webpack/prod.config.js
@@ -5,9 +5,9 @@ const commonConfig = require('./common.config');
 {%- if cookiecutter.use_whitenoise == 'n' %}
 {%- if cookiecutter.cloud_provider == 'AWS' %}
 const s3BucketName = process.env.DJANGO_AWS_STORAGE_BUCKET_NAME;
-const awsS3Domain = process.env.DJANGO_AWS_S3_CUSTOM_DOMAIN ?
-    process.env.DJANGO_AWS_S3_CUSTOM_DOMAIN
-    : `${s3BucketName}.s3.amazonaws.com`;
+const awsS3Domain = process.env.DJANGO_AWS_S3_CUSTOM_DOMAIN
+  ? process.env.DJANGO_AWS_S3_CUSTOM_DOMAIN
+  : `${s3BucketName}.s3.amazonaws.com`;
 const staticUrl = `https://${awsS3Domain}/static/`;
 {%- elif cookiecutter.cloud_provider == 'GCP' %}
 const staticUrl = `https://storage.googleapis.com/${process.env.DJANGO_GCP_STORAGE_BUCKET_NAME}/static/`;
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/js/project.js b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/js/project.js
index 62770f1c9..930fa54a2 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/js/project.js
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/js/project.js
@@ -1,5 +1,5 @@
-{%- if cookiecutter.frontend_pipeline == 'Webpack' %}
+{%- if cookiecutter.frontend_pipeline == 'Webpack' -%}
 import '../sass/project.scss';
-{%- endif %}
 
+{% endif -%}
 /* Project specific Javascript goes here. */
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss
index c9511e720..43435aca8 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/static/sass/project.scss
@@ -1,12 +1,11 @@
-@import "custom_bootstrap_vars";
-@import "~bootstrap/scss/bootstrap";
-
+@import 'custom_bootstrap_vars';
+@import '~bootstrap/scss/bootstrap';
 
 // project specific CSS goes here
 
-////////////////////////////////
-		//Variables//
-////////////////////////////////
+///////////////
+// Variables //
+///////////////
 
 // Alert colors
 
@@ -17,9 +16,9 @@ $pink: #f2dede;
 $dark-pink: #eed3d7;
 $red: #b94a48;
 
-////////////////////////////////
-		//Alerts//
-////////////////////////////////
+////////////
+// Alerts //
+////////////
 
 // bootstrap alert CSS, translated to the django-standard levels of
 // debug, info, success, warning, error

From 009ce5e0b4a66b8f677ac4d29a13adfbe3c6ea46 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 15 Apr 2023 11:15:42 +0000
Subject: [PATCH 2680/2840] Update Contributors

---
 CONTRIBUTORS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index c821674f0..47ece91dc 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1967,4 +1967,4 @@ guidance and advice.
 
 - Jannis Leidel
 - Nate Aune
-- Barry Morrison
+- Barry Morrison
\ No newline at end of file

From 550f270b708edb422b0c243ce9063adc11952365 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 15 Apr 2023 13:21:18 +0100
Subject: [PATCH 2681/2840] Relax rules for linting of pull requests on this
 template (#4273)

* Don't check for black or pre-commit by default

Fix #4261

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Ignore CONTRIBUTORS.md when running template's pre-commit

* Fix condition for skipping tests

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 .pre-commit-config.yaml               | 2 +-
 CONTRIBUTORS.md                       | 2 +-
 tests/test_bare.sh                    | 6 ------
 tests/test_cookiecutter_generation.py | 8 +++++++-
 tests/test_docker.sh                  | 7 -------
 5 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index d0b2f16b5..930465a57 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,4 +1,4 @@
-exclude: "{{cookiecutter.project_slug}}|.github/contributors.json|CHANGELOG.md"
+exclude: "{{cookiecutter.project_slug}}|.github/contributors.json|CHANGELOG.md|CONTRIBUTORS.md"
 default_stages: [commit]
 
 repos:
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 47ece91dc..c821674f0 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1967,4 +1967,4 @@ guidance and advice.
 
 - Jannis Leidel
 - Nate Aune
-- Barry Morrison
\ No newline at end of file
+- Barry Morrison
diff --git a/tests/test_bare.sh b/tests/test_bare.sh
index afd12fec8..5dc175ebd 100755
--- a/tests/test_bare.sh
+++ b/tests/test_bare.sh
@@ -20,12 +20,6 @@ sudo utility/install_os_dependencies.sh install
 # Install Python deps
 pip install -r requirements/local.txt
 
-# Lint by running pre-commit on all files
-# Needs a git repo to find the project root
-git init
-git add .
-pre-commit run --show-diff-on-failure -a
-
 # run the project's tests
 pytest
 
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index cb5a99cdb..e4a03b3b2 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -20,6 +20,11 @@ if sys.platform.startswith("win"):
 elif sys.platform.startswith("darwin") and os.getenv("CI"):
     pytest.skip("skipping slow macOS tests on CI", allow_module_level=True)
 
+# Run auto-fixable styles checks - skipped on CI by default. These can be fixed
+# automatically by running pre-commit after generation however they are tedious
+# to fix in the template, so we don't insist too much in fixing them.
+AUTOFIXABLE_STYLES = os.getenv("AUTOFIXABLE_STYLES") == 1
+
 
 @pytest.fixture
 def context():
@@ -184,9 +189,10 @@ def test_flake8_passes(cookies, context_override):
         pytest.fail(e.stdout.decode())
 
 
+@pytest.mark.skipif(not AUTOFIXABLE_STYLES, reason="Black is auto-fixable")
 @pytest.mark.parametrize("context_override", SUPPORTED_COMBINATIONS, ids=_fixture_id)
 def test_black_passes(cookies, context_override):
-    """Generated project should pass black."""
+    """Check whether generated project passes black style."""
     result = cookies.bake(extra_context=context_override)
 
     try:
diff --git a/tests/test_docker.sh b/tests/test_docker.sh
index 28d232896..5c60d20d3 100755
--- a/tests/test_docker.sh
+++ b/tests/test_docker.sh
@@ -14,13 +14,6 @@ cd .cache/docker
 cookiecutter ../../ --no-input --overwrite-if-exists use_docker=y "$@"
 cd my_awesome_project
 
-# Lint by running pre-commit on all files
-# Needs a git repo to find the project root
-# We don't have git inside Docker, so run it outside
-git init
-git add .
-pre-commit run --show-diff-on-failure -a
-
 # make sure all images build
 docker-compose -f local.yml build
 

From 40958abd32b8d752362669765e9e636c74a6a6d3 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Sat, 15 Apr 2023 12:21:47 +0000
Subject: [PATCH 2682/2840] Update Contributors

---
 CONTRIBUTORS.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index c821674f0..47ece91dc 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1967,4 +1967,4 @@ guidance and advice.
 
 - Jannis Leidel
 - Nate Aune
-- Barry Morrison
+- Barry Morrison
\ No newline at end of file

From 5fb1550c714de17ba2edc2a66a9434d2d52b9d4e Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 15 Apr 2023 13:41:51 +0100
Subject: [PATCH 2683/2840] Update contributing guide (#4274)

---
 CONTRIBUTING.md | 78 +++++++++++++++++++++++++++++++++++++------------
 1 file changed, 59 insertions(+), 19 deletions(-)

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 5c4ca6044..94ecbdd7d 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -2,41 +2,81 @@
 
 Always happy to get issues identified and pull requests!
 
-## Getting your pull request merged in
+## General considerations
 
-1.  Keep it small. The smaller the pull request, the more likely we are to accept.
-2.  Pull requests that fix a current issue get priority for review.
+1. Keep it small. The smaller the change, the more likely we are to accept.
+2. Changes that fix a current issue get priority for review.
+3. Check out [GitHub guide][submit-a-pr] if you've never created a pull request before.
+
+## Getting started
+
+1. Fork the repo
+2. Clone your fork
+3. Create a branch for your changes
+
+This last step is very important, don't start developing from master, it'll cause pain if you need to send another change later.
 
 ## Testing
 
+You'll need to run the tests using Python 3.11. We recommend using [tox](https://tox.readthedocs.io/en/latest/) to run the tests. It will automatically create a fresh virtual environment and install our test dependencies, such as [pytest-cookies](https://pypi.python.org/pypi/pytest-cookies/) and [flake8](https://pypi.python.org/pypi/flake8/).
+
+We'll also run the tests on GitHub actions when you send your pull request, but it's a good idea to run them locally before you send it.
+
 ### Installation
 
-Please install [tox](https://tox.readthedocs.io/en/latest/), which is a generic virtualenv management and test command line tool.
+First, make sure that your version of Python is 3.11:
 
-[tox](https://tox.readthedocs.io/en/latest/) is available for download from [PyPI](https://pypi.python.org/pypi) via [pip](https://pypi.python.org/pypi/pip/):
+```bash
+$ python --version
+Python 3.11.3
+```
 
-    $ pip install tox
+Any version that starts with 3.11 will do. If you need to install it, you can get it from [python.org](https://www.python.org/downloads/).
 
-It will automatically create a fresh virtual environment and install our test dependencies,
-such as [pytest-cookies](https://pypi.python.org/pypi/pytest-cookies/) and [flake8](https://pypi.python.org/pypi/flake8/).
+Then install `tox`, if not already installed:
 
-### Run the Tests
+```bash
+$ python -m pip install tox
+```
 
-Tox uses pytest under the hood, hence it supports the same syntax for selecting tests.
+### Run the template's test suite
 
-For further information please consult the [pytest usage docs](https://pytest.org/latest/usage.html#specifying-tests-selecting-tests).
+To run the tests of the template using the current Python version:
 
-To run all tests using various versions of python in virtualenvs defined in tox.ini, just run tox.:
+```bash
+$ tox -e py
+```
 
-    $ tox
+This uses `pytest `under the hood, and you can pass options to it after a `--`. So to run a particular test:
 
-It is possible to test with a specific version of python. To do this, the command
-is:
+```bash
+$ tox -e py -- -k test_default_configuration
+```
 
-    $ tox -e py311
+For further information, please consult the [pytest usage docs](https://pytest.org/en/latest/how-to/usage.html#specifying-which-tests-to-run).
 
-This will run pytest with the python3.11 interpreter, for example.
+### Run the generated project tests
 
-To run a particular test with tox for against your current Python version:
+The template tests are checking that the generated project is fully rendered and that it passes `flake8`. We also have some test scripts which generate a specific project combination, install the dependencies, run the tests of the generated project, install FE dependencies and generate the docs. They will install the template dependencies, so make sure you create and activate a virtual environment first.
 
-    $ tox -e py -- -k test_default_configuration
+```bash
+$ python -m venv venv
+$ source venv/bin/activate
+```
+
+These tests are slower and can be run with or without Docker:
+
+- Without Docker: `scripts/test_bare.sh` (for bare metal)
+- With Docker: `scripts/test_docker.sh`
+
+All arguments to these scripts will be passed to the `cookiecutter` CLI, letting you set options, for example:
+
+```bash
+$ scripts/test_bare.sh use_celery=y
+```
+
+## Submitting a pull request
+
+Once you're happy with your changes and they look ok locally, push and send send [a pull request][submit-a-pr] to the main repo, which will trigger the tests on GitHub actions. If they fail, try to fix them. A maintainer should take a look at your change and give you feedback or merge it.
+
+[submit-a-pr]: https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request

From 17fa459dc3d84f7790b69487386c4e1ef7c5b95f Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 15 Apr 2023 15:43:04 +0100
Subject: [PATCH 2684/2840] Fix inconsistent line length and move configs to
 pyproject.toml (#4276)

* Fix inconsistent line length and move config to pyproject.toml

Fix #2720

* Fix running tox with AUTOFIXABLE_STYLES

* Adjust some styles

* [pre-commit.ci] auto fixes from pre-commit.com hooks

for more information, see https://pre-commit.ci

* Adjust more styles

* Split isort and flake8 tests

---------

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 .flake8                                       |  3 +
 docs/conf.py                                  |  3 +-
 hooks/post_gen_project.py                     | 72 +++------------
 hooks/pre_gen_project.py                      | 40 ++------
 pyproject.toml                                | 29 ++++++
 pytest.ini                                    |  3 -
 requirements.txt                              |  1 -
 scripts/create_django_issue.py                | 42 ++-------
 scripts/update_changelog.py                   |  8 +-
 scripts/update_contributors.py                | 18 +---
 setup.cfg                                     |  7 --
 setup.py                                      |  5 +-
 tests/test_cookiecutter_generation.py         | 28 +++---
 tests/test_hooks.py                           |  4 +-
 tox.ini                                       |  1 +
 .../.pre-commit-config.yaml                   |  2 -
 {{cookiecutter.project_slug}}/.pylintrc       | 14 ---
 .../config/settings/base.py                   |  9 +-
 .../config/settings/local.py                  |  4 +-
 .../config/settings/production.py             | 34 +++----
 .../config/settings/test.py                   |  4 +-
 {{cookiecutter.project_slug}}/config/urls.py  |  4 +-
 {{cookiecutter.project_slug}}/pyproject.toml  | 92 +++++++++++++++++++
 {{cookiecutter.project_slug}}/pytest.ini      |  6 --
 {{cookiecutter.project_slug}}/setup.cfg       | 40 +-------
 .../{{cookiecutter.project_slug}}/__init__.py |  5 +-
 .../users/api/serializers.py                  |  4 +-
 .../users/tests/test_drf_urls.py              | 10 +-
 .../users/tests/test_urls.py                  |  5 +-
 .../users/views.py                            |  4 +-
 30 files changed, 213 insertions(+), 288 deletions(-)
 create mode 100644 .flake8
 create mode 100644 pyproject.toml
 delete mode 100644 pytest.ini
 delete mode 100644 setup.cfg
 delete mode 100644 {{cookiecutter.project_slug}}/.pylintrc
 create mode 100644 {{cookiecutter.project_slug}}/pyproject.toml
 delete mode 100644 {{cookiecutter.project_slug}}/pytest.ini

diff --git a/.flake8 b/.flake8
new file mode 100644
index 000000000..84b4b4411
--- /dev/null
+++ b/.flake8
@@ -0,0 +1,3 @@
+[flake8]
+exclude = docs
+max-line-length = 119
diff --git a/docs/conf.py b/docs/conf.py
index b1a97750a..22e73e5db 100644
--- a/docs/conf.py
+++ b/docs/conf.py
@@ -239,8 +239,7 @@ texinfo_documents = [
         "Cookiecutter Django documentation",
         "Daniel Roy Greenfeld",
         "Cookiecutter Django",
-        "A Cookiecutter template for creating production-ready "
-        "Django projects quickly.",
+        "A Cookiecutter template for creating production-ready " "Django projects quickly.",
         "Miscellaneous",
     )
 ]
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index 22cda531d..b79985a82 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -92,10 +92,7 @@ def remove_utility_files():
 def remove_heroku_files():
     file_names = ["Procfile", "runtime.txt", "requirements.txt"]
     for file_name in file_names:
-        if (
-            file_name == "requirements.txt"
-            and "{{ cookiecutter.ci_tool }}".lower() == "travis"
-        ):
+        if file_name == "requirements.txt" and "{{ cookiecutter.ci_tool }}".lower() == "travis":
             # don't remove the file if we are using travisci but not using heroku
             continue
         os.remove(file_name)
@@ -197,11 +194,7 @@ def handle_js_runner(choice, use_docker, use_async):
             "gulp-uglify-es",
         ]
         if not use_docker:
-            dev_django_cmd = (
-                "uvicorn config.asgi:application --reload"
-                if use_async
-                else "python manage.py runserver"
-            )
+            dev_django_cmd = "uvicorn config.asgi:application --reload" if use_async else "python manage.py runserver"
             scripts.update(
                 {
                     "dev": "concurrently npm:dev:*",
@@ -219,9 +212,7 @@ def remove_celery_files():
     file_names = [
         os.path.join("config", "celery_app.py"),
         os.path.join("{{ cookiecutter.project_slug }}", "users", "tasks.py"),
-        os.path.join(
-            "{{ cookiecutter.project_slug }}", "users", "tests", "test_tasks.py"
-        ),
+        os.path.join("{{ cookiecutter.project_slug }}", "users", "tests", "test_tasks.py"),
     ]
     for file_name in file_names:
         os.remove(file_name)
@@ -248,9 +239,7 @@ def remove_dotgithub_folder():
     shutil.rmtree(".github")
 
 
-def generate_random_string(
-    length, using_digits=False, using_ascii_letters=False, using_punctuation=False
-):
+def generate_random_string(length, using_digits=False, using_ascii_letters=False, using_punctuation=False):
     """
     Example:
         opting out for 50 symbol-long, [a-z][A-Z][0-9] string
@@ -344,9 +333,7 @@ def set_postgres_password(file_path, value=None):
 
 
 def set_celery_flower_user(file_path, value):
-    celery_flower_user = set_flag(
-        file_path, "!!!SET CELERY_FLOWER_USER!!!", value=value
-    )
+    celery_flower_user = set_flag(file_path, "!!!SET CELERY_FLOWER_USER!!!", value=value)
     return celery_flower_user
 
 
@@ -378,22 +365,14 @@ def set_flags_in_envs(postgres_user, celery_flower_user, debug=False):
     set_django_admin_url(production_django_envs_path)
 
     set_postgres_user(local_postgres_envs_path, value=postgres_user)
-    set_postgres_password(
-        local_postgres_envs_path, value=DEBUG_VALUE if debug else None
-    )
+    set_postgres_password(local_postgres_envs_path, value=DEBUG_VALUE if debug else None)
     set_postgres_user(production_postgres_envs_path, value=postgres_user)
-    set_postgres_password(
-        production_postgres_envs_path, value=DEBUG_VALUE if debug else None
-    )
+    set_postgres_password(production_postgres_envs_path, value=DEBUG_VALUE if debug else None)
 
     set_celery_flower_user(local_django_envs_path, value=celery_flower_user)
-    set_celery_flower_password(
-        local_django_envs_path, value=DEBUG_VALUE if debug else None
-    )
+    set_celery_flower_password(local_django_envs_path, value=DEBUG_VALUE if debug else None)
     set_celery_flower_user(production_django_envs_path, value=celery_flower_user)
-    set_celery_flower_password(
-        production_django_envs_path, value=DEBUG_VALUE if debug else None
-    )
+    set_celery_flower_password(production_django_envs_path, value=DEBUG_VALUE if debug else None)
 
 
 def set_flags_in_settings_files():
@@ -423,21 +402,9 @@ def remove_aws_dockerfile():
 def remove_drf_starter_files():
     os.remove(os.path.join("config", "api_router.py"))
     shutil.rmtree(os.path.join("{{cookiecutter.project_slug}}", "users", "api"))
-    os.remove(
-        os.path.join(
-            "{{cookiecutter.project_slug}}", "users", "tests", "test_drf_urls.py"
-        )
-    )
-    os.remove(
-        os.path.join(
-            "{{cookiecutter.project_slug}}", "users", "tests", "test_drf_views.py"
-        )
-    )
-    os.remove(
-        os.path.join(
-            "{{cookiecutter.project_slug}}", "users", "tests", "test_swagger.py"
-        )
-    )
+    os.remove(os.path.join("{{cookiecutter.project_slug}}", "users", "tests", "test_drf_urls.py"))
+    os.remove(os.path.join("{{cookiecutter.project_slug}}", "users", "tests", "test_drf_views.py"))
+    os.remove(os.path.join("{{cookiecutter.project_slug}}", "users", "tests", "test_swagger.py"))
 
 
 def remove_storages_module():
@@ -470,10 +437,7 @@ def main():
     else:
         remove_docker_files()
 
-    if (
-        "{{ cookiecutter.use_docker }}".lower() == "y"
-        and "{{ cookiecutter.cloud_provider}}" != "AWS"
-    ):
+    if "{{ cookiecutter.use_docker }}".lower() == "y" and "{{ cookiecutter.cloud_provider}}" != "AWS":
         remove_aws_dockerfile()
 
     if "{{ cookiecutter.use_heroku }}".lower() == "n":
@@ -481,10 +445,7 @@ def main():
     elif "{{ cookiecutter.frontend_pipeline }}" != "Django Compressor":
         remove_heroku_build_hooks()
 
-    if (
-        "{{ cookiecutter.use_docker }}".lower() == "n"
-        and "{{ cookiecutter.use_heroku }}".lower() == "n"
-    ):
+    if "{{ cookiecutter.use_docker }}".lower() == "n" and "{{ cookiecutter.use_heroku }}".lower() == "n":
         if "{{ cookiecutter.keep_local_envs_in_vcs }}".lower() == "y":
             print(
                 INFO + ".env(s) are only utilized when Docker Compose and/or "
@@ -512,10 +473,7 @@ def main():
             use_async=("{{ cookiecutter.use_async }}".lower() == "y"),
         )
 
-    if (
-        "{{ cookiecutter.cloud_provider }}" == "None"
-        and "{{ cookiecutter.use_docker }}".lower() == "n"
-    ):
+    if "{{ cookiecutter.cloud_provider }}" == "None" and "{{ cookiecutter.use_docker }}".lower() == "n":
         print(
             WARNING + "You chose to not use any cloud providers nor Docker, "
             "media files won't be served in production." + TERMINATOR
diff --git a/hooks/pre_gen_project.py b/hooks/pre_gen_project.py
index d067954db..33dc2e834 100644
--- a/hooks/pre_gen_project.py
+++ b/hooks/pre_gen_project.py
@@ -27,17 +27,11 @@ SUCCESS = "\x1b[1;32m [SUCCESS]: "
 
 project_slug = "{{ cookiecutter.project_slug }}"
 if hasattr(project_slug, "isidentifier"):
-    assert (
-        project_slug.isidentifier()
-    ), "'{}' project slug is not a valid Python identifier.".format(project_slug)
+    assert project_slug.isidentifier(), "'{}' project slug is not a valid Python identifier.".format(project_slug)
 
-assert (
-    project_slug == project_slug.lower()
-), "'{}' project slug should be all lowercase".format(project_slug)
+assert project_slug == project_slug.lower(), "'{}' project slug should be all lowercase".format(project_slug)
 
-assert (
-    "\\" not in "{{ cookiecutter.author_name }}"
-), "Don't include backslashes in author name."
+assert "\\" not in "{{ cookiecutter.author_name }}", "Don't include backslashes in author name."
 
 if "{{ cookiecutter.use_docker }}".lower() == "n":
     python_major_version = sys.version_info[0]
@@ -59,32 +53,16 @@ if "{{ cookiecutter.use_docker }}".lower() == "n":
                 print(
                     HINT
                     + "Please respond with {} or {}: ".format(
-                        ", ".join(
-                            ["'{}'".format(o) for o in yes_options if not o == ""]
-                        ),
-                        ", ".join(
-                            ["'{}'".format(o) for o in no_options if not o == ""]
-                        ),
+                        ", ".join(["'{}'".format(o) for o in yes_options if not o == ""]),
+                        ", ".join(["'{}'".format(o) for o in no_options if not o == ""]),
                     )
                     + TERMINATOR
                 )
 
-if (
-    "{{ cookiecutter.use_whitenoise }}".lower() == "n"
-    and "{{ cookiecutter.cloud_provider }}" == "None"
-):
-    print(
-        "You should either use Whitenoise or select a "
-        "Cloud Provider to serve static files"
-    )
+if "{{ cookiecutter.use_whitenoise }}".lower() == "n" and "{{ cookiecutter.cloud_provider }}" == "None":
+    print("You should either use Whitenoise or select a " "Cloud Provider to serve static files")
     sys.exit(1)
 
-if (
-    "{{ cookiecutter.mail_service }}" == "Amazon SES"
-    and "{{ cookiecutter.cloud_provider }}" != "AWS"
-):
-    print(
-        "You should either use AWS or select a different "
-        "Mail Service for sending emails."
-    )
+if "{{ cookiecutter.mail_service }}" == "Amazon SES" and "{{ cookiecutter.cloud_provider }}" != "AWS":
+    print("You should either use AWS or select a different " "Mail Service for sending emails.")
     sys.exit(1)
diff --git a/pyproject.toml b/pyproject.toml
new file mode 100644
index 000000000..2b4b98783
--- /dev/null
+++ b/pyproject.toml
@@ -0,0 +1,29 @@
+# ==== pytest ====
+[tool.pytest.ini_options]
+addopts = "-v --tb=short"
+norecursedirs = [
+    ".tox",
+    ".git",
+    "*/migrations/*",
+    "*/static/*",
+    "docs",
+    "venv",
+    "*/{{cookiecutter.project_slug}}/*",
+]
+
+
+# ==== black ====
+[tool.black]
+line-length = 119
+target-version = ['py311']
+
+
+# ==== isort ====
+[tool.isort]
+profile = "black"
+line_length = 119
+known_first_party = [
+    "tests",
+    "scripts",
+    "hooks",
+]
diff --git a/pytest.ini b/pytest.ini
deleted file mode 100644
index 52506f47d..000000000
--- a/pytest.ini
+++ /dev/null
@@ -1,3 +0,0 @@
-[pytest]
-addopts = -v --tb=short
-norecursedirs = .tox .git */migrations/* */static/* docs venv */{{cookiecutter.project_slug}}/*
diff --git a/requirements.txt b/requirements.txt
index cc729cf64..7ee3bbdea 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,6 @@ binaryornot==0.4.4
 black==23.3.0
 isort==5.12.0
 flake8==6.0.0
-flake8-isort==6.0.0
 pre-commit==3.2.2
 
 # Testing
diff --git a/scripts/create_django_issue.py b/scripts/create_django_issue.py
index 5809f393d..d3b3c3792 100644
--- a/scripts/create_django_issue.py
+++ b/scripts/create_django_issue.py
@@ -141,9 +141,7 @@ class GitHubManager:
         self.requirements_files = ["base", "local", "production"]
         # Format:
         # requirement file name: {package name: (master_version, package_info)}
-        self.requirements: dict[str, dict[str, tuple[str, dict]]] = {
-            x: {} for x in self.requirements_files
-        }
+        self.requirements: dict[str, dict[str, tuple[str, dict]]] = {x: {} for x in self.requirements_files}
 
     def setup(self) -> None:
         self.load_requirements()
@@ -177,11 +175,7 @@ class GitHubManager:
             "is": "issue",
             "in": "title",
         }
-        issues = list(
-            self.github.search_issues(
-                "[Django Update]", "created", "desc", **qualifiers
-            )
-        )
+        issues = list(self.github.search_issues("[Django Update]", "created", "desc", **qualifiers))
         print(f"Found {len(issues)} issues matching search")
         for issue in issues:
             matches = re.match(r"\[Update Django] Django (\d+.\d+)$", issue.title)
@@ -194,9 +188,7 @@ class GitHubManager:
             else:
                 self.existing_issues[issue_version] = issue
 
-    def get_compatibility(
-        self, package_name: str, package_info: dict, needed_dj_version: DjVersion
-    ):
+    def get_compatibility(self, package_name: str, package_info: dict, needed_dj_version: DjVersion):
         """
         Verify compatibility via setup.py classifiers. If Django is not in the
         classifiers, then default compatibility is n/a and OK is ✅.
@@ -209,9 +201,7 @@ class GitHubManager:
         # updated packages, or known releases that will happen but haven't yet
         if issue := self.existing_issues.get(needed_dj_version):
             if index := issue.body.find(package_name):
-                name, _current, prev_compat, ok = (
-                    s.strip() for s in issue.body[index:].split("|", 4)[:4]
-                )
+                name, _current, prev_compat, ok = (s.strip() for s in issue.body[index:].split("|", 4)[:4])
                 if ok in ("✅", "❓", "🕒"):
                     return prev_compat, ok
 
@@ -248,9 +238,7 @@ class GitHubManager:
     ]
 
     def _get_md_home_page_url(self, package_info: dict):
-        urls = [
-            package_info["info"].get(url_key) for url_key in self.HOME_PAGE_URL_KEYS
-        ]
+        urls = [package_info["info"].get(url_key) for url_key in self.HOME_PAGE_URL_KEYS]
         try:
             return f"[{{}}]({next(item for item in urls if item)})"
         except StopIteration:
@@ -259,13 +247,9 @@ class GitHubManager:
     def generate_markdown(self, needed_dj_version: DjVersion):
         requirements = f"{needed_dj_version} requirements tables\n\n"
         for _file in self.requirements_files:
-            requirements += _TABLE_HEADER.format_map(
-                {"file": _file, "dj_version": needed_dj_version}
-            )
+            requirements += _TABLE_HEADER.format_map({"file": _file, "dj_version": needed_dj_version})
             for package_name, (version, info) in self.requirements[_file].items():
-                compat_version, icon = self.get_compatibility(
-                    package_name, info, needed_dj_version
-                )
+                compat_version, icon = self.get_compatibility(package_name, info, needed_dj_version)
                 requirements += (
                     f"| {self._get_md_home_page_url(info).format(package_name)} "
                     f"| {version.strip()} "
@@ -282,9 +266,7 @@ class GitHubManager:
             issue.edit(body=description)
         else:
             print(f"Creating new issue for Django {needed_dj_version}")
-            issue = self.repo.create_issue(
-                f"[Update Django] Django {needed_dj_version}", description
-            )
+            issue = self.repo.create_issue(f"[Update Django] Django {needed_dj_version}", description)
             issue.add_to_labels(f"django{needed_dj_version}")
 
     def generate(self):
@@ -297,9 +279,7 @@ class GitHubManager:
 
 def main(django_max_version=None) -> None:
     # Check if there are any djs
-    current_dj, latest_djs = get_all_latest_django_versions(
-        django_max_version=django_max_version
-    )
+    current_dj, latest_djs = get_all_latest_django_versions(django_max_version=django_max_version)
     if not latest_djs:
         sys.exit(0)
     manager = GitHubManager(current_dj, latest_djs)
@@ -309,9 +289,7 @@ def main(django_max_version=None) -> None:
 
 if __name__ == "__main__":
     if GITHUB_REPO is None:
-        raise RuntimeError(
-            "No github repo, please set the environment variable GITHUB_REPOSITORY"
-        )
+        raise RuntimeError("No github repo, please set the environment variable GITHUB_REPOSITORY")
     max_version = None
     last_arg = sys.argv[-1]
     if CURRENT_FILE.name not in last_arg:
diff --git a/scripts/update_changelog.py b/scripts/update_changelog.py
index 57d915a4b..7d43a0b57 100644
--- a/scripts/update_changelog.py
+++ b/scripts/update_changelog.py
@@ -154,11 +154,7 @@ def update_git_repo(paths: list[Path], release: str) -> None:
 
 if __name__ == "__main__":
     if GITHUB_REPO is None:
-        raise RuntimeError(
-            "No github repo, please set the environment variable GITHUB_REPOSITORY"
-        )
+        raise RuntimeError("No github repo, please set the environment variable GITHUB_REPOSITORY")
     if GIT_BRANCH is None:
-        raise RuntimeError(
-            "No git branch set, please set the GITHUB_REF_NAME environment variable"
-        )
+        raise RuntimeError("No git branch set, please set the GITHUB_REF_NAME environment variable")
     main()
diff --git a/scripts/update_contributors.py b/scripts/update_contributors.py
index 76ccf60ad..09a7082c0 100644
--- a/scripts/update_contributors.py
+++ b/scripts/update_contributors.py
@@ -44,15 +44,9 @@ def iter_recent_authors():
     git CLI to work with Github usernames.
     """
     repo = Github(login_or_token=GITHUB_TOKEN, per_page=5).get_repo(GITHUB_REPO)
-    recent_pulls = repo.get_pulls(
-        state="closed", sort="updated", direction="desc"
-    ).get_page(0)
+    recent_pulls = repo.get_pulls(state="closed", sort="updated", direction="desc").get_page(0)
     for pull in recent_pulls:
-        if (
-            pull.merged
-            and pull.user.type == "User"
-            and pull.user.login not in BOT_LOGINS
-        ):
+        if pull.merged and pull.user.type == "User" and pull.user.login not in BOT_LOGINS:
             yield pull.user
 
 
@@ -96,9 +90,7 @@ def write_md_file(contributors):
     core_contributors = [c for c in contributors if c.get("is_core", False)]
     other_contributors = (c for c in contributors if not c.get("is_core", False))
     other_contributors = sorted(other_contributors, key=lambda c: c["name"].lower())
-    content = template.render(
-        core_contributors=core_contributors, other_contributors=other_contributors
-    )
+    content = template.render(core_contributors=core_contributors, other_contributors=other_contributors)
 
     file_path = ROOT / "CONTRIBUTORS.md"
     file_path.write_text(content)
@@ -106,7 +98,5 @@ def write_md_file(contributors):
 
 if __name__ == "__main__":
     if GITHUB_REPO is None:
-        raise RuntimeError(
-            "No github repo, please set the environment variable GITHUB_REPOSITORY"
-        )
+        raise RuntimeError("No github repo, please set the environment variable GITHUB_REPOSITORY")
     main()
diff --git a/setup.cfg b/setup.cfg
deleted file mode 100644
index dd8f1ef3c..000000000
--- a/setup.cfg
+++ /dev/null
@@ -1,7 +0,0 @@
-[flake8]
-exclude = docs
-max-line-length = 88
-
-[isort]
-profile = black
-known_first_party = tests,scripts,hooks
diff --git a/setup.py b/setup.py
index 3f20e29ca..eb7d14ffd 100644
--- a/setup.py
+++ b/setup.py
@@ -13,10 +13,7 @@ with open("README.rst") as readme_file:
 setup(
     name="cookiecutter-django",
     version=version,
-    description=(
-        "A Cookiecutter template for creating production-ready "
-        "Django projects quickly."
-    ),
+    description=("A Cookiecutter template for creating production-ready " "Django projects quickly."),
     long_description=long_description,
     author="Daniel Roy Greenfeld",
     author_email="pydanny@gmail.com",
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index e4a03b3b2..9837be3ef 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -23,7 +23,7 @@ elif sys.platform.startswith("darwin") and os.getenv("CI"):
 # Run auto-fixable styles checks - skipped on CI by default. These can be fixed
 # automatically by running pre-commit after generation however they are tedious
 # to fix in the template, so we don't insist too much in fixing them.
-AUTOFIXABLE_STYLES = os.getenv("AUTOFIXABLE_STYLES") == 1
+AUTOFIXABLE_STYLES = os.getenv("AUTOFIXABLE_STYLES") == "1"
 
 
 @pytest.fixture
@@ -144,11 +144,7 @@ def _fixture_id(ctx):
 
 def build_files_list(base_dir):
     """Build a list containing absolute paths to the generated files."""
-    return [
-        os.path.join(dirpath, file_path)
-        for dirpath, subdirs, files in os.walk(base_dir)
-        for file_path in files
-    ]
+    return [os.path.join(dirpath, file_path) for dirpath, subdirs, files in os.walk(base_dir) for file_path in files]
 
 
 def check_paths(paths):
@@ -208,6 +204,18 @@ def test_black_passes(cookies, context_override):
         pytest.fail(e.stdout.decode())
 
 
+@pytest.mark.skipif(not AUTOFIXABLE_STYLES, reason="isort is auto-fixable")
+@pytest.mark.parametrize("context_override", SUPPORTED_COMBINATIONS, ids=_fixture_id)
+def test_isort_passes(cookies, context_override):
+    """Check whether generated project passes isort style."""
+    result = cookies.bake(extra_context=context_override)
+
+    try:
+        sh.isort(_cwd=str(result.project_path))
+    except sh.ErrorReturnCode as e:
+        pytest.fail(e.stdout.decode())
+
+
 @pytest.mark.parametrize(
     ["use_docker", "expected_test_script"],
     [
@@ -240,9 +248,7 @@ def test_travis_invokes_pytest(cookies, context, use_docker, expected_test_scrip
         ("y", "docker-compose -f local.yml run django pytest"),
     ],
 )
-def test_gitlab_invokes_precommit_and_pytest(
-    cookies, context, use_docker, expected_test_script
-):
+def test_gitlab_invokes_precommit_and_pytest(cookies, context, use_docker, expected_test_script):
     context.update({"ci_tool": "Gitlab", "use_docker": use_docker})
     result = cookies.bake(extra_context=context)
 
@@ -269,9 +275,7 @@ def test_gitlab_invokes_precommit_and_pytest(
         ("y", "docker-compose -f local.yml run django pytest"),
     ],
 )
-def test_github_invokes_linter_and_pytest(
-    cookies, context, use_docker, expected_test_script
-):
+def test_github_invokes_linter_and_pytest(cookies, context, use_docker, expected_test_script):
     context.update({"ci_tool": "Github", "use_docker": use_docker})
     result = cookies.bake(extra_context=context)
 
diff --git a/tests/test_hooks.py b/tests/test_hooks.py
index 7ca752722..6afdc400b 100644
--- a/tests/test_hooks.py
+++ b/tests/test_hooks.py
@@ -22,7 +22,5 @@ def test_append_to_gitignore_file(working_directory):
     gitignore_file.write_text("node_modules/\n")
     append_to_gitignore_file(".envs/*")
     linesep = os.linesep.encode()
-    assert (
-        gitignore_file.read_bytes() == b"node_modules/" + linesep + b".envs/*" + linesep
-    )
+    assert gitignore_file.read_bytes() == b"node_modules/" + linesep + b".envs/*" + linesep
     assert gitignore_file.read_text() == "node_modules/\n.envs/*\n"
diff --git a/tox.ini b/tox.ini
index f0c22d48e..b10d16427 100644
--- a/tox.ini
+++ b/tox.ini
@@ -4,6 +4,7 @@ envlist = py311,black-template
 
 [testenv]
 deps = -rrequirements.txt
+passenv = AUTOFIXABLE_STYLES
 commands = pytest {posargs:./tests}
 
 [testenv:black-template]
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index a7c8fa583..5d8670e4a 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -44,8 +44,6 @@ repos:
     rev: 6.0.0
     hooks:
       - id: flake8
-        args: ['--config=setup.cfg']
-        additional_dependencies: [flake8-isort]
 
 # sets up .pre-commit-ci.yaml to ensure pre-commit dependencies stay up to date
 ci:
diff --git a/{{cookiecutter.project_slug}}/.pylintrc b/{{cookiecutter.project_slug}}/.pylintrc
deleted file mode 100644
index 9d604334b..000000000
--- a/{{cookiecutter.project_slug}}/.pylintrc
+++ /dev/null
@@ -1,14 +0,0 @@
-[MASTER]
-load-plugins=pylint_django{% if cookiecutter.use_celery == "y" %}, pylint_celery{% endif %}
-django-settings-module=config.settings.local
-[FORMAT]
-max-line-length=120
-
-[MESSAGES CONTROL]
-disable=missing-docstring,invalid-name
-
-[DESIGN]
-max-parents=13
-
-[TYPECHECK]
-generated-members=REQUEST,acl_users,aq_parent,"[a-zA-Z]+_set{1,2}",save,delete
diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index dbb396c65..c0ca31f36 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -130,9 +130,7 @@ PASSWORD_HASHERS = [
 ]
 # https://docs.djangoproject.com/en/dev/ref/settings/#auth-password-validators
 AUTH_PASSWORD_VALIDATORS = [
-    {
-        "NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator"
-    },
+    {"NAME": "django.contrib.auth.password_validation.UserAttributeSimilarityValidator"},
     {"NAME": "django.contrib.auth.password_validation.MinimumLengthValidator"},
     {"NAME": "django.contrib.auth.password_validation.CommonPasswordValidator"},
     {"NAME": "django.contrib.auth.password_validation.NumericPasswordValidator"},
@@ -257,9 +255,8 @@ LOGGING = {
     "disable_existing_loggers": False,
     "formatters": {
         "verbose": {
-            "format": "%(levelname)s %(asctime)s %(module)s "
-            "%(process)d %(thread)d %(message)s"
-        }
+            "format": "%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s",
+        },
     },
     "handlers": {
         "console": {
diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py
index 09d3bb9fa..adab6087a 100644
--- a/{{cookiecutter.project_slug}}/config/settings/local.py
+++ b/{{cookiecutter.project_slug}}/config/settings/local.py
@@ -37,9 +37,7 @@ EMAIL_HOST = "localhost"
 EMAIL_PORT = 1025
 {%- else -%}
 # https://docs.djangoproject.com/en/dev/ref/settings/#email-backend
-EMAIL_BACKEND = env(
-    "DJANGO_EMAIL_BACKEND", default="django.core.mail.backends.console.EmailBackend"
-)
+EMAIL_BACKEND = env("DJANGO_EMAIL_BACKEND", default="django.core.mail.backends.console.EmailBackend")
 {%- endif %}
 
 {%- if cookiecutter.use_whitenoise == 'y' %}
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index d5760147c..e76b63993 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -56,15 +56,11 @@ CSRF_COOKIE_SECURE = True
 # TODO: set this to 60 seconds first and then to 518400 once you prove the former works
 SECURE_HSTS_SECONDS = 60
 # https://docs.djangoproject.com/en/dev/ref/settings/#secure-hsts-include-subdomains
-SECURE_HSTS_INCLUDE_SUBDOMAINS = env.bool(
-    "DJANGO_SECURE_HSTS_INCLUDE_SUBDOMAINS", default=True
-)
+SECURE_HSTS_INCLUDE_SUBDOMAINS = env.bool("DJANGO_SECURE_HSTS_INCLUDE_SUBDOMAINS", default=True)
 # https://docs.djangoproject.com/en/dev/ref/settings/#secure-hsts-preload
 SECURE_HSTS_PRELOAD = env.bool("DJANGO_SECURE_HSTS_PRELOAD", default=True)
 # https://docs.djangoproject.com/en/dev/ref/middleware/#x-content-type-options-nosniff
-SECURE_CONTENT_TYPE_NOSNIFF = env.bool(
-    "DJANGO_SECURE_CONTENT_TYPE_NOSNIFF", default=True
-)
+SECURE_CONTENT_TYPE_NOSNIFF = env.bool("DJANGO_SECURE_CONTENT_TYPE_NOSNIFF", default=True)
 
 {% if cookiecutter.cloud_provider != 'None' -%}
 # STORAGES
@@ -85,7 +81,7 @@ AWS_QUERYSTRING_AUTH = False
 _AWS_EXPIRY = 60 * 60 * 24 * 7
 # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
 AWS_S3_OBJECT_PARAMETERS = {
-    "CacheControl": f"max-age={_AWS_EXPIRY}, s-maxage={_AWS_EXPIRY}, must-revalidate"
+    "CacheControl": f"max-age={_AWS_EXPIRY}, s-maxage={_AWS_EXPIRY}, must-revalidate",
 }
 # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
 AWS_S3_MAX_MEMORY_SIZE = env.int(
@@ -188,9 +184,7 @@ ANYMAIL = {
 EMAIL_BACKEND = "anymail.backends.mandrill.EmailBackend"
 ANYMAIL = {
     "MANDRILL_API_KEY": env("MANDRILL_API_KEY"),
-    "MANDRILL_API_URL": env(
-        "MANDRILL_API_URL", default="https://mandrillapp.com/api/1.0"
-    ),
+    "MANDRILL_API_URL": env("MANDRILL_API_URL", default="https://mandrillapp.com/api/1.0"),
 }
 {%- elif cookiecutter.mail_service == 'Postmark' %}
 # https://anymail.readthedocs.io/en/stable/esps/postmark/
@@ -211,18 +205,14 @@ ANYMAIL = {
 EMAIL_BACKEND = "anymail.backends.sendinblue.EmailBackend"
 ANYMAIL = {
     "SENDINBLUE_API_KEY": env("SENDINBLUE_API_KEY"),
-    "SENDINBLUE_API_URL": env(
-        "SENDINBLUE_API_URL", default="https://api.sendinblue.com/v3/"
-    ),
+    "SENDINBLUE_API_URL": env("SENDINBLUE_API_URL", default="https://api.sendinblue.com/v3/"),
 }
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
 # https://anymail.readthedocs.io/en/stable/esps/sparkpost/
 EMAIL_BACKEND = "anymail.backends.sparkpost.EmailBackend"
 ANYMAIL = {
     "SPARKPOST_API_KEY": env("SPARKPOST_API_KEY"),
-    "SPARKPOST_API_URL": env(
-        "SPARKPOST_API_URL", default="https://api.sparkpost.com/api/v1"
-    ),
+    "SPARKPOST_API_URL": env("SPARKPOST_API_URL", default="https://api.sparkpost.com/api/v1"),
 }
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
 # https://anymail.readthedocs.io/en/stable/esps
@@ -278,9 +268,8 @@ LOGGING = {
     "filters": {"require_debug_false": {"()": "django.utils.log.RequireDebugFalse"}},
     "formatters": {
         "verbose": {
-            "format": "%(levelname)s %(asctime)s %(module)s "
-            "%(process)d %(thread)d %(message)s"
-        }
+            "format": "%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s",
+        },
     },
     "handlers": {
         "mail_admins": {
@@ -314,9 +303,8 @@ LOGGING = {
     "disable_existing_loggers": True,
     "formatters": {
         "verbose": {
-            "format": "%(levelname)s %(asctime)s %(module)s "
-            "%(process)d %(thread)d %(message)s"
-        }
+            "format": "%(levelname)s %(asctime)s %(module)s %(process)d %(thread)d %(message)s",
+        },
     },
     "handlers": {
         "console": {
@@ -376,7 +364,7 @@ sentry_sdk.init(
 # -------------------------------------------------------------------------------
 # Tools that generate code samples can use SERVERS to point to the correct domain
 SPECTACULAR_SETTINGS["SERVERS"] = [  # noqa: F405
-    {"url": "https://{{ cookiecutter.domain_name }}", "description": "Production server"}
+    {"url": "https://{{ cookiecutter.domain_name }}", "description": "Production server"},
 ]
 
 {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/config/settings/test.py b/{{cookiecutter.project_slug}}/config/settings/test.py
index 7941c7413..92211ec76 100644
--- a/{{cookiecutter.project_slug}}/config/settings/test.py
+++ b/{{cookiecutter.project_slug}}/config/settings/test.py
@@ -32,9 +32,7 @@ TEMPLATES[0]["OPTIONS"]["debug"] = True  # type: ignore # noqa: F405
 {%- if cookiecutter.frontend_pipeline == 'Webpack' %}
 # django-webpack-loader
 # ------------------------------------------------------------------------------
-WEBPACK_LOADER["DEFAULT"][  # noqa: F405
-    "LOADER_CLASS"
-] = "webpack_loader.loader.FakeWebpackLoader"
+WEBPACK_LOADER["DEFAULT"]["LOADER_CLASS"] = "webpack_loader.loader.FakeWebpackLoader"  # noqa: F405
 
 {%- endif %}
 # Your stuff...
diff --git a/{{cookiecutter.project_slug}}/config/urls.py b/{{cookiecutter.project_slug}}/config/urls.py
index ab42cc103..7c5ad1a7e 100644
--- a/{{cookiecutter.project_slug}}/config/urls.py
+++ b/{{cookiecutter.project_slug}}/config/urls.py
@@ -14,9 +14,7 @@ from rest_framework.authtoken.views import obtain_auth_token
 
 urlpatterns = [
     path("", TemplateView.as_view(template_name="pages/home.html"), name="home"),
-    path(
-        "about/", TemplateView.as_view(template_name="pages/about.html"), name="about"
-    ),
+    path("about/", TemplateView.as_view(template_name="pages/about.html"), name="about"),
     # Django Admin, use {% raw %}{% url 'admin:index' %}{% endraw %}
     path(settings.ADMIN_URL, admin.site.urls),
     # User management
diff --git a/{{cookiecutter.project_slug}}/pyproject.toml b/{{cookiecutter.project_slug}}/pyproject.toml
new file mode 100644
index 000000000..6acac9b2c
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/pyproject.toml
@@ -0,0 +1,92 @@
+# ==== pytest ====
+[tool.pytest.ini_options]
+minversion = "6.0"
+addopts = "--ds=config.settings.test --reuse-db"
+python_files = [
+    "tests.py",
+    "test_*.py",
+]
+{%- if cookiecutter.frontend_pipeline == 'Gulp' %}
+norecursedirs = ["node_modules"]
+{%- endif %}
+
+# ==== Coverage ====
+[tool.coverage.run]
+include = ["{{cookiecutter.project_slug}}/**"]
+omit = ["*/migrations/*", "*/tests/*"]
+plugins = ["django_coverage_plugin"]
+
+
+# ==== black ====
+[tool.black]
+line-length = 119
+target-version = ['py311']
+
+
+# ==== isort ====
+[tool.isort]
+profile = "black"
+line_length = 119
+known_first_party = [
+    "{{cookiecutter.project_slug}}",
+    "config",
+]
+skip = ["venv/"]
+skip_glob = ["**/migrations/*.py"]
+
+
+# ==== mypy ====
+[tool.mypy]
+python_version = "3.11"
+check_untyped_defs = true
+ignore_missing_imports = true
+warn_unused_ignores = true
+warn_redundant_casts = true
+warn_unused_configs = true
+plugins = [
+    "mypy_django_plugin.main",
+{%- if cookiecutter.use_drf == "y" %}
+    "mypy_drf_plugin.main",
+{%- endif %}
+]
+
+[[tool.mypy.overrides]]
+# Django migrations should not produce any errors:
+module = "*.migrations.*"
+ignore_errors = true
+
+[tool.django-stubs]
+django_settings_module = "config.settings.test"
+
+
+# ==== PyLint ====
+[tool.pylint.MASTER]
+load-plugins = [
+    "pylint_django",
+{%- if cookiecutter.use_celery == "y" %}
+    "pylint_celery",
+{%- endif %}
+]
+django-settings-module = "config.settings.local"
+
+[tool.pylint.FORMAT]
+max-line-length = 119
+
+[tool.pylint."MESSAGES CONTROL"]
+disable = [
+    "missing-docstring",
+    "invalid-name",
+]
+
+[tool.pylint.DESIGN]
+max-parents = 13
+
+[tool.pylint.TYPECHECK]
+generated-members = [
+    "REQUEST",
+    "acl_users",
+    "aq_parent",
+    "[a-zA-Z]+_set{1,2}",
+    "save",
+    "delete",
+]
diff --git a/{{cookiecutter.project_slug}}/pytest.ini b/{{cookiecutter.project_slug}}/pytest.ini
deleted file mode 100644
index 969c7921e..000000000
--- a/{{cookiecutter.project_slug}}/pytest.ini
+++ /dev/null
@@ -1,6 +0,0 @@
-[pytest]
-addopts = --ds=config.settings.test --reuse-db
-python_files = tests.py test_*.py
-{%- if cookiecutter.frontend_pipeline == 'Gulp' %}
-norecursedirs = node_modules
-{%- endif %}
diff --git a/{{cookiecutter.project_slug}}/setup.cfg b/{{cookiecutter.project_slug}}/setup.cfg
index ab191732b..829064213 100644
--- a/{{cookiecutter.project_slug}}/setup.cfg
+++ b/{{cookiecutter.project_slug}}/setup.cfg
@@ -1,40 +1,10 @@
+# flake8 and pycodestyle don't support pyproject.toml
+# https://github.com/PyCQA/flake8/issues/234
+# https://github.com/PyCQA/pycodestyle/issues/813
 [flake8]
-max-line-length = 120
+max-line-length = 119
 exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv,.venv
 
 [pycodestyle]
-max-line-length = 120
+max-line-length = 119
 exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules,venv,.venv
-
-[isort]
-line_length = 88
-known_first_party = {{cookiecutter.project_slug}},config
-multi_line_output = 3
-default_section = THIRDPARTY
-skip = venv/
-skip_glob = **/migrations/*.py
-include_trailing_comma = true
-force_grid_wrap = 0
-use_parentheses = true
-
-[mypy]
-python_version = 3.11
-check_untyped_defs = True
-ignore_missing_imports = True
-warn_unused_ignores = True
-warn_redundant_casts = True
-warn_unused_configs = True
-plugins = mypy_django_plugin.main{% if cookiecutter.use_drf == "y" %}, mypy_drf_plugin.main{% endif %}
-
-[mypy.plugins.django-stubs]
-django_settings_module = config.settings.test
-
-[mypy-*.migrations.*]
-# Django migrations should not produce any errors:
-ignore_errors = True
-
-[coverage:run]
-include = {{cookiecutter.project_slug}}/**
-omit = */migrations/*, */tests/*
-plugins =
-    django_coverage_plugin
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/__init__.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/__init__.py
index fb6532709..150a914ee 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/__init__.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/__init__.py
@@ -1,5 +1,2 @@
 __version__ = "{{ cookiecutter.version }}"
-__version_info__ = tuple(
-    int(num) if num.isdigit() else num
-    for num in __version__.replace("-", ".", 1).split(".")
-)
+__version_info__ = tuple(int(num) if num.isdigit() else num for num in __version__.replace("-", ".", 1).split("."))
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py
index b497ddcf0..6b26367d0 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/api/serializers.py
@@ -11,12 +11,12 @@ class UserSerializer(serializers.ModelSerializer):
         fields = ["name", "url"]
 
         extra_kwargs = {
-            "url": {"view_name": "api:user-detail", "lookup_field": "pk"}
+            "url": {"view_name": "api:user-detail", "lookup_field": "pk"},
         }
         {%- else %}
         fields = ["username", "name", "url"]
 
         extra_kwargs = {
-            "url": {"view_name": "api:user-detail", "lookup_field": "username"}
+            "url": {"view_name": "api:user-detail", "lookup_field": "username"},
         }
         {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_urls.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_urls.py
index 3fcfe4d05..334ab1185 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_urls.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_drf_urls.py
@@ -5,16 +5,10 @@ from {{ cookiecutter.project_slug }}.users.models import User
 
 def test_user_detail(user: User):
     {%- if cookiecutter.username_type == "email" %}
-    assert (
-        reverse("api:user-detail", kwargs={"pk": user.pk})
-        == f"/api/users/{user.pk}/"
-    )
+    assert reverse("api:user-detail", kwargs={"pk": user.pk}) == f"/api/users/{user.pk}/"
     assert resolve(f"/api/users/{user.pk}/").view_name == "api:user-detail"
     {%- else %}
-    assert (
-        reverse("api:user-detail", kwargs={"username": user.username})
-        == f"/api/users/{user.username}/"
-    )
+    assert reverse("api:user-detail", kwargs={"username": user.username}) == f"/api/users/{user.username}/"
     assert resolve(f"/api/users/{user.username}/").view_name == "api:user-detail"
     {%- endif %}
 
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
index 062d7dc88..a0d068890 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_urls.py
@@ -8,10 +8,7 @@ def test_detail(user: User):
     assert reverse("users:detail", kwargs={"pk": user.pk}) == f"/users/{user.pk}/"
     assert resolve(f"/users/{user.pk}/").view_name == "users:detail"
     {%- else %}
-    assert (
-        reverse("users:detail", kwargs={"username": user.username})
-        == f"/users/{user.username}/"
-    )
+    assert reverse("users:detail", kwargs={"username": user.username}) == f"/users/{user.username}/"
     assert resolve(f"/users/{user.username}/").view_name == "users:detail"
     {%- endif %}
 
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
index 8e868f78d..82498e630 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
@@ -28,9 +28,7 @@ class UserUpdateView(LoginRequiredMixin, SuccessMessageMixin, UpdateView):
     success_message = _("Information successfully updated")
 
     def get_success_url(self):
-        assert (
-            self.request.user.is_authenticated
-        )  # for mypy to know that the user is authenticated
+        assert self.request.user.is_authenticated  # for mypy to know that the user is authenticated
         return self.request.user.get_absolute_url()
 
     def get_object(self):

From a1f2a670d96d4e2ec3dfe6e9d89603d6f517cfbb Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 15 Apr 2023 09:48:41 -0500
Subject: [PATCH 2685/2840] Update drf-spectacular to 0.26.2 (#4277)

---
 {{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 0fdee1f86..46b38314f 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -44,7 +44,7 @@ django-redis==5.2.0  # https://github.com/jazzband/django-redis
 djangorestframework==3.14.0  # https://github.com/encode/django-rest-framework
 django-cors-headers==3.14.0  # https://github.com/adamchainz/django-cors-headers
 # DRF-spectacular for api documentation
-drf-spectacular==0.26.1  # https://github.com/tfranzel/drf-spectacular
+drf-spectacular==0.26.2  # https://github.com/tfranzel/drf-spectacular
 {%- endif %}
 {%- if cookiecutter.frontend_pipeline == 'Webpack' %}
 django-webpack-loader==1.8.1  # https://github.com/django-webpack/django-webpack-loader

From 32474ab3674f9f98b569ec7f0a00134556eb1e39 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sat, 15 Apr 2023 15:53:31 +0100
Subject: [PATCH 2686/2840] Run template tests in parallel in pytest-xdist
 (#4275)

---
 .github/workflows/ci.yml | 2 +-
 requirements.txt         | 1 +
 tox.ini                  | 2 +-
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index c7cdda633..aee923ba4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -30,7 +30,7 @@ jobs:
       - name: Install dependencies
         run: pip install -r requirements.txt
       - name: Run tests
-        run: pytest tests
+        run: pytest -n auto tests
 
   docker:
     strategy:
diff --git a/requirements.txt b/requirements.txt
index 7ee3bbdea..f2216be6d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,6 +13,7 @@ pre-commit==3.2.2
 # ------------------------------------------------------------------------------
 tox==4.4.12
 pytest==7.3.1
+pytest-xdist==3.2.1
 pytest-cookies==0.7.0
 pytest-instafail==0.5.0
 pyyaml==6.0
diff --git a/tox.ini b/tox.ini
index b10d16427..903d5a53b 100644
--- a/tox.ini
+++ b/tox.ini
@@ -5,7 +5,7 @@ envlist = py311,black-template
 [testenv]
 deps = -rrequirements.txt
 passenv = AUTOFIXABLE_STYLES
-commands = pytest {posargs:./tests}
+commands = pytest -n auto {posargs:./tests}
 
 [testenv:black-template]
 deps = black

From b018b7b8a8616d9c56cae231743eb351d1ecc549 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sun, 16 Apr 2023 02:20:37 +0000
Subject: [PATCH 2687/2840] Release 2023.04.15

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 415b29a2e..77dcc36b6 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,27 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.04.15
+
+
+### Changed
+
+- Add username_type option ([#3958](https://github.com/cookiecutter/cookiecutter-django/pull/3958))
+
+- Fix inconsistent line length and move configs to pyproject.toml ([#4276](https://github.com/cookiecutter/cookiecutter-django/pull/4276))
+
+- Relax rules for linting of pull requests on this template ([#4273](https://github.com/cookiecutter/cookiecutter-django/pull/4273))
+
+- Add more pre-commit hooks ([#4266](https://github.com/cookiecutter/cookiecutter-django/pull/4266))
+
+- Upgrade Python to version 3.11 (Faster CPython) ([#4256](https://github.com/cookiecutter/cookiecutter-django/pull/4256))
+
+### Updated
+
+- Update drf-spectacular to 0.26.2 ([#4277](https://github.com/cookiecutter/cookiecutter-django/pull/4277))
+
+- Update pytest to 7.3.1 ([#4272](https://github.com/cookiecutter/cookiecutter-django/pull/4272))
+
 ## 2023.04.13
 
 ### Updated
diff --git a/setup.py b/setup.py
index eb7d14ffd..57bd1c61b 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.04.13"
+version = "2023.04.15"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 0a23b52b54553958ad77a302479f5159d8c72e84 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sun, 16 Apr 2023 12:59:01 +0100
Subject: [PATCH 2688/2840] Fix syntax in pre-commit config

---
 {{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 5d8670e4a..c47b403a3 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -22,7 +22,7 @@ repos:
     hooks:
       - id: prettier
         args: ['--tab-width', '2', '--single-quote']
-        exclude: {{cookiecutter.project_slug}}/templates/
+        exclude: '{{cookiecutter.project_slug}}/templates/'
 
   - repo: https://github.com/asottile/pyupgrade
     rev: v3.3.1

From 61314f2f9a993225e8db2cb5092eb54d201ed996 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sun, 16 Apr 2023 20:45:52 +0100
Subject: [PATCH 2689/2840] Tweak spacing for nginx container

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

diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index 4d56fbfa8..30d72d61e 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -97,6 +97,7 @@ services:
       - production_postgres_data_backups:/backups:z
   {%- endif %}
   {%- if cookiecutter.cloud_provider == 'None' %}
+
   nginx:
     build:
       context: .

From 1a9d301550ebbe7b00e74438ac48713156232018 Mon Sep 17 00:00:00 2001
From: Birtibu <130974179+Birtibu@users.noreply.github.com>
Date: Tue, 18 Apr 2023 21:42:15 +0200
Subject: [PATCH 2690/2840] Document how to add 3rd party packages with Docker
 (#4279)

* Update developing-locally-docker.rst

Add 3rd party python packages

* Update docs/developing-locally-docker.rst

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>

* Update docs/developing-locally-docker.rst

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>

---------

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 docs/developing-locally-docker.rst | 13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index 935e86020..3dbe6e47d 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -144,6 +144,19 @@ This tells our computer that all future commands are specifically for the dev1 m
 
     $ eval "$(docker-machine env dev1)"
 
+Add 3rd party python packages
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+To install a new 3rd party python package, you cannot use ``pip install <package_name>``, that would only add the package to the container. The container is ephemeral, so that new library won't be persisted if you run another container. Instead, you should modify the Docker image:
+You have to modify the relevant requirement file: base, local or production by adding: ::
+
+    <package_name>==<package_version>
+
+To get this change picked up, you'll need to rebuild the image(s) and restart the running container: ::
+
+    docker-compose -f local.yml build
+    docker-compose -f local.yml up
+
 Debugging
 ~~~~~~~~~
 

From dd1474989144b0f140fa9af19df18695bb103847 Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Tue, 18 Apr 2023 19:42:53 +0000
Subject: [PATCH 2691/2840] 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 ca5762fe8..37c85e1bc 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1387,5 +1387,10 @@
     "name": "Morten Kaae",
     "github_login": "MortenKaae",
     "twitter_username": ""
+  },
+  {
+    "name": "Birtibu",
+    "github_login": "Birtibu",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 47ece91dc..340588a9a 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -369,6 +369,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Birtibu</td>
+    <td>
+      <a href="https://github.com/Birtibu">Birtibu</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Bo Lopker</td>
     <td>

From cbcade52ca6c7bfff57e3b80b3fd132124bef06d Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 19 Apr 2023 02:19:15 +0000
Subject: [PATCH 2692/2840] Release 2023.04.18

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 77dcc36b6..56bea8264 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.04.18
+
+
+### Documentation
+
+- Document how to add 3rd party packages with Docker ([#4279](https://github.com/cookiecutter/cookiecutter-django/pull/4279))
+
 ## 2023.04.15
 
 
diff --git a/setup.py b/setup.py
index 57bd1c61b..caf384306 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.04.15"
+version = "2023.04.18"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From b63d53b16d93e1e32ed4aae9ac52f50efba0cdd6 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 19 Apr 2023 10:50:42 -0500
Subject: [PATCH 2693/2840] Update sentry-sdk to 1.20.0 (#4282)

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

From 46a8845467961b5e34bcdd7a829f435cea10cbba Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 20 Apr 2023 02:17:50 +0000
Subject: [PATCH 2694/2840] Release 2023.04.19

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56bea8264..6bcf9947c 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.04.19
+
+
+### Updated
+
+- Update sentry-sdk to 1.20.0 ([#4282](https://github.com/cookiecutter/cookiecutter-django/pull/4282))
+
 ## 2023.04.18
 
 
diff --git a/setup.py b/setup.py
index caf384306..feb62dd81 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.04.18"
+version = "2023.04.19"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 7d4dd985342b59f5550dfee3480715fedf9568b0 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 24 Apr 2023 01:28:46 -0500
Subject: [PATCH 2695/2840] Update sphinx to 6.2.0 (#4285)

* Update sphinx from 6.1.3 to 6.2.0

* Update sphinx from 6.1.3 to 6.2.0
---
 docs/requirements.txt                                | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index c16401c84..739c1d4a6 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,3 +1,3 @@
-sphinx==6.1.3
+sphinx==6.2.0
 sphinx-rtd-theme==1.2.0
 myst-parser==1.0.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index a867b0673..bef7edf87 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -23,7 +23,7 @@ djangorestframework-stubs==1.10.0  # https://github.com/typeddjango/djangorestfr
 
 # Documentation
 # ------------------------------------------------------------------------------
-sphinx==6.1.3  # https://github.com/sphinx-doc/sphinx
+sphinx==6.2.0  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From db0d78be8ac9bd65ae0fce7aaa4f89fd5552d11f Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 24 Apr 2023 07:29:28 +0100
Subject: [PATCH 2696/2840] Auto-update pre-commit hooks (#4286)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                               | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 930465a57..7b477739a 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -17,7 +17,7 @@ repos:
       - id: detect-private-key
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: "v3.0.0-alpha.6"
+    rev: "v3.0.0-alpha.8-for-vscode"
     hooks:
       - id: prettier
         args: ["--tab-width", "2"]
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index c47b403a3..42bbbc2cd 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -18,7 +18,7 @@ repos:
       - id: detect-private-key
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.0-alpha.6
+    rev: v3.0.0-alpha.8-for-vscode
     hooks:
       - id: prettier
         args: ['--tab-width', '2', '--single-quote']

From b177e4a8f4c5c755baf4feb3a5a5ef65c0c2dc2f Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 25 Apr 2023 02:18:35 +0000
Subject: [PATCH 2697/2840] Release 2023.04.24

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6bcf9947c..44a36da44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.04.24
+
+
+### Updated
+
+- Auto-update pre-commit hooks ([#4286](https://github.com/cookiecutter/cookiecutter-django/pull/4286))
+
+- Update sphinx to 6.2.0 ([#4285](https://github.com/cookiecutter/cookiecutter-django/pull/4285))
+
 ## 2023.04.19
 
 
diff --git a/setup.py b/setup.py
index feb62dd81..f72aa3d27 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.04.19"
+version = "2023.04.24"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 36455a3b30e184039cc10a16eef85216338bdf0f Mon Sep 17 00:00:00 2001
From: "pre-commit-ci[bot]"
 <66853113+pre-commit-ci[bot]@users.noreply.github.com>
Date: Tue, 25 Apr 2023 09:11:16 +0100
Subject: [PATCH 2698/2840] [pre-commit.ci] pre-commit autoupdate (#4289)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

updates:
- [github.com/pre-commit/mirrors-prettier: v3.0.0-alpha.8-for-vscode → v3.0.0-alpha.9-for-vscode](https://github.com/pre-commit/mirrors-prettier/compare/v3.0.0-alpha.8-for-vscode...v3.0.0-alpha.9-for-vscode)
- [github.com/asottile/pyupgrade: v3.3.1 → v3.3.2](https://github.com/asottile/pyupgrade/compare/v3.3.1...v3.3.2)

Co-authored-by: pre-commit-ci[bot] <66853113+pre-commit-ci[bot]@users.noreply.github.com>
---
 .pre-commit-config.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 7b477739a..9445866f5 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -17,13 +17,13 @@ repos:
       - id: detect-private-key
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: "v3.0.0-alpha.8-for-vscode"
+    rev: "v3.0.0-alpha.9-for-vscode"
     hooks:
       - id: prettier
         args: ["--tab-width", "2"]
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.1
+    rev: v3.3.2
     hooks:
       - id: pyupgrade
         args: [--py311-plus]

From 9af5be6c613c0473be79e037b366606208d5d8bf Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Tue, 25 Apr 2023 09:11:50 +0100
Subject: [PATCH 2699/2840] Auto-update pre-commit hooks (#4288)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 {{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 42bbbc2cd..d638c776b 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -18,14 +18,14 @@ repos:
       - id: detect-private-key
 
   - repo: https://github.com/pre-commit/mirrors-prettier
-    rev: v3.0.0-alpha.8-for-vscode
+    rev: v3.0.0-alpha.9-for-vscode
     hooks:
       - id: prettier
         args: ['--tab-width', '2', '--single-quote']
         exclude: '{{cookiecutter.project_slug}}/templates/'
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.1
+    rev: v3.3.2
     hooks:
       - id: pyupgrade
         args: [--py311-plus]

From ebbb4b36738c54bcd314112a6fbb06ebbe9d15ab Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 25 Apr 2023 09:13:42 +0100
Subject: [PATCH 2700/2840] Bump traefik from 2.9.10 to 2.10.0 (#4290)

Bumps traefik from 2.9.10 to 2.10.0.

---
updated-dependencies:
- dependency-name: traefik
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../compose/production/traefik/Dockerfile                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
index 7b053059d..30470d029 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
@@ -1,4 +1,4 @@
-FROM traefik:2.9.10
+FROM traefik:2.10.0
 RUN mkdir -p /etc/traefik/acme \
   && touch /etc/traefik/acme/acme.json \
   && chmod 600 /etc/traefik/acme/acme.json

From e0d2ff7761d4936b6e2c0aaa9d61ad3a7addae4f Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 25 Apr 2023 03:36:27 -0500
Subject: [PATCH 2701/2840] Update tox to 4.5.0 (#4287)

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index f2216be6d..75b377c5b 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ pre-commit==3.2.2
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.4.12
+tox==4.5.0
 pytest==7.3.1
 pytest-xdist==3.2.1
 pytest-cookies==0.7.0

From 15c933c206e721b58e39f20a7bb849a079dd85f4 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Tue, 25 Apr 2023 10:44:02 +0200
Subject: [PATCH 2702/2840] Fix comment typos in Dockerfiles

---
 {{cookiecutter.project_slug}}/compose/local/django/Dockerfile   | 2 +-
 {{cookiecutter.project_slug}}/compose/local/docs/Dockerfile     | 2 +-
 .../compose/production/django/Dockerfile                        | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index 1d5c14afc..db48870d8 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -1,4 +1,4 @@
-# define an alias for the specfic python version used in this file.
+# define an alias for the specific python version used in this file.
 FROM python:3.11.3-slim-bullseye as python
 
 # Python build stage
diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
index f8bcc35bd..8239a6635 100644
--- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
@@ -1,4 +1,4 @@
-# define an alias for the specfic python version used in this file.
+# define an alias for the specific python version used in this file.
 FROM python:3.11.3-slim-bullseye as python
 
 
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index 84c702db0..33222c524 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -24,7 +24,7 @@ ENV DJANGO_AZURE_ACCOUNT_NAME=${DJANGO_AZURE_ACCOUNT_NAME}
 RUN npm run build
 
 {%- endif %}
-# define an alias for the specfic python version used in this file.
+# define an alias for the specific python version used in this file.
 FROM python:3.11.3-slim-bullseye as python
 
 # Python build stage

From 50364f9d1077b3b7292678b4bab0de11b0cd413f Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 25 Apr 2023 12:49:21 -0500
Subject: [PATCH 2703/2840] Update sphinx to 6.2.1 (#4292)

* Update sphinx from 6.2.0 to 6.2.1

* Update sphinx from 6.2.0 to 6.2.1
---
 docs/requirements.txt                                | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 739c1d4a6..d3dd61dc6 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,3 +1,3 @@
-sphinx==6.2.0
+sphinx==6.2.1
 sphinx-rtd-theme==1.2.0
 myst-parser==1.0.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index bef7edf87..4578903ee 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -23,7 +23,7 @@ djangorestframework-stubs==1.10.0  # https://github.com/typeddjango/djangorestfr
 
 # Documentation
 # ------------------------------------------------------------------------------
-sphinx==6.2.0  # https://github.com/sphinx-doc/sphinx
+sphinx==6.2.1  # https://github.com/sphinx-doc/sphinx
 sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 
 # Code quality

From 0444b6d5deb9f58a6cedc379df6eff3d1403e9b6 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 25 Apr 2023 12:49:32 -0500
Subject: [PATCH 2704/2840] Update sentry-sdk from 1.20.0 to 1.21.0 (#4293)

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

From 6f7871d2a8c00a47dce54fa568be4481967fb849 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 26 Apr 2023 02:18:44 +0000
Subject: [PATCH 2705/2840] Release 2023.04.25

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 44a36da44..ca975eaee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.04.25
+
+
+### Updated
+
+- Update sentry-sdk to 1.21.0 ([#4293](https://github.com/cookiecutter/cookiecutter-django/pull/4293))
+
+- Update sphinx to 6.2.1 ([#4292](https://github.com/cookiecutter/cookiecutter-django/pull/4292))
+
+- Bump traefik from 2.9.10 to 2.10.0 ([#4290](https://github.com/cookiecutter/cookiecutter-django/pull/4290))
+
+- Auto-update pre-commit hooks ([#4288](https://github.com/cookiecutter/cookiecutter-django/pull/4288))
+
 ## 2023.04.24
 
 
diff --git a/setup.py b/setup.py
index f72aa3d27..f396dff2c 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.04.24"
+version = "2023.04.25"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 956d851039f6d8859a9e6ba9f0fc6d4124f23d1c Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 26 Apr 2023 01:54:46 -0500
Subject: [PATCH 2706/2840] Update werkzeug to 2.3.0 (#4296)

---
 {{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 4578903ee..4d15033b7 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,6 +1,6 @@
 -r base.txt
 
-Werkzeug[watchdog]==2.2.3 # https://github.com/pallets/werkzeug
+Werkzeug[watchdog]==2.3.0 # https://github.com/pallets/werkzeug
 ipdb==0.13.13  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.9.6  # https://github.com/psycopg/psycopg2

From 3b68594197b9881250ca27adc6e03cdf998fb004 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 26 Apr 2023 01:55:56 -0500
Subject: [PATCH 2707/2840] Update mypy to 1.2.0 (#4295)

---
 {{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 4d15033b7..a06d6eab5 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -13,7 +13,7 @@ watchfiles==0.19.0  # https://github.com/samuelcolvin/watchfiles
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==1.1.1  # https://github.com/python/mypy
+mypy==1.2.0  # https://github.com/python/mypy
 django-stubs==1.16.0  # https://github.com/typeddjango/django-stubs
 pytest==7.3.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.7  # https://github.com/Frozenball/pytest-sugar

From 16c203fde1d02a5d02ed2df0eac625a02f6516aa Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 26 Apr 2023 01:57:20 -0500
Subject: [PATCH 2708/2840] Update coverage to 7.2.3 (#4297)

---
 {{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 a06d6eab5..887954a59 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==6.0.0  # https://github.com/PyCQA/flake8
 flake8-isort==6.0.0  # https://github.com/gforcada/flake8-isort
-coverage==7.2.2  # https://github.com/nedbat/coveragepy
+coverage==7.2.3  # https://github.com/nedbat/coveragepy
 black==23.3.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 5bc3df765070abe2187ad3c45983c3ae73bb9d58 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Apr 2023 08:06:56 +0100
Subject: [PATCH 2709/2840] Upgrade to node v18 (#4294)

* Bump node in /{{cookiecutter.project_slug}}/compose/local/node

Bumps node from 16-bullseye-slim to 18-bullseye-slim.

---
updated-dependencies:
- dependency-name: node
  dependency-type: direct:production
...

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

* Update to node 18 in prod Dockerfile

* Update to node 18 in package.json

* Update node version in CI

* Update node version in documentation

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
---
 .github/workflows/ci.yml                                        | 2 +-
 docs/developing-locally.rst                                     | 2 +-
 {{cookiecutter.project_slug}}/compose/local/node/Dockerfile     | 2 +-
 .../compose/production/django/Dockerfile                        | 2 +-
 {{cookiecutter.project_slug}}/package.json                      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index aee923ba4..dbda77b5e 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -110,6 +110,6 @@ jobs:
         run: pip install -r requirements.txt
       - uses: actions/setup-node@v3
         with:
-          node-version: "16"
+          node-version: "18"
       - name: Bare Metal ${{ matrix.script.name }}
         run: sh tests/test_bare.sh ${{ matrix.script.args }}
diff --git a/docs/developing-locally.rst b/docs/developing-locally.rst
index b8655a84c..b79033aaa 100644
--- a/docs/developing-locally.rst
+++ b/docs/developing-locally.rst
@@ -174,7 +174,7 @@ Sass Compilation & Live Reloading
 
 If you've opted for Gulp or Webpack as front-end pipeline, the project comes configured with `Sass`_ compilation and `live reloading`_. As you change you Sass/JS source files, the task runner will automatically rebuild the corresponding CSS and JS assets and reload them in your browser without refreshing the page.
 
-#. Make sure that `Node.js`_ v16 is installed on your machine.
+#. Make sure that `Node.js`_ v18 is installed on your machine.
 #. In the project root, install the JS dependencies with::
 
     $ npm install
diff --git a/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile
index 8062fa689..707ed0c9d 100644
--- a/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/node/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:16-bullseye-slim
+FROM node:18-bullseye-slim
 
 WORKDIR /app
 
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index 33222c524..4c8695a57 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -1,5 +1,5 @@
 {% if cookiecutter.frontend_pipeline in ['Gulp', 'Webpack'] -%}
-FROM node:16-bullseye-slim as client-builder
+FROM node:18-bullseye-slim as client-builder
 
 ARG APP_HOME=/app
 WORKDIR ${APP_HOME}
diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json
index 90ac63763..a04cf41f5 100644
--- a/{{cookiecutter.project_slug}}/package.json
+++ b/{{cookiecutter.project_slug}}/package.json
@@ -35,7 +35,7 @@
     "webpack-merge": "^5.8.0"
   },
   "engines": {
-    "node": "16"
+    "node": "18"
   },
   "browserslist": [
     "last 2 versions"

From 3198750b385195731cc638a54b023e37752626da Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Apr 2023 08:47:17 +0100
Subject: [PATCH 2710/2840] Upgrade concurrently to 8.0.1 (#4237)

Bumps [concurrently](https://github.com/open-cli-tools/concurrently) from 7.6.0 to 8.0.1.
- [Release notes](https://github.com/open-cli-tools/concurrently/releases)
- [Commits](https://github.com/open-cli-tools/concurrently/compare/v7.6.0...v8.0.1)

---
updated-dependencies:
- dependency-name: concurrently
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json
index a04cf41f5..d6cdf6a70 100644
--- a/{{cookiecutter.project_slug}}/package.json
+++ b/{{cookiecutter.project_slug}}/package.json
@@ -11,7 +11,7 @@
     "browser-sync": "^2.27.7",
     "css-loader": "^6.5.1",
     "gulp-concat": "^2.6.1",
-    "concurrently": "^7.0.0",
+    "concurrently": "^8.0.1",
     "cssnano": "^5.0.11",
     "gulp": "^4.0.2",
     "gulp-imagemin": "^7.1.0",

From 3a9882e92c05e184732afb933b07a9263c3f4281 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 26 Apr 2023 09:22:00 +0100
Subject: [PATCH 2711/2840] Upgrade cssnano to v6.0.0 (#4233)

Bumps [cssnano](https://github.com/cssnano/cssnano) from 5.1.15 to 6.0.0.
- [Release notes](https://github.com/cssnano/cssnano/releases)
- [Commits](https://github.com/cssnano/cssnano/compare/cssnano@5.1.15...cssnano@6.0.0)

---
updated-dependencies:
- dependency-name: cssnano
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json
index d6cdf6a70..c60a7243e 100644
--- a/{{cookiecutter.project_slug}}/package.json
+++ b/{{cookiecutter.project_slug}}/package.json
@@ -12,7 +12,7 @@
     "css-loader": "^6.5.1",
     "gulp-concat": "^2.6.1",
     "concurrently": "^8.0.1",
-    "cssnano": "^5.0.11",
+    "cssnano": "^6.0.0",
     "gulp": "^4.0.2",
     "gulp-imagemin": "^7.1.0",
     "gulp-plumber": "^1.2.1",

From 66660f41e63468b332906751ffb22f428d1d0bbf Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Wed, 26 Apr 2023 10:29:07 +0200
Subject: [PATCH 2712/2840] Update cdn js URLs to latest Bootstrap

---
 {{cookiecutter.project_slug}}/package.json                    | 2 +-
 .../{{cookiecutter.project_slug}}/templates/base.html         | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json
index c60a7243e..affcd2e01 100644
--- a/{{cookiecutter.project_slug}}/package.json
+++ b/{{cookiecutter.project_slug}}/package.json
@@ -7,7 +7,7 @@
     "@popperjs/core": "^2.10.2",
     "autoprefixer": "^10.4.0",
     "babel-loader": "^9.1.2",
-    "bootstrap": "^5.1.3",
+    "bootstrap": "^5.2.3",
     "browser-sync": "^2.27.7",
     "css-loader": "^6.5.1",
     "gulp-concat": "^2.6.1",
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
index ad51a6e18..44f0d5c52 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -20,7 +20,7 @@
     {%- if cookiecutter.frontend_pipeline in ['None', 'Django Compressor'] %}
     {%- raw %}
     <!-- Latest compiled and minified Bootstrap CSS -->
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.3/css/bootstrap.min.css" integrity="sha512-GQGU0fMMi238uA+a/bdWJfpUGKUkBdgfFdgBm72SUQ6BeyWjoY/ton0tEjH+OSH9iP4Dfh+7HM0I9f5eR0L/4w==" crossorigin="anonymous" referrerpolicy="no-referrer" />
+    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.2.3/css/bootstrap.min.css" integrity="sha512-SbiR/eusphKoMVVXysTKG/7VseWii+Y3FdHrt0EpKgpToZeemhqHeZeLWLhJutz/2ut2Vw1uQEj2MbRF+TVBUA==" crossorigin="anonymous" referrerpolicy="no-referrer" />
     {%- endraw %}
     {%- endif %}
     {%- raw %}
@@ -51,7 +51,7 @@
       {% render_bundle 'vendors' 'js' attrs='defer' %}
       {%- endraw %}{% else %}{% raw %}
       <!-- Bootstrap JS -->
-      <script defer src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.1.3/js/bootstrap.min.js" integrity="sha512-OvBgP9A2JBgiRad/mM36mkzXSXaJE9BEIENnVEmeZdITvwT09xnxLtT4twkCa8m/loMbPHsvPl0T8lRGVBwjlQ==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
+      <script defer src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.2.3/js/bootstrap.min.js" integrity="sha512-1/RvZTcCDEUjY/CypiMz+iqqtaoQfAITmNSJY17Myp4Ms5mdxPS5UV7iOfdZoxcGhzFbOm6sntTKJppjvuhg4g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
       <!-- Your stuff: Third-party javascript libraries go here -->
       {%- endraw %}{% endif %}{% raw %}
 

From 83997366016386260470d6147020192508609d4d Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 26 Apr 2023 16:09:20 -0500
Subject: [PATCH 2713/2840] Update tox from 4.5.0 to 4.5.1 (#4299)

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

diff --git a/requirements.txt b/requirements.txt
index 75b377c5b..bb4d2adb4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -11,7 +11,7 @@ pre-commit==3.2.2
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.5.0
+tox==4.5.1
 pytest==7.3.1
 pytest-xdist==3.2.1
 pytest-cookies==0.7.0

From f6e9f2c8182201e72dda3a8ac6f89fe85acc655f Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 26 Apr 2023 16:09:48 -0500
Subject: [PATCH 2714/2840] Update requests from 2.28.2 to 2.29.0 (#4300)

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

diff --git a/requirements.txt b/requirements.txt
index bb4d2adb4..0748004e8 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -23,4 +23,4 @@ pyyaml==6.0
 PyGithub==1.58.1
 gitpython==3.1.31
 jinja2==3.1.2
-requests==2.28.2
+requests==2.29.0

From 5cb3b33122b88c059c48fc33928689baa2ee47fd Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 27 Apr 2023 02:18:40 +0000
Subject: [PATCH 2715/2840] Release 2023.04.26

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ca975eaee..a204f8973 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,23 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.04.26
+
+
+### Updated
+
+- Upgrade cssnano to v6.0.0 ([#4233](https://github.com/cookiecutter/cookiecutter-django/pull/4233))
+
+- Upgrade concurrently to 8.0.1 ([#4237](https://github.com/cookiecutter/cookiecutter-django/pull/4237))
+
+- Upgrade to node v18 ([#4294](https://github.com/cookiecutter/cookiecutter-django/pull/4294))
+
+- Update coverage to 7.2.3 ([#4297](https://github.com/cookiecutter/cookiecutter-django/pull/4297))
+
+- Update mypy to 1.2.0 ([#4295](https://github.com/cookiecutter/cookiecutter-django/pull/4295))
+
+- Update werkzeug to 2.3.0 ([#4296](https://github.com/cookiecutter/cookiecutter-django/pull/4296))
+
 ## 2023.04.25
 
 
diff --git a/setup.py b/setup.py
index f396dff2c..8d97078d8 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.04.25"
+version = "2023.04.26"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From fe49a2cbe526da7627d7ab69e7b0bcbcae8aa416 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 27 Apr 2023 09:39:01 -0500
Subject: [PATCH 2716/2840] Update django-stubs to 4.2.0 (#4301)

---
 {{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 887954a59..6129fdef6 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -14,7 +14,7 @@ watchfiles==0.19.0  # https://github.com/samuelcolvin/watchfiles
 # Testing
 # ------------------------------------------------------------------------------
 mypy==1.2.0  # https://github.com/python/mypy
-django-stubs==1.16.0  # https://github.com/typeddjango/django-stubs
+django-stubs==4.2.0  # https://github.com/typeddjango/django-stubs
 pytest==7.3.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.7  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}

From a8f5c55455cd126801be61ec06ef59c01d227e62 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 27 Apr 2023 09:56:51 -0500
Subject: [PATCH 2717/2840] Update werkzeug to 2.3.1 (#4302)

---
 {{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 6129fdef6..0b729ee56 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,6 +1,6 @@
 -r base.txt
 
-Werkzeug[watchdog]==2.3.0 # https://github.com/pallets/werkzeug
+Werkzeug[watchdog]==2.3.1 # https://github.com/pallets/werkzeug
 ipdb==0.13.13  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.9.6  # https://github.com/psycopg/psycopg2

From d0d679bb97fa7481bd986c013a49acfe7c83cbc3 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 27 Apr 2023 12:55:44 -0500
Subject: [PATCH 2718/2840] Update djangorestframework-stubs from 1.10.0 to
 3.14.0 (#4303)

---
 {{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 0b729ee56..bac28ecfa 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -18,7 +18,7 @@ django-stubs==4.2.0  # https://github.com/typeddjango/django-stubs
 pytest==7.3.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.7  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
-djangorestframework-stubs==1.10.0  # https://github.com/typeddjango/djangorestframework-stubs
+djangorestframework-stubs==3.14.0  # https://github.com/typeddjango/djangorestframework-stubs
 {%- endif %}
 
 # Documentation

From 9d821ee82b27ab9376d0c1f2ffb490b289fde389 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 28 Apr 2023 02:18:55 +0000
Subject: [PATCH 2719/2840] Release 2023.04.27

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a204f8973..093cf98ef 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 -->
 
+## 2023.04.27
+
+
+### Updated
+
+- Update djangorestframework-stubs to 3.14.0 ([#4303](https://github.com/cookiecutter/cookiecutter-django/pull/4303))
+
+- Update werkzeug to 2.3.1 ([#4302](https://github.com/cookiecutter/cookiecutter-django/pull/4302))
+
+- Update django-stubs to 4.2.0 ([#4301](https://github.com/cookiecutter/cookiecutter-django/pull/4301))
+
 ## 2023.04.26
 
 
diff --git a/setup.py b/setup.py
index 8d97078d8..bc1345965 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.04.26"
+version = "2023.04.27"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From c88f8ef37a2fa333600ef3603d30282ae242cb1e Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 28 Apr 2023 08:56:22 +0100
Subject: [PATCH 2720/2840] Add django-upgrade to pre-commit hooks (#4298)

---
 requirements.txt                              |  1 +
 tests/test_cookiecutter_generation.py         | 27 +++++++++++++++++--
 .../.pre-commit-config.yaml                   |  6 +++++
 3 files changed, 32 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 0748004e8..5e3b3f468 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,6 +7,7 @@ binaryornot==0.4.4
 black==23.3.0
 isort==5.12.0
 flake8==6.0.0
+django-upgrade==1.13.0
 pre-commit==3.2.2
 
 # Testing
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 9837be3ef..778e3411f 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -1,3 +1,4 @@
+import glob
 import os
 import re
 import sys
@@ -24,6 +25,7 @@ elif sys.platform.startswith("darwin") and os.getenv("CI"):
 # automatically by running pre-commit after generation however they are tedious
 # to fix in the template, so we don't insist too much in fixing them.
 AUTOFIXABLE_STYLES = os.getenv("AUTOFIXABLE_STYLES") == "1"
+auto_fixable = pytest.mark.skipif(not AUTOFIXABLE_STYLES, reason="auto-fixable")
 
 
 @pytest.fixture
@@ -185,7 +187,7 @@ def test_flake8_passes(cookies, context_override):
         pytest.fail(e.stdout.decode())
 
 
-@pytest.mark.skipif(not AUTOFIXABLE_STYLES, reason="Black is auto-fixable")
+@auto_fixable
 @pytest.mark.parametrize("context_override", SUPPORTED_COMBINATIONS, ids=_fixture_id)
 def test_black_passes(cookies, context_override):
     """Check whether generated project passes black style."""
@@ -204,7 +206,7 @@ def test_black_passes(cookies, context_override):
         pytest.fail(e.stdout.decode())
 
 
-@pytest.mark.skipif(not AUTOFIXABLE_STYLES, reason="isort is auto-fixable")
+@auto_fixable
 @pytest.mark.parametrize("context_override", SUPPORTED_COMBINATIONS, ids=_fixture_id)
 def test_isort_passes(cookies, context_override):
     """Check whether generated project passes isort style."""
@@ -216,6 +218,27 @@ def test_isort_passes(cookies, context_override):
         pytest.fail(e.stdout.decode())
 
 
+@auto_fixable
+@pytest.mark.parametrize("context_override", SUPPORTED_COMBINATIONS, ids=_fixture_id)
+def test_django_upgrade_passes(cookies, context_override):
+    """Check whether generated project passes django-upgrade."""
+    result = cookies.bake(extra_context=context_override)
+
+    python_files = [
+        file_path.removeprefix(f"{result.project_path}/")
+        for file_path in glob.glob(str(result.project_path / "**" / "*.py"), recursive=True)
+    ]
+    try:
+        sh.django_upgrade(
+            "--target-version",
+            "4.1",
+            *python_files,
+            _cwd=str(result.project_path),
+        )
+    except sh.ErrorReturnCode as e:
+        pytest.fail(e.stdout.decode())
+
+
 @pytest.mark.parametrize(
     ["use_docker", "expected_test_script"],
     [
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index d638c776b..cd64098a8 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -24,6 +24,12 @@ repos:
         args: ['--tab-width', '2', '--single-quote']
         exclude: '{{cookiecutter.project_slug}}/templates/'
 
+  - repo: https://github.com/adamchainz/django-upgrade
+    rev: "1.13.0"
+    hooks:
+      - id: django-upgrade
+        args: ["--target-version", "4.1"]
+
   - repo: https://github.com/asottile/pyupgrade
     rev: v3.3.2
     hooks:

From c570e146ec53b46f47313dc6895be8677fa64e94 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 29 Apr 2023 02:18:04 +0000
Subject: [PATCH 2721/2840] Release 2023.04.28

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 093cf98ef..128c5d960 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.04.28
+
+
+### Changed
+
+- Add django-upgrade to pre-commit hooks ([#4298](https://github.com/cookiecutter/cookiecutter-django/pull/4298))
+
 ## 2023.04.27
 
 
diff --git a/setup.py b/setup.py
index bc1345965..25f36db70 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.04.27"
+version = "2023.04.28"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 3240a0709b7abd6cab0cf890b854deab7ed79193 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 2 May 2023 02:30:51 -0500
Subject: [PATCH 2722/2840] Update werkzeug from 2.3.1 to 2.3.3 (#4307)

---
 {{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 bac28ecfa..a1d232925 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,6 +1,6 @@
 -r base.txt
 
-Werkzeug[watchdog]==2.3.1 # https://github.com/pallets/werkzeug
+Werkzeug[watchdog]==2.3.3 # https://github.com/pallets/werkzeug
 ipdb==0.13.13  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.9.6  # https://github.com/psycopg/psycopg2

From 964c27a8aef4d6e565b2853fb358412e15adc9fa Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 2 May 2023 02:31:47 -0500
Subject: [PATCH 2723/2840] Update uvicorn from 0.21.1 to 0.22.0 (#4305)

---
 {{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 46b38314f..23ea46dda 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -24,7 +24,7 @@ flower==1.2.0  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}
-uvicorn[standard]==0.21.1  # https://github.com/encode/uvicorn
+uvicorn[standard]==0.22.0  # https://github.com/encode/uvicorn
 {%- endif %}
 
 # Django

From ffe666f2ddfc1b90bd94fc3a68a854c46a4b7e0a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 2 May 2023 16:28:54 +0100
Subject: [PATCH 2724/2840] Upgrade traefik to 2.10.1 (#4304)

Bumps traefik from 2.10.0 to 2.10.1.

---
updated-dependencies:
- dependency-name: traefik
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../compose/production/traefik/Dockerfile                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
index 30470d029..581bbfebd 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
@@ -1,4 +1,4 @@
-FROM traefik:2.10.0
+FROM traefik:2.10.1
 RUN mkdir -p /etc/traefik/acme \
   && touch /etc/traefik/acme/acme.json \
   && chmod 600 /etc/traefik/acme/acme.json

From 6bf6a87e50fc7f59b2d74448bd441eed70766c7c Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 3 May 2023 02:17:44 +0000
Subject: [PATCH 2725/2840] Release 2023.05.02

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

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 128c5d960..48d464f27 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 -->
 
+## 2023.05.02
+
+
+### Updated
+
+- Upgrade traefik to 2.10.1 ([#4304](https://github.com/cookiecutter/cookiecutter-django/pull/4304))
+
+- Update uvicorn to 0.22.0 ([#4305](https://github.com/cookiecutter/cookiecutter-django/pull/4305))
+
+- Update werkzeug to 2.3.3 ([#4307](https://github.com/cookiecutter/cookiecutter-django/pull/4307))
+
 ## 2023.04.28
 
 
diff --git a/setup.py b/setup.py
index 25f36db70..e727c951b 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.04.28"
+version = "2023.05.02"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 18a8ec3a0b4ad27c6328c95afcfe16bac2fa2700 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Thu, 4 May 2023 09:02:02 +0100
Subject: [PATCH 2726/2840] Remove pytz from dependencies (#4309)

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

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 23ea46dda..d54929c41 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,4 +1,3 @@
-pytz==2023.3  # https://github.com/stub42/pytz
 python-slugify==8.0.1  # https://github.com/un33k/python-slugify
 Pillow==9.5.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}

From 8284e4479f5d8d833335fd1be24cb6fba10e683e Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 4 May 2023 03:02:47 -0500
Subject: [PATCH 2727/2840] Update requests from 2.29.0 to 2.30.0 (#4311)

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

diff --git a/requirements.txt b/requirements.txt
index 5e3b3f468..e180bbe62 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -24,4 +24,4 @@ pyyaml==6.0
 PyGithub==1.58.1
 gitpython==3.1.31
 jinja2==3.1.2
-requests==2.29.0
+requests==2.30.0

From 6af34444761d85e7910b2db4136e62574eb2e96f Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 4 May 2023 03:04:03 -0500
Subject: [PATCH 2728/2840] Update sentry-sdk from 1.21.0 to 1.21.1 (#4312)

---
 {{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 112dd08ec..130f3fb32 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.6  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.21.0  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.21.1  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
 hiredis==2.2.2  # https://github.com/redis/hiredis-py

From 2778552879f8ce4ce994c5569119eaec91c63f3f Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 4 May 2023 03:12:00 -0500
Subject: [PATCH 2729/2840] Update django from 4.1.8 to 4.1.9 (#4313)

---
 {{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 d54929c41..59a82b398 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -28,7 +28,7 @@ uvicorn[standard]==0.22.0  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==4.1.8  # pyup: < 4.2  # https://www.djangoproject.com/
+django==4.1.9  # pyup: < 4.2  # https://www.djangoproject.com/
 django-environ==0.10.0  # https://github.com/joke2k/django-environ
 django-model-utils==4.3.1  # https://github.com/jazzband/django-model-utils
 django-allauth==0.54.0  # https://github.com/pennersr/django-allauth

From 56863a960bfbed7e0a49bc813a25d410b403e390 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 4 May 2023 03:12:44 -0500
Subject: [PATCH 2730/2840] Update coverage from 7.2.3 to 7.2.5 (#4314)

---
 {{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 a1d232925..fab8ece41 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==6.0.0  # https://github.com/PyCQA/flake8
 flake8-isort==6.0.0  # https://github.com/gforcada/flake8-isort
-coverage==7.2.3  # https://github.com/nedbat/coveragepy
+coverage==7.2.5  # https://github.com/nedbat/coveragepy
 black==23.3.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From d0578306f4b54ef291d2d287b51f10997bf6caee Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 4 May 2023 04:14:34 -0500
Subject: [PATCH 2731/2840] Update pre-commit to 3.3.1 (#4315)

* Update pre-commit from 3.2.2 to 3.3.1

* Update pre-commit from 3.2.2 to 3.3.1
---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index e180bbe62..a92562508 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ black==23.3.0
 isort==5.12.0
 flake8==6.0.0
 django-upgrade==1.13.0
-pre-commit==3.2.2
+pre-commit==3.3.1
 
 # Testing
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index fab8ece41..0fb0bce9d 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -36,7 +36,7 @@ pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}
-pre-commit==3.2.2  # https://github.com/pre-commit/pre-commit
+pre-commit==3.3.1  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From 86fc36ec7ed9f3a56179c61ef971f519d30db494 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 4 May 2023 09:42:37 -0500
Subject: [PATCH 2732/2840] Update django-anymail to 9.2 (#4316)

* Update django-anymail from 9.1 to 9.2

* Update django-anymail from 9.1 to 9.2

* Update django-anymail from 9.1 to 9.2

* Update django-anymail from 9.1 to 9.2

* Update django-anymail from 9.1 to 9.2

* Update django-anymail from 9.1 to 9.2

* Update django-anymail from 9.1 to 9.2

* Update django-anymail from 9.1 to 9.2

* Update django-anymail from 9.1 to 9.2
---
 .../requirements/production.txt                | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 130f3fb32..8fe006e07 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -24,21 +24,21 @@ django-storages[google]==1.13.2  # https://github.com/jschneier/django-storages
 django-storages[azure]==1.13.2  # https://github.com/jschneier/django-storages
 {%- endif %}
 {%- if cookiecutter.mail_service == 'Mailgun' %}
-django-anymail[mailgun]==9.1  # https://github.com/anymail/django-anymail
+django-anymail[mailgun]==9.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
-django-anymail[amazon_ses]==9.1  # https://github.com/anymail/django-anymail
+django-anymail[amazon_ses]==9.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
-django-anymail[mailjet]==9.1  # https://github.com/anymail/django-anymail
+django-anymail[mailjet]==9.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
-django-anymail[mandrill]==9.1  # https://github.com/anymail/django-anymail
+django-anymail[mandrill]==9.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
-django-anymail[postmark]==9.1  # https://github.com/anymail/django-anymail
+django-anymail[postmark]==9.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
-django-anymail[sendgrid]==9.1  # https://github.com/anymail/django-anymail
+django-anymail[sendgrid]==9.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
-django-anymail[sendinblue]==9.1  # https://github.com/anymail/django-anymail
+django-anymail[sendinblue]==9.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
-django-anymail[sparkpost]==9.1  # https://github.com/anymail/django-anymail
+django-anymail[sparkpost]==9.2  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
-django-anymail==9.1  # https://github.com/anymail/django-anymail
+django-anymail==9.2  # https://github.com/anymail/django-anymail
 {%- endif %}

From e75453f7d8be934c8c38f7ee6cbc398c23e4d529 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 5 May 2023 02:16:40 +0000
Subject: [PATCH 2733/2840] Release 2023.05.04

---
 CHANGELOG.md | 21 +++++++++++++++++++++
 setup.py     |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 48d464f27..bccf5bb1e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,27 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.05.04
+
+
+### Changed
+
+- Remove pytz from dependencies ([#4309](https://github.com/cookiecutter/cookiecutter-django/pull/4309))
+
+### Updated
+
+- Update django-anymail to 9.2 ([#4316](https://github.com/cookiecutter/cookiecutter-django/pull/4316))
+
+- Update pre-commit to 3.3.1 ([#4315](https://github.com/cookiecutter/cookiecutter-django/pull/4315))
+
+- Update coverage to 7.2.5 ([#4314](https://github.com/cookiecutter/cookiecutter-django/pull/4314))
+
+- Update django to 4.1.9 ([#4313](https://github.com/cookiecutter/cookiecutter-django/pull/4313))
+
+- Update sentry-sdk to 1.21.1 ([#4312](https://github.com/cookiecutter/cookiecutter-django/pull/4312))
+
+- Update requests to 2.30.0 ([#4311](https://github.com/cookiecutter/cookiecutter-django/pull/4311))
+
 ## 2023.05.02
 
 
diff --git a/setup.py b/setup.py
index e727c951b..ad838117f 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.05.02"
+version = "2023.05.04"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From c3bff996dea960e895593d54092038f6ab87df5a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?=
 <bnafta@gmail.com>
Date: Fri, 5 May 2023 17:23:34 -0300
Subject: [PATCH 2734/2840] Add Fabio to the Support this Project! section on
 Readme

---
 README.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/README.md b/README.md
index 90cbe3379..d718ee34c 100644
--- a/README.md
+++ b/README.md
@@ -59,6 +59,7 @@ _These features can be enabled during initial project setup._
 This project is run by volunteers. Please support them in their efforts to maintain and improve Cookiecutter Django:
 
 - Daniel Roy Greenfeld, Project Lead ([GitHub](https://github.com/pydanny), [Patreon](https://www.patreon.com/danielroygreenfeld)): expertise in Django and AWS ELB.
+- Fabio C. Barrionuevo, Core Developer ([GitHub](https://github.com/luzfcb)): expertise in Python/Django, hands-on DevOps and frontend experience.
 - Nikita Shupeyko, Core Developer ([GitHub](https://github.com/webyneter)): expertise in Python/Django, hands-on DevOps and frontend experience.
 
 Projects that provide financial support to the maintainers:

From 244fa4ee981686e795ed215323a81c5d992bfbde Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Mon, 8 May 2023 15:41:51 +0100
Subject: [PATCH 2735/2840] Fix the build on RTD (#4322)

* Pin urllib3 to v1

* Upgrade docs to Python 3.11

* Unpin urllib3 in docs requirements
---
 .readthedocs.yaml | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/.readthedocs.yaml b/.readthedocs.yaml
index beb30d845..4598ff77c 100644
--- a/.readthedocs.yaml
+++ b/.readthedocs.yaml
@@ -4,12 +4,17 @@
 # Required
 version: 2
 
+# Set the version of Python and other tools you might need
+build:
+  os: ubuntu-22.04
+  tools:
+    python: "3.11"
+
 # Build documentation in the docs/ directory with Sphinx
 sphinx:
   configuration: docs/conf.py
 
-# Version of Python and requirements required to build the docs
+# Declare the Python requirements required to build your docs
 python:
-  version: "3.8"
   install:
     - requirements: docs/requirements.txt

From cd2e3b7783d3a4244c6ba895faa613ea37f1a30c Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 8 May 2023 09:47:13 -0500
Subject: [PATCH 2736/2840] Update sentry-sdk to 1.22.2 (#4321)

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
---
 {{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 8fe006e07..7c22dcd6f 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.6  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.21.1  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.22.2  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
 hiredis==2.2.2  # https://github.com/redis/hiredis-py

From 43efe9a7efce091c55a4dbfa4120e35cd6be7768 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 8 May 2023 15:52:45 +0100
Subject: [PATCH 2737/2840] Auto-update pre-commit hooks (#4320)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                               | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 9445866f5..2c7876d3c 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -23,7 +23,7 @@ repos:
         args: ["--tab-width", "2"]
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.2
+    rev: v3.4.0
     hooks:
       - id: pyupgrade
         args: [--py311-plus]
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index cd64098a8..44e2cd349 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -31,7 +31,7 @@ repos:
         args: ["--target-version", "4.1"]
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.3.2
+    rev: v3.4.0
     hooks:
       - id: pyupgrade
         args: [--py311-plus]

From 7abf93616f70737de9e280503bf1805cadf65092 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 9 May 2023 02:19:03 +0000
Subject: [PATCH 2738/2840] Release 2023.05.08

---
 CHANGELOG.md | 9 +++++++++
 setup.py     | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index bccf5bb1e..df851ccb2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.05.08
+
+
+### Updated
+
+- Auto-update pre-commit hooks ([#4320](https://github.com/cookiecutter/cookiecutter-django/pull/4320))
+
+- Update sentry-sdk to 1.22.2 ([#4321](https://github.com/cookiecutter/cookiecutter-django/pull/4321))
+
 ## 2023.05.04
 
 
diff --git a/setup.py b/setup.py
index ad838117f..39d4532e4 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.05.04"
+version = "2023.05.08"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From a06298121355ef0a9954982d289f1610a42496e0 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 9 May 2023 11:31:35 -0500
Subject: [PATCH 2739/2840] Update werkzeug from 2.3.3 to 2.3.4 (#4325)

---
 {{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 0fb0bce9d..f5fc21d49 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,6 +1,6 @@
 -r base.txt
 
-Werkzeug[watchdog]==2.3.3 # https://github.com/pallets/werkzeug
+Werkzeug[watchdog]==2.3.4 # https://github.com/pallets/werkzeug
 ipdb==0.13.13  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.9.6  # https://github.com/psycopg/psycopg2

From b2de9cc5d9d0be82ebaa59e09c99cf5ceb8cfdf8 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 9 May 2023 11:31:48 -0500
Subject: [PATCH 2740/2840] Update pygithub from 1.58.1 to 1.58.2 (#4326)

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index a92562508..2b4736def 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,7 +21,7 @@ pyyaml==6.0
 
 # Scripting
 # ------------------------------------------------------------------------------
-PyGithub==1.58.1
+PyGithub==1.58.2
 gitpython==3.1.31
 jinja2==3.1.2
 requests==2.30.0

From b5717dd82ba5d4c72cfc2214ad8a4843c862aa18 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 10 May 2023 02:17:49 +0000
Subject: [PATCH 2741/2840] Release 2023.05.09

---
 CHANGELOG.md | 7 +++++++
 setup.py     | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index df851ccb2..39e3c2037 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.05.09
+
+
+### Updated
+
+- Update werkzeug to 2.3.4 ([#4325](https://github.com/cookiecutter/cookiecutter-django/pull/4325))
+
 ## 2023.05.08
 
 
diff --git a/setup.py b/setup.py
index 39d4532e4..79e73e17a 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.05.08"
+version = "2023.05.09"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 54d78f733ef97e3077418affa54cac7b74dbb35d Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Sun, 14 May 2023 21:56:17 +0100
Subject: [PATCH 2742/2840] Use single quotes in pre-commit config

---
 {{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 44e2cd349..3a0411d81 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -25,10 +25,10 @@ repos:
         exclude: '{{cookiecutter.project_slug}}/templates/'
 
   - repo: https://github.com/adamchainz/django-upgrade
-    rev: "1.13.0"
+    rev: '1.13.0'
     hooks:
       - id: django-upgrade
-        args: ["--target-version", "4.1"]
+        args: ['--target-version', '4.1']
 
   - repo: https://github.com/asottile/pyupgrade
     rev: v3.4.0

From f76c2afb0c2f5200d99c2bf958c391ff8082cefe Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 15 May 2023 13:14:07 -0500
Subject: [PATCH 2743/2840] Update pytest-xdist from 3.2.1 to 3.3.0 (#4336)

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 2b4736def..459172945 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,7 +14,7 @@ pre-commit==3.3.1
 # ------------------------------------------------------------------------------
 tox==4.5.1
 pytest==7.3.1
-pytest-xdist==3.2.1
+pytest-xdist==3.3.0
 pytest-cookies==0.7.0
 pytest-instafail==0.5.0
 pyyaml==6.0

From 36b92f4f0d4e0943c692bb58550f749e0d98a6b7 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 15 May 2023 14:36:17 -0500
Subject: [PATCH 2744/2840] Update sentry-sdk from 1.22.2 to 1.23.0 (#4337)

---
 {{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 7c22dcd6f..6ea48f78e 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.6  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.22.2  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.23.0  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
 hiredis==2.2.2  # https://github.com/redis/hiredis-py

From 8ec0f365876c212bee11e16497886ad3b7db4f33 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 15 May 2023 15:21:25 -0500
Subject: [PATCH 2745/2840] Update django-cors-headers from 3.14.0 to 4.0.0
 (#4329)

---
 {{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 59a82b398..0c4b58bf2 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -41,7 +41,7 @@ django-redis==5.2.0  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == 'y' %}
 # Django REST Framework
 djangorestframework==3.14.0  # https://github.com/encode/django-rest-framework
-django-cors-headers==3.14.0  # https://github.com/adamchainz/django-cors-headers
+django-cors-headers==4.0.0  # https://github.com/adamchainz/django-cors-headers
 # DRF-spectacular for api documentation
 drf-spectacular==0.26.2  # https://github.com/tfranzel/drf-spectacular
 {%- endif %}

From 3949f7392284181eb973eea7133a341ff0021aed Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 15 May 2023 18:33:36 -0500
Subject: [PATCH 2746/2840] Update sh to 2.0.4 (#4338)

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 459172945..f308aef60 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,5 +1,5 @@
 cookiecutter==2.1.1
-sh==2.0.3; sys_platform != "win32"
+sh==2.0.4; sys_platform != "win32"
 binaryornot==0.4.4
 
 # Code quality

From d3d19264d7236dc704273a555e3741b26d0f848a Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 16 May 2023 02:19:27 +0000
Subject: [PATCH 2747/2840] Release 2023.05.15

---
 CHANGELOG.md | 9 +++++++++
 setup.py     | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 39e3c2037..16b0786d7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.05.15
+
+
+### Updated
+
+- Update django-cors-headers to 4.0.0 ([#4329](https://github.com/cookiecutter/cookiecutter-django/pull/4329))
+
+- Update sentry-sdk to 1.23.0 ([#4337](https://github.com/cookiecutter/cookiecutter-django/pull/4337))
+
 ## 2023.05.09
 
 
diff --git a/setup.py b/setup.py
index 79e73e17a..f1933ad27 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.05.09"
+version = "2023.05.15"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 3bd669a80d2fd2bc10b2a8b9288f1d47121f4d09 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 17 May 2023 14:03:03 -0500
Subject: [PATCH 2748/2840] Update sentry-sdk from 1.23.0 to 1.23.1 (#4341)

---
 {{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 6ea48f78e..5c140ff6f 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.6  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.23.0  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.23.1  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
 hiredis==2.2.2  # https://github.com/redis/hiredis-py

From bc2d4ed80d781f89d8f6b8ee191e38edcfaea17e Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 18 May 2023 02:18:40 +0000
Subject: [PATCH 2749/2840] Release 2023.05.17

---
 CHANGELOG.md | 7 +++++++
 setup.py     | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 16b0786d7..20e34019e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.05.17
+
+
+### Updated
+
+- Update sentry-sdk to 1.23.1 ([#4341](https://github.com/cookiecutter/cookiecutter-django/pull/4341))
+
 ## 2023.05.15
 
 
diff --git a/setup.py b/setup.py
index f1933ad27..da8ffb55a 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.05.15"
+version = "2023.05.17"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 6f308d4e503359856d7d2bbc0a83cbfb686a564c Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 18 May 2023 11:29:05 -0500
Subject: [PATCH 2750/2840] Update pre-commit to 3.3.2 (#4342)

* Update pre-commit from 3.3.1 to 3.3.2

* Update pre-commit from 3.3.1 to 3.3.2
---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index f308aef60..c924285e3 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ black==23.3.0
 isort==5.12.0
 flake8==6.0.0
 django-upgrade==1.13.0
-pre-commit==3.3.1
+pre-commit==3.3.2
 
 # Testing
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index f5fc21d49..89a3b3b42 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -36,7 +36,7 @@ pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}
-pre-commit==3.3.1  # https://github.com/pre-commit/pre-commit
+pre-commit==3.3.2  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From 7a35191a76f2ce6b4b0709d004580e17ce626601 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 19 May 2023 02:18:55 +0000
Subject: [PATCH 2751/2840] Release 2023.05.18

---
 CHANGELOG.md | 7 +++++++
 setup.py     | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 20e34019e..1fcdedef9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.05.18
+
+
+### Updated
+
+- Update pre-commit to 3.3.2 ([#4342](https://github.com/cookiecutter/cookiecutter-django/pull/4342))
+
 ## 2023.05.17
 
 
diff --git a/setup.py b/setup.py
index da8ffb55a..6adcd3657 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.05.17"
+version = "2023.05.18"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From b0d8916e61d4456ef8a41ee49011c8d20edaab2e Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 23 May 2023 07:39:38 -0500
Subject: [PATCH 2752/2840] Update requests from 2.30.0 to 2.31.0 (#4346)

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index c924285e3..f37b6fef5 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -24,4 +24,4 @@ pyyaml==6.0
 PyGithub==1.58.2
 gitpython==3.1.31
 jinja2==3.1.2
-requests==2.30.0
+requests==2.31.0

From 52c2b0575c73e6414e0bbb2b9fb7a84b5f00dc51 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 23 May 2023 07:40:07 -0500
Subject: [PATCH 2753/2840] Update pytest-xdist from 3.3.0 to 3.3.1 (#4344)

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index f37b6fef5..c06987a2e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -14,7 +14,7 @@ pre-commit==3.3.2
 # ------------------------------------------------------------------------------
 tox==4.5.1
 pytest==7.3.1
-pytest-xdist==3.3.0
+pytest-xdist==3.3.1
 pytest-cookies==0.7.0
 pytest-instafail==0.5.0
 pyyaml==6.0

From 2dab4630dfd66072c6f4fec3e287333a2de31aef Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 23 May 2023 07:42:30 -0500
Subject: [PATCH 2754/2840] Update django-webpack-loader from 1.8.1 to 2.0.0
 (#4345)

---
 {{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 0c4b58bf2..ee00cda7b 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -46,5 +46,5 @@ django-cors-headers==4.0.0  # https://github.com/adamchainz/django-cors-headers
 drf-spectacular==0.26.2  # https://github.com/tfranzel/drf-spectacular
 {%- endif %}
 {%- if cookiecutter.frontend_pipeline == 'Webpack' %}
-django-webpack-loader==1.8.1  # https://github.com/django-webpack/django-webpack-loader
+django-webpack-loader==2.0.0  # https://github.com/django-webpack/django-webpack-loader
 {%- endif %}

From 60a3ee78b891ee5a372f4e1267732ee7e369d9ed Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 23 May 2023 12:32:48 -0300
Subject: [PATCH 2755/2840] Bump webpack-bundle-tracker in
 /{{cookiecutter.project_slug}} (#4347)

Bumps [webpack-bundle-tracker](https://github.com/django-webpack/webpack-bundle-tracker) from 1.8.1 to 2.0.0.
- [Release notes](https://github.com/django-webpack/webpack-bundle-tracker/releases)
- [Commits](https://github.com/django-webpack/webpack-bundle-tracker/compare/1.8.1...2.0.0)

---
updated-dependencies:
- dependency-name: webpack-bundle-tracker
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/package.json b/{{cookiecutter.project_slug}}/package.json
index affcd2e01..fdfd26bf3 100644
--- a/{{cookiecutter.project_slug}}/package.json
+++ b/{{cookiecutter.project_slug}}/package.json
@@ -29,7 +29,7 @@
     "sass": "^1.43.4",
     "sass-loader": "^13.2.0",
     "webpack": "^5.65.0",
-    "webpack-bundle-tracker": "^1.4.0",
+    "webpack-bundle-tracker": "^2.0.0",
     "webpack-cli": "^5.0.1",
     "webpack-dev-server": "^4.6.0",
     "webpack-merge": "^5.8.0"

From 65abf6165ae035fe44938d22e8f04a72211af5d7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?=
 <bnafta@gmail.com>
Date: Tue, 23 May 2023 12:57:52 -0300
Subject: [PATCH 2756/2840] Fix compatibility webpack-bundle-tracker>=2.0.0 js
 library (#4350)

required after upgrade django-webpack-loader to >=2.0.0
---
 {{cookiecutter.project_slug}}/webpack/common.config.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/webpack/common.config.js b/{{cookiecutter.project_slug}}/webpack/common.config.js
index 6aba2bc77..d95434dbd 100644
--- a/{{cookiecutter.project_slug}}/webpack/common.config.js
+++ b/{{cookiecutter.project_slug}}/webpack/common.config.js
@@ -20,7 +20,8 @@ module.exports = {
   },
   plugins: [
     new BundleTracker({
-      filename: path.resolve(__dirname, '../webpack-stats.json'),
+      path: path.resolve(path.join(__dirname, '../')),
+      filename: 'webpack-stats.json',
     }),
     new MiniCssExtractPlugin({ filename: 'css/[name].[contenthash].css' }),
   ],

From ff0bedc0d4c845c20246334e5165ddbc9444dcc1 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 23 May 2023 11:07:05 -0500
Subject: [PATCH 2757/2840] Update sentry-sdk from 1.23.1 to 1.24.0 (#4349)

---
 {{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 5c140ff6f..663619693 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.6  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.23.1  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.24.0  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
 hiredis==2.2.2  # https://github.com/redis/hiredis-py

From 1be71b8b95ea91c1c8ad8a94f29479316b036b55 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 23 May 2023 11:10:26 -0500
Subject: [PATCH 2758/2840] Update sphinx-rtd-theme from 1.2.0 to 1.2.1 (#4348)

---
 docs/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index d3dd61dc6..e37d638b0 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,3 +1,3 @@
 sphinx==6.2.1
-sphinx-rtd-theme==1.2.0
+sphinx-rtd-theme==1.2.1
 myst-parser==1.0.0

From 58980d9b4df7a7fc93ed57938f978489781877f4 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 24 May 2023 02:21:17 +0000
Subject: [PATCH 2759/2840] Release 2023.05.23

---
 CHANGELOG.md | 21 +++++++++++++++++++++
 setup.py     |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1fcdedef9..aa4ab1e39 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,27 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.05.23
+
+
+### Changed
+
+- Fix compatibility webpack-bundle-tracker&gt;=2.0.0 js library required after upgrade django-webpack-loader&gt;=2.0.0 ([#4350](https://github.com/cookiecutter/cookiecutter-django/pull/4350))
+
+### Updated
+
+- Update sphinx-rtd-theme to 1.2.1 ([#4348](https://github.com/cookiecutter/cookiecutter-django/pull/4348))
+
+- Update sentry-sdk to 1.24.0 ([#4349](https://github.com/cookiecutter/cookiecutter-django/pull/4349))
+
+- Bump webpack-bundle-tracker from 1.8.1 to 2.0.0 in /{{cookiecutter.project_slug}} ([#4347](https://github.com/cookiecutter/cookiecutter-django/pull/4347))
+
+- Update django-webpack-loader to 2.0.0 ([#4345](https://github.com/cookiecutter/cookiecutter-django/pull/4345))
+
+- Update pytest-xdist to 3.3.1 ([#4344](https://github.com/cookiecutter/cookiecutter-django/pull/4344))
+
+- Update requests to 2.31.0 ([#4346](https://github.com/cookiecutter/cookiecutter-django/pull/4346))
+
 ## 2023.05.18
 
 
diff --git a/setup.py b/setup.py
index 6adcd3657..6cc61b94c 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.05.18"
+version = "2023.05.23"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 02d2d24b6907ae4fcfdd9c74482615ae7d36c42f Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 24 May 2023 02:10:13 -0500
Subject: [PATCH 2760/2840] Update coverage from 7.2.5 to 7.2.6 (#4351)

---
 {{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 89a3b3b42..431ab9701 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==6.0.0  # https://github.com/PyCQA/flake8
 flake8-isort==6.0.0  # https://github.com/gforcada/flake8-isort
-coverage==7.2.5  # https://github.com/nedbat/coveragepy
+coverage==7.2.6  # https://github.com/nedbat/coveragepy
 black==23.3.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 8d64f1749461310b04a2b512184bb0623fb22ba0 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 24 May 2023 15:51:38 +0100
Subject: [PATCH 2761/2840] Prevent Celery restarts on media file changes
 (#4352)

Fix #4318
---
 .../compose/local/django/celery/beat/start                      | 2 +-
 .../compose/local/django/celery/flower/start                    | 2 +-
 .../compose/local/django/celery/worker/start                    | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
index 61f83968b..8adc4891a 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
@@ -5,4 +5,4 @@ set -o nounset
 
 
 rm -f './celerybeat.pid'
-exec watchfiles celery.__main__.main --args '-A config.celery_app beat -l INFO'
+exec watchfiles --filter python celery.__main__.main --args '-A config.celery_app beat -l INFO'
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start
index ac3cc6b36..b4783d2f0 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start
@@ -3,6 +3,6 @@
 set -o errexit
 set -o nounset
 
-exec watchfiles celery.__main__.main \
+exec watchfiles --filter python celery.__main__.main \
     --args \
     "-A config.celery_app -b \"${CELERY_BROKER_URL}\" flower --basic_auth=\"${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}\""
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
index 16341fdd1..183a80159 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
@@ -4,4 +4,4 @@ set -o errexit
 set -o nounset
 
 
-exec watchfiles celery.__main__.main --args '-A config.celery_app worker -l INFO'
+exec watchfiles --filter python celery.__main__.main --args '-A config.celery_app worker -l INFO'

From ee31a1eb639722a88a4b03af4db31aea8b682488 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 25 May 2023 02:19:11 +0000
Subject: [PATCH 2762/2840] Release 2023.05.24

---
 CHANGELOG.md | 11 +++++++++++
 setup.py     |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index aa4ab1e39..fbb4ca121 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 -->
 
+## 2023.05.24
+
+
+### Fixed
+
+- Prevent Celery restarts on media file changes ([#4352](https://github.com/cookiecutter/cookiecutter-django/pull/4352))
+
+### Updated
+
+- Update coverage to 7.2.6 ([#4351](https://github.com/cookiecutter/cookiecutter-django/pull/4351))
+
 ## 2023.05.23
 
 
diff --git a/setup.py b/setup.py
index 6cc61b94c..1c19b5b5c 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.05.23"
+version = "2023.05.24"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 7585febf580cf9d3bcaff50a8712d4b30f23947e Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 28 May 2023 05:23:26 -0500
Subject: [PATCH 2763/2840] Update tox from 4.5.1 to 4.5.2 (#4354)

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index c06987a2e..4b05c1b1e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==3.3.2
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.5.1
+tox==4.5.2
 pytest==7.3.1
 pytest-xdist==3.3.1
 pytest-cookies==0.7.0

From 4b7cf3e80e402f94afd5504411bb85d96b83fa9d Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Mon, 29 May 2023 02:22:46 +0000
Subject: [PATCH 2764/2840] Release 2023.05.28

---
 CHANGELOG.md | 3 +++
 setup.py     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index fbb4ca121..19c925b52 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.05.28
+
+
 ## 2023.05.24
 
 
diff --git a/setup.py b/setup.py
index 1c19b5b5c..3f1c6457a 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.05.24"
+version = "2023.05.28"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From cb290a6d43b43971bc0e890f8c1bcfbc5ab33078 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 30 May 2023 09:47:46 -0500
Subject: [PATCH 2765/2840] Update coverage to 7.2.7 (#4356)

---
 {{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 431ab9701..187409552 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -30,7 +30,7 @@ sphinx-autobuild==2021.3.14 # https://github.com/GaretJax/sphinx-autobuild
 # ------------------------------------------------------------------------------
 flake8==6.0.0  # https://github.com/PyCQA/flake8
 flake8-isort==6.0.0  # https://github.com/gforcada/flake8-isort
-coverage==7.2.6  # https://github.com/nedbat/coveragepy
+coverage==7.2.7  # https://github.com/nedbat/coveragepy
 black==23.3.0  # https://github.com/psf/black
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}

From 332fa9afa21a99998520297b40b7dd4a5a476351 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 30 May 2023 10:04:26 -0500
Subject: [PATCH 2766/2840] Update django-anymail to 10.0 (#4357)

* Update django-anymail from 9.2 to 10.0

* Update django-anymail from 9.2 to 10.0

* Update django-anymail from 9.2 to 10.0

* Update django-anymail from 9.2 to 10.0

* Update django-anymail from 9.2 to 10.0

* Update django-anymail from 9.2 to 10.0

* Update django-anymail from 9.2 to 10.0

* Update django-anymail from 9.2 to 10.0

* Update django-anymail from 9.2 to 10.0

* Update the 'extra' for Amazon SES

---------

Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
---
 .../requirements/production.txt                | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 663619693..9f0e742af 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -24,21 +24,21 @@ django-storages[google]==1.13.2  # https://github.com/jschneier/django-storages
 django-storages[azure]==1.13.2  # https://github.com/jschneier/django-storages
 {%- endif %}
 {%- if cookiecutter.mail_service == 'Mailgun' %}
-django-anymail[mailgun]==9.2  # https://github.com/anymail/django-anymail
+django-anymail[mailgun]==10.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Amazon SES' %}
-django-anymail[amazon_ses]==9.2  # https://github.com/anymail/django-anymail
+django-anymail[amazon-ses]==10.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mailjet' %}
-django-anymail[mailjet]==9.2  # https://github.com/anymail/django-anymail
+django-anymail[mailjet]==10.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Mandrill' %}
-django-anymail[mandrill]==9.2  # https://github.com/anymail/django-anymail
+django-anymail[mandrill]==10.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Postmark' %}
-django-anymail[postmark]==9.2  # https://github.com/anymail/django-anymail
+django-anymail[postmark]==10.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Sendgrid' %}
-django-anymail[sendgrid]==9.2  # https://github.com/anymail/django-anymail
+django-anymail[sendgrid]==10.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SendinBlue' %}
-django-anymail[sendinblue]==9.2  # https://github.com/anymail/django-anymail
+django-anymail[sendinblue]==10.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'SparkPost' %}
-django-anymail[sparkpost]==9.2  # https://github.com/anymail/django-anymail
+django-anymail[sparkpost]==10.0  # https://github.com/anymail/django-anymail
 {%- elif cookiecutter.mail_service == 'Other SMTP' %}
-django-anymail==9.2  # https://github.com/anymail/django-anymail
+django-anymail==10.0  # https://github.com/anymail/django-anymail
 {%- endif %}

From 062c942ab68571ac488b011040bf39613324cc30 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 30 May 2023 10:04:46 -0500
Subject: [PATCH 2767/2840] Update redis to 4.5.5 (#4358)

---
 {{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 ee00cda7b..73185f355 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -11,7 +11,7 @@ argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==6.4.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==4.5.4  # https://github.com/redis/redis-py
+redis==4.5.5  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.2.2  # https://github.com/redis/hiredis-py
 {%- endif %}

From 8d0ad800e751c52f20d25bb1355f04307c92327e Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 30 May 2023 10:05:20 -0500
Subject: [PATCH 2768/2840] Update django-debug-toolbar to 4.1.0 (#4359)

---
 {{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 187409552..073160be3 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -42,7 +42,7 @@ pre-commit==3.3.2  # https://github.com/pre-commit/pre-commit
 # ------------------------------------------------------------------------------
 factory-boy==3.2.1  # https://github.com/FactoryBoy/factory_boy
 
-django-debug-toolbar==4.0.0  # https://github.com/jazzband/django-debug-toolbar
+django-debug-toolbar==4.1.0  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==3.2.1  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==3.0.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.5.2  # https://github.com/pytest-dev/pytest-django

From 0e89b70e948040174fc3d8900d8dde754570217d Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 30 May 2023 10:05:37 -0500
Subject: [PATCH 2769/2840] Update hiredis to 2.2.3 (#4360)

* Update hiredis from 2.2.2 to 2.2.3

* Update hiredis from 2.2.2 to 2.2.3
---
 {{cookiecutter.project_slug}}/requirements/base.txt       | 2 +-
 {{cookiecutter.project_slug}}/requirements/production.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 73185f355..6f33acb7e 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -13,7 +13,7 @@ whitenoise==6.4.0  # https://github.com/evansd/whitenoise
 {%- endif %}
 redis==4.5.5  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
-hiredis==2.2.2  # https://github.com/redis/hiredis-py
+hiredis==2.2.3  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
 celery==5.2.7  # pyup: < 6.0  # https://github.com/celery/celery
diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt
index 9f0e742af..bbe502ba5 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.24.0  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
-hiredis==2.2.2  # https://github.com/redis/hiredis-py
+hiredis==2.2.3  # https://github.com/redis/hiredis-py
 {%- endif %}
 
 # Django

From 00b22bc02d6c1668972cf61a6632dbbb200b8a86 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 31 May 2023 02:31:12 +0000
Subject: [PATCH 2770/2840] Release 2023.05.30

---
 CHANGELOG.md | 15 +++++++++++++++
 setup.py     |  2 +-
 2 files changed, 16 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 19c925b52..c99a80f2e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,21 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.05.30
+
+
+### Updated
+
+- Update hiredis to 2.2.3 ([#4360](https://github.com/cookiecutter/cookiecutter-django/pull/4360))
+
+- Update django-debug-toolbar to 4.1.0 ([#4359](https://github.com/cookiecutter/cookiecutter-django/pull/4359))
+
+- Update redis to 4.5.5 ([#4358](https://github.com/cookiecutter/cookiecutter-django/pull/4358))
+
+- Update django-anymail to 10.0 ([#4357](https://github.com/cookiecutter/cookiecutter-django/pull/4357))
+
+- Update coverage to 7.2.7 ([#4356](https://github.com/cookiecutter/cookiecutter-django/pull/4356))
+
 ## 2023.05.28
 
 
diff --git a/setup.py b/setup.py
index 3f1c6457a..e6c5c99f8 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.05.28"
+version = "2023.05.30"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 752dbffdceb681c27916a2d0b0ccee1d17fb2a55 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 2 Jun 2023 08:55:43 -0500
Subject: [PATCH 2771/2840] Update sentry-sdk to 1.25.0 (#4364)

---
 {{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 bbe502ba5..2714fe6f8 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.6  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.24.0  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.25.0  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
 hiredis==2.2.3  # https://github.com/redis/hiredis-py

From c56451e268d0107255209690d15d10a8d81f96c5 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 2 Jun 2023 18:18:37 +0200
Subject: [PATCH 2772/2840] Update django-stubs from 4.2.0 to 4.2.1

---
 {{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 073160be3..398788e58 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -14,7 +14,7 @@ watchfiles==0.19.0  # https://github.com/samuelcolvin/watchfiles
 # Testing
 # ------------------------------------------------------------------------------
 mypy==1.2.0  # https://github.com/python/mypy
-django-stubs==4.2.0  # https://github.com/typeddjango/django-stubs
+django-stubs==4.2.1  # https://github.com/typeddjango/django-stubs
 pytest==7.3.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.7  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}

From 0f7485f7c46ce89ece4533f7489282d5957eda6c Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 2 Jun 2023 18:18:40 +0200
Subject: [PATCH 2773/2840] Update djangorestframework-stubs from 3.14.0 to
 3.14.1

---
 {{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 073160be3..1462804fe 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -18,7 +18,7 @@ django-stubs==4.2.0  # https://github.com/typeddjango/django-stubs
 pytest==7.3.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.7  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
-djangorestframework-stubs==3.14.0  # https://github.com/typeddjango/djangorestframework-stubs
+djangorestframework-stubs==3.14.1  # https://github.com/typeddjango/djangorestframework-stubs
 {%- endif %}
 
 # Documentation

From d085363ae9e0d8bc596c777d45b8be7bf05d3532 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 3 Jun 2023 02:27:09 +0000
Subject: [PATCH 2774/2840] Release 2023.06.02

---
 CHANGELOG.md | 7 +++++++
 setup.py     | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index c99a80f2e..06441cb95 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.06.02
+
+
+### Updated
+
+- Update sentry-sdk to 1.25.0 ([#4364](https://github.com/cookiecutter/cookiecutter-django/pull/4364))
+
 ## 2023.05.30
 
 
diff --git a/setup.py b/setup.py
index e6c5c99f8..19820f7bc 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.05.30"
+version = "2023.06.02"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 72887ed6733ea8add5ddbd41148cec20f21a5776 Mon Sep 17 00:00:00 2001
From: Matheus Jardim Bernardes <matheusjardimb@gmail.com>
Date: Wed, 7 Jun 2023 05:50:30 -0300
Subject: [PATCH 2775/2840] add pt_BR .po file (#4367)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* add pt_BR .po file

* add ptBR strings

* update docs

* add README.rst info for i18n

* Update {{cookiecutter.project_slug}}/locale/pt_BR/LC_MESSAGES/django.po

Co-authored-by: Fábio C. Barrionuevo da Luz <bnafta@gmail.com>

---------

Co-authored-by: Matheus Jardim <matheus.jardim@conceptu.ind.br>
Co-authored-by: Fábio C. Barrionuevo da Luz <bnafta@gmail.com>
---
 .../config/settings/base.py                   |   6 +
 .../locale/README.rst                         |  12 +-
 .../locale/pt_BR/LC_MESSAGES/django.po        | 321 ++++++++++++++++++
 3 files changed, 337 insertions(+), 2 deletions(-)
 create mode 100644 {{cookiecutter.project_slug}}/locale/pt_BR/LC_MESSAGES/django.po

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index c0ca31f36..487669e0a 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -26,6 +26,12 @@ DEBUG = env.bool("DJANGO_DEBUG", False)
 TIME_ZONE = "{{ cookiecutter.timezone }}"
 # https://docs.djangoproject.com/en/dev/ref/settings/#language-code
 LANGUAGE_CODE = "en-us"
+# https://docs.djangoproject.com/en/dev/ref/settings/#languages
+# from django.utils.translation import gettext_lazy as _
+# LANGUAGES = [
+#     ('en', _('English')),
+#     ('pt-br', _('Português')),
+# ]
 # https://docs.djangoproject.com/en/dev/ref/settings/#site-id
 SITE_ID = 1
 # https://docs.djangoproject.com/en/dev/ref/settings/#use-i18n
diff --git a/{{cookiecutter.project_slug}}/locale/README.rst b/{{cookiecutter.project_slug}}/locale/README.rst
index c2f1dcd6f..a501b7a18 100644
--- a/{{cookiecutter.project_slug}}/locale/README.rst
+++ b/{{cookiecutter.project_slug}}/locale/README.rst
@@ -1,6 +1,14 @@
 Translations
 ============
 
-Translations will be placed in this folder when running::
+Start by configuring `LANGUAGES` at settings, by uncommenting languages you are willing to support.
 
-    python manage.py makemessages
+Translations will be placed in this folder when running:
+
+    python manage.py makemessages --all
+
+Then you should edit the .po files providing proper translations and then run the following for compiling the messages:
+
+    python manage.py compilemessages
+
+Note: You may need to restart the django server for changes to take effect.
diff --git a/{{cookiecutter.project_slug}}/locale/pt_BR/LC_MESSAGES/django.po b/{{cookiecutter.project_slug}}/locale/pt_BR/LC_MESSAGES/django.po
new file mode 100644
index 000000000..fc17c6a61
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/locale/pt_BR/LC_MESSAGES/django.po
@@ -0,0 +1,321 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2023-06-04 21:42+0000\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <LL@li.org>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+#: {{cookiecutter.project_slug}}/templates/account/account_inactive.html:5
+#: {{cookiecutter.project_slug}}/templates/account/account_inactive.html:8
+msgid "Account Inactive"
+msgstr "Conta Inativa"
+
+#: {{cookiecutter.project_slug}}/templates/account/account_inactive.html:10
+msgid "This account is inactive."
+msgstr "Esta conta está inativa."
+
+#: {{cookiecutter.project_slug}}/templates/account/email.html:7
+msgid "Account"
+msgstr "Conta"
+
+#: {{cookiecutter.project_slug}}/templates/account/email.html:10
+msgid "E-mail Addresses"
+msgstr "Endereços de E-mail"
+
+#: {{cookiecutter.project_slug}}/templates/account/email.html:13
+msgid "The following e-mail addresses are associated with your account:"
+msgstr "Os seguintes endereços de e-mail estão associados à sua conta:"
+
+#: {{cookiecutter.project_slug}}/templates/account/email.html:27
+msgid "Verified"
+msgstr "Verificado"
+
+#: {{cookiecutter.project_slug}}/templates/account/email.html:29
+msgid "Unverified"
+msgstr "Não verificado"
+
+#: {{cookiecutter.project_slug}}/templates/account/email.html:31
+msgid "Primary"
+msgstr "Primário"
+
+#: {{cookiecutter.project_slug}}/templates/account/email.html:37
+msgid "Make Primary"
+msgstr "Tornar Primário"
+
+#: {{cookiecutter.project_slug}}/templates/account/email.html:38
+msgid "Re-send Verification"
+msgstr "Reenviar verificação"
+
+#: {{cookiecutter.project_slug}}/templates/account/email.html:39
+msgid "Remove"
+msgstr "Remover"
+
+#: {{cookiecutter.project_slug}}/templates/account/email.html:46
+msgid "Warning:"
+msgstr "Aviso:"
+
+#: {{cookiecutter.project_slug}}/templates/account/email.html:46
+msgid ""
+"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."
+msgstr ""
+"No momento, você não tem nenhum endereço de e-mail configurado. Você "
+"realmente deve adicionar um endereço de e-mail para receber notificações, "
+"redefinir sua senha etc."
+
+#: {{cookiecutter.project_slug}}/templates/account/email.html:51
+msgid "Add E-mail Address"
+msgstr "Adicionar Endereço de E-mail"
+
+#: {{cookiecutter.project_slug}}/templates/account/email.html:56
+msgid "Add E-mail"
+msgstr "Adicionar E-mail"
+
+#: {{cookiecutter.project_slug}}/templates/account/email.html:66
+msgid "Do you really want to remove the selected e-mail address?"
+msgstr "Você realmente deseja remover o endereço de e-mail selecionado?"
+
+#: {{cookiecutter.project_slug}}/templates/account/email_confirm.html:6
+#: {{cookiecutter.project_slug}}/templates/account/email_confirm.html:10
+msgid "Confirm E-mail Address"
+msgstr "Confirme o endereço de e-mail"
+
+#: {{cookiecutter.project_slug}}/templates/account/email_confirm.html:16
+#, python-format
+msgid ""
+"Please confirm that <a href=\"mailto:%(email)s\">%(email)s</a> is an e-mail "
+"address for user %(user_display)s."
+msgstr ""
+"Confirme se <a href=\"mailto:%(email)s\">%(email)s</a> é um endereço de "
+"e-mail do usuário %(user_display)s."
+
+#: {{cookiecutter.project_slug}}/templates/account/email_confirm.html:20
+msgid "Confirm"
+msgstr "Confirmar"
+
+#: {{cookiecutter.project_slug}}/templates/account/email_confirm.html:27
+#, python-format
+msgid ""
+"This e-mail confirmation link expired or is invalid. Please <a href="
+"\"%(email_url)s\">issue a new e-mail confirmation request</a>."
+msgstr "Este link de confirmação de e-mail expirou ou é inválido. "
+"Por favor, <a href=\"%(email_url)s\">emita um novo pedido de confirmação por e-mail</a>."
+
+#: {{cookiecutter.project_slug}}/templates/account/login.html:7
+#: {{cookiecutter.project_slug}}/templates/account/login.html:11
+#: {{cookiecutter.project_slug}}/templates/account/login.html:56
+#: {{cookiecutter.project_slug}}/templates/base.html:72
+msgid "Sign In"
+msgstr "Entrar"
+
+#: {{cookiecutter.project_slug}}/templates/account/login.html:17
+msgid "Please sign in with one of your existing third party accounts:"
+msgstr "Faça login com uma de suas contas de terceiros existentes:"
+
+#: {{cookiecutter.project_slug}}/templates/account/login.html:19
+#, python-format
+msgid ""
+"Or, <a href=\"%(signup_url)s\">sign up</a> for a %(site_name)s account and "
+"sign in below:"
+msgstr "Ou, <a href=\"%(signup_url)s\">cadastre-se</a> para uma conta em %(site_name)s e entre abaixo:"
+
+#: {{cookiecutter.project_slug}}/templates/account/login.html:32
+msgid "or"
+msgstr "or"
+
+#: {{cookiecutter.project_slug}}/templates/account/login.html:41
+#, python-format
+msgid ""
+"If you have not created an account yet, then please <a href=\"%(signup_url)s"
+"\">sign up</a> first."
+msgstr "Se você ainda não criou uma conta, <a href=\"%(signup_url)s"
+"\">registre-se primeiro</a>."
+
+#: {{cookiecutter.project_slug}}/templates/account/login.html:55
+msgid "Forgot Password?"
+msgstr "Esqueceu sua senha?"
+
+#: {{cookiecutter.project_slug}}/templates/account/logout.html:5
+#: {{cookiecutter.project_slug}}/templates/account/logout.html:8
+#: {{cookiecutter.project_slug}}/templates/account/logout.html:17
+#: {{cookiecutter.project_slug}}/templates/base.html:61
+msgid "Sign Out"
+msgstr "Sair"
+
+#: {{cookiecutter.project_slug}}/templates/account/logout.html:10
+msgid "Are you sure you want to sign out?"
+msgstr "Você tem certeza que deseja sair?"
+
+#: {{cookiecutter.project_slug}}/templates/account/password_change.html:6
+#: {{cookiecutter.project_slug}}/templates/account/password_change.html:9
+#: {{cookiecutter.project_slug}}/templates/account/password_change.html:14
+#: {{cookiecutter.project_slug}}/templates/account/password_reset_from_key.html:5
+#: {{cookiecutter.project_slug}}/templates/account/password_reset_from_key.html:8
+#: {{cookiecutter.project_slug}}/templates/account/password_reset_from_key_done.html:4
+#: {{cookiecutter.project_slug}}/templates/account/password_reset_from_key_done.html:7
+msgid "Change Password"
+msgstr "Alterar Senha"
+
+#: {{cookiecutter.project_slug}}/templates/account/password_reset.html:7
+#: {{cookiecutter.project_slug}}/templates/account/password_reset.html:11
+#: {{cookiecutter.project_slug}}/templates/account/password_reset_done.html:6
+#: {{cookiecutter.project_slug}}/templates/account/password_reset_done.html:9
+msgid "Password Reset"
+msgstr "Redefinição de senha"
+
+#: {{cookiecutter.project_slug}}/templates/account/password_reset.html:16
+msgid ""
+"Forgotten your password? Enter your e-mail address below, and we'll send you "
+"an e-mail allowing you to reset it."
+msgstr "Esqueceu sua senha? Digite seu endereço de e-mail abaixo e enviaremos um e-mail permitindo que você o redefina."
+
+#: {{cookiecutter.project_slug}}/templates/account/password_reset.html:21
+msgid "Reset My Password"
+msgstr "Redefinir minha senha"
+
+#: {{cookiecutter.project_slug}}/templates/account/password_reset.html:24
+msgid "Please contact us if you have any trouble resetting your password."
+msgstr "Entre em contato conosco se tiver algum problema para redefinir sua senha."
+
+#: {{cookiecutter.project_slug}}/templates/account/password_reset_done.html:15
+msgid ""
+"We have sent you an e-mail. Please contact us if you do not receive it "
+"within a few minutes."
+msgstr "Enviamos um e-mail para você. Entre em contato conosco se você não recebê-lo dentro de alguns minutos."
+
+#: {{cookiecutter.project_slug}}/templates/account/password_reset_from_key.html:8
+msgid "Bad Token"
+msgstr "Token Inválido"
+
+#: {{cookiecutter.project_slug}}/templates/account/password_reset_from_key.html:12
+#, python-format
+msgid ""
+"The password reset link was invalid, possibly because it has already been "
+"used.  Please request a <a href=\"%(passwd_reset_url)s\">new password reset</"
+"a>."
+msgstr "O link de redefinição de senha era inválido, possivelmente porque já foi usado. "
+"<a href=\"%(passwd_reset_url)s\">Solicite uma nova redefinição de senha</a>."
+
+#: {{cookiecutter.project_slug}}/templates/account/password_reset_from_key.html:18
+msgid "change password"
+msgstr "alterar senha"
+
+#: {{cookiecutter.project_slug}}/templates/account/password_reset_from_key.html:21
+#: {{cookiecutter.project_slug}}/templates/account/password_reset_from_key_done.html:8
+msgid "Your password is now changed."
+msgstr "Sua senha agora foi alterada."
+
+#: {{cookiecutter.project_slug}}/templates/account/password_set.html:6
+#: {{cookiecutter.project_slug}}/templates/account/password_set.html:9
+#: {{cookiecutter.project_slug}}/templates/account/password_set.html:14
+msgid "Set Password"
+msgstr "Definir Senha"
+
+#: {{cookiecutter.project_slug}}/templates/account/signup.html:6
+msgid "Signup"
+msgstr "Cadastro"
+
+#: {{cookiecutter.project_slug}}/templates/account/signup.html:9
+#: {{cookiecutter.project_slug}}/templates/account/signup.html:19
+#: {{cookiecutter.project_slug}}/templates/base.html:67
+msgid "Sign Up"
+msgstr "Cadastro"
+
+#: {{cookiecutter.project_slug}}/templates/account/signup.html:11
+#, python-format
+msgid ""
+"Already have an account? Then please <a href=\"%(login_url)s\">sign in</a>."
+msgstr "já tem uma conta? Então, por favor, faça <a href=\"%(login_url)s\">login</a>."
+
+#: {{cookiecutter.project_slug}}/templates/account/signup_closed.html:5
+#: {{cookiecutter.project_slug}}/templates/account/signup_closed.html:8
+msgid "Sign Up Closed"
+msgstr "Inscrições encerradas"
+
+#: {{cookiecutter.project_slug}}/templates/account/signup_closed.html:10
+msgid "We are sorry, but the sign up is currently closed."
+msgstr "Lamentamos, mas as inscrições estão encerradas no momento."
+
+#: {{cookiecutter.project_slug}}/templates/account/verification_sent.html:5
+#: {{cookiecutter.project_slug}}/templates/account/verification_sent.html:8
+#: {{cookiecutter.project_slug}}/templates/account/verified_email_required.html:5
+#: {{cookiecutter.project_slug}}/templates/account/verified_email_required.html:8
+msgid "Verify Your E-mail Address"
+msgstr "Verifique seu endereço de e-mail"
+
+#: {{cookiecutter.project_slug}}/templates/account/verification_sent.html:10
+msgid ""
+"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."
+msgstr "Enviamos um e-mail para você para verificação. Siga o link fornecido para finalizar o processo de inscrição. Entre em contato conosco se você não recebê-lo dentro de alguns minutos."
+
+#: {{cookiecutter.project_slug}}/templates/account/verified_email_required.html:12
+msgid ""
+"This part of the site requires us to verify that\n"
+"you are who you claim to be. For this purpose, we require that you\n"
+"verify ownership of your e-mail address. "
+msgstr "Esta parte do site exige que verifiquemos se você é quem afirma ser.\n"
+"Para esse fim, exigimos que você verifique a propriedade\n"
+"do seu endereço de e-mail."
+
+#: {{cookiecutter.project_slug}}/templates/account/verified_email_required.html:16
+msgid ""
+"We have sent an e-mail to you for\n"
+"verification. Please click on the link inside this e-mail. Please\n"
+"contact us if you do not receive it within a few minutes."
+msgstr "Enviamos um e-mail para você para verificação.\n"
+"Por favor, clique no link dentro deste e-mail.\n"
+"Entre em contato conosco se você não recebê-lo dentro de alguns minutos."
+
+#: {{cookiecutter.project_slug}}/templates/account/verified_email_required.html:20
+#, python-format
+msgid ""
+"<strong>Note:</strong> you can still <a href=\"%(email_url)s\">change your e-"
+"mail address</a>."
+msgstr "<strong>Nota</strong>: você ainda pode <a href=\"%(email_url)s\">alterar seu endereço de e-mail</a>."
+
+#: {{cookiecutter.project_slug}}/templates/base.html:57
+msgid "My Profile"
+msgstr "Meu perfil"
+
+#: {{cookiecutter.project_slug}}/users/admin.py:17
+msgid "Personal info"
+msgstr "Informação pessoal"
+
+#: {{cookiecutter.project_slug}}/users/admin.py:19
+msgid "Permissions"
+msgstr "Permissões"
+
+#: {{cookiecutter.project_slug}}/users/admin.py:30
+msgid "Important dates"
+msgstr "Datas importantes"
+
+#: {{cookiecutter.project_slug}}/users/apps.py:7
+msgid "Users"
+msgstr "Usuários"
+
+#: {{cookiecutter.project_slug}}/users/forms.py:24
+#: {{cookiecutter.project_slug}}/users/tests/test_forms.py:36
+msgid "This username has already been taken."
+msgstr "Este nome de usuário já foi usado."
+
+#: {{cookiecutter.project_slug}}/users/models.py:15
+msgid "Name of User"
+msgstr "Nome do Usuário"
+
+#: {{cookiecutter.project_slug}}/users/views.py:23
+msgid "Information successfully updated"
+msgstr "Informação atualizada com sucesso"

From fbc2373bcc8d7205541d37eb5e2934ace0fcc59d Mon Sep 17 00:00:00 2001
From: browniebroke <browniebroke@users.noreply.github.com>
Date: Wed, 7 Jun 2023 08:51:12 +0000
Subject: [PATCH 2776/2840] 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 37c85e1bc..13c4eafd3 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1392,5 +1392,10 @@
     "name": "Birtibu",
     "github_login": "Birtibu",
     "twitter_username": ""
+  },
+  {
+    "name": "Matheus Jardim Bernardes",
+    "github_login": "matheusjardimb",
+    "twitter_username": ""
   }
 ]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 340588a9a..4e2f1fb31 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -1314,6 +1314,13 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
+  <tr>
+    <td>Matheus Jardim Bernardes</td>
+    <td>
+      <a href="https://github.com/matheusjardimb">matheusjardimb</a>
+    </td>
+    <td></td>
+  </tr>
   <tr>
     <td>Mathijs Hoogland</td>
     <td>

From 45c407d47a42c29221adae6493f05c8b5c1aa1f6 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 10 May 2023 18:05:25 +0100
Subject: [PATCH 2777/2840] Update mypy from 1.2.0 to 1.3.0

---
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 073160be3..277b09cfb 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -13,7 +13,7 @@ watchfiles==0.19.0  # https://github.com/samuelcolvin/watchfiles
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==1.2.0  # https://github.com/python/mypy
+mypy==1.3.0  # https://github.com/python/mypy
 django-stubs==4.2.0  # https://github.com/typeddjango/django-stubs
 pytest==7.3.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.7  # https://github.com/Frozenball/pytest-sugar

From e96955656fcb1a7e2a687f09fa773ff268e2415f Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 7 Jun 2023 04:15:10 -0500
Subject: [PATCH 2778/2840] Update tox to 4.6.0 (#4371)

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 4b05c1b1e..f964e4ac7 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==3.3.2
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.5.2
+tox==4.6.0
 pytest==7.3.1
 pytest-xdist==3.3.1
 pytest-cookies==0.7.0

From 36b5606823e83b4570a0120d3a6b412682cdfdf7 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 7 Jun 2023 04:17:09 -0500
Subject: [PATCH 2779/2840] Update django-extensions to 3.2.3 (#4372)

---
 {{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 c427ae22f..4728ffbde 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -43,6 +43,6 @@ pre-commit==3.3.2  # https://github.com/pre-commit/pre-commit
 factory-boy==3.2.1  # https://github.com/FactoryBoy/factory_boy
 
 django-debug-toolbar==4.1.0  # https://github.com/jazzband/django-debug-toolbar
-django-extensions==3.2.1  # https://github.com/django-extensions/django-extensions
+django-extensions==3.2.3  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==3.0.0  # https://github.com/nedbat/django_coverage_plugin
 pytest-django==4.5.2  # https://github.com/pytest-dev/pytest-django

From 5bf90a43a9a28fb3306b268d4d02a9a44efa4426 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Wed, 7 Jun 2023 17:12:01 +0100
Subject: [PATCH 2780/2840] Replace `runserver` with `runserver_plus` (#4373)

This reverts commit f93a9f78d9a249718acd20e297fb02b177353912

In #4255, `runserver_plus` was replaced by `runserver` due to some bugs in django-extensions, preventing us to upgrade Django.

In #4372, django-extensions was upgraded to a version with a fix, so we can go back to using `runserver_plus`.
---
 hooks/post_gen_project.py                     |  4 ++-
 .../runConfigurations/runserver_plus.xml      | 33 +++++++++++++++++++
 .../compose/local/django/start                |  2 +-
 3 files changed, 37 insertions(+), 2 deletions(-)
 create mode 100644 {{cookiecutter.project_slug}}/.idea/runConfigurations/runserver_plus.xml

diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index b79985a82..927419f8c 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -194,7 +194,9 @@ def handle_js_runner(choice, use_docker, use_async):
             "gulp-uglify-es",
         ]
         if not use_docker:
-            dev_django_cmd = "uvicorn config.asgi:application --reload" if use_async else "python manage.py runserver"
+            dev_django_cmd = (
+                "uvicorn config.asgi:application --reload" if use_async else "python manage.py runserver_plus"
+            )
             scripts.update(
                 {
                     "dev": "concurrently npm:dev:*",
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/runserver_plus.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/runserver_plus.xml
new file mode 100644
index 000000000..242f861a6
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/runserver_plus.xml
@@ -0,0 +1,33 @@
+<component name="ProjectRunConfigurationManager">
+  <configuration default="false" name="runserver_plus" type="Python.DjangoServer" factoryName="Django server" singleton="true">
+    <module name="{{ cookiecutter.project_slug }}" />
+    <option name="INTERPRETER_OPTIONS" value="" />
+    <option name="PARENT_ENVS" value="true" />
+    <envs>
+      <env name="PYTHONUNBUFFERED" value="1" />
+      <env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" />
+    </envs>
+    <option name="SDK_HOME" value="" />
+    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+    <option name="IS_MODULE_SDK" value="true" />
+    <option name="ADD_CONTENT_ROOTS" value="true" />
+    <option name="ADD_SOURCE_ROOTS" value="true" />
+    <PathMappingSettings>
+      <option name="pathMappings">
+        <list>
+          <mapping local-root="$PROJECT_DIR$" remote-root="/app" />
+        </list>
+      </option>
+    </PathMappingSettings>
+    <option name="launchJavascriptDebuger" value="false" />
+    <option name="port" value="8000" />
+    <option name="host" value="0.0.0.0" />
+    <option name="additionalOptions" value="" />
+    <option name="browserUrl" value="" />
+    <option name="runTestServer" value="false" />
+    <option name="runNoReload" value="false" />
+    <option name="useCustomRunCommand" value="true" />
+    <option name="customRunCommand" value="runserver_plus" />
+    <method />
+  </configuration>
+</component>
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start b/{{cookiecutter.project_slug}}/compose/local/django/start
index 6415d7fb4..ec57dc8e4 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/start
@@ -9,5 +9,5 @@ python manage.py migrate
 {%- if cookiecutter.use_async == 'y' %}
 exec uvicorn config.asgi:application --host 0.0.0.0 --reload --reload-include '*.html'
 {%- else %}
-exec python manage.py runserver 0.0.0.0:8000
+exec python manage.py runserver_plus 0.0.0.0:8000
 {%- endif %}

From 34e97530ded6841520cd01b65058dd34696abd3d Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 7 Jun 2023 11:14:04 -0500
Subject: [PATCH 2781/2840] Update sphinx-rtd-theme from 1.2.1 to 1.2.2 (#4375)

---
 docs/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index e37d638b0..1ae530fa7 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,3 +1,3 @@
 sphinx==6.2.1
-sphinx-rtd-theme==1.2.1
+sphinx-rtd-theme==1.2.2
 myst-parser==1.0.0

From d6c8c760e7a679f7d4140fe26c796cfcbc14f623 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 7 Jun 2023 11:55:10 -0500
Subject: [PATCH 2782/2840] Update sentry-sdk from 1.25.0 to 1.25.1 (#4376)

---
 {{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 2714fe6f8..aec79b3d3 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.6  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.25.0  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.25.1  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
 hiredis==2.2.3  # https://github.com/redis/hiredis-py

From e4915d62acc86154cd95e13b9498770d16690a29 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 8 Jun 2023 02:31:36 +0000
Subject: [PATCH 2783/2840] Release 2023.06.07

---
 CHANGELOG.md | 21 +++++++++++++++++++++
 setup.py     |  2 +-
 2 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 06441cb95..4b56dc7c2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,27 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.06.07
+
+
+### Changed
+
+- Replace `runserver` with `runserver_plus` ([#4373](https://github.com/cookiecutter/cookiecutter-django/pull/4373))
+
+- Add translations for Brazilian Portuguese ([#4367](https://github.com/cookiecutter/cookiecutter-django/pull/4367))
+
+### Updated
+
+- Update sentry-sdk to 1.25.1 ([#4376](https://github.com/cookiecutter/cookiecutter-django/pull/4376))
+
+- Update django-extensions to 3.2.3 ([#4372](https://github.com/cookiecutter/cookiecutter-django/pull/4372))
+
+- Update djangorestframework-stubs to 3.14.1 ([#4366](https://github.com/cookiecutter/cookiecutter-django/pull/4366))
+
+- Update django-stubs to 4.2.1 ([#4365](https://github.com/cookiecutter/cookiecutter-django/pull/4365))
+
+- Update mypy to 1.3.0 ([#4327](https://github.com/cookiecutter/cookiecutter-django/pull/4327))
+
 ## 2023.06.02
 
 
diff --git a/setup.py b/setup.py
index 19820f7bc..f9d6222d5 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.06.02"
+version = "2023.06.07"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 135ea503e4e662a7aaba760b2758bed07ac10162 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 8 Jun 2023 05:15:42 -0500
Subject: [PATCH 2784/2840] Update werkzeug from 2.3.4 to 2.3.5 (#4377)

---
 {{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 4728ffbde..3e8b13133 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -1,6 +1,6 @@
 -r base.txt
 
-Werkzeug[watchdog]==2.3.4 # https://github.com/pallets/werkzeug
+Werkzeug[watchdog]==2.3.5 # https://github.com/pallets/werkzeug
 ipdb==0.13.13  # https://github.com/gotcha/ipdb
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.9.6  # https://github.com/psycopg/psycopg2

From 1025d7308362bf7094fa2303ce22b4b51f27770f Mon Sep 17 00:00:00 2001
From: mpsantos <mpsantos@gmail.com>
Date: Thu, 8 Jun 2023 12:41:35 -0300
Subject: [PATCH 2785/2840] Translate fixed message in test (#4374)

---
 .../{{cookiecutter.project_slug}}/users/tests/test_views.py    | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
index 0cd0021ff..2c1027038 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_views.py
@@ -7,6 +7,7 @@ from django.contrib.sessions.middleware import SessionMiddleware
 from django.http import HttpRequest, HttpResponseRedirect
 from django.test import RequestFactory
 from django.urls import reverse
+from django.utils.translation import gettext_lazy as _
 
 from {{ cookiecutter.project_slug }}.users.forms import UserAdminChangeForm
 from {{ cookiecutter.project_slug }}.users.models import User
@@ -72,7 +73,7 @@ class TestUserUpdateView:
         view.form_valid(form)
 
         messages_sent = [m.message for m in messages.get_messages(request)]
-        assert messages_sent == ["Information successfully updated"]
+        assert messages_sent == [_("Information successfully updated")]
 
 
 class TestUserRedirectView:

From 74b98844c2d68b82a2286d6a0c89217e92071684 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 8 Jun 2023 10:43:28 -0500
Subject: [PATCH 2786/2840] Update celery to 5.3.0 (#4369)

---
 {{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 6f33acb7e..9b2159edf 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -16,7 +16,7 @@ redis==4.5.5  # https://github.com/redis/redis-py
 hiredis==2.2.3  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
-celery==5.2.7  # pyup: < 6.0  # https://github.com/celery/celery
+celery==5.3.0  # pyup: < 6.0  # https://github.com/celery/celery
 django-celery-beat==2.5.0  # https://github.com/celery/django-celery-beat
 {%- if cookiecutter.use_docker == 'y' %}
 flower==1.2.0  # https://github.com/mher/flower

From b2dfd2683456460a455d0f3031249710a30b5e5e Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Jun 2023 16:47:37 +0100
Subject: [PATCH 2787/2840] Update to Python 3.11.4 in local Docker compose
 (#4380)

Bumps python from 3.11.3-slim-bullseye to 3.11.4-slim-bullseye.

---
updated-dependencies:
- dependency-name: python
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/compose/local/django/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index db48870d8..b1f459ba5 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -1,5 +1,5 @@
 # define an alias for the specific python version used in this file.
-FROM python:3.11.3-slim-bullseye as python
+FROM python:3.11.4-slim-bullseye as python
 
 # Python build stage
 FROM python as python-build-stage

From 4e4ca84519b5015217fd7b6e7a53c49aa7601df9 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Jun 2023 16:47:43 +0100
Subject: [PATCH 2788/2840] Update to Python 3.11.4 in docs Docker compose
 (#4379)

Bumps python from 3.11.3-slim-bullseye to 3.11.4-slim-bullseye.

---
updated-dependencies:
- dependency-name: python
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 {{cookiecutter.project_slug}}/compose/local/docs/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
index 8239a6635..f9895a083 100644
--- a/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/docs/Dockerfile
@@ -1,5 +1,5 @@
 # define an alias for the specific python version used in this file.
-FROM python:3.11.3-slim-bullseye as python
+FROM python:3.11.4-slim-bullseye as python
 
 
 # Python build stage

From ca780d5665ab46df1ccd7b9fffdcff16f7a3eb0f Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Thu, 8 Jun 2023 16:47:50 +0100
Subject: [PATCH 2789/2840] Update to Python 3.11.4 in production Docker
 compose (#4378)

Bumps python from 3.11.3-slim-bullseye to 3.11.4-slim-bullseye.

---
updated-dependencies:
- dependency-name: python
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../compose/production/django/Dockerfile                        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index 4c8695a57..bbe459839 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -25,7 +25,7 @@ RUN npm run build
 
 {%- endif %}
 # define an alias for the specific python version used in this file.
-FROM python:3.11.3-slim-bullseye as python
+FROM python:3.11.4-slim-bullseye as python
 
 # Python build stage
 FROM python as python-build-stage

From 61ebd31e5d5be3401e0b842b0a151c7fc7aa6b91 Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Thu, 8 Jun 2023 16:49:59 +0100
Subject: [PATCH 2790/2840] Update Heroku runtime to Python 3.11.4

---
 {{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 afe12ad1b..431fc7e8c 100644
--- a/{{cookiecutter.project_slug}}/runtime.txt
+++ b/{{cookiecutter.project_slug}}/runtime.txt
@@ -1 +1 @@
-python-3.11.3
+python-3.11.4

From 932c7b6145712c42006dccfe4f4570a66faff759 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 9 Jun 2023 02:32:22 +0000
Subject: [PATCH 2791/2840] Release 2023.06.08

---
 CHANGELOG.md | 19 +++++++++++++++++++
 setup.py     |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4b56dc7c2..f572bd79e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,25 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.06.08
+
+
+### Fixed
+
+- Fix failure in user view test caused by translations ([#4374](https://github.com/cookiecutter/cookiecutter-django/pull/4374))
+
+### Updated
+
+- Update to Python 3.11.4 in production Docker compose ([#4378](https://github.com/cookiecutter/cookiecutter-django/pull/4378))
+
+- Update to Python 3.11.4 in docs Docker compose ([#4379](https://github.com/cookiecutter/cookiecutter-django/pull/4379))
+
+- Update to Python 3.11.4 in local Docker compose ([#4380](https://github.com/cookiecutter/cookiecutter-django/pull/4380))
+
+- Update celery to 5.3.0 ([#4369](https://github.com/cookiecutter/cookiecutter-django/pull/4369))
+
+- Update werkzeug to 2.3.5 ([#4377](https://github.com/cookiecutter/cookiecutter-django/pull/4377))
+
 ## 2023.06.07
 
 
diff --git a/setup.py b/setup.py
index f9d6222d5..f541bdee6 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.06.07"
+version = "2023.06.08"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 2e561ed6c4c7ed8950334eaa63eca70a32dac055 Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Fri, 9 Jun 2023 11:12:44 +0100
Subject: [PATCH 2792/2840] Fix missing `compilemessages` step before deploying
 to prod (#4363)

* Update readme on internationalization

* Run compilemessages when building production image

* Run compilemessages when deploying to Heroku

* Always keep Heroku post-compile hooks

* Add empty po file for en-US language

* Update instructions for Docker

* Update default po file

* Convert locale readme to markdown and expand a bit the instructions

* Don't compile translations for 3rd party packages

* Use simplified settings & set env variables for compiling translations

* Update README for translations

* Improve metadata for Brazilian Portuguese translations

* Fix condition for django compressor on Heroku

* Fix condition for Django Compressor
---
 hooks/post_gen_project.py                     |  6 ----
 .../bin/post_compile                          |  4 +++
 .../compose/production/django/Dockerfile      |  4 +++
 .../locale/README.md                          | 32 +++++++++++++++++++
 .../locale/README.rst                         | 14 --------
 .../locale/en_US/LC_MESSAGES/django.po        | 12 +++++++
 .../locale/pt_BR/LC_MESSAGES/django.po        | 16 +++-------
 7 files changed, 57 insertions(+), 31 deletions(-)
 create mode 100644 {{cookiecutter.project_slug}}/locale/README.md
 delete mode 100644 {{cookiecutter.project_slug}}/locale/README.rst
 create mode 100644 {{cookiecutter.project_slug}}/locale/en_US/LC_MESSAGES/django.po

diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index 927419f8c..11f165b78 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -96,10 +96,6 @@ def remove_heroku_files():
             # don't remove the file if we are using travisci but not using heroku
             continue
         os.remove(file_name)
-    remove_heroku_build_hooks()
-
-
-def remove_heroku_build_hooks():
     shutil.rmtree("bin")
 
 
@@ -444,8 +440,6 @@ def main():
 
     if "{{ cookiecutter.use_heroku }}".lower() == "n":
         remove_heroku_files()
-    elif "{{ cookiecutter.frontend_pipeline }}" != "Django Compressor":
-        remove_heroku_build_hooks()
 
     if "{{ cookiecutter.use_docker }}".lower() == "n" and "{{ cookiecutter.use_heroku }}".lower() == "n":
         if "{{ cookiecutter.keep_local_envs_in_vcs }}".lower() == "y":
diff --git a/{{cookiecutter.project_slug}}/bin/post_compile b/{{cookiecutter.project_slug}}/bin/post_compile
index a9c94b39a..16719f493 100644
--- a/{{cookiecutter.project_slug}}/bin/post_compile
+++ b/{{cookiecutter.project_slug}}/bin/post_compile
@@ -1,4 +1,5 @@
 #!/usr/bin/env bash
+{%- if cookiecutter.frontend_pipeline == "Django Compressor" %}
 
 compress_enabled() {
 python << END
@@ -19,4 +20,7 @@ if compress_enabled
 then
   python manage.py compress
 fi
+{%- endif %}
+
 python manage.py collectstatic --noinput
+python manage.py compilemessages -i site-packages
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index bbe459839..5a863ddc5 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -121,4 +121,8 @@ RUN chown django:django ${APP_HOME}
 
 USER django
 
+RUN DATABASE_URL="" \
+  DJANGO_SETTINGS_MODULE="config.settings.test" \
+  python manage.py compilemessages
+
 ENTRYPOINT ["/entrypoint"]
diff --git a/{{cookiecutter.project_slug}}/locale/README.md b/{{cookiecutter.project_slug}}/locale/README.md
new file mode 100644
index 000000000..b2a8a0ef2
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/locale/README.md
@@ -0,0 +1,32 @@
+# Translations
+
+Start by configuring the `LANGUAGES` settings in `base.py`, by uncommenting languages you are willing to support. Then, translations strings will be placed in this folder when running:
+
+```bash
+{% if cookiecutter.use_docker == 'y' %}docker-compose -f local.yml run --rm django {% endif %}python manage.py makemessages -all --no-location
+```
+
+This should generate `django.po` (stands for Portable Object) files under each locale `<locale name>/LC_MESSAGES/django.po`. Each translatable string in the codebase is collected with its `msgid` and need to be translated as `msgstr`, for example:
+
+```po
+msgid "users"
+msgstr "utilisateurs"
+```
+
+Once all translations are done, they need to be compiled into `.mo` files (stands for Machine Object), which are the actual binary files used by the application:
+
+```bash
+{% if cookiecutter.use_docker == 'y' %}docker-compose -f local.yml run --rm django {% endif %}python manage.py compilemessages
+```
+
+Note that the `.po` files are NOT used by the application directly, so if the `.mo` files are out of dates, the content won't appear as translated even if the `.po` files are up-to-date.
+
+## Production
+
+The production image runs `compilemessages` automatically at build time, so as long as your translated source files (PO) are up-to-date, you're good to go.
+
+## Add a new language
+
+1. Update the [`LANGUAGES` setting](https://docs.djangoproject.com/en/stable/ref/settings/#std-setting-LANGUAGES) to your project's base settings.
+2. Create the locale folder for the language next to this file, e.g. `fr_FR` for French. Make sure the case is correct.
+3. Run `makemessages` (as instructed above) to generate the PO files for the new language.
diff --git a/{{cookiecutter.project_slug}}/locale/README.rst b/{{cookiecutter.project_slug}}/locale/README.rst
deleted file mode 100644
index a501b7a18..000000000
--- a/{{cookiecutter.project_slug}}/locale/README.rst
+++ /dev/null
@@ -1,14 +0,0 @@
-Translations
-============
-
-Start by configuring `LANGUAGES` at settings, by uncommenting languages you are willing to support.
-
-Translations will be placed in this folder when running:
-
-    python manage.py makemessages --all
-
-Then you should edit the .po files providing proper translations and then run the following for compiling the messages:
-
-    python manage.py compilemessages
-
-Note: You may need to restart the django server for changes to take effect.
diff --git a/{{cookiecutter.project_slug}}/locale/en_US/LC_MESSAGES/django.po b/{{cookiecutter.project_slug}}/locale/en_US/LC_MESSAGES/django.po
new file mode 100644
index 000000000..6a4aa2e0b
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/locale/en_US/LC_MESSAGES/django.po
@@ -0,0 +1,12 @@
+# Translations for the {{ cookiecutter.project_name }} project
+# Copyright (C) {% now 'utc', '%Y' %} {{ cookiecutter.author_name }}
+# {{ cookiecutter.author_name }} <{{ cookiecutter.email }}>, {% now 'utc', '%Y' %}.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: {{ cookiecutter.version }}\n"
+"Language: en-US\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
diff --git a/{{cookiecutter.project_slug}}/locale/pt_BR/LC_MESSAGES/django.po b/{{cookiecutter.project_slug}}/locale/pt_BR/LC_MESSAGES/django.po
index fc17c6a61..2556abba8 100644
--- a/{{cookiecutter.project_slug}}/locale/pt_BR/LC_MESSAGES/django.po
+++ b/{{cookiecutter.project_slug}}/locale/pt_BR/LC_MESSAGES/django.po
@@ -1,18 +1,12 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+# Translations for the {{ cookiecutter.project_name }} project
+# Copyright (C) {% now 'utc', '%Y' %} {{ cookiecutter.author_name }}
+# {{ cookiecutter.author_name }} <{{ cookiecutter.email }}>, {% now 'utc', '%Y' %}.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2023-06-04 21:42+0000\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
+"Project-Id-Version: {{ cookiecutter.version }}\n"
+"Language: pt-BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

From f643dffa733dbb114eeda42aa02c375f8b0dd9bb Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 10 Jun 2023 02:27:27 +0000
Subject: [PATCH 2793/2840] Release 2023.06.09

---
 CHANGELOG.md | 7 +++++++
 setup.py     | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f572bd79e..a32895aa7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.06.09
+
+
+### Fixed
+
+- Fix missing `compilemessages` step before deploying to prod ([#4363](https://github.com/cookiecutter/cookiecutter-django/pull/4363))
+
 ## 2023.06.08
 
 
diff --git a/setup.py b/setup.py
index f541bdee6..9271e944e 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.06.08"
+version = "2023.06.09"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 9bb27586d5cefac5d06d3fcddc63ea2f4f3c8065 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Sun, 11 Jun 2023 09:15:29 +0100
Subject: [PATCH 2794/2840] Auto-update pre-commit hooks (#4385)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                               | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 2c7876d3c..98afc14e0 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -23,7 +23,7 @@ repos:
         args: ["--tab-width", "2"]
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.4.0
+    rev: v3.6.0
     hooks:
       - id: pyupgrade
         args: [--py311-plus]
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index 3a0411d81..91a50b97d 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -31,7 +31,7 @@ repos:
         args: ['--target-version', '4.1']
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.4.0
+    rev: v3.6.0
     hooks:
       - id: pyupgrade
         args: [--py311-plus]

From 733f5b95442be0a164fc20cda474dc3683a8ec2a Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 11 Jun 2023 03:16:04 -0500
Subject: [PATCH 2795/2840] Update pytest to 7.3.2 (#4384)

* Update pytest from 7.3.1 to 7.3.2

* Update pytest from 7.3.1 to 7.3.2
---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index f964e4ac7..61faaa59e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,7 +13,7 @@ pre-commit==3.3.2
 # Testing
 # ------------------------------------------------------------------------------
 tox==4.6.0
-pytest==7.3.1
+pytest==7.3.2
 pytest-xdist==3.3.1
 pytest-cookies==0.7.0
 pytest-instafail==0.5.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 3e8b13133..2c72a0866 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -15,7 +15,7 @@ watchfiles==0.19.0  # https://github.com/samuelcolvin/watchfiles
 # ------------------------------------------------------------------------------
 mypy==1.3.0  # https://github.com/python/mypy
 django-stubs==4.2.1  # https://github.com/typeddjango/django-stubs
-pytest==7.3.1  # https://github.com/pytest-dev/pytest
+pytest==7.3.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.7  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
 djangorestframework-stubs==3.14.1  # https://github.com/typeddjango/djangorestframework-stubs

From 554edd43b14a45b6b9767ad3b58c5b909807272e Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Mon, 12 Jun 2023 02:31:28 +0000
Subject: [PATCH 2796/2840] Release 2023.06.11

---
 CHANGELOG.md | 9 +++++++++
 setup.py     | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a32895aa7..60c1ce384 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.06.11
+
+
+### Updated
+
+- Update pytest to 7.3.2 ([#4384](https://github.com/cookiecutter/cookiecutter-django/pull/4384))
+
+- Auto-update pre-commit hooks ([#4385](https://github.com/cookiecutter/cookiecutter-django/pull/4385))
+
 ## 2023.06.09
 
 
diff --git a/setup.py b/setup.py
index 9271e944e..cc429c0e0 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.06.09"
+version = "2023.06.11"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From fa096673e4909528528ed7a63678a9ea2244be22 Mon Sep 17 00:00:00 2001
From: Jelmer Draaijer <info@jelmert.nl>
Date: Tue, 13 Jun 2023 21:08:21 +0200
Subject: [PATCH 2797/2840] Add @foarsitter as core contributor

---
 .github/contributors.json | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/.github/contributors.json b/.github/contributors.json
index 13c4eafd3..b6eb7d639 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -53,6 +53,12 @@
     "twitter_username": "sfdye",
     "is_core": true
   },
+  {
+    "name": "Jelmer Draaijer",
+    "github_login": "foarsitter",
+    "twitter_username": "",
+    "is_core": true
+  },
   {
     "name": "18",
     "github_login": "dezoito",
@@ -553,11 +559,6 @@
     "github_login": "jvanbrug",
     "twitter_username": ""
   },
-  {
-    "name": "Jelmer Draaijer",
-    "github_login": "foarsitter",
-    "twitter_username": ""
-  },
   {
     "name": "Jerome Caisip",
     "github_login": "jeromecaisip",
@@ -1398,4 +1399,4 @@
     "github_login": "matheusjardimb",
     "twitter_username": ""
   }
-]
\ No newline at end of file
+]

From dc61beecba271019ad72f28096c8e4b9db5ba2a4 Mon Sep 17 00:00:00 2001
From: foarsitter <foarsitter@users.noreply.github.com>
Date: Tue, 13 Jun 2023 20:06:25 +0000
Subject: [PATCH 2798/2840] Update Contributors

---
 .github/contributors.json |  2 +-
 CONTRIBUTORS.md           | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.github/contributors.json b/.github/contributors.json
index b6eb7d639..f5d7a4df6 100644
--- a/.github/contributors.json
+++ b/.github/contributors.json
@@ -1399,4 +1399,4 @@
     "github_login": "matheusjardimb",
     "twitter_username": ""
   }
-]
+]
\ No newline at end of file
diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md
index 4e2f1fb31..52072d8e2 100644
--- a/CONTRIBUTORS.md
+++ b/CONTRIBUTORS.md
@@ -74,6 +74,13 @@ accept and merge pull requests.
     </td>
     <td>sfdye</td>
   </tr>
+  <tr>
+    <td>Jelmer Draaijer</td>
+    <td>
+      <a href="https://github.com/foarsitter">foarsitter</a>
+    </td>
+    <td></td>
+  </tr>
 </table>
 
 _Audrey is also the creator of Cookiecutter. Audrey and Daniel are on
@@ -1006,13 +1013,6 @@ Listed in alphabetical order.
     </td>
     <td></td>
   </tr>
-  <tr>
-    <td>Jelmer Draaijer</td>
-    <td>
-      <a href="https://github.com/foarsitter">foarsitter</a>
-    </td>
-    <td></td>
-  </tr>
   <tr>
     <td>Jens Nilsson</td>
     <td>

From 0d308fa2eeaa7bb1b4c1e9387af6e838e0c8e083 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 14 Jun 2023 00:54:36 -0500
Subject: [PATCH 2799/2840] Update pre-commit to 3.3.3 (#4390)

* Update pre-commit from 3.3.2 to 3.3.3

* Update pre-commit from 3.3.2 to 3.3.3
---
 requirements.txt                                     | 2 +-
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/requirements.txt b/requirements.txt
index 61faaa59e..3f33db7db 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,7 +8,7 @@ black==23.3.0
 isort==5.12.0
 flake8==6.0.0
 django-upgrade==1.13.0
-pre-commit==3.3.2
+pre-commit==3.3.3
 
 # Testing
 # ------------------------------------------------------------------------------
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 2c72a0866..983f96cb9 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -36,7 +36,7 @@ pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
 {%- endif %}
-pre-commit==3.3.2  # https://github.com/pre-commit/pre-commit
+pre-commit==3.3.3  # https://github.com/pre-commit/pre-commit
 
 # Django
 # ------------------------------------------------------------------------------

From 1c399167adf90b28589a88018dd8f33c06fdb49b Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Wed, 14 Jun 2023 13:54:22 +0100
Subject: [PATCH 2800/2840] Update django-webpack-loader from 2.0.0 to 2.0.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 9b2159edf..293defde1 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -46,5 +46,5 @@ django-cors-headers==4.0.0  # https://github.com/adamchainz/django-cors-headers
 drf-spectacular==0.26.2  # https://github.com/tfranzel/drf-spectacular
 {%- endif %}
 {%- if cookiecutter.frontend_pipeline == 'Webpack' %}
-django-webpack-loader==2.0.0  # https://github.com/django-webpack/django-webpack-loader
+django-webpack-loader==2.0.1  # https://github.com/django-webpack/django-webpack-loader
 {%- endif %}

From c15eb6d97a4995478c3a4b2db2498d7ffaed1a17 Mon Sep 17 00:00:00 2001
From: Jelmer Draaijer <info@jelmert.nl>
Date: Thu, 6 Apr 2023 16:31:30 +0200
Subject: [PATCH 2801/2840] Upgrade to django 4.2

---
 README.md                                           | 2 +-
 setup.py                                            | 2 +-
 {{cookiecutter.project_slug}}/requirements/base.txt | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/README.md b/README.md
index d718ee34c..42f5047e6 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,7 @@ production-ready Django projects quickly.
 
 ## Features
 
-- For Django 4.1
+- For Django 4.2
 - Works with Python 3.11
 - Renders Django projects with 100% starting test coverage
 - Twitter [Bootstrap](https://github.com/twbs/bootstrap) v5
diff --git a/setup.py b/setup.py
index cc429c0e0..a6fd4d67a 100644
--- a/setup.py
+++ b/setup.py
@@ -24,7 +24,7 @@ setup(
     classifiers=[
         "Development Status :: 4 - Beta",
         "Environment :: Console",
-        "Framework :: Django :: 4.1",
+        "Framework :: Django :: 4.2",
         "Intended Audience :: Developers",
         "Natural Language :: English",
         "License :: OSI Approved :: BSD License",
diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 293defde1..5b38805af 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -28,7 +28,7 @@ uvicorn[standard]==0.22.0  # https://github.com/encode/uvicorn
 
 # Django
 # ------------------------------------------------------------------------------
-django==4.1.9  # pyup: < 4.2  # https://www.djangoproject.com/
+django==4.2.2  # pyup: < 5.0  # https://www.djangoproject.com/
 django-environ==0.10.0  # https://github.com/joke2k/django-environ
 django-model-utils==4.3.1  # https://github.com/jazzband/django-model-utils
 django-allauth==0.54.0  # https://github.com/pennersr/django-allauth

From da308877951e1697d3e4267bae06675eaf1989c2 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 14 Jun 2023 12:27:57 -0500
Subject: [PATCH 2802/2840] Update django-upgrade from 1.13.0 to 1.14.0 (#4394)

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 3f33db7db..0b59babfd 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -7,7 +7,7 @@ binaryornot==0.4.4
 black==23.3.0
 isort==5.12.0
 flake8==6.0.0
-django-upgrade==1.13.0
+django-upgrade==1.14.0
 pre-commit==3.3.3
 
 # Testing

From 61ee4c3e30cfd70f53af89f1df18af037a4a9f8a Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 14 Jun 2023 14:49:07 -0500
Subject: [PATCH 2803/2840] Update django-cors-headers from 4.0.0 to 4.1.0
 (#4391)

---
 {{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 293defde1..7d733ed7f 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -41,7 +41,7 @@ django-redis==5.2.0  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == 'y' %}
 # Django REST Framework
 djangorestframework==3.14.0  # https://github.com/encode/django-rest-framework
-django-cors-headers==4.0.0  # https://github.com/adamchainz/django-cors-headers
+django-cors-headers==4.1.0  # https://github.com/adamchainz/django-cors-headers
 # DRF-spectacular for api documentation
 drf-spectacular==0.26.2  # https://github.com/tfranzel/drf-spectacular
 {%- endif %}

From 6d9cfeb0997ac3a4c3d9f8f5cad9a03d68fb2ac9 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 15 Jun 2023 02:24:08 +0000
Subject: [PATCH 2804/2840] Release 2023.06.14

---
 CHANGELOG.md | 13 +++++++++++++
 setup.py     |  2 +-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 60c1ce384..ad0e5acc5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,19 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.06.14
+
+
+### Updated
+
+- Update django-cors-headers to 4.1.0 ([#4391](https://github.com/cookiecutter/cookiecutter-django/pull/4391))
+
+- Update django-upgrade to 1.14.0 ([#4394](https://github.com/cookiecutter/cookiecutter-django/pull/4394))
+
+- Update django-webpack-loader to 2.0.1 ([#4392](https://github.com/cookiecutter/cookiecutter-django/pull/4392))
+
+- Update pre-commit to 3.3.3 ([#4390](https://github.com/cookiecutter/cookiecutter-django/pull/4390))
+
 ## 2023.06.11
 
 
diff --git a/setup.py b/setup.py
index cc429c0e0..e6ad617c9 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.06.11"
+version = "2023.06.14"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 8c93ad4dd0cf24253e9e30256cd1d8118fdccc15 Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Fri, 16 Jun 2023 07:41:56 +0100
Subject: [PATCH 2805/2840] Auto-update pre-commit hooks (#4395)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 {{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 91a50b97d..99b08271c 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -25,7 +25,7 @@ repos:
         exclude: '{{cookiecutter.project_slug}}/templates/'
 
   - repo: https://github.com/adamchainz/django-upgrade
-    rev: '1.13.0'
+    rev: '1.14.0'
     hooks:
       - id: django-upgrade
         args: ['--target-version', '4.1']

From d6b46df30a52f02faf35aa90f2812fc3f80ef958 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 16 Jun 2023 01:43:17 -0500
Subject: [PATCH 2806/2840] Update tox from 4.6.0 to 4.6.1 (#4398)

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 0b59babfd..e9253922d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==3.3.3
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.6.0
+tox==4.6.1
 pytest==7.3.2
 pytest-xdist==3.3.1
 pytest-cookies==0.7.0

From 9b3c4e7a94f3c3657127ac9f67f9314a531622ad Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 16 Jun 2023 14:55:01 +0100
Subject: [PATCH 2807/2840] Update django-redis 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 7d733ed7f..22130752f 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -37,7 +37,7 @@ crispy-bootstrap5==0.7  # https://github.com/django-crispy-forms/crispy-bootstra
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
 django-compressor==4.3.1  # https://github.com/django-compressor/django-compressor
 {%- endif %}
-django-redis==5.2.0  # https://github.com/jazzband/django-redis
+django-redis==5.3.0  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == 'y' %}
 # Django REST Framework
 djangorestframework==3.14.0  # https://github.com/encode/django-rest-framework

From 9c8913ef4790d46c4b659137d65840f2ffcbb871 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 16 Jun 2023 15:10:09 -0500
Subject: [PATCH 2808/2840] Update whitenoise from 6.4.0 to 6.5.0 (#4400)

---
 {{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 22130752f..92d6b2a0d 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -9,7 +9,7 @@ rcssmin==1.1.1  # https://github.com/ndparker/rcssmin
 {%- endif %}
 argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
-whitenoise==6.4.0  # https://github.com/evansd/whitenoise
+whitenoise==6.5.0  # https://github.com/evansd/whitenoise
 {%- endif %}
 redis==4.5.5  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}

From fc96e3859161635807b9a874925ff1543dffce0d Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sat, 17 Jun 2023 02:21:32 +0000
Subject: [PATCH 2809/2840] Release 2023.06.16

---
 CHANGELOG.md | 11 +++++++++++
 setup.py     |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index ad0e5acc5..a90c1fecd 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 -->
 
+## 2023.06.16
+
+
+### Updated
+
+- Update whitenoise to 6.5.0 ([#4400](https://github.com/cookiecutter/cookiecutter-django/pull/4400))
+
+- Update django-redis to 5.3.0 ([#4399](https://github.com/cookiecutter/cookiecutter-django/pull/4399))
+
+- Auto-update pre-commit hooks ([#4395](https://github.com/cookiecutter/cookiecutter-django/pull/4395))
+
 ## 2023.06.14
 
 
diff --git a/setup.py b/setup.py
index e6ad617c9..717d19913 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.06.14"
+version = "2023.06.16"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From ba9d73ce2139d9755f504e8452c7d34fcfad7ff9 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 17 Jun 2023 13:38:53 -0500
Subject: [PATCH 2810/2840] Update myst-parser from 1.0.0 to 2.0.0 (#4388)

---
 docs/requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docs/requirements.txt b/docs/requirements.txt
index 1ae530fa7..d06b651b3 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,3 +1,3 @@
 sphinx==6.2.1
 sphinx-rtd-theme==1.2.2
-myst-parser==1.0.0
+myst-parser==2.0.0

From 0b92189b61a51dbaaf990c7cc547bd52b156c7eb Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 17 Jun 2023 13:39:30 -0500
Subject: [PATCH 2811/2840] Update tox from 4.6.1 to 4.6.2 (#4401)

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index e9253922d..95b3d8cdc 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==3.3.3
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.6.1
+tox==4.6.2
 pytest==7.3.2
 pytest-xdist==3.3.1
 pytest-cookies==0.7.0

From 1e40d7908fcc5e3e276db37e0e1f630f7fba2b78 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Sun, 18 Jun 2023 02:31:49 +0000
Subject: [PATCH 2812/2840] Release 2023.06.17

---
 CHANGELOG.md | 3 +++
 setup.py     | 2 +-
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index a90c1fecd..1ed82b9a1 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.06.17
+
+
 ## 2023.06.16
 
 
diff --git a/setup.py b/setup.py
index 717d19913..f03a87a09 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.06.16"
+version = "2023.06.17"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 7ad2e1fdae82e011fa823f5f42590bf6ce3638ee Mon Sep 17 00:00:00 2001
From: Bruno Alla <browniebroke@users.noreply.github.com>
Date: Sun, 18 Jun 2023 13:03:36 +0100
Subject: [PATCH 2813/2840] Fix missing celery env variable when running
 compilemessages (#4403)

---
 .../compose/production/django/Dockerfile                       | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index 5a863ddc5..a48cbc4af 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -122,6 +122,9 @@ RUN chown django:django ${APP_HOME}
 USER django
 
 RUN DATABASE_URL="" \
+  {%- if cookiecutter.use_celery == "y" %}
+  CELERY_BROKER_URL="" \
+  {%- endif %}
   DJANGO_SETTINGS_MODULE="config.settings.test" \
   python manage.py compilemessages
 

From 224f31e7f34ab9daaa8e8394e9c6823e7657fd58 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sun, 18 Jun 2023 07:32:36 -0500
Subject: [PATCH 2814/2840] Update flower from 1.2.0 to 2.0.0 (#4402)

---
 {{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 92d6b2a0d..6a9b57013 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -19,7 +19,7 @@ hiredis==2.2.3  # https://github.com/redis/hiredis-py
 celery==5.3.0  # pyup: < 6.0  # https://github.com/celery/celery
 django-celery-beat==2.5.0  # https://github.com/celery/django-celery-beat
 {%- if cookiecutter.use_docker == 'y' %}
-flower==1.2.0  # https://github.com/mher/flower
+flower==2.0.0  # https://github.com/mher/flower
 {%- endif %}
 {%- endif %}
 {%- if cookiecutter.use_async == 'y' %}

From 95353f07a975a201cd90088ad1b1905611b94d11 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Mon, 19 Jun 2023 02:26:21 +0000
Subject: [PATCH 2815/2840] Release 2023.06.18

---
 CHANGELOG.md | 11 +++++++++++
 setup.py     |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1ed82b9a1..6eabf5799 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 -->
 
+## 2023.06.18
+
+
+### Changed
+
+- Fix missing celery env variable when running compilemessages ([#4403](https://github.com/cookiecutter/cookiecutter-django/pull/4403))
+
+### Updated
+
+- Update flower to 2.0.0 ([#4402](https://github.com/cookiecutter/cookiecutter-django/pull/4402))
+
 ## 2023.06.17
 
 
diff --git a/setup.py b/setup.py
index f03a87a09..335b1cc66 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.06.17"
+version = "2023.06.18"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 2bff4b8a8376cece7268af0635f100fc0c71c9c0 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 19 Jun 2023 04:11:17 -0500
Subject: [PATCH 2816/2840] Update celery to 5.3.1 (#4404)

---
 {{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 6a9b57013..5e7f7d28d 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -16,7 +16,7 @@ redis==4.5.5  # https://github.com/redis/redis-py
 hiredis==2.2.3  # https://github.com/redis/hiredis-py
 {%- endif %}
 {%- if cookiecutter.use_celery == "y" %}
-celery==5.3.0  # pyup: < 6.0  # https://github.com/celery/celery
+celery==5.3.1  # pyup: < 6.0  # https://github.com/celery/celery
 django-celery-beat==2.5.0  # https://github.com/celery/django-celery-beat
 {%- if cookiecutter.use_docker == 'y' %}
 flower==2.0.0  # https://github.com/mher/flower

From 5de0e05490cd28cf517d71b5f19c9aa0afb8889b Mon Sep 17 00:00:00 2001
From: "github-actions[bot]"
 <41898282+github-actions[bot]@users.noreply.github.com>
Date: Mon, 19 Jun 2023 10:11:35 +0100
Subject: [PATCH 2817/2840] Auto-update pre-commit hooks (#4405)

Co-authored-by: browniebroke <browniebroke@users.noreply.github.com>
---
 .pre-commit-config.yaml                               | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 98afc14e0..b35eae073 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -23,7 +23,7 @@ repos:
         args: ["--tab-width", "2"]
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.6.0
+    rev: v3.7.0
     hooks:
       - id: pyupgrade
         args: [--py311-plus]
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index 99b08271c..f16a87fd2 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -31,7 +31,7 @@ repos:
         args: ['--target-version', '4.1']
 
   - repo: https://github.com/asottile/pyupgrade
-    rev: v3.6.0
+    rev: v3.7.0
     hooks:
       - id: pyupgrade
         args: [--py311-plus]

From 399a080c5b708ba72cb53eefa6a270c7a4de5218 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 20 Jun 2023 02:21:32 +0000
Subject: [PATCH 2818/2840] Release 2023.06.19

---
 CHANGELOG.md | 9 +++++++++
 setup.py     | 2 +-
 2 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6eabf5799..d35d947ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,15 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.06.19
+
+
+### Updated
+
+- Auto-update pre-commit hooks ([#4405](https://github.com/cookiecutter/cookiecutter-django/pull/4405))
+
+- Update celery to 5.3.1 ([#4404](https://github.com/cookiecutter/cookiecutter-django/pull/4404))
+
 ## 2023.06.18
 
 
diff --git a/setup.py b/setup.py
index 335b1cc66..64027dad9 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.06.18"
+version = "2023.06.19"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From b4c705f16e1e0c2cd7e070a731e2c900a3e5247a Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 21 Jun 2023 10:36:44 +0100
Subject: [PATCH 2819/2840] Upgrade traefik to 2.10.3 (#4408)

Bumps traefik from 2.10.1 to 2.10.3.

---
updated-dependencies:
- dependency-name: traefik
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
---
 .../compose/production/traefik/Dockerfile                       | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
index 581bbfebd..bdedff720 100644
--- a/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/traefik/Dockerfile
@@ -1,4 +1,4 @@
-FROM traefik:2.10.1
+FROM traefik:2.10.3
 RUN mkdir -p /etc/traefik/acme \
   && touch /etc/traefik/acme/acme.json \
   && chmod 600 /etc/traefik/acme/acme.json

From 91cc9e2f3a654b1fee051a24030aa42d907923bb Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 21 Jun 2023 04:37:05 -0500
Subject: [PATCH 2820/2840] Update tox to 4.6.3 (#4407)

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 95b3d8cdc..084f870f4 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -12,7 +12,7 @@ pre-commit==3.3.3
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==4.6.2
+tox==4.6.3
 pytest==7.3.2
 pytest-xdist==3.3.1
 pytest-cookies==0.7.0

From c2afdae77a958eb34ea0113304a3969376149562 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Thu, 22 Jun 2023 02:26:04 +0000
Subject: [PATCH 2821/2840] Release 2023.06.21

---
 CHANGELOG.md | 7 +++++++
 setup.py     | 2 +-
 2 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index d35d947ac..7d563b1a9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,13 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.06.21
+
+
+### Updated
+
+- Upgrade traefik to 2.10.3 ([#4408](https://github.com/cookiecutter/cookiecutter-django/pull/4408))
+
 ## 2023.06.19
 
 
diff --git a/setup.py b/setup.py
index 64027dad9..3d6c87f92 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.06.19"
+version = "2023.06.21"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 9f9a88670855490d7026e998f7d9443efbb50467 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 22 Jun 2023 10:28:21 -0500
Subject: [PATCH 2822/2840] Update sentry-sdk from 1.25.1 to 1.26.0 (#4409)

---
 {{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 aec79b3d3..36f6e74f5 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -8,7 +8,7 @@ psycopg2==2.9.6  # https://github.com/psycopg/psycopg2
 Collectfast==2.2.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==1.25.1  # https://github.com/getsentry/sentry-python
+sentry-sdk==1.26.0  # https://github.com/getsentry/sentry-python
 {%- endif %}
 {%- if cookiecutter.use_docker == "n" and cookiecutter.windows == "y" %}
 hiredis==2.2.3  # https://github.com/redis/hiredis-py

From a99e28702403bd04e2c44cf760d880a719266c28 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 22 Jun 2023 14:24:23 -0500
Subject: [PATCH 2823/2840] Update drf-spectacular from 0.26.2 to 0.26.3
 (#4411)

---
 {{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 5e7f7d28d..a032f404d 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -43,7 +43,7 @@ django-redis==5.3.0  # https://github.com/jazzband/django-redis
 djangorestframework==3.14.0  # https://github.com/encode/django-rest-framework
 django-cors-headers==4.1.0  # https://github.com/adamchainz/django-cors-headers
 # DRF-spectacular for api documentation
-drf-spectacular==0.26.2  # https://github.com/tfranzel/drf-spectacular
+drf-spectacular==0.26.3  # https://github.com/tfranzel/drf-spectacular
 {%- endif %}
 {%- if cookiecutter.frontend_pipeline == 'Webpack' %}
 django-webpack-loader==2.0.1  # https://github.com/django-webpack/django-webpack-loader

From 2c5342c36d8a917c229249e6c5668e49a0855f62 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 22 Jun 2023 14:24:38 -0500
Subject: [PATCH 2824/2840] Update pygithub from 1.58.2 to 1.59.0 (#4410)

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 084f870f4..15497ac2e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -21,7 +21,7 @@ pyyaml==6.0
 
 # Scripting
 # ------------------------------------------------------------------------------
-PyGithub==1.58.2
+PyGithub==1.59.0
 gitpython==3.1.31
 jinja2==3.1.2
 requests==2.31.0

From d45ecc53f11f540a9f15e63722878957ace31607 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Fri, 23 Jun 2023 02:32:39 +0000
Subject: [PATCH 2825/2840] Release 2023.06.22

---
 CHANGELOG.md | 11 +++++++++++
 setup.py     |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7d563b1a9..56fa84c30 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 -->
 
+## 2023.06.22
+
+
+### Updated
+
+- Update pygithub to 1.59.0 ([#4410](https://github.com/cookiecutter/cookiecutter-django/pull/4410))
+
+- Update drf-spectacular to 0.26.3 ([#4411](https://github.com/cookiecutter/cookiecutter-django/pull/4411))
+
+- Update sentry-sdk to 1.26.0 ([#4409](https://github.com/cookiecutter/cookiecutter-django/pull/4409))
+
 ## 2023.06.21
 
 
diff --git a/setup.py b/setup.py
index 3d6c87f92..9ab3a64bb 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.06.21"
+version = "2023.06.22"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 2b9c56cf3995ae1695a1b084a19de0c4b21e192a Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Fri, 23 Jun 2023 10:21:53 +0100
Subject: [PATCH 2826/2840] Add open-collective to funding file

---
 .github/FUNDING.yml | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml
index 53a486671..23ca7a37f 100644
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -2,11 +2,4 @@
 
 github: [pydanny, browniebroke]
 patreon: feldroy
-open_collective: # Replace with a single Open Collective username
-ko_fi: # Replace with a single Ko-fi username
-tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel
-community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry
-liberapay: # Replace with a single Liberapay username
-issuehunt: # Replace with a single IssueHunt username
-otechie: # Replace with a single Otechie username
-custom: ["https://www.patreon.com/browniebroke"]
+open_collective: cookiecutter-django

From d4824e1934cdf1f4d923e490b2e7119371bf1baa Mon Sep 17 00:00:00 2001
From: Bruno Alla <alla.brunoo@gmail.com>
Date: Fri, 23 Jun 2023 10:35:44 +0100
Subject: [PATCH 2827/2840] Link to OpenCollective in README

---
 README.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/README.md b/README.md
index d718ee34c..bab5aa041 100644
--- a/README.md
+++ b/README.md
@@ -56,10 +56,11 @@ _These features can be enabled during initial project setup._
 
 ## Support this Project!
 
-This project is run by volunteers. Please support them in their efforts to maintain and improve Cookiecutter Django:
+This project is an open source project run by volunteers. You can sponsor us via [OpenCollective](https://opencollective.com/cookiecutter-django) or individually via GitHub Sponsors:
 
 - Daniel Roy Greenfeld, Project Lead ([GitHub](https://github.com/pydanny), [Patreon](https://www.patreon.com/danielroygreenfeld)): expertise in Django and AWS ELB.
 - Fabio C. Barrionuevo, Core Developer ([GitHub](https://github.com/luzfcb)): expertise in Python/Django, hands-on DevOps and frontend experience.
+- Bruno Alla, Core Developer ([GitHub](https://github.com/browniebroke)): expertise in Python/Django and DevOps.
 - Nikita Shupeyko, Core Developer ([GitHub](https://github.com/webyneter)): expertise in Python/Django, hands-on DevOps and frontend experience.
 
 Projects that provide financial support to the maintainers:

From a126dfb96f0143adf3c9cc644f7f79a2c3186476 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 23 Jun 2023 18:48:31 +0100
Subject: [PATCH 2828/2840] Update pytest from 7.3.2 to 7.4.0

---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 15497ac2e..c547458b6 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -13,7 +13,7 @@ pre-commit==3.3.3
 # Testing
 # ------------------------------------------------------------------------------
 tox==4.6.3
-pytest==7.3.2
+pytest==7.4.0
 pytest-xdist==3.3.1
 pytest-cookies==0.7.0
 pytest-instafail==0.5.0

From b2642ac37d12eaa8e94c15214233d51a329e4cdb Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 23 Jun 2023 18:48:31 +0100
Subject: [PATCH 2829/2840] Update pytest from 7.3.2 to 7.4.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 983f96cb9..b3a3e7c74 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -15,7 +15,7 @@ watchfiles==0.19.0  # https://github.com/samuelcolvin/watchfiles
 # ------------------------------------------------------------------------------
 mypy==1.3.0  # https://github.com/python/mypy
 django-stubs==4.2.1  # https://github.com/typeddjango/django-stubs
-pytest==7.3.2  # https://github.com/pytest-dev/pytest
+pytest==7.4.0  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.7  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
 djangorestframework-stubs==3.14.1  # https://github.com/typeddjango/djangorestframework-stubs

From f0357e2ad04628bb99e8a41d4eadd47eb443d4dc Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 25 Jun 2023 16:38:42 +0100
Subject: [PATCH 2830/2840] Update redis from 4.5.5 to 4.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 a032f404d..d23da8c61 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -11,7 +11,7 @@ argon2-cffi==21.3.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==6.5.0  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==4.5.5  # https://github.com/redis/redis-py
+redis==4.6.0  # https://github.com/redis/redis-py
 {%- if cookiecutter.use_docker == "y" or cookiecutter.windows == "n" %}
 hiredis==2.2.3  # https://github.com/redis/hiredis-py
 {%- endif %}

From da6fadd99ea1a6da02d9130727a5e530a38caf2f Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 26 Jun 2023 02:35:34 +0100
Subject: [PATCH 2831/2840] Update mypy from 1.3.0 to 1.4.1

---
 {{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 983f96cb9..b3f53a140 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -13,7 +13,7 @@ watchfiles==0.19.0  # https://github.com/samuelcolvin/watchfiles
 
 # Testing
 # ------------------------------------------------------------------------------
-mypy==1.3.0  # https://github.com/python/mypy
+mypy==1.4.1  # https://github.com/python/mypy
 django-stubs==4.2.1  # https://github.com/typeddjango/django-stubs
 pytest==7.3.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.7  # https://github.com/Frozenball/pytest-sugar

From 541ef05fc80706291ed1f4c0ca559ab73358eb97 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Tue, 27 Jun 2023 02:33:15 +0000
Subject: [PATCH 2832/2840] Release 2023.06.26

---
 CHANGELOG.md | 11 +++++++++++
 setup.py     |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56fa84c30..309f62a26 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 -->
 
+## 2023.06.26
+
+
+### Updated
+
+- Update pytest to 7.4.0 ([#4412](https://github.com/cookiecutter/cookiecutter-django/pull/4412))
+
+- Update redis to 4.6.0 ([#4415](https://github.com/cookiecutter/cookiecutter-django/pull/4415))
+
+- Update mypy to 1.4.1 ([#4416](https://github.com/cookiecutter/cookiecutter-django/pull/4416))
+
 ## 2023.06.22
 
 
diff --git a/setup.py b/setup.py
index 9ab3a64bb..bf58e0239 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.06.22"
+version = "2023.06.26"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From 30e85068727dc7d609f410804614a43c463cca0c Mon Sep 17 00:00:00 2001
From: monosans <hsyqixco@protonmail.com>
Date: Tue, 27 Jun 2023 21:52:36 +0000
Subject: [PATCH 2833/2840] Add djLint for HTML formatting and linting (#4389)

* Add djLint for HTML formatting and linting

* Remove djLint pre-commit hook

* Bump djLint from 1.31.0 to 1.31.1
---
 pyproject.toml                                |  21 ++
 requirements.txt                              |   1 +
 tests/test_cookiecutter_generation.py         |  26 ++
 .../.pre-commit-config.yaml                   |   6 +
 {{cookiecutter.project_slug}}/pyproject.toml  |  20 ++
 .../requirements/local.txt                    |   1 +
 .../templates/403.html                        |  14 +-
 .../templates/404.html                        |  14 +-
 .../templates/500.html                        |  13 +-
 .../templates/account/account_inactive.html   |  12 +-
 .../templates/account/base.html               |  15 +-
 .../templates/account/email.html              | 135 ++++----
 .../templates/account/email_confirm.html      |  46 ++-
 .../templates/account/login.html              |  91 +++---
 .../templates/account/logout.html             |  29 +-
 .../templates/account/password_change.html    |  22 +-
 .../templates/account/password_reset.html     |  37 ++-
 .../account/password_reset_done.html          |  19 +-
 .../account/password_reset_from_key.html      |  42 ++-
 .../account/password_reset_from_key_done.html |  10 +-
 .../templates/account/password_set.html       |  25 +-
 .../templates/account/signup.html             |  37 ++-
 .../templates/account/signup_closed.html      |  12 +-
 .../templates/account/verification_sent.html  |  15 +-
 .../account/verified_email_required.html      |  31 +-
 .../templates/base.html                       | 294 ++++++++++--------
 .../templates/pages/about.html                |   4 +-
 .../templates/pages/home.html                 |   4 +-
 .../templates/users/user_detail.html          |  62 ++--
 .../templates/users/user_form.html            |  42 ++-
 30 files changed, 643 insertions(+), 457 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 2b4b98783..2a9f00b29 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -27,3 +27,24 @@ known_first_party = [
     "scripts",
     "hooks",
 ]
+
+
+# ==== djLint ====
+[tool.djlint]
+blank_line_after_tag = "load,extends"
+close_void_tags = true
+format_css = true
+format_js = true
+# TODO: remove T002 when fixed https://github.com/Riverside-Healthcare/djLint/issues/687
+ignore = "H006,H030,H031,T002,T028"
+ignore_blocks = "raw"
+include = "H017,H035"
+indent = 2
+max_line_length = 119
+profile = "jinja"
+
+[tool.djlint.css]
+indent_size = 2
+
+[tool.djlint.js]
+indent_size = 2
diff --git a/requirements.txt b/requirements.txt
index c547458b6..d6d0ca754 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,6 +8,7 @@ black==23.3.0
 isort==5.12.0
 flake8==6.0.0
 django-upgrade==1.14.0
+djlint==1.31.1
 pre-commit==3.3.3
 
 # Testing
diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 778e3411f..bb91e329a 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -239,6 +239,32 @@ def test_django_upgrade_passes(cookies, context_override):
         pytest.fail(e.stdout.decode())
 
 
+@pytest.mark.parametrize("context_override", SUPPORTED_COMBINATIONS, ids=_fixture_id)
+def test_djlint_lint_passes(cookies, context_override):
+    """Check whether generated project passes djLint --lint."""
+    result = cookies.bake(extra_context=context_override)
+
+    autofixable_rules = "H014,T001"
+    # TODO: remove T002 when fixed https://github.com/Riverside-Healthcare/djLint/issues/687
+    ignored_rules = "H006,H030,H031,T002"
+    try:
+        sh.djlint("--lint", "--ignore", f"{autofixable_rules},{ignored_rules}", ".", _cwd=str(result.project_path))
+    except sh.ErrorReturnCode as e:
+        pytest.fail(e.stdout.decode())
+
+
+@auto_fixable
+@pytest.mark.parametrize("context_override", SUPPORTED_COMBINATIONS, ids=_fixture_id)
+def test_djlint_check_passes(cookies, context_override):
+    """Check whether generated project passes djLint --check."""
+    result = cookies.bake(extra_context=context_override)
+
+    try:
+        sh.djlint("--check", ".", _cwd=str(result.project_path))
+    except sh.ErrorReturnCode as e:
+        pytest.fail(e.stdout.decode())
+
+
 @pytest.mark.parametrize(
     ["use_docker", "expected_test_script"],
     [
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index f16a87fd2..f400001f1 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -51,6 +51,12 @@ repos:
     hooks:
       - id: flake8
 
+  - repo: https://github.com/Riverside-Healthcare/djLint
+    rev: v1.31.1
+    hooks:
+      - id: djlint-reformat-django
+      - id: djlint-django
+
 # sets up .pre-commit-ci.yaml to ensure pre-commit dependencies stay up to date
 ci:
   autoupdate_schedule: weekly
diff --git a/{{cookiecutter.project_slug}}/pyproject.toml b/{{cookiecutter.project_slug}}/pyproject.toml
index 6acac9b2c..7e4c9aa9c 100644
--- a/{{cookiecutter.project_slug}}/pyproject.toml
+++ b/{{cookiecutter.project_slug}}/pyproject.toml
@@ -90,3 +90,23 @@ generated-members = [
     "save",
     "delete",
 ]
+
+
+# ==== djLint ====
+[tool.djlint]
+blank_line_after_tag = "load,extends"
+close_void_tags = true
+format_css = true
+format_js = true
+# TODO: remove T002 when fixed https://github.com/Riverside-Healthcare/djLint/issues/687
+ignore = "H006,H030,H031,T002"
+include = "H017,H035"
+indent = 2
+max_line_length = 119
+profile = "django"
+
+[tool.djlint.css]
+indent_size = 2
+
+[tool.djlint.js]
+indent_size = 2
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 543b86b70..bf4e8a49d 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -32,6 +32,7 @@ flake8==6.0.0  # https://github.com/PyCQA/flake8
 flake8-isort==6.0.0  # https://github.com/gforcada/flake8-isort
 coverage==7.2.7  # https://github.com/nedbat/coveragepy
 black==23.3.0  # https://github.com/psf/black
+djlint==1.31.1  # https://github.com/Riverside-Healthcare/djLint
 pylint-django==2.5.3  # https://github.com/PyCQA/pylint-django
 {%- if cookiecutter.use_celery == 'y' %}
 pylint-celery==0.3  # https://github.com/PyCQA/pylint-celery
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/403.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/403.html
index 4c4745f7d..d90b33f9b 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/403.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/403.html
@@ -1,10 +1,14 @@
 {% raw %}{% extends "base.html" %}
 
-{% block title %}Forbidden (403){% endblock %}
-
+{% block title %}Forbidden (403){% endblock title %}
 {% block content %}
-<h1>Forbidden (403)</h1>
-
-<p>{% if exception %}{{ exception }}{% else %}You're not allowed to access this page.{% endif %}</p>
+  <h1>Forbidden (403)</h1>
+  <p>
+    {% if exception %}
+      {{ exception }}
+    {% else %}
+      You're not allowed to access this page.
+    {% endif %}
+  </p>
 {% endblock content %}
 {%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/404.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/404.html
index d98241858..621596412 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/404.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/404.html
@@ -1,10 +1,14 @@
 {% raw %}{% extends "base.html" %}
 
-{% block title %}Page not found{% endblock %}
-
+{% block title %}Page not found{% endblock title %}
 {% block content %}
-<h1>Page not found</h1>
-
-<p>{% if exception %}{{ exception }}{% else %}This is not the page you were looking for.{% endif %}</p>
+  <h1>Page not found</h1>
+  <p>
+    {% if exception %}
+      {{ exception }}
+    {% else %}
+      This is not the page you were looking for.
+    {% endif %}
+  </p>
 {% endblock content %}
 {%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/500.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/500.html
index 481bb2d0b..890320164 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/500.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/500.html
@@ -1,12 +1,11 @@
 {% raw %}{% extends "base.html" %}
 
-{% block title %}Server Error{% endblock %}
-
+{% block title %}Server Error{% endblock title %}
 {% block content %}
-<h1>Ooops!!! 500</h1>
-
-<h3>Looks like something went wrong!</h3>
-
-<p>We track these errors automatically, but if the problem persists feel free to contact us. In the meantime, try refreshing.</p>
+  <h1>Ooops!!! 500</h1>
+  <h3>Looks like something went wrong!</h3>
+  <p>
+    We track these errors automatically, but if the problem persists feel free to contact us. In the meantime, try refreshing.
+  </p>
 {% endblock content %}
 {%- endraw %}
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 ab910820e..a9112cf09 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 %}{% translate "Account Inactive" %}{% endblock %}
-
+{% block head_title %}
+  {% translate "Account Inactive" %}
+{% endblock head_title %}
 {% block inner %}
-<h1>{% translate "Account Inactive" %}</h1>
-
-<p>{% translate "This account is inactive." %}</p>
-{% endblock %}
+  <h1>{% translate "Account Inactive" %}</h1>
+  <p>{% translate "This account is inactive." %}</p>
+{% endblock inner %}
 {%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/base.html
index 03c86724b..057618257 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/base.html
@@ -1,11 +1,14 @@
 {% raw %}{% extends "base.html" %}
-{% block title %}{% block head_title %}{% endblock head_title %}{% endblock title %}
 
+{% block title %}
+  {% block head_title %}
+  {% endblock head_title %}
+{% endblock title %}
 {% block content %}
-<div class="row">
-  <div class="col-md-6 offset-md-3">
-    {% block inner %}{% endblock %}
+  <div class="row">
+    <div class="col-md-6 offset-md-3">
+      {% block inner %}{% endblock inner %}
+    </div>
   </div>
-</div>
-{% endblock %}
+{% endblock content %}
 {%- 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 1faa2b9fd..37770f00c 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email.html
@@ -4,76 +4,77 @@
 {% load i18n %}
 {% load crispy_forms_tags %}
 
-{% block head_title %}{% translate "Account" %}{% endblock %}
-
+{% block head_title %}
+  {% translate "Account" %}
+{% endblock head_title %}
 {% block inner %}
-<h1>{% translate "E-mail Addresses" %}</h1>
-
-{% if user.emailaddress_set.all %}
-<p>{% translate 'The following e-mail addresses are associated with your account:' %}</p>
-
-<form action="{% url 'account_email' %}" class="email_list" method="post">
-{% csrf_token %}
-<fieldset class="blockLabels">
-
-  {% for emailaddress in user.emailaddress_set.all %}
-<div class="radio">
-  <label for="email_radio_{{forloop.counter}}" class="{% if emailaddress.primary %}primary_email{%endif%}">
-
-    <input id="email_radio_{{forloop.counter}}" type="radio" name="email" {% if emailaddress.primary or user.emailaddress_set.count == 1 %}checked="checked"{%endif %} value="{{emailaddress.email}}"/>
-
-    {{ emailaddress.email }}
-    {% if emailaddress.verified %}
-    <span class="verified">{% translate "Verified" %}</span>
-    {% else %}
-    <span class="unverified">{% translate "Unverified" %}</span>
-    {% endif %}
-    {% if emailaddress.primary %}<span class="primary">{% translate "Primary" %}</span>{% endif %}
-  </label>
-</div>
-  {% endfor %}
-
-<div class="form-group">
-      <button class="secondaryAction btn btn-primary" type="submit" name="action_primary" >{% translate 'Make Primary' %}</button>
-      <button class="secondaryAction btn btn-primary" type="submit" name="action_send" >{% translate 'Re-send Verification' %}</button>
-      <button class="primaryAction btn btn-primary" type="submit" name="action_remove" >{% translate 'Remove' %}</button>
-</div>
-
-</fieldset>
-</form>
-
-{% else %}
-<p><strong>{% translate 'Warning:'%}</strong> {% translate "You currently do not have any e-mail address set up. You should really add an e-mail address so you can receive notifications, reset your password, etc." %}</p>
-
-{% endif %}
-
-
-    <h2>{% translate "Add E-mail Address" %}</h2>
-
-    <form method="post" action="{% url 'account_email' %}" class="add_email">
-        {% csrf_token %}
-        {{ form|crispy }}
-        <button class="btn btn-primary" name="action_add" type="submit">{% translate "Add E-mail" %}</button>
+  <h1>{% translate "E-mail Addresses" %}</h1>
+  {% if user.emailaddress_set.all %}
+    <p>{% translate "The following e-mail addresses are associated with your account:" %}</p>
+    <form action="{% url 'account_email' %}" class="email_list" method="post">
+      {% csrf_token %}
+      <fieldset class="blockLabels">
+        {% for emailaddress in user.emailaddress_set.all %}
+          <div class="radio">
+            <label for="email_radio_{{ forloop.counter }}"
+                   class="{% if emailaddress.primary %}primary_email{% endif %}">
+              <input id="email_radio_{{ forloop.counter }}"
+                     type="radio"
+                     name="email"
+                     {% if emailaddress.primary or user.emailaddress_set.count == 1 %}checked="checked"{% endif %}
+                     value="{{ emailaddress.email }}" />
+              {{ emailaddress.email }}
+              {% if emailaddress.verified %}
+                <span class="verified">{% translate "Verified" %}</span>
+              {% else %}
+                <span class="unverified">{% translate "Unverified" %}</span>
+              {% endif %}
+              {% if emailaddress.primary %}
+                <span class="primary">{% translate "Primary" %}</span>
+              {% endif %}
+            </label>
+          </div>
+        {% endfor %}
+        <div class="form-group">
+          <button class="secondaryAction btn btn-primary"
+                  type="submit"
+                  name="action_primary">{% translate "Make Primary" %}</button>
+          <button class="secondaryAction btn btn-primary"
+                  type="submit"
+                  name="action_send">{% translate "Re-send Verification" %}</button>
+          <button class="primaryAction btn btn-primary"
+                  type="submit"
+                  name="action_remove">{% translate "Remove" %}</button>
+        </div>
+      </fieldset>
     </form>
-
-{% endblock %}
-
-
+  {% else %}
+    <p>
+      <strong>{% translate "Warning:" %}</strong> {% translate "You currently do not have any e-mail address set up. You should really add an e-mail address so you can receive notifications, reset your password, etc." %}
+    </p>
+  {% endif %}
+  <h2>{% translate "Add E-mail Address" %}</h2>
+  <form method="post" action="{% url 'account_email' %}" class="add_email">
+    {% csrf_token %}
+    {{ form|crispy }}
+    <button class="btn btn-primary" name="action_add" type="submit">{% translate "Add E-mail" %}</button>
+  </form>
+{% endblock inner %}
 {% block inline_javascript %}
-{{ block.super }}
-<script type="text/javascript">
-window.addEventListener('DOMContentLoaded',function() {
-  const message = "{% translate 'Do you really want to remove the selected e-mail address?' %}";
-  const actions = document.getElementsByName('action_remove');
-  if (actions.length) {
-    actions[0].addEventListener("click",function(e) {
-      if (!confirm(message)) {
-        e.preventDefault();
+  {{ block.super }}
+  <script type="text/javascript">
+    window.addEventListener('DOMContentLoaded', function() {
+      const message = "{% translate 'Do you really want to remove the selected e-mail address?' %}";
+      const actions = document.getElementsByName('action_remove');
+      if (actions.length) {
+        actions[0].addEventListener("click", function(e) {
+          if (!confirm(message)) {
+            e.preventDefault();
+          }
+        });
       }
+      Array.from(document.getElementsByClassName('form-group')).forEach(x => x.classList.remove('row'));
     });
-  }
-  Array.from(document.getElementsByClassName('form-group')).forEach(x => x.classList.remove('row'));
-});
-</script>
-{% endblock %}
+  </script>
+{% endblock inline_javascript %}
 {%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email_confirm.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/email_confirm.html
index 5e4924c83..40ca4a47b 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,30 +3,26 @@
 {% load i18n %}
 {% load account %}
 
-{% block head_title %}{% translate "Confirm E-mail Address" %}{% endblock %}
-
-
+{% block head_title %}
+  {% translate "Confirm E-mail Address" %}
+{% endblock head_title %}
 {% block inner %}
-<h1>{% translate "Confirm E-mail Address" %}</h1>
-
-{% if confirmation %}
-
-{% user_display confirmation.email_address.user as user_display %}
-
-<p>{% blocktranslate with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for user {{ user_display }}.{% endblocktranslate %}</p>
-
-<form method="post" action="{% url 'account_confirm_email' confirmation.key %}">
-{% csrf_token %}
-    <button class="btn btn-primary" type="submit">{% translate 'Confirm' %}</button>
-</form>
-
-{% else %}
-
-{% url 'account_email' as email_url %}
-
-<p>{% blocktranslate %}This e-mail confirmation link expired or is invalid. Please <a href="{{ email_url }}">issue a new e-mail confirmation request</a>.{% endblocktranslate %}</p>
-
-{% endif %}
-
-{% endblock %}
+  <h1>{% translate "Confirm E-mail Address" %}</h1>
+  {% if confirmation %}
+    {% user_display confirmation.email_address.user as user_display %}
+    <p>
+      {% blocktranslate with confirmation.email_address.email as email %}Please confirm that <a href="mailto:{{ email }}">{{ email }}</a> is an e-mail address for user {{ user_display }}.{% endblocktranslate %}
+    </p>
+    <form method="post"
+          action="{% url 'account_confirm_email' confirmation.key %}">
+      {% csrf_token %}
+      <button class="btn btn-primary" type="submit">{% translate "Confirm" %}</button>
+    </form>
+  {% else %}
+    {% url 'account_email' as email_url %}
+    <p>
+      {% blocktranslate %}This e-mail confirmation link expired or is invalid. Please <a href="{{ email_url }}">issue a new e-mail confirmation request</a>.{% endblocktranslate %}
+    </p>
+  {% endif %}
+{% endblock inner %}
 {%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/login.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/login.html
index 25a292eda..5737afc06 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/login.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/login.html
@@ -4,57 +4,50 @@
 {% load account socialaccount %}
 {% load crispy_forms_tags %}
 
-{% block head_title %}{% translate "Sign In" %}{% endblock %}
-
+{% block head_title %}
+  {% translate "Sign In" %}
+{% endblock head_title %}
 {% block inner %}
-
-<h1>{% translate "Sign In" %}</h1>
-
-{% get_providers as socialaccount_providers %}
-
-{% if socialaccount_providers %}
-  <p>
-    {% translate "Please sign in with one of your existing third party accounts:" %}
-    {% if ACCOUNT_ALLOW_REGISTRATION %}
-      {% blocktranslate trimmed %}
-        Or, <a href="{{ signup_url }}">sign up</a>
-        for a {{ site_name }} account and sign in below:
-      {% endblocktranslate %}
-    {% endif %}
-  </p>
-
-  <div class="socialaccount_ballot">
-
-    <ul class="socialaccount_providers">
-      {% include "socialaccount/snippets/provider_list.html" with process="login" %}
-    </ul>
-
-    <div class="login-or">{% translate "or" %}</div>
-
-  </div>
-
-  {% include "socialaccount/snippets/login_extra.html" %}
-
-{% else %}
-  {% if ACCOUNT_ALLOW_REGISTRATION %}
+  <h1>{% translate "Sign In" %}</h1>
+  {% get_providers as socialaccount_providers %}
+  {% if socialaccount_providers %}
     <p>
-      {% blocktranslate trimmed %}
-        If you have not created an account yet, then please
-        <a href="{{ signup_url }}">sign up</a> first.
-      {% endblocktranslate %}
+      {% translate "Please sign in with one of your existing third party accounts:" %}
+      {% if ACCOUNT_ALLOW_REGISTRATION %}
+        {% blocktranslate trimmed %}
+          Or, <a href="{{ signup_url }}">sign up</a>
+          for a {{ site_name }} account and sign in below:
+        {% endblocktranslate %}
+      {% endif %}
     </p>
+    <div class="socialaccount_ballot">
+      <ul class="socialaccount_providers">
+        {% include "socialaccount/snippets/provider_list.html" with process="login" %}
+      </ul>
+      <div class="login-or">{% translate "or" %}</div>
+    </div>
+    {% include "socialaccount/snippets/login_extra.html" %}
+  {% else %}
+    {% if ACCOUNT_ALLOW_REGISTRATION %}
+      <p>
+        {% blocktranslate trimmed %}
+          If you have not created an account yet, then please
+          <a href="{{ signup_url }}">sign up</a> first.
+        {% endblocktranslate %}
+      </p>
+    {% endif %}
   {% endif %}
-{% endif %}
-
-<form class="login" method="POST" action="{% url 'account_login' %}">
-  {% csrf_token %}
-  {{ form|crispy }}
-  {% if redirect_field_value %}
-  <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
-  {% endif %}
-  <a class="button secondaryAction" href="{% url 'account_reset_password' %}">{% translate "Forgot Password?" %}</a>
-  <button class="primaryAction btn btn-primary" type="submit">{% translate "Sign In" %}</button>
-</form>
-
-{% endblock %}
+  <form class="login" method="post" action="{% url 'account_login' %}">
+    {% csrf_token %}
+    {{ form|crispy }}
+    {% if redirect_field_value %}
+      <input type="hidden"
+             name="{{ redirect_field_name }}"
+             value="{{ redirect_field_value }}" />
+    {% endif %}
+    <a class="button secondaryAction"
+       href="{% url 'account_reset_password' %}">{% translate "Forgot Password?" %}</a>
+    <button class="primaryAction btn btn-primary" type="submit">{% translate "Sign In" %}</button>
+  </form>
+{% endblock inner %}
 {%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/logout.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/logout.html
index 5edc60478..43ae9ed38 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,20 @@
 
 {% load i18n %}
 
-{% block head_title %}{% translate "Sign Out" %}{% endblock %}
-
+{% block head_title %}
+  {% translate "Sign Out" %}
+{% endblock head_title %}
 {% block inner %}
-<h1>{% translate "Sign Out" %}</h1>
-
-<p>{% translate 'Are you sure you want to sign out?' %}</p>
-
-<form method="post" action="{% url 'account_logout' %}">
-  {% csrf_token %}
-  {% if redirect_field_value %}
-  <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}"/>
-  {% endif %}
-  <button class="btn btn-danger" type="submit">{% translate 'Sign Out' %}</button>
-</form>
-{% endblock %}
+  <h1>{% translate "Sign Out" %}</h1>
+  <p>{% translate "Are you sure you want to sign out?" %}</p>
+  <form method="post" action="{% url 'account_logout' %}">
+    {% csrf_token %}
+    {% if redirect_field_value %}
+      <input type="hidden"
+             name="{{ redirect_field_name }}"
+             value="{{ redirect_field_value }}" />
+    {% endif %}
+    <button class="btn btn-danger" type="submit">{% translate "Sign Out" %}</button>
+  </form>
+{% endblock inner %}
 {%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_change.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_change.html
index b8dd7ac53..2e6110d5d 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,17 @@
 {% load i18n %}
 {% load crispy_forms_tags %}
 
-{% block head_title %}{% translate "Change Password" %}{% endblock %}
-
+{% block head_title %}
+  {% translate "Change Password" %}
+{% endblock head_title %}
 {% block inner %}
-    <h1>{% translate "Change Password" %}</h1>
-
-    <form method="POST" action="{% url 'account_change_password' %}" class="password_change">
-        {% csrf_token %}
-        {{ form|crispy }}
-        <button class="btn btn-primary" type="submit" name="action">{% translate "Change Password" %}</button>
-    </form>
-{% endblock %}
+  <h1>{% translate "Change Password" %}</h1>
+  <form method="post"
+        action="{% url 'account_change_password' %}"
+        class="password_change">
+    {% csrf_token %}
+    {{ form|crispy }}
+    <button class="btn btn-primary" type="submit" name="action">{% translate "Change Password" %}</button>
+  </form>
+{% endblock inner %}
 {%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset.html
index f424b2111..0c184269a 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,26 @@
 {% load account %}
 {% load crispy_forms_tags %}
 
-{% block head_title %}{% translate "Password Reset" %}{% endblock %}
-
+{% block head_title %}
+  {% translate "Password Reset" %}
+{% endblock head_title %}
 {% block inner %}
-
-    <h1>{% translate "Password Reset" %}</h1>
-    {% if user.is_authenticated %}
+  <h1>{% translate "Password Reset" %}</h1>
+  {% if user.is_authenticated %}
     {% include "account/snippets/already_logged_in.html" %}
-    {% endif %}
-
-    <p>{% translate "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it." %}</p>
-
-    <form method="POST" action="{% url 'account_reset_password' %}" class="password_reset">
-        {% csrf_token %}
-        {{ form|crispy }}
-        <input class="btn btn-primary" type="submit" value="{% translate 'Reset My Password' %}" />
-    </form>
-
-    <p>{% blocktranslate %}Please contact us if you have any trouble resetting your password.{% endblocktranslate %}</p>
-{% endblock %}
+  {% endif %}
+  <p>
+    {% translate "Forgotten your password? Enter your e-mail address below, and we'll send you an e-mail allowing you to reset it." %}
+  </p>
+  <form method="post"
+        action="{% url 'account_reset_password' %}"
+        class="password_reset">
+    {% csrf_token %}
+    {{ form|crispy }}
+    <input class="btn btn-primary"
+           type="submit"
+           value="{% translate 'Reset My Password' %}" />
+  </form>
+  <p>{% blocktranslate %}Please contact us if you have any trouble resetting your password.{% endblocktranslate %}</p>
+{% endblock inner %}
 {%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset_done.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset_done.html
index 76d07eb21..a596425bb 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,16 @@
 {% load i18n %}
 {% load account %}
 
-{% block head_title %}{% translate "Password Reset" %}{% endblock %}
-
+{% block head_title %}
+  {% translate "Password Reset" %}
+{% endblock head_title %}
 {% block inner %}
-    <h1>{% translate "Password Reset" %}</h1>
-
-    {% if user.is_authenticated %}
+  <h1>{% translate "Password Reset" %}</h1>
+  {% if user.is_authenticated %}
     {% include "account/snippets/already_logged_in.html" %}
-    {% endif %}
-
-    <p>{% blocktranslate %}We have sent you an e-mail. Please contact us if you do not receive it within a few minutes.{% endblocktranslate %}</p>
-{% endblock %}
+  {% endif %}
+  <p>
+    {% blocktranslate %}We have sent you an e-mail. Please contact us if you do not receive it within a few minutes.{% endblocktranslate %}
+  </p>
+{% endblock inner %}
 {%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset_from_key.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset_from_key.html
index ce5d72a6d..a958ba089 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,24 +2,36 @@
 
 {% load i18n %}
 {% load crispy_forms_tags %}
-{% block head_title %}{% translate "Change Password" %}{% endblock %}
 
+{% block head_title %}
+  {% translate "Change Password" %}
+{% endblock head_title %}
 {% block inner %}
-    <h1>{% if token_fail %}{% translate "Bad Token" %}{% else %}{% translate "Change Password" %}{% endif %}</h1>
-
+  <h1>
     {% if token_fail %}
-        {% url 'account_reset_password' as passwd_reset_url %}
-        <p>{% blocktranslate %}The password reset link was invalid, possibly because it has already been used.  Please request a <a href="{{ passwd_reset_url }}">new password reset</a>.{% endblocktranslate %}</p>
+      {% translate "Bad Token" %}
     {% else %}
-        {% if form %}
-            <form method="POST" action=".">
-                {% csrf_token %}
-                {{ form|crispy }}
-                <input class="btn btn-primary" type="submit" name="action" value="{% translate 'change password' %}"/>
-            </form>
-        {% else %}
-            <p>{% translate 'Your password is now changed.' %}</p>
-        {% endif %}
+      {% translate "Change Password" %}
     {% endif %}
-{% endblock %}
+  </h1>
+  {% if token_fail %}
+    {% url 'account_reset_password' as passwd_reset_url %}
+    <p>
+      {% blocktranslate %}The password reset link was invalid, possibly because it has already been used.  Please request a <a href="{{ passwd_reset_url }}">new password reset</a>.{% endblocktranslate %}
+    </p>
+  {% else %}
+    {% if form %}
+      <form method="post" action=".">
+        {% csrf_token %}
+        {{ form|crispy }}
+        <input class="btn btn-primary"
+               type="submit"
+               name="action"
+               value="{% translate 'change password' %}" />
+      </form>
+    {% else %}
+      <p>{% translate "Your password is now changed." %}</p>
+    {% endif %}
+  {% endif %}
+{% endblock inner %}
 {%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset_from_key_done.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_reset_from_key_done.html
index 34123fd53..ee399b404 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,12 @@
 {% raw %}{% extends "account/base.html" %}
 
 {% load i18n %}
-{% block head_title %}{% translate "Change Password" %}{% endblock %}
 
+{% block head_title %}
+  {% translate "Change Password" %}
+{% endblock head_title %}
 {% block inner %}
-    <h1>{% translate "Change Password" %}</h1>
-    <p>{% translate 'Your password is now changed.' %}</p>
-{% endblock %}
+  <h1>{% translate "Change Password" %}</h1>
+  <p>{% translate "Your password is now changed." %}</p>
+{% endblock inner %}
 {%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_set.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/password_set.html
index 812410fc0..3efc30874 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,20 @@
 {% load i18n %}
 {% load crispy_forms_tags %}
 
-{% block head_title %}{% translate "Set Password" %}{% endblock %}
-
+{% block head_title %}
+  {% translate "Set Password" %}
+{% endblock head_title %}
 {% block inner %}
-    <h1>{% translate "Set Password" %}</h1>
-
-    <form method="POST" action="{% url 'account_set_password' %}" class="password_set">
-        {% csrf_token %}
-        {{ form|crispy }}
-        <input class="btn btn-primary" type="submit" name="action" value="{% translate 'Set Password' %}"/>
-    </form>
-{% endblock %}
+  <h1>{% translate "Set Password" %}</h1>
+  <form method="post"
+        action="{% url 'account_set_password' %}"
+        class="password_set">
+    {% csrf_token %}
+    {{ form|crispy }}
+    <input class="btn btn-primary"
+           type="submit"
+           name="action"
+           value="{% translate 'Set Password' %}" />
+  </form>
+{% endblock inner %}
 {%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/signup.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/signup.html
index 8c1c11aca..54150a474 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/signup.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/signup.html
@@ -3,21 +3,26 @@
 {% load i18n %}
 {% load crispy_forms_tags %}
 
-{% block head_title %}{% translate "Signup" %}{% endblock %}
-
+{% block head_title %}
+  {% translate "Signup" %}
+{% endblock head_title %}
 {% block inner %}
-<h1>{% translate "Sign Up" %}</h1>
-
-<p>{% blocktranslate %}Already have an account? Then please <a href="{{ login_url }}">sign in</a>.{% endblocktranslate %}</p>
-
-<form class="signup" id="signup_form" method="post" action="{% url 'account_signup' %}">
-  {% csrf_token %}
-  {{ form|crispy }}
-  {% if redirect_field_value %}
-  <input type="hidden" name="{{ redirect_field_name }}" value="{{ redirect_field_value }}" />
-  {% endif %}
-  <button class="btn btn-primary" type="submit">{% translate "Sign Up" %} &raquo;</button>
-</form>
-
-{% endblock %}
+  <h1>{% translate "Sign Up" %}</h1>
+  <p>
+    {% blocktranslate %}Already have an account? Then please <a href="{{ login_url }}">sign in</a>.{% endblocktranslate %}
+  </p>
+  <form class="signup"
+        id="signup_form"
+        method="post"
+        action="{% url 'account_signup' %}">
+    {% csrf_token %}
+    {{ form|crispy }}
+    {% if redirect_field_value %}
+      <input type="hidden"
+             name="{{ redirect_field_name }}"
+             value="{{ redirect_field_value }}" />
+    {% endif %}
+    <button class="btn btn-primary" type="submit">{% translate "Sign Up" %} »</button>
+  </form>
+{% endblock inner %}
 {%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/signup_closed.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/signup_closed.html
index c2e64d14f..b3472ed6d 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 %}{% translate "Sign Up Closed" %}{% endblock %}
-
+{% block head_title %}
+  {% translate "Sign Up Closed" %}
+{% endblock head_title %}
 {% block inner %}
-<h1>{% translate "Sign Up Closed" %}</h1>
-
-<p>{% translate "We are sorry, but the sign up is currently closed." %}</p>
-{% endblock %}
+  <h1>{% translate "Sign Up Closed" %}</h1>
+  <p>{% translate "We are sorry, but the sign up is currently closed." %}</p>
+{% endblock inner %}
 {%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/verification_sent.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/verification_sent.html
index be8f1cef9..d71bbc41a 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,13 @@
 
 {% load i18n %}
 
-{% block head_title %}{% translate "Verify Your E-mail Address" %}{% endblock %}
-
+{% block head_title %}
+  {% translate "Verify Your E-mail Address" %}
+{% endblock head_title %}
 {% block inner %}
-    <h1>{% translate "Verify Your E-mail Address" %}</h1>
-
-    <p>{% blocktranslate %}We have sent an e-mail to you for verification. Follow the link provided to finalize the signup process. Please contact us if you do not receive it within a few minutes.{% endblocktranslate %}</p>
-
-{% endblock %}
+  <h1>{% translate "Verify Your E-mail Address" %}</h1>
+  <p>
+    {% blocktranslate %}We have sent an e-mail to you for verification. Follow the link provided to finalize the signup process. Please contact us if you do not receive it within a few minutes.{% endblocktranslate %}
+  </p>
+{% endblock inner %}
 {%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/verified_email_required.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/account/verified_email_required.html
index 2148a1804..b736581ce 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,24 @@
 
 {% load i18n %}
 
-{% block head_title %}{% translate "Verify Your E-mail Address" %}{% endblock %}
-
+{% block head_title %}
+  {% translate "Verify Your E-mail Address" %}
+{% endblock head_title %}
 {% block inner %}
-<h1>{% translate "Verify Your E-mail Address" %}</h1>
-
-{% url 'account_email' as email_url %}
-
-<p>{% blocktranslate %}This part of the site requires us to verify that
+  <h1>{% translate "Verify Your E-mail Address" %}</h1>
+  {% url 'account_email' as email_url %}
+  <p>
+    {% blocktranslate %}This part of the site requires us to verify that
 you are who you claim to be. For this purpose, we require that you
-verify ownership of your e-mail address. {% endblocktranslate %}</p>
-
-<p>{% blocktranslate %}We have sent an e-mail to you for
+verify ownership of your e-mail address. {% endblocktranslate %}
+  </p>
+  <p>
+    {% blocktranslate %}We have sent an e-mail to you for
 verification. Please click on the link inside this e-mail. Please
-contact us if you do not receive it within a few minutes.{% endblocktranslate %}</p>
-
-<p>{% blocktranslate %}<strong>Note:</strong> you can still <a href="{{ email_url }}">change your e-mail address</a>.{% endblocktranslate %}</p>
-{% endblock %}
+contact us if you do not receive it within a few minutes.{% endblocktranslate %}
+  </p>
+  <p>
+    {% blocktranslate %}<strong>Note:</strong> you can still <a href="{{ email_url }}">change your e-mail address</a>.{% endblocktranslate %}
+  </p>
+{% endblock inner %}
 {%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
index 44f0d5c52..421973e57 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/base.html
@@ -1,150 +1,194 @@
-{% raw %}{% load static i18n {% endraw %}
-{%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}compress
-{%- endif %}{% raw %}%}{% endraw %}
-{%- if cookiecutter.frontend_pipeline == 'Webpack' %}{% raw %}{% load render_bundle from webpack_loader %}{% endraw %}
+{% raw %}
+{% load static i18n {% endraw %}
+
+{%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}compress{%- endif %}{% raw %}%}{% endraw %}
+  {%- if cookiecutter.frontend_pipeline == 'Webpack' %}{% raw %}
+    {% load render_bundle from webpack_loader %}
+
+  {% endraw %}
 {%- endif %}{% raw %}<!DOCTYPE html>
 {% get_current_language as LANGUAGE_CODE %}
 <html lang="{{ LANGUAGE_CODE }}">
   <head>
-    <meta charset="utf-8">
-    <meta http-equiv="x-ua-compatible" content="ie=edge">
-    <title>{% block title %}{% endraw %}{{ cookiecutter.project_name }}{% raw %}{% endblock title %}</title>
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <meta name="description" content="{% endraw %}{{ cookiecutter.description }}{% raw %}">
-    <meta name="author" content="{% endraw %}{{ cookiecutter.author_name }}{% raw %}">
-
-    <link rel="icon" href="{% static 'images/favicons/favicon.ico' %}">
-
-    {% block css %}
-    {%- endraw %}
-    {%- if cookiecutter.frontend_pipeline in ['None', 'Django Compressor'] %}
+    <meta charset="utf-8" />
+    <meta http-equiv="x-ua-compatible" content="ie=edge" />
+    <title>
+      {% block title %}
+      {% endraw %}{{ cookiecutter.project_name }}{% raw %}
+    {% endblock title %}
+  </title>
+  <meta name="viewport" content="width=device-width, initial-scale=1.0" />
+  <meta name="description"
+        content="{% endraw %}{{ cookiecutter.description }}{% raw %}" />
+  <meta name="author"
+        content="{% endraw %}{{ cookiecutter.author_name }}{% raw %}" />
+  <link rel="icon" href="{% static 'images/favicons/favicon.ico' %}" />
+  {% block css %}
+  {%- endraw %}
+  {%- if cookiecutter.frontend_pipeline in ['None', 'Django Compressor'] %}
     {%- raw %}
     <!-- Latest compiled and minified Bootstrap CSS -->
-    <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.2.3/css/bootstrap.min.css" integrity="sha512-SbiR/eusphKoMVVXysTKG/7VseWii+Y3FdHrt0EpKgpToZeemhqHeZeLWLhJutz/2ut2Vw1uQEj2MbRF+TVBUA==" crossorigin="anonymous" referrerpolicy="no-referrer" />
-    {%- endraw %}
-    {%- endif %}
-    {%- raw %}
-    <!-- Your stuff: Third-party CSS libraries go here -->
-
-    <!-- This file stores project-specific CSS -->
-    {%- endraw %}{% if cookiecutter.frontend_pipeline == 'None' %}{% raw %}
-    <link href="{% static 'css/project.css' %}" rel="stylesheet">
-    {%- endraw %}{% elif cookiecutter.frontend_pipeline == 'Django Compressor' %}{% raw %}
-    {% compress css %}
-    <link href="{% static 'css/project.css' %}" rel="stylesheet">
-    {% endcompress %}
-    {%- endraw %}{% elif cookiecutter.frontend_pipeline == 'Gulp' %}{% raw %}
-    <link href="{% static 'css/project.min.css' %}" rel="stylesheet">
-    {%- endraw %}{% elif cookiecutter.frontend_pipeline == "Webpack" %}{% raw %}
-    {% render_bundle 'project' 'css' %}
-    {%- endraw %}{% endif %}{% raw %}
-    {% endblock %}
-    <!-- Le javascript
+    <link rel="stylesheet"
+          href="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.2.3/css/bootstrap.min.css"
+          integrity="sha512-SbiR/eusphKoMVVXysTKG/7VseWii+Y3FdHrt0EpKgpToZeemhqHeZeLWLhJutz/2ut2Vw1uQEj2MbRF+TVBUA=="
+          crossorigin="anonymous"
+          referrerpolicy="no-referrer" />
+  {%- endraw %}
+{%- endif %}
+{%- raw %}
+<!-- Your stuff: Third-party CSS libraries go here -->
+<!-- This file stores project-specific CSS -->
+{%- endraw %}
+{% if cookiecutter.frontend_pipeline == 'None' %}
+  {% raw %}
+  <link href="{% static 'css/project.css' %}" rel="stylesheet" />
+{%- endraw %}
+{% elif cookiecutter.frontend_pipeline == 'Django Compressor' %}
+{% raw %}
+{% compress css %}
+  <link href="{% static 'css/project.css' %}" rel="stylesheet" />
+{% endcompress %}
+{%- endraw %}
+{% elif cookiecutter.frontend_pipeline == 'Gulp' %}
+{% raw %}
+<link href="{% static 'css/project.min.css' %}" rel="stylesheet" />
+{%- endraw %}
+{% elif cookiecutter.frontend_pipeline == "Webpack" %}
+{% raw %}
+{% render_bundle 'project' 'css' %}
+{%- endraw %}
+{% endif %}
+{% raw %}
+{% endblock css %}
+<!-- Le javascript
     ================================================== -->
-    {# Placed at the top of the document so pages load faster with defer #}
-    {% block javascript %}
-      {%- endraw %}{% if cookiecutter.frontend_pipeline == 'Gulp' %}{% raw %}
-      <!-- Vendor dependencies bundled as one file -->
-      <script defer src="{% static 'js/vendors.min.js' %}"></script>
-      {%- endraw %}{% elif cookiecutter.frontend_pipeline == "Webpack" %}{% raw %}
-      <!-- Vendor dependencies bundled as one file -->
-      {% render_bundle 'vendors' 'js' attrs='defer' %}
-      {%- endraw %}{% else %}{% raw %}
-      <!-- Bootstrap JS -->
-      <script defer src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.2.3/js/bootstrap.min.js" integrity="sha512-1/RvZTcCDEUjY/CypiMz+iqqtaoQfAITmNSJY17Myp4Ms5mdxPS5UV7iOfdZoxcGhzFbOm6sntTKJppjvuhg4g==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-      <!-- Your stuff: Third-party javascript libraries go here -->
-      {%- endraw %}{% endif %}{% raw %}
-
-      <!-- place project specific Javascript in this file -->
-      {%- endraw %}{% if cookiecutter.frontend_pipeline == 'None' %}{% raw %}
-      <script defer src="{% static 'js/project.js' %}"></script>
-      {%- endraw %}{% elif cookiecutter.frontend_pipeline == 'Django Compressor' %}{% raw %}
-      {% compress js %}
-      <script defer src="{% static 'js/project.js' %}"></script>
-      {% endcompress %}
-      {%- endraw %}{% elif cookiecutter.frontend_pipeline == 'Gulp' %}{% raw %}
-      <script defer src="{% static 'js/project.min.js' %}"></script>
-      {%- endraw %}{% elif cookiecutter.frontend_pipeline == "Webpack" %}{% raw %}
-      {% render_bundle 'project' 'js' attrs='defer' %}
-      {%- endraw %}{% endif %}{% raw %}
-
-    {% endblock javascript %}
-
-  </head>
-
-  <body>
-
-    <div class="mb-1">
-      <nav class="navbar navbar-expand-md navbar-light bg-light">
-        <div class="container-fluid">
-          <button class="navbar-toggler navbar-toggler-right" type="button" data-bs-toggle="collapse" data-bs-target="#navbarSupportedContent" aria-controls="navbarSupportedContent" aria-expanded="false" aria-label="Toggle navigation">
-            <span class="navbar-toggler-icon"></span>
-          </button>
-          <a class="navbar-brand" href="{% url 'home' %}">{% endraw %}{{ cookiecutter.project_name }}{% raw %}</a>
-
-          <div class="collapse navbar-collapse" id="navbarSupportedContent">
-            <ul class="navbar-nav mr-auto">
-              <li class="nav-item active">
-                <a class="nav-link" href="{% url 'home' %}">Home <span class="visually-hidden">(current)</span></a>
-              </li>
+{# Placed at the top of the document so pages load faster with defer #}
+{% block javascript %}
+{%- endraw %}
+{% if cookiecutter.frontend_pipeline == 'Gulp' %}
+  {% raw %}
+  <!-- Vendor dependencies bundled as one file -->
+  <script defer src="{% static 'js/vendors.min.js' %}"></script>
+{%- endraw %}
+{% elif cookiecutter.frontend_pipeline == "Webpack" %}
+{% raw %}
+<!-- Vendor dependencies bundled as one file -->
+{% render_bundle 'vendors' 'js' attrs='defer' %}
+{%- endraw %}
+{% else %}
+{% raw %}
+<!-- Bootstrap JS -->
+<script defer
+        src="https://cdnjs.cloudflare.com/ajax/libs/bootstrap/5.2.3/js/bootstrap.min.js"
+        integrity="sha512-1/RvZTcCDEUjY/CypiMz+iqqtaoQfAITmNSJY17Myp4Ms5mdxPS5UV7iOfdZoxcGhzFbOm6sntTKJppjvuhg4g=="
+        crossorigin="anonymous"
+        referrerpolicy="no-referrer"></script>
+<!-- Your stuff: Third-party javascript libraries go here -->
+{%- endraw %}
+{% endif %}
+{% raw %}
+<!-- place project specific Javascript in this file -->
+{%- endraw %}
+{% if cookiecutter.frontend_pipeline == 'None' %}
+  {% raw %}
+  <script defer src="{% static 'js/project.js' %}"></script>
+{%- endraw %}
+{% elif cookiecutter.frontend_pipeline == 'Django Compressor' %}
+{% raw %}
+{% compress js %}
+  <script defer src="{% static 'js/project.js' %}"></script>
+{% endcompress %}
+{%- endraw %}
+{% elif cookiecutter.frontend_pipeline == 'Gulp' %}
+{% raw %}
+<script defer src="{% static 'js/project.min.js' %}"></script>
+{%- endraw %}
+{% elif cookiecutter.frontend_pipeline == "Webpack" %}
+{% raw %}
+{% render_bundle 'project' 'js' attrs='defer' %}
+{%- endraw %}
+{% endif %}
+{% raw %}
+{% endblock javascript %}
+</head>
+<body>
+  <div class="mb-1">
+    <nav class="navbar navbar-expand-md navbar-light bg-light">
+      <div class="container-fluid">
+        <button class="navbar-toggler navbar-toggler-right"
+                type="button"
+                data-bs-toggle="collapse"
+                data-bs-target="#navbarSupportedContent"
+                aria-controls="navbarSupportedContent"
+                aria-expanded="false"
+                aria-label="Toggle navigation">
+          <span class="navbar-toggler-icon"></span>
+        </button>
+        <a class="navbar-brand" href="{% url 'home' %}">{% endraw %}{{ cookiecutter.project_name }}{% raw %}</a>
+        <div class="collapse navbar-collapse" id="navbarSupportedContent">
+          <ul class="navbar-nav mr-auto">
+            <li class="nav-item active">
+              <a class="nav-link" href="{% url 'home' %}">Home <span class="visually-hidden">(current)</span></a>
+            </li>
+            <li class="nav-item">
+              <a class="nav-link" href="{% url 'about' %}">About</a>
+            </li>
+            {% if request.user.is_authenticated %}
               <li class="nav-item">
-                <a class="nav-link" href="{% url 'about' %}">About</a>
+                <a class="nav-link"
+                   href="{% endraw %}{% if cookiecutter.username_type == "email" %}{% raw %}{% url 'users:detail' request.user.pk %}{% endraw %}{% else %}{% raw %}{% url 'users:detail' request.user.username %}{% endraw %}{% endif %}{% raw %}">{% translate "My Profile" %}</a>
               </li>
-              {% if request.user.is_authenticated %}
-                <li class="nav-item">
-                  <a class="nav-link" href="{% endraw %}{% if cookiecutter.username_type == "email" %}{% raw %}{% url 'users:detail' request.user.pk %}{% endraw %}{% else %}{% raw %}{% url 'users:detail' request.user.username %}{% endraw %}{% endif %}{% raw %}">{% 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' %}">{% translate "Sign Out" %}</a>
-                </li>
-              {% else %}
-                {% if ACCOUNT_ALLOW_REGISTRATION %}
               <li class="nav-item">
                 {# URL provided by django-allauth/account/urls.py #}
-                <a id="sign-up-link" class="nav-link" href="{% url 'account_signup' %}">{% translate "Sign Up" %}</a>
+                <a class="nav-link" href="{% url 'account_logout' %}">{% translate "Sign Out" %}</a>
               </li>
-              {% endif %}
+            {% else %}
+              {% if ACCOUNT_ALLOW_REGISTRATION %}
                 <li class="nav-item">
                   {# URL provided by django-allauth/account/urls.py #}
-                  <a id="log-in-link" class="nav-link" href="{% url 'account_login' %}">{% translate "Sign In" %}</a>
+                  <a id="sign-up-link" class="nav-link" href="{% url 'account_signup' %}">{% translate "Sign Up" %}</a>
                 </li>
               {% endif %}
-            </ul>
-          </div>
+              <li class="nav-item">
+                {# URL provided by django-allauth/account/urls.py #}
+                <a id="log-in-link" class="nav-link" href="{% url 'account_login' %}">{% translate "Sign In" %}</a>
+              </li>
+            {% endif %}
+          </ul>
         </div>
-      </nav>
-
-    </div>
-
-    <div class="container">
-
-      {% if messages %}
-        {% for message in messages %}
-          <div class="alert alert-dismissible {% if message.tags %}alert-{{ message.tags }}{% endif %}">
-            {{ message }}
-            <button type="button" class="btn-close" data-bs-dismiss="alert" aria-label="Close"></button>
-          </div>
-        {% endfor %}
-      {% endif %}
-
-      {% block content %}
-        <p>Use this document as a way to quick start any new project.</p>
-      {% endblock content %}
-
-    </div> <!-- /container -->
-
-    {% block modal %}{% endblock modal %}
-
-    {% block inline_javascript %}
+      </div>
+    </nav>
+  </div>
+  <div class="container">
+    {% if messages %}
+      {% for message in messages %}
+        <div class="alert alert-dismissible {% if message.tags %}alert-{{ message.tags }}{% endif %}">
+          {{ message }}
+          <button type="button"
+                  class="btn-close"
+                  data-bs-dismiss="alert"
+                  aria-label="Close"></button>
+        </div>
+      {% endfor %}
+    {% endif %}
+    {% block content %}
+      <p>Use this document as a way to quick start any new project.</p>
+    {% endblock content %}
+  </div>
+  <!-- /container -->
+  {% block modal %}
+  {% endblock modal %}
+  {% block inline_javascript %}
     {% comment %}
     Script tags with only code, no src (defer by default). To run
     with a "defer" so that you run inline code:
     <script>
-      window.addEventListener('DOMContentLoaded', () => {/* Run whatever you want */});
+      window.addEventListener('DOMContentLoaded', () => {
+        /* Run whatever you want */
+      });
     </script>
     {% endcomment %}
-    {% endblock inline_javascript %}
-  </body>
+  {% endblock inline_javascript %}
+</body>
 </html>
 {%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/pages/about.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/pages/about.html
index 8968a3d4f..3d301eead 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/pages/about.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/pages/about.html
@@ -1 +1,3 @@
-{% raw %}{% extends "base.html" %}{% endraw %}
+{% raw %}{% extends "base.html" %}
+
+{% endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/pages/home.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/pages/home.html
index 8968a3d4f..3d301eead 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/pages/home.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/pages/home.html
@@ -1 +1,3 @@
-{% raw %}{% extends "base.html" %}{% endraw %}
+{% raw %}{% extends "base.html" %}
+
+{% endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_detail.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_detail.html
index ee2c4aee9..4e632b015 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_detail.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_detail.html
@@ -1,35 +1,45 @@
 {% raw %}{% extends "base.html" %}
+
 {% load static %}
 
-{% block title %}User: {% endraw %}{% if cookiecutter.username_type == "email" %}{% raw %}{{ object.name }}{% endraw %}{% else %}{% raw %}{{ object.username }}{% endraw %}{% endif %}{% raw %}{% endblock %}
-
+{% block title %}
+  User: {% endraw %}
+  {% if cookiecutter.username_type == "email" %}
+    {% raw %}{{ object.name }}{% endraw %}
+  {% else %}
+    {% raw %}{{ object.username }}{% endraw %}
+  {% endif %}
+  {% raw %}
+{% endblock title %}
 {% block content %}
-<div class="container">
-
-  <div class="row">
-    <div class="col-sm-12">
-
-      <h2>{% endraw %}{% if cookiecutter.username_type == "email" %}{% raw %}{{ object.name }}{% endraw %}{% else %}{% raw %}{{ object.username }}{% endraw %}{% endif %}{% raw %}</h2>
-      {% if object.name %}
-        <p>{{ object.name }}</p>
-      {% endif %}
+  <div class="container">
+    <div class="row">
+      <div class="col-sm-12">
+        <h2>
+        {% endraw %}
+        {% if cookiecutter.username_type == "email" %}
+          {% raw %}{{ object.name }}{% endraw %}
+        {% else %}
+          {% raw %}{{ object.username }}{% endraw %}
+        {% endif %}
+        {% raw %}
+      </h2>
+      {% if object.name %}<p>{{ object.name }}</p>{% endif %}
     </div>
   </div>
-
-{% if object == request.user %}
-<!-- Action buttons -->
-<div class="row">
-
-  <div class="col-sm-12">
-    <a class="btn btn-primary" href="{% url 'users:update' %}" role="button">My Info</a>
-    <a class="btn btn-primary" href="{% url 'account_email' %}" role="button">E-Mail</a>
-    <!-- Your Stuff: Custom user template urls -->
-  </div>
-
-</div>
-<!-- End Action buttons -->
-{% endif %}
-
+  {% if object == request.user %}
+    <!-- Action buttons -->
+    <div class="row">
+      <div class="col-sm-12">
+        <a class="btn btn-primary" href="{% url 'users:update' %}" role="button">My Info</a>
+        <a class="btn btn-primary"
+           href="{% url 'account_email' %}"
+           role="button">E-Mail</a>
+        <!-- Your Stuff: Custom user template urls -->
+      </div>
+    </div>
+    <!-- End Action buttons -->
+  {% endif %}
 </div>
 {% endblock content %}
 {%- endraw %}
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_form.html b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_form.html
index 65401624a..bd1299a6d 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_form.html
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/templates/users/user_form.html
@@ -1,18 +1,36 @@
 {% raw %}{% extends "base.html" %}
+
 {% load crispy_forms_tags %}
 
-{% block title %}{% endraw %}{% if cookiecutter.username_type == "email" %}{% raw %}{{ user.name }}{% endraw %}{% else %}{% raw %}{{ user.username }}{% endraw %}{% endif %}{% raw %}{% endblock %}
-
+{% block title %}
+{% endraw %}
+{% if cookiecutter.username_type == "email" %}
+  {% raw %}{{ user.name }}{% endraw %}
+{% else %}
+  {% raw %}{{ user.username }}{% endraw %}
+{% endif %}
+{% raw %}
+{% endblock title %}
 {% block content %}
-  <h1>{% endraw %}{% if cookiecutter.username_type == "email" %}{% raw %}{{ user.name }}{% endraw %}{% else %}{% raw %}{{ user.username }}{% endraw %}{% endif %}{% raw %}</h1>
-  <form class="form-horizontal" method="post" action="{% url 'users:update' %}">
-    {% csrf_token %}
-    {{ form|crispy }}
-    <div class="control-group">
-      <div class="controls">
-        <button type="submit" class="btn btn-primary">Update</button>
-      </div>
+  <h1>
+  {% endraw %}
+  {% if cookiecutter.username_type == "email" %}
+    {% raw %}{{ user.name }}{% endraw %}
+  {% else %}
+    {% raw %}{{ user.username }}{% endraw %}
+  {% endif %}
+  {% raw %}
+</h1>
+<form class="form-horizontal"
+      method="post"
+      action="{% url 'users:update' %}">
+  {% csrf_token %}
+  {{ form|crispy }}
+  <div class="control-group">
+    <div class="controls">
+      <button type="submit" class="btn btn-primary">Update</button>
     </div>
-  </form>
-{% endblock %}
+  </div>
+</form>
+{% endblock content %}
 {%- endraw %}

From d0e36d7d28df86ccedcf88cc3b43b3b9176efbd6 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 27 Jun 2023 16:52:58 -0500
Subject: [PATCH 2834/2840] Update django-stubs to 4.2.2 (#4419)

---
 {{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 bf4e8a49d..d4d9d7d37 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -14,7 +14,7 @@ watchfiles==0.19.0  # https://github.com/samuelcolvin/watchfiles
 # Testing
 # ------------------------------------------------------------------------------
 mypy==1.4.1  # https://github.com/python/mypy
-django-stubs==4.2.1  # https://github.com/typeddjango/django-stubs
+django-stubs==4.2.2  # https://github.com/typeddjango/django-stubs
 pytest==7.4.0  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.7  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}

From 0225a7c83f45dfd2b1bf3c3ec2e638305cdc7dfb Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 27 Jun 2023 17:08:18 -0500
Subject: [PATCH 2835/2840] Update djangorestframework-stubs to 3.14.2 (#4420)

---
 {{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 d4d9d7d37..3d8938f33 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -18,7 +18,7 @@ django-stubs==4.2.2  # https://github.com/typeddjango/django-stubs
 pytest==7.4.0  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.7  # https://github.com/Frozenball/pytest-sugar
 {%- if cookiecutter.use_drf == "y" %}
-djangorestframework-stubs==3.14.1  # https://github.com/typeddjango/djangorestframework-stubs
+djangorestframework-stubs==3.14.2  # https://github.com/typeddjango/djangorestframework-stubs
 {%- endif %}
 
 # Documentation

From d13e4270c254e649760cbae5647023fd376d2878 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Tue, 27 Jun 2023 18:18:19 -0400
Subject: [PATCH 2836/2840] Remove prettier unless  in pre-commit (#4418)

* Remove prettier webpack in pre-commit

* Update {{cookiecutter.project_slug}}/.pre-commit-config.yaml

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>

* Tweak vertical spacing

---------

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
---
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index f400001f1..ae602a364 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -16,6 +16,7 @@ repos:
       - id: check-case-conflict
       - id: check-docstring-first
       - id: detect-private-key
+{%- if cookiecutter.frontend_pipeline in ["Webpack", "Gulp"] %}
 
   - repo: https://github.com/pre-commit/mirrors-prettier
     rev: v3.0.0-alpha.9-for-vscode
@@ -23,6 +24,7 @@ repos:
       - id: prettier
         args: ['--tab-width', '2', '--single-quote']
         exclude: '{{cookiecutter.project_slug}}/templates/'
+{%- endif %}
 
   - repo: https://github.com/adamchainz/django-upgrade
     rev: '1.14.0'

From 5a7de40b839b1b8bf52d7d9a490e4d380b2587c5 Mon Sep 17 00:00:00 2001
From: Andrew Chen Wang <60190294+Andrew-Chen-Wang@users.noreply.github.com>
Date: Tue, 27 Jun 2023 18:36:01 -0400
Subject: [PATCH 2837/2840] Populate user name field in social auth (#3968)

* Populate user name field in social auth

* Add docstring for populate_user

* Fix missing def

* Fix missing def

* Add some type hints to the SocialAccountAdapter class

---------

Co-authored-by: Bruno Alla <browniebroke@users.noreply.github.com>
Co-authored-by: Bruno Alla <alla.brunoo@gmail.com>
---
 .../users/adapters.py                         | 27 ++++++++++++++++---
 1 file changed, 24 insertions(+), 3 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/adapters.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/adapters.py
index 0d206fae4..c5c824bda 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/adapters.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/adapters.py
@@ -1,16 +1,37 @@
-from typing import Any
+from __future__ import annotations
+
+import typing
 
 from allauth.account.adapter import DefaultAccountAdapter
 from allauth.socialaccount.adapter import DefaultSocialAccountAdapter
 from django.conf import settings
 from django.http import HttpRequest
 
+if typing.TYPE_CHECKING:
+    from allauth.socialaccount.models import SocialLogin
+    from {{cookiecutter.project_slug}}.users.models import User
+
 
 class AccountAdapter(DefaultAccountAdapter):
-    def is_open_for_signup(self, request: HttpRequest):
+    def is_open_for_signup(self, request: HttpRequest) -> bool:
         return getattr(settings, "ACCOUNT_ALLOW_REGISTRATION", True)
 
 
 class SocialAccountAdapter(DefaultSocialAccountAdapter):
-    def is_open_for_signup(self, request: HttpRequest, sociallogin: Any):
+    def is_open_for_signup(self, request: HttpRequest, sociallogin: SocialLogin) -> bool:
         return getattr(settings, "ACCOUNT_ALLOW_REGISTRATION", True)
+
+    def populate_user(self, request: HttpRequest, sociallogin: SocialLogin, data: dict[str, typing.Any]) -> User:
+        """
+        Populates user information from social provider info.
+
+        See: https://django-allauth.readthedocs.io/en/latest/advanced.html?#creating-and-populating-user-instances
+        """
+        user = sociallogin.user
+        if name := data.get("name"):
+            user.name = name
+        elif first_name := data.get("first_name"):
+            user.name = first_name
+            if last_name := data.get("last_name"):
+                user.name += f" {last_name}"
+        return super().populate_user(request, sociallogin, data)

From e9eb72b0b9614c6718cdc03a7a706c43cda107e6 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Tue, 27 Jun 2023 23:52:40 +0100
Subject: [PATCH 2838/2840] Update django-compressor from 4.3.1 to 4.4

---
 {{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 d23da8c61..1a39feb82 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -35,7 +35,7 @@ django-allauth==0.54.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==2.0  # https://github.com/django-crispy-forms/django-crispy-forms
 crispy-bootstrap5==0.7  # https://github.com/django-crispy-forms/crispy-bootstrap5
 {%- if cookiecutter.frontend_pipeline == 'Django Compressor' %}
-django-compressor==4.3.1  # https://github.com/django-compressor/django-compressor
+django-compressor==4.4  # https://github.com/django-compressor/django-compressor
 {%- endif %}
 django-redis==5.3.0  # https://github.com/jazzband/django-redis
 {%- if cookiecutter.use_drf == 'y' %}

From 199278b5ca17d4acd989e3c18760711d00e8d811 Mon Sep 17 00:00:00 2001
From: github-actions <action@github.com>
Date: Wed, 28 Jun 2023 02:32:45 +0000
Subject: [PATCH 2839/2840] Release 2023.06.27

---
 CHANGELOG.md | 19 +++++++++++++++++++
 setup.py     |  2 +-
 2 files changed, 20 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 309f62a26..e60e18d27 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,25 @@ All enhancements and patches to Cookiecutter Django will be documented in this f
 
 <!-- GENERATOR_PLACEHOLDER -->
 
+## 2023.06.27
+
+
+### Changed
+
+- Populate User `name` field during social auth ([#3968](https://github.com/cookiecutter/cookiecutter-django/pull/3968))
+
+- Add djLint for HTML formatting and linting ([#4389](https://github.com/cookiecutter/cookiecutter-django/pull/4389))
+
+### Fixed
+
+- Only include prettier pre-commit hook with node-based front-end pipeline ([#4418](https://github.com/cookiecutter/cookiecutter-django/pull/4418))
+
+### Updated
+
+- Update djangorestframework-stubs to 3.14.2 ([#4420](https://github.com/cookiecutter/cookiecutter-django/pull/4420))
+
+- Update django-stubs to 4.2.2 ([#4419](https://github.com/cookiecutter/cookiecutter-django/pull/4419))
+
 ## 2023.06.26
 
 
diff --git a/setup.py b/setup.py
index bf58e0239..571407bf3 100644
--- a/setup.py
+++ b/setup.py
@@ -5,7 +5,7 @@ except ImportError:
     from distutils.core import setup
 
 # We use calendar versioning
-version = "2023.06.26"
+version = "2023.06.27"
 
 with open("README.rst") as readme_file:
     long_description = readme_file.read()

From ef36732569cb5baaa5b26e45888831c97e2392fd Mon Sep 17 00:00:00 2001
From: Jelmer Draaijer <info@jelmert.nl>
Date: Wed, 28 Jun 2023 08:38:04 +0200
Subject: [PATCH 2840/2840] Set target-version for django upgrade to 4.2

---
 tests/test_cookiecutter_generation.py                 | 2 +-
 {{cookiecutter.project_slug}}/.pre-commit-config.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/tests/test_cookiecutter_generation.py b/tests/test_cookiecutter_generation.py
index 778e3411f..6ffce81db 100755
--- a/tests/test_cookiecutter_generation.py
+++ b/tests/test_cookiecutter_generation.py
@@ -231,7 +231,7 @@ def test_django_upgrade_passes(cookies, context_override):
     try:
         sh.django_upgrade(
             "--target-version",
-            "4.1",
+            "4.2",
             *python_files,
             _cwd=str(result.project_path),
         )
diff --git a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
index 91a50b97d..4fe4778bc 100644
--- a/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
+++ b/{{cookiecutter.project_slug}}/.pre-commit-config.yaml
@@ -28,7 +28,7 @@ repos:
     rev: '1.13.0'
     hooks:
       - id: django-upgrade
-        args: ['--target-version', '4.1']
+        args: ['--target-version', '4.2']
 
   - repo: https://github.com/asottile/pyupgrade
     rev: v3.6.0