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 01/71] 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 7088e6fe..d7363a1a 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 02/71] 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 01791e8c..f7b0b4d3 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 03/71] 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 01791e8c..3f96a898 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 04/71] 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 1270a25e..049d75f1 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 05/71] 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 daa4870c..6f4289c3 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 06/71] 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 daa4870c..a0c7b525 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 07/71] 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 e59644ff..10d1ea5b 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 08/71] 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 049d75f1..9bf87407 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 09/71] 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 dd795609..c7e9aa92 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 10/71] 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 ff84f180..95815564 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 331cbba6..62ec9d82 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 11/71] 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 95815564..0544f14b 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 12/71] 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 9bf87407..91b1e79c 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 13/71] 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 dd795609..1068b194 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 14/71] 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 3a3930b2..90bb6395 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 7a5d5454..712f2bf4 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 15/71] 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 9bf87407..efff1c48 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 16/71] 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 10d1ea5b..a036e77e 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 17/71] 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 efc3d117..c90fb4cd 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 18/71] 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 efc3d117..0614fa8f 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 19/71] 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 1d08dcb7..5dfff7ea 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 20/71] 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 a036e77e..00c1a16c 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 21/71] 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 5dfff7ea..bb60bed0 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 22/71] 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 00c1a16c..d65a0cbc 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 23/71] 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 efff1c48..33ac3f7b 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 24/71] 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 39080994..13398eb3 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 25/71] 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 bb60bed0..5756ebe4 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 26/71] 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 90bb6395..5224de1f 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 e4f47351..4be3c4bc 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 fdab5a90..7a58d099 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 00000000..b9d69a9a
--- /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 bb60bed0..73104eda 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 27/71] 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 90bb6395..8a1d9c45 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 b19266bf..792dd3b0 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 28/71] 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 038778cf..0df50ff4 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 29/71] 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 b7596f81..dbdee176 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 30/71] Update CONTRIBUTORS.rst

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

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 8a1d9c45..ae4022d5 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 31/71] 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 e011da63..baee3196 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 32/71] 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 13398eb3..66786b19 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 33/71] 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 41f0f46c..935a0d12 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 2ab0a7cb..015d8aff 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 712f2bf4..22a2acae 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 34/71] 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 d65a0cbc..8d32e81a 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 35/71] 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 d65a0cbc..c1fdd2a3 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 36/71] 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 baee3196..4a1c4209 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 37/71] 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 4a1c4209..2f7234bc 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 38/71] 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 4be3c4bc..2fba0979 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 39/71] 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 52b48ab0..e3b2248d 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 40/71] 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 66786b19..451d4281 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 41/71] 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 451d4281..eccaa000 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 42/71] 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 2f7234bc..d338f929 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 43/71] 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 eccaa000..966c944a 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 44/71] 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 d338f929..bc8e6651 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 45/71] 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 966c944a..9a3d9888 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 46/71] 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 9a3d9888..73c787dd 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 47/71] 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 bc8e6651..61ab281f 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 48/71] 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 d5012532..c89de8f0 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 49/71] 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 c89de8f0..e20dff51 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 50/71] 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 73c787dd..18f2e122 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 51/71] 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 e20dff51..93116cbd 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 52/71] 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 dbdee176..6ca90421 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 53/71] 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 61ab281f..5cfcce2b 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 54/71] 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 e20dff51..4722ce9c 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 55/71] 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 6a86a273..e9da0d48 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 56/71] 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 846cb578..c0a66efc 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 57/71] Add self to contributors.rst

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

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 56416abf..53edb28e 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 58/71] 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 18f2e122..5f7c2e32 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 59/71] 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 c0a66efc..7be7f97c 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 60/71] 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 c0a66efc..850d1f02 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 61/71] 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 5cfcce2b..3ebc2320 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 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 62/71] 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 5cfcce2b..df378239 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 63/71] 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 6ca90421..6ac35587 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 64/71] 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 3ebc2320..d4453daa 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 65/71] 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 5f7c2e32..ffde9100 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 66/71] 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 5f7c2e32..b032f217 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 67/71] 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 3ebc2320..4fd01d7c 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 68/71] 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 4a75eef5..ab1451d3 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 69/71] 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 28bcb4a5..6f19183f 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 70/71] 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 28bcb4a5..aa740145 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 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 71/71] 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 69217ab3..438ccca6 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