From 32f303f619c63fa53e8be60e24ca5a9836eb8066 Mon Sep 17 00:00:00 2001
From: Emile Petrone <emile.petrone@gmail.com>
Date: Sun, 20 May 2018 12:37:36 -0400
Subject: [PATCH 01/69] Added documentation for Docker deployment in detached
 mode

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

diff --git a/docs/deployment-with-docker.rst b/docs/deployment-with-docker.rst
index 90f2fa5c0..de0026a60 100644
--- a/docs/deployment-with-docker.rst
+++ b/docs/deployment-with-docker.rst
@@ -84,6 +84,10 @@ Once this is ready, you can run it with::
 
     docker-compose -f production.yml up
 
+To run the stack and detach the containers, run::
+
+    docker-compose -f production.yml up -d
+
 To run a migration, open up a second terminal and run::
 
    docker-compose -f production.yml run --rm django python manage.py migrate

From 820e3540da9638ed41c380c7d80324f942c00c54 Mon Sep 17 00:00:00 2001
From: Nikita Shupeyko <webyneter@gmail.com>
Date: Mon, 21 May 2018 12:44:38 +0300
Subject: [PATCH 02/69] Upgrade Caddy to 0.11 and pin its version to minor
 rather than patch (#1653)

---
 .../compose/production/caddy/Dockerfile                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/caddy/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/caddy/Dockerfile
index d02f0342d..8cbbf1df7 100644
--- a/{{cookiecutter.project_slug}}/compose/production/caddy/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/caddy/Dockerfile
@@ -1,3 +1,3 @@
-FROM abiosoft/caddy:0.10.6
+FROM abiosoft/caddy:0.11
 
 COPY ./compose/production/caddy/Caddyfile /etc/Caddyfile

From 9b938647b44142a329e0e3daaf1c99ce202d55d8 Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Mon, 21 May 2018 14:59:20 +0300
Subject: [PATCH 03/69] Refactor exec "$@" in django entrypoint.sh

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

diff --git a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint.sh b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint.sh
index 74242bde4..ddf096aa7 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint.sh
+++ b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint.sh
@@ -5,8 +5,6 @@ set -o pipefail
 set -o nounset
 
 
-cmd="$@"
-
 # N.B. If only .env files supported variable expansion...
 export CELERY_BROKER_URL="${REDIS_URL}"
 
@@ -44,4 +42,4 @@ done
 
 >&2 echo 'PostgreSQL is up - continuing...'
 
-exec $cmd
+exec "$@"

From 90953a83f202ddd3a6fa3b7cd58db6a32facbf69 Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Mon, 21 May 2018 15:03:37 +0300
Subject: [PATCH 04/69] Alter django entrypoint.sh output

---
 .../compose/production/django/entrypoint.sh                 | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint.sh b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint.sh
index ddf096aa7..4845e343b 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint.sh
+++ b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint.sh
@@ -34,12 +34,10 @@ sys.exit(0)
 
 END
 }
-
 until postgres_ready; do
-  >&2 echo 'PostgreSQL is unavailable (sleeping)...'
+  >&2 echo 'Waiting for PostgreSQL to become available...'
   sleep 1
 done
-
->&2 echo 'PostgreSQL is up - continuing...'
+>&2 echo 'PostgreSQL is available'
 
 exec "$@"

From 849f64e1a52d5d0c1db768a9cd31b10a6e9db414 Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Mon, 14 May 2018 10:28:50 +0300
Subject: [PATCH 05/69] Remove .sh ext from executable scripts

---
 .../compose/local/django/Dockerfile           | 26 ++++++++--------
 .../compose/local/django/celery/beat/start.sh | 10 -------
 .../local/django/celery/worker/start.sh       |  9 ------
 .../compose/local/django/start.sh             | 10 -------
 .../compose/production/django/Dockerfile      | 30 +++++++++----------
 .../django/celery/beat/{start.sh => start}    |  0
 .../django/celery/worker/{start.sh => start}  |  0
 .../django/{entrypoint.sh => entrypoint}      |  0
 .../django/{gunicorn.sh => gunicorn}          |  0
 {{cookiecutter.project_slug}}/local.yml       |  6 ++--
 {{cookiecutter.project_slug}}/production.yml  |  6 ++--
 11 files changed, 34 insertions(+), 63 deletions(-)
 delete mode 100644 {{cookiecutter.project_slug}}/compose/local/django/celery/beat/start.sh
 delete mode 100644 {{cookiecutter.project_slug}}/compose/local/django/celery/worker/start.sh
 delete mode 100644 {{cookiecutter.project_slug}}/compose/local/django/start.sh
 rename {{cookiecutter.project_slug}}/compose/production/django/celery/beat/{start.sh => start} (100%)
 rename {{cookiecutter.project_slug}}/compose/production/django/celery/worker/{start.sh => start} (100%)
 rename {{cookiecutter.project_slug}}/compose/production/django/{entrypoint.sh => entrypoint} (100%)
 rename {{cookiecutter.project_slug}}/compose/production/django/{gunicorn.sh => gunicorn} (100%)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index 3e3691d00..df9561f71 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -19,22 +19,22 @@ RUN apk update \
 COPY ./requirements /requirements
 RUN pip install -r /requirements/local.txt
 
-COPY ./compose/production/django/entrypoint.sh /entrypoint.sh
-RUN sed -i 's/\r//' /entrypoint.sh
-RUN chmod +x /entrypoint.sh
+COPY ./compose/production/django/entrypoint /entrypoint
+RUN sed -i 's/\r//' /entrypoint
+RUN chmod +x /entrypoint
 
-COPY ./compose/local/django/start.sh /start.sh
-RUN sed -i 's/\r//' /start.sh
-RUN chmod +x /start.sh
+COPY ./compose/local/django/start /start
+RUN sed -i 's/\r//' /start
+RUN chmod +x /start
 {% if cookiecutter.use_celery == "y" %}
-COPY ./compose/local/django/celery/worker/start.sh /start-celeryworker.sh
-RUN sed -i 's/\r//' /start-celeryworker.sh
-RUN chmod +x /start-celeryworker.sh
+COPY ./compose/local/django/celery/worker/start /start-celeryworker
+RUN sed -i 's/\r//' /start-celeryworker
+RUN chmod +x /start-celeryworker
 
-COPY ./compose/local/django/celery/beat/start.sh /start-celerybeat.sh
-RUN sed -i 's/\r//' /start-celerybeat.sh
-RUN chmod +x /start-celerybeat.sh
+COPY ./compose/local/django/celery/beat/start /start-celerybeat
+RUN sed -i 's/\r//' /start-celerybeat
+RUN chmod +x /start-celerybeat
 {% endif %}
 WORKDIR /app
 
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/entrypoint"]
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start.sh b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start.sh
deleted file mode 100644
index 0ca8bb507..000000000
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -o errexit
-set -o pipefail
-set -o nounset
-set -o xtrace
-
-
-rm -f './celerybeat.pid'
-celery -A {{cookiecutter.project_slug}}.taskapp beat -l INFO
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start.sh b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start.sh
deleted file mode 100644
index 4335340de..000000000
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-
-set -o errexit
-set -o pipefail
-set -o nounset
-set -o xtrace
-
-
-celery -A {{cookiecutter.project_slug}}.taskapp worker -l INFO
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start.sh b/{{cookiecutter.project_slug}}/compose/local/django/start.sh
deleted file mode 100644
index 50227e19e..000000000
--- a/{{cookiecutter.project_slug}}/compose/local/django/start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-set -o errexit
-set -o pipefail
-set -o nounset
-set -o xtrace
-
-
-python manage.py migrate
-python manage.py runserver_plus 0.0.0.0:8000
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index e8d2e0fc2..04ac0d55e 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -19,23 +19,23 @@ COPY ./requirements /requirements
 RUN pip install --no-cache-dir -r /requirements/production.txt \
     && rm -rf /requirements
 
-COPY ./compose/production/django/gunicorn.sh /gunicorn.sh
-RUN sed -i 's/\r//' /gunicorn.sh
-RUN chmod +x /gunicorn.sh
-RUN chown django /gunicorn.sh
+COPY ./compose/production/django/gunicorn /gunicorn
+RUN sed -i 's/\r//' /gunicorn
+RUN chmod +x /gunicorn
+RUN chown django /gunicorn
 
-COPY ./compose/production/django/entrypoint.sh /entrypoint.sh
-RUN sed -i 's/\r//' /entrypoint.sh
-RUN chmod +x /entrypoint.sh
-RUN chown django /entrypoint.sh
+COPY ./compose/production/django/entrypoint /entrypoint
+RUN sed -i 's/\r//' /entrypoint
+RUN chmod +x /entrypoint
+RUN chown django /entrypoint
 {% if cookiecutter.use_celery == "y" %}
-COPY ./compose/production/django/celery/worker/start.sh /start-celeryworker.sh
-RUN sed -i 's/\r//' /start-celeryworker.sh
-RUN chmod +x /start-celeryworker.sh
+COPY ./compose/production/django/celery/worker/start /start-celeryworker
+RUN sed -i 's/\r//' /start-celeryworker
+RUN chmod +x /start-celeryworker
 
-COPY ./compose/production/django/celery/beat/start.sh /start-celerybeat.sh
-RUN sed -i 's/\r//' /start-celerybeat.sh
-RUN chmod +x /start-celerybeat.sh
+COPY ./compose/production/django/celery/beat/start /start-celerybeat
+RUN sed -i 's/\r//' /start-celerybeat
+RUN chmod +x /start-celerybeat
 {% endif %}
 COPY . /app
 
@@ -45,4 +45,4 @@ USER django
 
 WORKDIR /app
 
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/entrypoint"]
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start.sh b/{{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
similarity index 100%
rename from {{cookiecutter.project_slug}}/compose/production/django/celery/beat/start.sh
rename to {{cookiecutter.project_slug}}/compose/production/django/celery/beat/start
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/worker/start.sh b/{{cookiecutter.project_slug}}/compose/production/django/celery/worker/start
similarity index 100%
rename from {{cookiecutter.project_slug}}/compose/production/django/celery/worker/start.sh
rename to {{cookiecutter.project_slug}}/compose/production/django/celery/worker/start
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/entrypoint.sh b/{{cookiecutter.project_slug}}/compose/production/django/entrypoint
similarity index 100%
rename from {{cookiecutter.project_slug}}/compose/production/django/entrypoint.sh
rename to {{cookiecutter.project_slug}}/compose/production/django/entrypoint
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/gunicorn.sh b/{{cookiecutter.project_slug}}/compose/production/django/gunicorn
similarity index 100%
rename from {{cookiecutter.project_slug}}/compose/production/django/gunicorn.sh
rename to {{cookiecutter.project_slug}}/compose/production/django/gunicorn
diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index d22a9d089..c725fff79 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -22,7 +22,7 @@ services:
       - ./.envs/.local/.postgres
     ports:
       - "8000:8000"
-    command: /start.sh
+    command: /start
 
   postgres:
     build:
@@ -60,7 +60,7 @@ services:
       - ./.envs/.local/.django
       - ./.envs/.local/.postgres
     ports: []
-    command: /start-celeryworker.sh
+    command: /start-celeryworker
 
   celerybeat:
     <<: *django
@@ -75,6 +75,6 @@ services:
       - ./.envs/.local/.django
       - ./.envs/.local/.postgres
     ports: []
-    command: /start-celerybeat.sh
+    command: /start-celerybeat
 
   {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index f8f8ca22c..51c896275 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -17,7 +17,7 @@ services:
     env_file:
       - ./.envs/.production/.django
       - ./.envs/.production/.postgres
-    command: /gunicorn.sh
+    command: /gunicorn
 
   postgres:
     build:
@@ -58,7 +58,7 @@ services:
     env_file:
       - ./.envs/.production/.django
       - ./.envs/.production/.postgres
-    command: /start-celeryworker.sh
+    command: /start-celeryworker
 
   celerybeat:
     <<: *django
@@ -69,6 +69,6 @@ services:
     env_file:
       - ./.envs/.production/.django
       - ./.envs/.production/.postgres
-    command: /start-celerybeat.sh
+    command: /start-celerybeat
 
   {%- endif %}

From cfff5b9d0866c8ec5dfc0a5a275a9d17f4ce1b3f Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Mon, 21 May 2018 15:34:28 +0300
Subject: [PATCH 06/69] Commit local django celery start scripts back

---
 .../compose/local/django/celery/beat/start             | 10 ++++++++++
 .../compose/local/django/celery/worker/start           |  9 +++++++++
 2 files changed, 19 insertions(+)
 create mode 100644 {{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
 create mode 100644 {{cookiecutter.project_slug}}/compose/local/django/celery/worker/start

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
new file mode 100644
index 000000000..0ca8bb507
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -o errexit
+set -o pipefail
+set -o nounset
+set -o xtrace
+
+
+rm -f './celerybeat.pid'
+celery -A {{cookiecutter.project_slug}}.taskapp beat -l INFO
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
new file mode 100644
index 000000000..4335340de
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
@@ -0,0 +1,9 @@
+#!/bin/sh
+
+set -o errexit
+set -o pipefail
+set -o nounset
+set -o xtrace
+
+
+celery -A {{cookiecutter.project_slug}}.taskapp worker -l INFO

From 4a1ea2fb458862e1e4e0704ad0659b6408b1c4bb Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Mon, 21 May 2018 15:39:12 +0300
Subject: [PATCH 07/69] Commit local django start scripts back

---
 .../compose/local/django/start                         | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 {{cookiecutter.project_slug}}/compose/local/django/start

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start b/{{cookiecutter.project_slug}}/compose/local/django/start
new file mode 100644
index 000000000..50227e19e
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/compose/local/django/start
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -o errexit
+set -o pipefail
+set -o nounset
+set -o xtrace
+
+
+python manage.py migrate
+python manage.py runserver_plus 0.0.0.0:8000

From 8e429d7e3d5ad785b12f761b27197bd31ef5da27 Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Mon, 21 May 2018 16:20:16 +0300
Subject: [PATCH 08/69] Update PyCharm configs with respect to the latest IDE
 version

---
 {{cookiecutter.project_slug}}/.idea/misc.xml  |  6 ++++
 .../.idea/modules.xml                         |  8 +++++
 .../runConfigurations/Docker__runserver.xml   | 33 -------------------
 .../merge_production_dotenvs_in_dotenv.xml    |  2 +-
 .../{Docker__migrate.xml => migrate.xml}      |  8 ++---
 .../.idea/runConfigurations/runserver.xml     | 33 +++++++++++++++++++
 ..._runserver_plus.xml => runserver_plus.xml} |  8 ++---
 ...ocker__tests___all.xml => tests___all.xml} |  6 ++--
 ...stUser.xml => tests___class__TestUser.xml} |  6 ++--
 ...dels.xml => tests___file__test_models.xml} |  6 ++--
 ...e__users.xml => tests___module__users.xml} |  6 ++--
 ...sts___specific__test_get_absolute_url.xml} |  6 ++--
 {{cookiecutter.project_slug}}/.idea/vcs.xml   |  2 +-
 .../.idea/{{cookiecutter.project_slug}}.iml   | 19 +++++++++--
 14 files changed, 88 insertions(+), 61 deletions(-)
 create mode 100644 {{cookiecutter.project_slug}}/.idea/misc.xml
 create mode 100644 {{cookiecutter.project_slug}}/.idea/modules.xml
 delete mode 100644 {{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__runserver.xml
 rename {{cookiecutter.project_slug}}/.idea/runConfigurations/{Docker__migrate.xml => migrate.xml} (80%)
 create mode 100644 {{cookiecutter.project_slug}}/.idea/runConfigurations/runserver.xml
 rename {{cookiecutter.project_slug}}/.idea/runConfigurations/{Docker__runserver_plus.xml => runserver_plus.xml} (81%)
 rename {{cookiecutter.project_slug}}/.idea/runConfigurations/{Docker__tests___all.xml => tests___all.xml} (83%)
 rename {{cookiecutter.project_slug}}/.idea/runConfigurations/{Docker__tests___class__TestUser.xml => tests___class__TestUser.xml} (83%)
 rename {{cookiecutter.project_slug}}/.idea/runConfigurations/{Docker__tests___file__test_models.xml => tests___file__test_models.xml} (82%)
 rename {{cookiecutter.project_slug}}/.idea/runConfigurations/{Docker__tests___module__users.xml => tests___module__users.xml} (82%)
 rename {{cookiecutter.project_slug}}/.idea/runConfigurations/{Docker__tests___specific__test_get_absolute_url.xml => tests___specific__test_get_absolute_url.xml} (82%)

diff --git a/{{cookiecutter.project_slug}}/.idea/misc.xml b/{{cookiecutter.project_slug}}/.idea/misc.xml
new file mode 100644
index 000000000..10af178fd
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/.idea/misc.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="JavaScriptSettings">
+    <option name="languageLevel" value="ES6" />
+  </component>
+</project>
diff --git a/{{cookiecutter.project_slug}}/.idea/modules.xml b/{{cookiecutter.project_slug}}/.idea/modules.xml
new file mode 100644
index 000000000..1418fcddf
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/.idea/modules.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/{{ cookiecutter.project_slug }}.iml" filepath="$PROJECT_DIR$/.idea/{{ cookiecutter.project_slug }}.iml" />
+    </modules>
+  </component>
+</project>
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__runserver.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__runserver.xml
deleted file mode 100644
index 77b9a5875..000000000
--- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__runserver.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Docker: runserver" type="Python.DjangoServer" factoryName="Django server" singleton="true">
-    <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="docker-compose://[$PROJECT_DIR$/local.yml]:django/python" />
-    <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="false" />
-    <option name="ADD_CONTENT_ROOTS" value="true" />
-    <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="{{ cookiecutter.project_slug }}" />
-    <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="false" />
-    <option name="customRunCommand" value="" />
-    <method />
-  </configuration>
-</component>
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/merge_production_dotenvs_in_dotenv.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/merge_production_dotenvs_in_dotenv.xml
index 18f8365aa..cf2c5dd89 100644
--- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/merge_production_dotenvs_in_dotenv.xml
+++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/merge_production_dotenvs_in_dotenv.xml
@@ -1,5 +1,6 @@
 <component name="ProjectRunConfigurationManager">
   <configuration default="false" name="merge_production_dotenvs_in_dotenv" type="PythonConfigurationType" factoryName="Python" singleton="true">
+    <module name="{{ cookiecutter.project_slug }}" />
     <option name="INTERPRETER_OPTIONS" value="" />
     <option name="PARENT_ENVS" value="true" />
     <envs>
@@ -10,7 +11,6 @@
     <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="{{ cookiecutter.project_slug }}" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
     <option name="SCRIPT_NAME" value="merge_production_dotenvs_in_dotenv.py" />
     <option name="PARAMETERS" value="" />
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__migrate.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/migrate.xml
similarity index 80%
rename from {{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__migrate.xml
rename to {{cookiecutter.project_slug}}/.idea/runConfigurations/migrate.xml
index cc2fe0bb0..b457c5f55 100644
--- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__migrate.xml
+++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/migrate.xml
@@ -1,17 +1,17 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Docker: migrate" type="Python.DjangoServer" factoryName="Django server" singleton="true">
+  <configuration default="false" name="migrate" 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="docker-compose://[$PROJECT_DIR$/local.yml]:django/python" />
+    <option name="SDK_HOME" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="false" />
+    <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="{{ cookiecutter.project_slug }}" />
     <PathMappingSettings>
       <option name="pathMappings">
         <list>
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/runserver.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/runserver.xml
new file mode 100644
index 000000000..2a348a2e7
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/runserver.xml
@@ -0,0 +1,33 @@
+<component name="ProjectRunConfigurationManager"> 
+  <configuration default="false" name="runserver" 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="false" /> 
+    <option name="customRunCommand" value="" /> 
+    <method />
+  </configuration>
+</component>
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__runserver_plus.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/runserver_plus.xml
similarity index 81%
rename from {{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__runserver_plus.xml
rename to {{cookiecutter.project_slug}}/.idea/runConfigurations/runserver_plus.xml
index 07bbe40cb..242f861a6 100644
--- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__runserver_plus.xml
+++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/runserver_plus.xml
@@ -1,17 +1,17 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Docker: runserver_plus" type="Python.DjangoServer" factoryName="Django server" singleton="true">
+  <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="docker-compose://[$PROJECT_DIR$/local.yml]:django/python" />
+    <option name="SDK_HOME" value="" />
     <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-    <option name="IS_MODULE_SDK" value="false" />
+    <option name="IS_MODULE_SDK" value="true" />
     <option name="ADD_CONTENT_ROOTS" value="true" />
     <option name="ADD_SOURCE_ROOTS" value="true" />
-    <module name="{{ cookiecutter.project_slug }}" />
     <PathMappingSettings>
       <option name="pathMappings">
         <list>
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___all.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/tests___all.xml
similarity index 83%
rename from {{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___all.xml
rename to {{cookiecutter.project_slug}}/.idea/runConfigurations/tests___all.xml
index c4fd62aae..be70ffcd6 100644
--- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___all.xml
+++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/tests___all.xml
@@ -1,17 +1,17 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Docker: tests - all" type="DjangoTestsConfigurationType" factoryName="Django tests" singleton="true">
+  <configuration default="false" name="tests - all" type="DjangoTestsConfigurationType" factoryName="Django tests" 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.test" />
     </envs>
-    <option name="SDK_HOME" value="docker-compose://[$PROJECT_DIR$/local.yml]:django/python" />
+    <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" />
-    <module name="{{ cookiecutter.project_slug }}" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
     <PathMappingSettings>
       <option name="pathMappings">
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___class__TestUser.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/tests___class__TestUser.xml
similarity index 83%
rename from {{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___class__TestUser.xml
rename to {{cookiecutter.project_slug}}/.idea/runConfigurations/tests___class__TestUser.xml
index 78da4a677..204de9dd1 100644
--- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___class__TestUser.xml
+++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/tests___class__TestUser.xml
@@ -1,17 +1,17 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Docker: tests - class: TestUser" type="DjangoTestsConfigurationType" factoryName="Django tests" singleton="true">
+  <configuration default="false" name="tests - class: TestUser" type="DjangoTestsConfigurationType" factoryName="Django tests" 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.test" />
     </envs>
-    <option name="SDK_HOME" value="docker-compose://[$PROJECT_DIR$/local.yml]:django/python" />
+    <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" />
-    <module name="{{ cookiecutter.project_slug }}" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
     <PathMappingSettings>
       <option name="pathMappings">
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___file__test_models.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/tests___file__test_models.xml
similarity index 82%
rename from {{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___file__test_models.xml
rename to {{cookiecutter.project_slug}}/.idea/runConfigurations/tests___file__test_models.xml
index 0391bf257..ddb6d3d6d 100644
--- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___file__test_models.xml
+++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/tests___file__test_models.xml
@@ -1,17 +1,17 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Docker: tests - file: test_models" type="DjangoTestsConfigurationType" factoryName="Django tests" singleton="true">
+  <configuration default="false" name="tests - file: test_models" type="DjangoTestsConfigurationType" factoryName="Django tests" 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.test" />
     </envs>
-    <option name="SDK_HOME" value="docker-compose://[$PROJECT_DIR$/local.yml]:django/python" />
+    <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" />
-    <module name="{{ cookiecutter.project_slug }}" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
     <PathMappingSettings>
       <option name="pathMappings">
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___module__users.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/tests___module__users.xml
similarity index 82%
rename from {{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___module__users.xml
rename to {{cookiecutter.project_slug}}/.idea/runConfigurations/tests___module__users.xml
index 651ea5cb9..d838b5da6 100644
--- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___module__users.xml
+++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/tests___module__users.xml
@@ -1,17 +1,17 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Docker: tests - module: users" type="DjangoTestsConfigurationType" factoryName="Django tests" singleton="true">
+  <configuration default="false" name="tests - module: users" type="DjangoTestsConfigurationType" factoryName="Django tests" 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.test" />
     </envs>
-    <option name="SDK_HOME" value="docker-compose://[$PROJECT_DIR$/local.yml]:django/python" />
+    <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" />
-    <module name="{{ cookiecutter.project_slug }}" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
     <PathMappingSettings>
       <option name="pathMappings">
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___specific__test_get_absolute_url.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/tests___specific__test_get_absolute_url.xml
similarity index 82%
rename from {{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___specific__test_get_absolute_url.xml
rename to {{cookiecutter.project_slug}}/.idea/runConfigurations/tests___specific__test_get_absolute_url.xml
index 8c7893907..c391058f2 100644
--- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___specific__test_get_absolute_url.xml
+++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/tests___specific__test_get_absolute_url.xml
@@ -1,17 +1,17 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="Docker: tests - specific: test_get_absolute_url" type="DjangoTestsConfigurationType" factoryName="Django tests" singleton="true">
+  <configuration default="false" name="tests - specific: test_get_absolute_url" type="DjangoTestsConfigurationType" factoryName="Django tests" 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.test" />
     </envs>
-    <option name="SDK_HOME" value="docker-compose://[$PROJECT_DIR$/local.yml]:django/python" />
+    <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" />
-    <module name="{{ cookiecutter.project_slug }}" />
     <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
     <PathMappingSettings>
       <option name="pathMappings">
diff --git a/{{cookiecutter.project_slug}}/.idea/vcs.xml b/{{cookiecutter.project_slug}}/.idea/vcs.xml
index 94a25f7f4..5ace414d8 100644
--- a/{{cookiecutter.project_slug}}/.idea/vcs.xml
+++ b/{{cookiecutter.project_slug}}/.idea/vcs.xml
@@ -3,4 +3,4 @@
   <component name="VcsDirectoryMappings">
     <mapping directory="$PROJECT_DIR$" vcs="Git" />
   </component>
-</project>
\ No newline at end of file
+</project>
diff --git a/{{cookiecutter.project_slug}}/.idea/{{cookiecutter.project_slug}}.iml b/{{cookiecutter.project_slug}}/.idea/{{cookiecutter.project_slug}}.iml
index c0f35d4b1..8ff6e3883 100644
--- a/{{cookiecutter.project_slug}}/.idea/{{cookiecutter.project_slug}}.iml
+++ b/{{cookiecutter.project_slug}}/.idea/{{cookiecutter.project_slug}}.iml
@@ -5,19 +5,32 @@
       <configuration>
         <option name="rootFolder" value="$MODULE_DIR$" />
         <option name="settingsModule" value="config/settings/local.py" />
-        <option name="manageScript" value="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" /> 
       </configuration>
     </facet>
   </component>
   <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$">
+    {% if cookiecutter.js_task_runner != 'None' %}
+    <content url="file://$MODULE_DIR$"> 
       <excludeFolder url="file://$MODULE_DIR$/node_modules" />
     </content>
+    {% else %} 
+    <content url="file://$MODULE_DIR$" /> 
+    {% endif %}
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <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>
   <component name="TemplatesService">
     <option name="TEMPLATE_CONFIGURATION" value="Django" />
@@ -31,4 +44,4 @@
     <option name="projectConfiguration" value="py.test" />
     <option name="PROJECT_TEST_RUNNER" value="py.test" />
   </component>
-</module>
\ No newline at end of file
+</module>

From b19c5f5d915240fb13c9cf3c396c14d9ef82d8aa Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Mon, 21 May 2018 21:22:35 +0300
Subject: [PATCH 09/69] Opt out of Sentry by default

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

diff --git a/cookiecutter.json b/cookiecutter.json
index cb41bbfce..0af0cb83a 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -34,8 +34,8 @@
   "use_compressor": "n",
   "use_celery": "n",
   "use_mailhog": "n",
-  "use_sentry": "y",
   "use_whitenoise": "y",
+  "use_sentry": "n",
   "use_heroku": "n",
   "use_travisci": "n",
   "keep_local_envs_in_vcs": "y",

From b42b86da2085c1281e6f955c1d8776328d20b9fb Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Mon, 21 May 2018 21:22:53 +0300
Subject: [PATCH 10/69] Opt out of WhiteNoise by default

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

diff --git a/cookiecutter.json b/cookiecutter.json
index 0af0cb83a..bd7ee7222 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -34,8 +34,8 @@
   "use_compressor": "n",
   "use_celery": "n",
   "use_mailhog": "n",
-  "use_whitenoise": "y",
   "use_sentry": "n",
+  "use_whitenoise": "n",
   "use_heroku": "n",
   "use_travisci": "n",
   "keep_local_envs_in_vcs": "y",

From 9eebd077bd136255b72d4b359207b6ed61a2822a Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Mon, 21 May 2018 21:35:08 +0300
Subject: [PATCH 11/69] Update README.rst

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

diff --git a/README.rst b/README.rst
index 25f421947..9c1640712 100644
--- a/README.rst
+++ b/README.rst
@@ -158,13 +158,13 @@ Answer the prompts with your own desired options_. For example::
     domain_name [example.com]: myreddit.com
     version [0.1.0]: 0.0.1
     timezone [UTC]: America/Los_Angeles
-    use_whitenoise [y]: n
+    use_whitenoise [n]: n
     use_celery [n]: y
     use_mailhog [n]: n
-    use_sentry [y]: y
+    use_sentry [n]: y
     use_pycharm [n]: y
     windows [n]: n
-    use_docker [y]: n
+    use_docker [n]: n
     use_heroku [n]: y
     use_compressor [n]: y
     Select postgresql_version:

From ac82eab61c7fcc50d0a7d165ea264ccb1a7b729f Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Mon, 21 May 2018 21:35:49 +0300
Subject: [PATCH 12/69] Remove cookiecutter option defaults from docs

Rationale: duplicate values
---
 docs/project-generation-options.rst | 48 ++++++++++++++---------------
 1 file changed, 24 insertions(+), 24 deletions(-)

diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst
index 476d65af9..60453b870 100644
--- a/docs/project-generation-options.rst
+++ b/docs/project-generation-options.rst
@@ -1,31 +1,31 @@
 Project Generation Options
 ==========================
 
-project_name [My Awesome Project]:
+project_name:
     Your project's human-readable name, capitals and spaces allowed.
 
-project_slug [my_awesome_project]:
+project_slug:
     Your project's slug without dashes or spaces. Used to name your repo
     and in other places where a Python-importable version of your project name
     is needed.
 
-description [Behold My Awesome Project!]
+description:
     Describes your project and gets used in places like ``README.rst`` and such.
 
-author_name [Daniel Roy Greenfeld]:
+author_name:
     This is you! The value goes into places like ``LICENSE`` and such.
 
-email [daniel-roy-greenfeld@example.com]:
+email:
     The email address you want to identify yourself in the project.
 
-domain_name [example.com]
+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.
 
-version [0.1.0]
+version:
     The version of the project at its inception.
 
-open_source_license [1]
+open_source_license:
     A software license for the project. The choices are:
 
     1. MIT_
@@ -34,19 +34,19 @@ open_source_license [1]
     4. `Apache Software License 2.0`_
     5. Not open source
 
-timezone [UTC]
+timezone:
     The value to be used for the ``TIME_ZONE`` setting of the project.
 
-windows [n]
+windows:
     Indicates whether the project should be configured for development on Windows.
 
-use_pycharm [n]
+use_pycharm:
     Indicates whether the project should be configured for development with PyCharm_.
 
-use_docker [y]
+use_docker:
     Indicates whether the project should be configured to use Docker_ and `Docker Compose`_.
 
-postgresql_version [1]
+postgresql_version:
     Select a PostgreSQL_ version to use. The choices are:
 
     1. 10.3
@@ -57,45 +57,45 @@ postgresql_version [1]
     6. 9.4
     7. 9.3
 
-js_task_runner [1]
+js_task_runner:
     Select a JavaScript task runner. The choices are:
 
     1. None
     2. Gulp_
 
-custom_bootstrap_compilation [n]
+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.
 
-use_compressor [n]
+use_compressor:
     Indicates whether the project should be configured to use `Django Compressor`_.
 
-use_celery [n]
+use_celery:
     Indicates whether the project should be configured to use Celery_.
 
-use_mailhog [n]
+use_mailhog:
     Indicates whether the project should be configured to use MailHog_.
 
-use_sentry [n]
+use_sentry:
     Indicates whether the project should be configured to use Sentry_.
 
-use_whitenoise [y]
+use_whitenoise:
     Indicates whether the project should be configured to use WhiteNoise_.
 
-use_heroku [n]
+use_heroku:
     Indicates whether the project should be configured so as to be deployable
     to Heroku_.
 
-use_travisci [n]
+use_travisci:
     Indicates whether the project should be configured to use `Travis CI`_.
 
-keep_local_envs_in_vcs [y]
+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).
 
-debug [n]
+debug:
     Indicates whether the project should be configured for debugging.
     This option is relevant for Cookiecutter Django developers only.
 

From 5b6c8a89d31d35c3a518f36e48220c20b5280f64 Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Mon, 21 May 2018 21:36:03 +0300
Subject: [PATCH 13/69] Fix flake8 errors in wsgi.py

---
 {{cookiecutter.project_slug}}/config/wsgi.py | 2 --
 1 file changed, 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/wsgi.py b/{{cookiecutter.project_slug}}/config/wsgi.py
index 7d180b1b2..4c1350061 100644
--- a/{{cookiecutter.project_slug}}/config/wsgi.py
+++ b/{{cookiecutter.project_slug}}/config/wsgi.py
@@ -23,12 +23,10 @@ from django.core.wsgi import get_wsgi_application
 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

From de56ad90993032587737e33224b7c219422f3103 Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Mon, 21 May 2018 21:37:42 +0300
Subject: [PATCH 14/69] Remove redundant js_task_runner declaration from
 test_docker.sh

---
 tests/test_docker.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/test_docker.sh b/tests/test_docker.sh
index 384fdff2d..bebac1488 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 js_task_runner=None
+cookiecutter ../../ --no-input --overwrite-if-exists use_docker=y
 cd my_awesome_project
 
 # run the project's tests

From 600be33b857a7b32a09d704ba3763454f10abd77 Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Mon, 21 May 2018 21:57:31 +0300
Subject: [PATCH 15/69] Fix E402 in production.py

---
 {{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 b9b0ea0c6..4a31fc1ea 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -99,7 +99,7 @@ DEFAULT_FILE_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage'
 MEDIA_URL = f'https://s3.amazonaws.com/{AWS_STORAGE_BUCKET_NAME}/'
 {%- else %}
 # region http://stackoverflow.com/questions/10390244/
-from storages.backends.s3boto3 import S3Boto3Storage
+from storages.backends.s3boto3 import S3Boto3Storage  # noqa E402
 StaticRootS3BotoStorage = lambda: S3Boto3Storage(location='static')  # noqa
 MediaRootS3BotoStorage = lambda: S3Boto3Storage(location='media', file_overwrite=False)  # noqa
 # endregion

From b069f8e40e49197fb8d9acadf5075dbc0b50159f Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Mon, 21 May 2018 21:57:52 +0300
Subject: [PATCH 16/69] Fix E303 in production.py

---
 .../config/settings/production.py                 | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 4a31fc1ea..889ae179a 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -158,8 +158,8 @@ INSTALLED_APPS += ['gunicorn']  # noqa F405
 # http://whitenoise.evans.io/en/latest/django.html#enable-whitenoise
 MIDDLEWARE = ['whitenoise.middleware.WhiteNoiseMiddleware'] + MIDDLEWARE  # noqa F405
 
-{%- endif %}
-{% if cookiecutter.use_compressor == 'y' -%}
+{% endif %}
+{%- if cookiecutter.use_compressor == 'y' -%}
 # django-compressor
 # ------------------------------------------------------------------------------
 # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_ENABLED
@@ -169,16 +169,16 @@ 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' -%}
+{% endif %}
+{%- if cookiecutter.use_whitenoise == 'n' -%}
 # Collectfast
 # ------------------------------------------------------------------------------
 # https://github.com/antonagestam/collectfast#installation
 INSTALLED_APPS = ['collectfast'] + INSTALLED_APPS  # noqa F405
 AWS_PRELOAD_METADATA = True
 
-{%- endif %}
-{% if cookiecutter.use_sentry == 'y' -%}
+{% endif %}
+{%- if cookiecutter.use_sentry == 'y' -%}
 # raven
 # ------------------------------------------------------------------------------
 # https://docs.sentry.io/clients/python/integrations/django/
@@ -241,6 +241,7 @@ SENTRY_CELERY_LOGLEVEL = env.int('DJANGO_SENTRY_LOG_LEVEL', logging.INFO)
 RAVEN_CONFIG = {
     'dsn': SENTRY_DSN
 }
+
 {%- else %}
 # LOGGING
 # ------------------------------------------------------------------------------
@@ -290,6 +291,6 @@ LOGGING = {
     }
 }
 
-{%- endif %}
+{% endif %}
 # Your stuff...
 # ------------------------------------------------------------------------------

From 6cefe2b9dca692985638845b6188f139a61ca768 Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Mon, 21 May 2018 22:28:18 +0300
Subject: [PATCH 17/69] Rename gunicorn script to start

---
 .../compose/production/django/Dockerfile               | 10 +++++-----
 .../compose/production/django/{gunicorn => start}      |  0
 {{cookiecutter.project_slug}}/production.yml           |  2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)
 rename {{cookiecutter.project_slug}}/compose/production/django/{gunicorn => start} (100%)

diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index 04ac0d55e..bcebd4b59 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -19,15 +19,15 @@ COPY ./requirements /requirements
 RUN pip install --no-cache-dir -r /requirements/production.txt \
     && rm -rf /requirements
 
-COPY ./compose/production/django/gunicorn /gunicorn
-RUN sed -i 's/\r//' /gunicorn
-RUN chmod +x /gunicorn
-RUN chown django /gunicorn
-
 COPY ./compose/production/django/entrypoint /entrypoint
 RUN sed -i 's/\r//' /entrypoint
 RUN chmod +x /entrypoint
 RUN chown django /entrypoint
+
+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" %}
 COPY ./compose/production/django/celery/worker/start /start-celeryworker
 RUN sed -i 's/\r//' /start-celeryworker
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/gunicorn b/{{cookiecutter.project_slug}}/compose/production/django/start
similarity index 100%
rename from {{cookiecutter.project_slug}}/compose/production/django/gunicorn
rename to {{cookiecutter.project_slug}}/compose/production/django/start
diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index 51c896275..c76197513 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -17,7 +17,7 @@ services:
     env_file:
       - ./.envs/.production/.django
       - ./.envs/.production/.postgres
-    command: /gunicorn
+    command: /start
 
   postgres:
     build:

From 39c825a262ccec637d4c5d96e81fb22e9aefe44e Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Mon, 21 May 2018 22:36:50 +0300
Subject: [PATCH 18/69] Fix latest Caddy version

---
 .../compose/production/caddy/Dockerfile                         | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/compose/production/caddy/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/caddy/Dockerfile
index 8cbbf1df7..c32efb3ee 100644
--- a/{{cookiecutter.project_slug}}/compose/production/caddy/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/caddy/Dockerfile
@@ -1,3 +1,3 @@
-FROM abiosoft/caddy:0.11
+FROM abiosoft/caddy:0.11.0
 
 COPY ./compose/production/caddy/Caddyfile /etc/Caddyfile

From c3b9f72f31b1af960f18c042f30630e33e1a7d68 Mon Sep 17 00:00:00 2001
From: Michel Sassano <sassano.michel@gmail.com>
Date: Fri, 25 May 2018 08:21:22 +0200
Subject: [PATCH 19/69] Remove openssl to fix unsatisfiable constraints error
 with libressl (#1661)

Removed the openssl-dev package from the Django Dockerfiles (local and production) to fix the unsatisfiable constraints error.

The error appears because you can't have openssl and libressl installed at the same time. One of the package used by the template/project installs libressl which create an error when trying to install openssl.

Thx to @browniebroke
---
 {{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 df9561f71..274249548 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -9,7 +9,7 @@ RUN apk update \
   # 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 openssl-dev py-cffi \
+  && apk add libffi-dev py-cffi \
   # Translations dependencies
   && apk add gettext \
   # https://docs.djangoproject.com/en/dev/ref/django-admin/#dbshell
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index bcebd4b59..7ae8a7cb9 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -9,7 +9,7 @@ RUN apk update \
   # 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 openssl-dev py-cffi
+  && apk add libffi-dev py-cffi
 
 RUN addgroup -S django \
     && adduser -S -G django django

From 39d897169c6985b6b97c39aa20324364b704acf7 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 25 May 2018 09:31:33 +0200
Subject: [PATCH 20/69] Update pytest to 3.6.0 (#1662)

* Update pytest from 3.5.1 to 3.6.0

* Update pytest from 3.5.1 to 3.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 eedbfad06..b428b6cb0 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,5 +9,5 @@ flake8==3.5.0
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.0.0
-pytest==3.5.1
+pytest==3.6.0
 pytest-cookies==0.3.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 958dba1bd..4dee0421f 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -11,7 +11,7 @@ psycopg2-binary==2.7.4  # https://github.com/psycopg/psycopg2
 
 # Testing
 # ------------------------------------------------------------------------------
-pytest==3.5.1  # https://github.com/pytest-dev/pytest
+pytest==3.6.0  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.1  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From 688cd45d1e648ec4be75faacfca97f9c9b896280 Mon Sep 17 00:00:00 2001
From: Nikita Shupeyko <webyneter@gmail.com>
Date: Fri, 25 May 2018 10:31:52 +0300
Subject: [PATCH 21/69] Split issue templates by categories (#1645)

* Add bug report template

* Add feature proposal template

* Add improvement template

* Add question template

* Bug -> Bug Report

* Add regression template

* Minor enhancements

* Alter the old issue template

* Add more question resources

* Add paid support template

* Address feedback from @browniebroke

* Update Paid Support Request template

* Remove a trailing linebreak from the Paid Support Request template

* Introduce a pull request template
---
 .github/ISSUE_TEMPLATE.md              | 33 +-------------------------
 .github/ISSUE_TEMPLATE/bug.md          | 23 ++++++++++++++++++
 .github/ISSUE_TEMPLATE/feature.md      | 24 +++++++++++++++++++
 .github/ISSUE_TEMPLATE/improvement.md  | 24 +++++++++++++++++++
 .github/ISSUE_TEMPLATE/paid-support.md | 10 ++++++++
 .github/ISSUE_TEMPLATE/question.md     |  6 +++++
 .github/ISSUE_TEMPLATE/regression.md   | 28 ++++++++++++++++++++++
 .github/PULL_REQUEST_TEMPLATE.md       | 27 +++++++++++++++++++++
 8 files changed, 143 insertions(+), 32 deletions(-)
 create mode 100644 .github/ISSUE_TEMPLATE/bug.md
 create mode 100644 .github/ISSUE_TEMPLATE/feature.md
 create mode 100644 .github/ISSUE_TEMPLATE/improvement.md
 create mode 100644 .github/ISSUE_TEMPLATE/paid-support.md
 create mode 100644 .github/ISSUE_TEMPLATE/question.md
 create mode 100644 .github/ISSUE_TEMPLATE/regression.md
 create mode 100644 .github/PULL_REQUEST_TEMPLATE.md

diff --git a/.github/ISSUE_TEMPLATE.md b/.github/ISSUE_TEMPLATE.md
index 37a905b9d..b232b6e34 100644
--- a/.github/ISSUE_TEMPLATE.md
+++ b/.github/ISSUE_TEMPLATE.md
@@ -1,32 +1 @@
-**Note: for support questions, please use the `cookiecutter-django` tag on stackoverflow**. This repository's issues are reserved for feature requests and bug reports.
-
-* **I'm submitting a ... **
-  - [ ] bug report
-  - [ ] feature request
-  - [ ] support request => Please do not submit support request here, see note at the top of this template.
-
-
-* **Do you want to request a *feature* or report a *bug*?**
-
-
-
-* **What is the current behavior?**
-
-
-
-* **If the current behavior is a bug, please provide the steps to reproduce and if possible a minimal demo of the problem** 
-
-
-* **What is the expected behavior?**
-
-
-
-* **What is the motivation / use case for changing the behavior?**
-
-
-
-* **Please tell us about your environment:**
-
-
-
-* **Other information** (e.g. detailed explanation, stacktraces, related issues, suggestions how to fix, links for us to have context, eg. stackoverflow, gitter, etc)
+## [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
new file mode 100644
index 000000000..75f6a19c6
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/bug.md
@@ -0,0 +1,23 @@
+---
+name: Bug Report
+about: Report a bug
+---
+
+## What happened?
+
+
+
+
+## What should've happened instead?
+
+
+
+
+## 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/ISSUE_TEMPLATE/feature.md b/.github/ISSUE_TEMPLATE/feature.md
new file mode 100644
index 000000000..b0d560d81
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/feature.md
@@ -0,0 +1,24 @@
+---
+name: New Feature Proposal
+about: Propose a new feature
+---
+
+## 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/improvement.md b/.github/ISSUE_TEMPLATE/improvement.md
new file mode 100644
index 000000000..572652373
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/improvement.md
@@ -0,0 +1,24 @@
+---
+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
new file mode 100644
index 000000000..7cd2c4a57
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/paid-support.md
@@ -0,0 +1,10 @@
+---
+name: Paid Support Request
+about: Ask Core Team members to help you out
+---
+
+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.
+
+* 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 Django, Docker, and Heroku.
diff --git a/.github/ISSUE_TEMPLATE/question.md b/.github/ISSUE_TEMPLATE/question.md
new file mode 100644
index 000000000..0c0f3d891
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/question.md
@@ -0,0 +1,6 @@
+---
+name: Question
+about: Please, ask your question on StackOverflow or Gitter
+---
+
+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.
diff --git a/.github/ISSUE_TEMPLATE/regression.md b/.github/ISSUE_TEMPLATE/regression.md
new file mode 100644
index 000000000..80384004b
--- /dev/null
+++ b/.github/ISSUE_TEMPLATE/regression.md
@@ -0,0 +1,28 @@
+---
+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
new file mode 100644
index 000000000..8dbff6c25
--- /dev/null
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -0,0 +1,27 @@
+[//]: # (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?)
+
+
+
+
+## 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.")
+
+

From ea9a781cc88db7964077aca870d6e8d1e2b7ea58 Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Fri, 25 May 2018 12:07:17 +0300
Subject: [PATCH 22/69] Install Mailgun's (and potentially, other ESPs')
 dependencies with Anymail

Rationale: this is a [generic way](https://github.com/anymail/django-anymail#anymail-1-2-3) of handling Anymail ESP dependencies
---
 {{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 e36dc78a2..9ddb7d15f 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -14,4 +14,4 @@ raven==6.8.0  # https://github.com/getsentry/raven-python
 # Django
 # ------------------------------------------------------------------------------
 django-storages[boto3]==1.6.6  # https://github.com/jschneier/django-storages
-django-anymail==2.2  # https://github.com/anymail/django-anymail
+django-anymail[mailgun]==2.2  # https://github.com/anymail/django-anymail

From 77f61de23655811b2d77caa84df3e852e92b23c8 Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Fri, 25 May 2018 12:55:27 +0300
Subject: [PATCH 23/69] chown django /start-(celerybeat|celeryworker) in
 production Django

---
 .../compose/production/django/Dockerfile                        | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index 7ae8a7cb9..b204a4810 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -32,10 +32,12 @@ RUN chown django /start
 COPY ./compose/production/django/celery/worker/start /start-celeryworker
 RUN sed -i 's/\r//' /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 chmod +x /start-celerybeat
+RUN chown django /start-celerybeat
 {% endif %}
 COPY . /app
 

From 225aca189c103bb733a6274bdf6010d815016364 Mon Sep 17 00:00:00 2001
From: msaizar <saizar.martin@gmail.com>
Date: Sun, 27 May 2018 14:12:56 -0300
Subject: [PATCH 24/69] Added articles to README.rst (#1659)

* Added articles to README.rst

* Updated CONTRIBUTORS.rst
---
 CONTRIBUTORS.rst | 2 ++
 README.rst       | 4 ++++
 2 files changed, 6 insertions(+)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index a5ea2d937..0f6761ed5 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -120,6 +120,7 @@ Listed in alphabetical order.
   Lyla Fischer
   Malik Sulaimanov         `@flyudvik`_                  @flyudvik
   Martin Blech
+  Martin Saizar            `@msaizar`_
   Mathijs Hoogland         `@MathijsHoogland`_
   Matt Braymer-Hayes       `@mattayes`_                  @mattayes
   Matt Linares
@@ -218,6 +219,7 @@ Listed in alphabetical order.
 .. _@kevgathuku: https://github.com/kevgathuku
 .. _@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
 .. _@menzenski: https://github.com/menzenski
diff --git a/README.rst b/README.rst
index 9c1640712..7e24a8369 100644
--- a/README.rst
+++ b/README.rst
@@ -279,6 +279,8 @@ experience better.
 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
@@ -290,6 +292,8 @@ Articles
 
 Have a blog or online publication? Write about your cookiecutter-django tips and tricks, then send us a pull request with the link.
 
+.. _`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 fe3f45ba7dbb52cb6018f538d02eefac059ca5b8 Mon Sep 17 00:00:00 2001
From: Nikita Shupeyko <webyneter@gmail.com>
Date: Sun, 27 May 2018 22:36:13 +0300
Subject: [PATCH 25/69] Rename DJANGO_SENTRY_DSN env to SENTRY_DSN (#1663)

Rationale: so that Heroku auto-provisioned Sentry addon, with its SENTRY_DSN config var is being connected to out-of-box
---
 docs/deployment-on-heroku.rst                 | 33 +++++++++++--------
 docs/deployment-with-docker.rst               |  2 +-
 docs/settings.rst                             |  2 +-
 .../.envs/.production/.django                 |  2 +-
 .../config/settings/production.py             |  2 +-
 5 files changed, 23 insertions(+), 18 deletions(-)

diff --git a/docs/deployment-on-heroku.rst b/docs/deployment-on-heroku.rst
index 982168fc7..7006a2877 100644
--- a/docs/deployment-on-heroku.rst
+++ b/docs/deployment-on-heroku.rst
@@ -14,26 +14,31 @@ Run these commands to deploy the project to Heroku:
     heroku pg:promote DATABASE_URL
 
     heroku addons:create heroku-redis:hobby-dev
-    heroku addons:create mailgun
 
-    heroku config:set WEB_CONCURRENCY=4
-    # Generating a 32 character-long random string without any of the visually similiar characters "IOl01":
-    heroku config:set DJANGO_ADMIN_URL="$(openssl rand -base64 4096 | tr -dc 'A-HJ-NP-Za-km-z2-9' | head -c 32)/"
-    heroku config:set DJANGO_SECRET_KEY="$(openssl rand -base64 64)"
-    heroku config:set DJANGO_SETTINGS_MODULE=config.settings.production
-    heroku config:set DJANGO_ALLOWED_HOSTS='.herokuapp.com'
+    # If using mailgun:
+    heroku addons:create mailgun:starter
 
-    heroku config:set DJANGO_AWS_ACCESS_KEY_ID=YOUR_AWS_ID_HERE
-    heroku config:set DJANGO_AWS_SECRET_ACCESS_KEY=YOUR_AWS_SECRET_ACCESS_KEY_HERE
-    heroku config:set DJANGO_AWS_STORAGE_BUCKET_NAME=YOUR_AWS_S3_BUCKET_NAME_HERE
-
-    # This is to be set only if you're using Sentry:
-    heroku config:set DJANGO_SENTRY_DSN=YOUR_SENTRY_DSN
+    heroku addons:create sentry:f1
 
     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":
+    heroku config:set DJANGO_ADMIN_URL="$(openssl rand -base64 4096 | tr -dc 'A-HJ-NP-Za-km-z2-9' | head -c 32)/"
+    heroku config:set DJANGO_ALLOWED_HOSTS=  # Set this to your Heroku app url, e.g. 'bionic-beaver-28392.herokuapp.com'
+
+    heroku config:set DJANGO_AWS_ACCESS_KEY_ID=  # Assign with AWS_ACCESS_KEY_ID
+    heroku config:set DJANGO_AWS_SECRET_ACCESS_KEY=  # Assign with AWS_SECRET_ACCESS_KEY
+    heroku config:set DJANGO_AWS_STORAGE_BUCKET_NAME=  # Assign with AWS_STORAGE_BUCKET_NAME
 
     git push heroku master
+
     heroku run python manage.py migrate
-    heroku run python manage.py check --deploy
     heroku run python manage.py createsuperuser
+    heroku run python manage.py collectstatic --no-input
+
+    heroku run python manage.py check --deploy
+
     heroku open
diff --git a/docs/deployment-with-docker.rst b/docs/deployment-with-docker.rst
index de0026a60..42798aae8 100644
--- a/docs/deployment-with-docker.rst
+++ b/docs/deployment-with-docker.rst
@@ -32,7 +32,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 ``DJANGO_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.
 
 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.
 
diff --git a/docs/settings.rst b/docs/settings.rst
index 60593a5d1..6e71a5151 100644
--- a/docs/settings.rst
+++ b/docs/settings.rst
@@ -44,7 +44,7 @@ Environment Variable                    Django Setting              Development
 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_SENTRY_DSN                       SENTRY_DSN                  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
diff --git a/{{cookiecutter.project_slug}}/.envs/.production/.django b/{{cookiecutter.project_slug}}/.envs/.production/.django
index 2e9eefea7..5cb90897b 100644
--- a/{{cookiecutter.project_slug}}/.envs/.production/.django
+++ b/{{cookiecutter.project_slug}}/.envs/.production/.django
@@ -37,7 +37,7 @@ WEB_CONCURRENCY=4
 {% if cookiecutter.use_sentry == 'y' %}
 # Sentry
 # ------------------------------------------------------------------------------
-DJANGO_SENTRY_DSN=
+SENTRY_DSN=
 {% endif %}
 
 # Redis
diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py
index 889ae179a..ecd517ddd 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -187,7 +187,7 @@ MIDDLEWARE = ['raven.contrib.django.raven_compat.middleware.SentryResponseErrorI
 
 # Sentry
 # ------------------------------------------------------------------------------
-SENTRY_DSN = env('DJANGO_SENTRY_DSN')
+SENTRY_DSN = env('SENTRY_DSN')
 SENTRY_CLIENT = env('DJANGO_SENTRY_CLIENT', default='raven.contrib.django.raven_compat.DjangoClient')
 LOGGING = {
     'version': 1,

From e08b6ab6f81c106097d347867e4274b8c9e8593a Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Mon, 28 May 2018 12:50:37 +0300
Subject: [PATCH 26/69] Remove set -o pipefail command from celeryworker start
 script

---
 .../compose/local/django/celery/worker/start                     | 1 -
 1 file changed, 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 4335340de..ecc032504 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 set -o errexit
-set -o pipefail
 set -o nounset
 set -o xtrace
 

From b8c7ae8b4bf65bca8530814f7dcaee0a31421352 Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Mon, 28 May 2018 12:50:57 +0300
Subject: [PATCH 27/69] Remove set -o pipefail command from celerybeat start
 script

---
 .../compose/local/django/celery/beat/start                       | 1 -
 1 file changed, 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
index 0ca8bb507..d1c9db455 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
@@ -1,7 +1,6 @@
 #!/bin/sh
 
 set -o errexit
-set -o pipefail
 set -o nounset
 set -o xtrace
 

From a4240bcf085625c9b084eec5511a3a6cf53f9fb5 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Mon, 28 May 2018 21:18:55 -0700
Subject: [PATCH 28/69] Update sphinx from 1.7.4 to 1.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 4dee0421f..be108fa88 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.7.4  # https://github.com/sphinx-doc/sphinx
+Sphinx==1.7.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 eea6cc94de48102a235533fa76dca4a4c2d561df Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 31 May 2018 06:55:38 +0200
Subject: [PATCH 29/69] Update raven to 6.9.0 (#1667)

This PR updates [raven](https://pypi.org/project/raven) from **6.8.0** to **6.9.0**.



<details>
  <summary>Changelog</summary>


   ### 6.9.0
   ```
   ------------------
* [Core] Switched from culprit to transaction for automatic transaction reporting.
* [CI] Removed py3.3 from build
* [Django] resolved an issue where the log integration would override the user.
   ```


</details>




<details>
  <summary>Links</summary>

  - PyPI: https://pypi.org/project/raven
  - Changelog: https://pyup.io/changelogs/raven/
  - Repo: https://github.com/getsentry/raven-python
</details>
---
 {{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 9ddb7d15f..59a028a14 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" %}
-raven==6.8.0  # https://github.com/getsentry/raven-python
+raven==6.9.0  # https://github.com/getsentry/raven-python
 {%- endif %}
 
 # Django

From cff7111edbdaf773641624320b6bb25c466ccdd6 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 31 May 2018 15:14:37 +0200
Subject: [PATCH 30/69] Update django-anymail from 2.2 to 3.0 (#1668)

---
 {{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 59a028a14..d3b18ed92 100644
--- a/{{cookiecutter.project_slug}}/requirements/production.txt
+++ b/{{cookiecutter.project_slug}}/requirements/production.txt
@@ -14,4 +14,4 @@ raven==6.9.0  # https://github.com/getsentry/raven-python
 # Django
 # ------------------------------------------------------------------------------
 django-storages[boto3]==1.6.6  # https://github.com/jschneier/django-storages
-django-anymail[mailgun]==2.2  # https://github.com/anymail/django-anymail
+django-anymail[mailgun]==3.0  # https://github.com/anymail/django-anymail

From 77f87c453253c03cd76e04ec351e45acc3032e0a Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 1 Jun 2018 15:16:03 -0700
Subject: [PATCH 31/69] Update django from 2.0.5 to 2.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 bd7e051bb..6b2ec4b55 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -15,7 +15,7 @@ celery==3.1.25  # pyup: <4.0  # https://github.com/celery/celery
 
 # Django
 # ------------------------------------------------------------------------------
-django==2.0.5  # pyup: < 2.1  # https://www.djangoproject.com/
+django==2.0.6  # pyup: < 2.1  # https://www.djangoproject.com/
 django-environ==0.4.4  # https://github.com/joke2k/django-environ
 django-model-utils==3.1.2  # https://github.com/jazzband/django-model-utils
 django-allauth==0.36.0  # https://github.com/pennersr/django-allauth

From 5b5ad0e4fc97f540fdbda459adaa1ccc68cf6712 Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Tue, 5 Jun 2018 12:13:50 +0300
Subject: [PATCH 32/69] Fix Py.Test unittests fail on new cookie

Fixes #1674
---
 .../{{cookiecutter.project_slug}}/users/urls.py                 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py
index a98e63b84..fef93ad58 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py
@@ -8,7 +8,7 @@ urlpatterns = [
     path("~redirect/", view=views.UserRedirectView.as_view(), name="redirect"),
     path("~update/", view=views.UserUpdateView.as_view(), name="update"),
     path(
-        "<str:username>",
+        "<str:username>/",
         view=views.UserDetailView.as_view(),
         name="detail",
     ),

From f25492d74f13d1f6a87ebbe0b9ad5f7223715b95 Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Tue, 5 Jun 2018 12:17:47 +0300
Subject: [PATCH 33/69] Clean up .travis.yml

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

diff --git a/.travis.yml b/.travis.yml
index 8be8bc440..a46726d6c 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,5 +1,3 @@
-# Config file for automatic testing at travis-ci.org
-
 sudo: required
 
 services:
@@ -10,18 +8,18 @@ language: python
 python: 3.6
 
 env:
-    - TOX_ENV=py36
+  - TOX_ENV=py36
 
 before_install:
   - docker-compose -v
   - docker -v
 
 script:
-    - tox -e $TOX_ENV
-    - sh tests/test_docker.sh
+  - tox -e $TOX_ENV
+  - sh tests/test_docker.sh
 
 install:
-    - pip install tox
+  - pip install tox
 
 notifications:
   email:

From 95d218e3e4de0ffda03245bba79d807f02679251 Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Tue, 5 Jun 2018 12:18:07 +0300
Subject: [PATCH 34/69] Rename CeleryConfig to CeleryAppConfig

---
 {{cookiecutter.project_slug}}/config/settings/base.py           | 2 +-
 .../{{cookiecutter.project_slug}}/taskapp/celery.py             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index e767d5dff..f0fb81c2f 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -228,7 +228,7 @@ MANAGERS = ADMINS
 {% if cookiecutter.use_celery == 'y' -%}
 # Celery
 # ------------------------------------------------------------------------------
-INSTALLED_APPS += ['{{cookiecutter.project_slug}}.taskapp.celery.CeleryConfig']
+INSTALLED_APPS += ['{{cookiecutter.project_slug}}.taskapp.celery.CeleryAppConfig']
 # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-broker_url
 CELERY_BROKER_URL = env('CELERY_BROKER_URL', default='django://')
 # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-result_backend
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py
index 3c5d0e9cd..ed5c71760 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py
@@ -13,7 +13,7 @@ if not settings.configured:
 app = Celery('{{cookiecutter.project_slug}}')
 
 
-class CeleryConfig(AppConfig):
+class CeleryAppConfig(AppConfig):
     name = '{{cookiecutter.project_slug}}.taskapp'
     verbose_name = 'Celery Config'
 

From c812e01fc5968a33871ba0ff4742bf7f9e9f04c6 Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Tue, 5 Jun 2018 12:18:35 +0300
Subject: [PATCH 35/69] Rename UsersConfig to UsersAppConfig

---
 {{cookiecutter.project_slug}}/config/settings/base.py           | 2 +-
 .../{{cookiecutter.project_slug}}/users/apps.py                 | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index f0fb81c2f..26bbd479a 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.UsersConfig',
+    '{{ cookiecutter.project_slug }}.users.apps.UsersAppConfig',
     # 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 118bfda91..32fab76d7 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/apps.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/apps.py
@@ -1,7 +1,7 @@
 from django.apps import AppConfig
 
 
-class UsersConfig(AppConfig):
+class UsersAppConfig(AppConfig):
     name = "{{cookiecutter.project_slug}}.users"
     verbose_name = "Users"
 

From 27cf4f01da7f578edcb4d44386c980f95cb85804 Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Tue, 5 Jun 2018 12:23:06 +0300
Subject: [PATCH 36/69] Upgrade postgres to 10.4

Closes #1669.
---
 cookiecutter.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cookiecutter.json b/cookiecutter.json
index bd7ee7222..21a639a3a 100644
--- a/cookiecutter.json
+++ b/cookiecutter.json
@@ -18,6 +18,7 @@
   "use_pycharm": "n",
   "use_docker": "n",
   "postgresql_version": [
+    "10.4",
     "10.3",
     "10.2",
     "10.1",

From d8526d1b2d0e6d8b97a1a8b2183d295cbc91f0b4 Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Tue, 5 Jun 2018 12:28:11 +0300
Subject: [PATCH 37/69] Unset -o xtrace in compose start scripts

---
 .../compose/local/django/celery/beat/start                       | 1 -
 .../compose/local/django/celery/worker/start                     | 1 -
 {{cookiecutter.project_slug}}/compose/local/django/start         | 1 -
 3 files changed, 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 d1c9db455..4e2493f3b 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start
@@ -2,7 +2,6 @@
 
 set -o errexit
 set -o nounset
-set -o xtrace
 
 
 rm -f './celerybeat.pid'
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
index ecc032504..c8bc31d3a 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start
@@ -2,7 +2,6 @@
 
 set -o errexit
 set -o nounset
-set -o xtrace
 
 
 celery -A {{cookiecutter.project_slug}}.taskapp worker -l INFO
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/start b/{{cookiecutter.project_slug}}/compose/local/django/start
index 50227e19e..921604dcb 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/start
+++ b/{{cookiecutter.project_slug}}/compose/local/django/start
@@ -3,7 +3,6 @@
 set -o errexit
 set -o pipefail
 set -o nounset
-set -o xtrace
 
 
 python manage.py migrate

From 0ff3236ce4e3560b93e729ed5251cebe6ac46dde Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Wed, 6 Jun 2018 08:38:28 +0200
Subject: [PATCH 38/69] Update pytest to 3.6.1 (#1675)

* Update pytest from 3.6.0 to 3.6.1

* Update pytest from 3.6.0 to 3.6.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 b428b6cb0..9f378fdaa 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,5 +9,5 @@ flake8==3.5.0
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.0.0
-pytest==3.6.0
+pytest==3.6.1
 pytest-cookies==0.3.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index be108fa88..c67276107 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -11,7 +11,7 @@ psycopg2-binary==2.7.4  # https://github.com/psycopg/psycopg2
 
 # Testing
 # ------------------------------------------------------------------------------
-pytest==3.6.0  # https://github.com/pytest-dev/pytest
+pytest==3.6.1  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.1  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From 911e822e8559af56d5067a4e0db9d92debb9f401 Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Wed, 6 Jun 2018 09:40:19 +0300
Subject: [PATCH 39/69] Gitignore .pytest_cache/ in project template

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

diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore
index 3cabaac22..c6273596b 100644
--- a/{{cookiecutter.project_slug}}/.gitignore
+++ b/{{cookiecutter.project_slug}}/.gitignore
@@ -341,3 +341,5 @@ pip-selfcheck.json
 MailHog
 {%- endif %}
 {{ cookiecutter.project_slug }}/media/
+
+.pytest_cache/

From 7d7eb787732762d693e9956d082d99c3bf2399a0 Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Sat, 9 Jun 2018 14:51:54 +0300
Subject: [PATCH 40/69] Remove duplicate Docker Compose service configuration

Rationale: those sections will always be there thanks to inheritance
---
 {{cookiecutter.project_slug}}/local.yml      |  6 ------
 {{cookiecutter.project_slug}}/production.yml | 12 ------------
 2 files changed, 18 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index c725fff79..5ad26dfd0 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -56,9 +56,6 @@ services:
       {% if cookiecutter.use_mailhog == 'y' -%}
       - mailhog
       {%- endif %}
-    env_file:
-      - ./.envs/.local/.django
-      - ./.envs/.local/.postgres
     ports: []
     command: /start-celeryworker
 
@@ -71,9 +68,6 @@ services:
       {% if cookiecutter.use_mailhog == 'y' -%}
       - mailhog
       {%- endif %}
-    env_file:
-      - ./.envs/.local/.django
-      - ./.envs/.local/.postgres
     ports: []
     command: /start-celerybeat
 
diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index c76197513..4ee178d82 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -52,23 +52,11 @@ services:
   celeryworker:
     <<: *django
     image: {{ cookiecutter.project_slug }}_production_celeryworker
-    depends_on:
-     - postgres
-     - redis
-    env_file:
-      - ./.envs/.production/.django
-      - ./.envs/.production/.postgres
     command: /start-celeryworker
 
   celerybeat:
     <<: *django
     image: {{ cookiecutter.project_slug }}_production_celerybeat
-    depends_on:
-      - postgres
-      - redis
-    env_file:
-      - ./.envs/.production/.django
-      - ./.envs/.production/.postgres
     command: /start-celerybeat
 
   {%- endif %}

From 75c423c88e2f5eb3038517314e81315c6fb7c6d3 Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Tue, 12 Jun 2018 13:21:10 +0300
Subject: [PATCH 41/69] Update @pydanny and @webyneter bios

---
 .github/ISSUE_TEMPLATE/paid-support.md | 2 +-
 README.rst                             | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/.github/ISSUE_TEMPLATE/paid-support.md b/.github/ISSUE_TEMPLATE/paid-support.md
index 7cd2c4a57..d565e564f 100644
--- a/.github/ISSUE_TEMPLATE/paid-support.md
+++ b/.github/ISSUE_TEMPLATE/paid-support.md
@@ -7,4 +7,4 @@ Provided your question goes beyound [regular support](https://github.com/pydanny
 
 * 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 Django, Docker, and Heroku.
+* Nikita Shupeyko, Core Developer ([GitHub](https://github.com/webyneter)): expertise in Python/Django, hands-on DevOps and frontend experience.
diff --git a/README.rst b/README.rst
index 7e24a8369..0eaea5194 100644
--- a/README.rst
+++ b/README.rst
@@ -98,7 +98,9 @@ Support this Project!
 
 This project is run by volunteers. Please support them in their efforts to maintain and improve Cookiecutter Django:
 
-* https://www.patreon.com/danielroygreenfeld: Project lead. Expertise in AWS ELB and 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:
 

From 636b5f361d196cb15a3f4d07ac430988e124c499 Mon Sep 17 00:00:00 2001
From: Bruno Alla <bruno.alla@founders4schools.org.uk>
Date: Fri, 15 Jun 2018 12:10:27 +0100
Subject: [PATCH 42/69] Remove entry from .gitignore causing compose/local to
 match

---
 .gitignore | 1 -
 1 file changed, 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 9e4496f1c..54fafb8be 100644
--- a/.gitignore
+++ b/.gitignore
@@ -215,7 +215,6 @@ tags
 [Ii]nclude
 [Ll]ib
 [Ll]ib64
-[Ll]ocal
 [Ss]cripts
 pyvenv.cfg
 pip-selfcheck.json

From a9db5b09826e8c6e033c5f00d1ba736b56f44195 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 15 Jun 2018 14:20:28 -0700
Subject: [PATCH 43/69] Update django-test-plus from 1.0.22 to 1.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 c67276107..d3e938ea2 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -22,7 +22,7 @@ coverage==4.5.1  # https://github.com/nedbat/coveragepy
 # Django
 # ------------------------------------------------------------------------------
 factory-boy==2.11.1  # https://github.com/FactoryBoy/factory_boy
-django-test-plus==1.0.22  # https://github.com/revsys/django-test-plus
+django-test-plus==1.1.0  # https://github.com/revsys/django-test-plus
 
 django-debug-toolbar==1.9.1  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==2.0.7  # https://github.com/django-extensions/django-extensions

From cec06b2d813c8a78396600f27871f6a5b8b2011c Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Fri, 15 Jun 2018 14:20:32 -0700
Subject: [PATCH 44/69] Update pytest-django 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 c67276107..60600308b 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -27,4 +27,4 @@ django-test-plus==1.0.22  # https://github.com/revsys/django-test-plus
 django-debug-toolbar==1.9.1  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==2.0.7  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.5.0  # https://github.com/nedbat/django_coverage_plugin
-pytest-django==3.2.1  # https://github.com/pytest-dev/pytest-django
+pytest-django==3.3.0  # https://github.com/pytest-dev/pytest-django

From c6c8ca953afcd721bf7ef7b13b3f7a77587bacf9 Mon Sep 17 00:00:00 2001
From: Bruno Alla <bruno.alla@founders4schools.org.uk>
Date: Sat, 16 Jun 2018 15:07:40 +0100
Subject: [PATCH 45/69] Remove entry from other .gitignore causing
 compose/local to match

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

diff --git a/{{cookiecutter.project_slug}}/.gitignore b/{{cookiecutter.project_slug}}/.gitignore
index c6273596b..679fb9026 100644
--- a/{{cookiecutter.project_slug}}/.gitignore
+++ b/{{cookiecutter.project_slug}}/.gitignore
@@ -330,7 +330,6 @@ tags
 [Ii]nclude
 [Ll]ib
 [Ll]ib64
-[Ll]ocal
 [Ss]cripts
 pyvenv.cfg
 pip-selfcheck.json

From 24a7e535c66bc63ac37e112b26215c4eb9d43a51 Mon Sep 17 00:00:00 2001
From: pyup-bot <github-bot@pyup.io>
Date: Sun, 17 Jun 2018 12:36:30 -0700
Subject: [PATCH 46/69] Update psycopg2-binary from 2.7.4 to 2.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 ac8e452d0..a72a54186 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -6,7 +6,7 @@ Sphinx==1.7.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 %}
-psycopg2-binary==2.7.4  # https://github.com/psycopg/psycopg2
+psycopg2-binary==2.7.5  # https://github.com/psycopg/psycopg2
 {%- endif %}
 
 # Testing

From f3d76a413422092a38b58167bdd4e7a3aea7b405 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 19 Jun 2018 00:07:14 +0200
Subject: [PATCH 47/69] Update celery from 3.1.25 to 3.1.26.post2 (#1683)

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

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 6b2ec4b55..a5399ea5a 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -10,7 +10,7 @@ whitenoise==3.3.1  # https://github.com/evansd/whitenoise
 {%- endif %}
 redis>=2.10.5  # https://github.com/antirez/redis
 {%- if cookiecutter.use_celery == "y" %}
-celery==3.1.25  # pyup: <4.0  # https://github.com/celery/celery
+celery==3.1.26.post2  # pyup: <4.0  # https://github.com/celery/celery
 {%- endif %}
 
 # Django

From 75a0699848dd752c412e750da9fefe4006ba8454 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 21 Jun 2018 05:00:47 +0200
Subject: [PATCH 48/69] Update pytest to 3.6.2 (#1690)

This PR updates [pytest](https://pypi.org/project/pytest) from **3.6.1** to **3.6.2**.



*The bot wasn't able to find a changelog for this release. [Got an idea?](https://github.com/pyupio/changelogs/issues/new)*

<details>
  <summary>Links</summary>

  - PyPI: https://pypi.org/project/pytest
  - Changelog: https://pyup.io/changelogs/pytest/
  - Repo: https://github.com/pytest-dev/pytest/issues
  - Homepage: http://pytest.org
</details>
---
 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 9f378fdaa..77770fa9e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,5 +9,5 @@ flake8==3.5.0
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.0.0
-pytest==3.6.1
+pytest==3.6.2
 pytest-cookies==0.3.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index a72a54186..14903b1af 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -11,7 +11,7 @@ psycopg2-binary==2.7.5  # https://github.com/psycopg/psycopg2
 
 # Testing
 # ------------------------------------------------------------------------------
-pytest==3.6.1  # https://github.com/pytest-dev/pytest
+pytest==3.6.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.1  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From 5309fbf5e7135087f61f58bb2a940d92596e371b Mon Sep 17 00:00:00 2001
From: Wan Liuyang <tsfdye@gmail.com>
Date: Thu, 21 Jun 2018 14:53:04 +0800
Subject: [PATCH 49/69] Upgrade celery to 4.2 (#1446)

* Update celery to 4.1.0

* Re-add endif closing block

* Update local.py

* Update base.txt

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

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index a5399ea5a..5e8f78468 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -10,7 +10,7 @@ whitenoise==3.3.1  # https://github.com/evansd/whitenoise
 {%- endif %}
 redis>=2.10.5  # https://github.com/antirez/redis
 {%- if cookiecutter.use_celery == "y" %}
-celery==3.1.26.post2  # pyup: <4.0  # https://github.com/celery/celery
+celery==4.2.0  # pyup: <5.0  # https://github.com/celery/celery
 {%- endif %}
 
 # Django

From 07060eaecc07c444470b91b0915b63b6f4fc88f7 Mon Sep 17 00:00:00 2001
From: Nikita Shupeyko <webyneter@gmail.com>
Date: Thu, 21 Jun 2018 19:38:48 +0000
Subject: [PATCH 50/69] Extend & enhance Celery configuration (#1679)

* CELERY_TASK_TIME_LIMIT

* CELERY_TASK_SOFT_TIME_LIMIT

* CELERY_ALWAYS_EAGER -> CELERY_TASK_ALWAYS_EAGER

* CELERY_EAGER_PROPAGATES = CELERY_TASK_ALWAYS_EAGER

Addresses https://github.com/pydanny/cookiecutter-django/pull/1446/files#r167238808

* CELERY_RESULT_BACKEND = CELERY_BROKER_URL always

* CELERY_TIMEZONE = TIME_ZONE

* CELERY_TASK_EAGER_PROPAGATES = True

* Name task limit settings appropriately

CELERY_TASK_TIME_LIMIT -> CELERYD_TASK_TIME_LIMIT, CELERY_TASK_SOFT_TIME_LIMIT -> CELERYD_TASK_SOFT_TIME_LIMIT
---
 .../config/settings/base.py                      | 16 +++++++++++-----
 .../config/settings/local.py                     |  6 ++++--
 2 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/{{cookiecutter.project_slug}}/config/settings/base.py b/{{cookiecutter.project_slug}}/config/settings/base.py
index 26bbd479a..e4ab28844 100644
--- a/{{cookiecutter.project_slug}}/config/settings/base.py
+++ b/{{cookiecutter.project_slug}}/config/settings/base.py
@@ -229,19 +229,25 @@ MANAGERS = ADMINS
 # 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
 # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-broker_url
-CELERY_BROKER_URL = env('CELERY_BROKER_URL', default='django://')
+CELERY_BROKER_URL = env('CELERY_BROKER_URL')
 # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-result_backend
-if CELERY_BROKER_URL == 'django://':
-    CELERY_RESULT_BACKEND = 'redis://'
-else:
-    CELERY_RESULT_BACKEND = CELERY_BROKER_URL
+CELERY_RESULT_BACKEND = CELERY_BROKER_URL
 # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-accept_content
 CELERY_ACCEPT_CONTENT = ['json']
 # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-task_serializer
 CELERY_TASK_SERIALIZER = 'json'
 # http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-result_serializer
 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
+# 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
 
 {%- endif %}
 # django-allauth
diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py
index ac11eda56..741f324af 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
 # ------------------------------------------------------------------------------
-# http://docs.celeryproject.org/en/latest/userguide/configuration.html#std:setting-task_always_eager
-CELERY_ALWAYS_EAGER = True
+# http://docs.celeryproject.org/en/latest/userguide/configuration.html#task-always-eager
+CELERY_TASK_ALWAYS_EAGER = True
+# http://docs.celeryproject.org/en/latest/userguide/configuration.html#task-eager-propagates
+CELERY_TASK_EAGER_PROPAGATES = True
 
 {%- endif %}
 # Your stuff...

From 83b5f00ac55af641152e99c11b806ac62149dcfa Mon Sep 17 00:00:00 2001
From: Denis Orehovsky <denis.orehovsky@gmail.com>
Date: Thu, 21 Jun 2018 22:39:19 +0300
Subject: [PATCH 51/69] Add celery prefix for configuration (#1676)

* Add celery prefix for configuration

* Update CONTRIBUTORS.rst
---
 CONTRIBUTORS.rst                                              | 2 ++
 .../{{cookiecutter.project_slug}}/taskapp/celery.py           | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 0f6761ed5..55ae6d722 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -87,6 +87,7 @@ Listed in alphabetical order.
   David Díaz               `@ddiazpinto`_                @DavidDiazPinto
   Davur Clementsen         `@dsclementsen`_              @davur
   Delio Castillo           `@jangeador`_                 @jangeador
+  Denis Orehovsky          `@apirobot`_
   Dónal Adams              `@epileptic-fish`_
   Dong Huynh               `@trungdong`_
   Emanuel Calso            `@bloodpet`_                  @bloodpet
@@ -172,6 +173,7 @@ Listed in alphabetical order.
 .. _@amjith: https://github.com/amjith
 .. _@andor-pierdelacabeza: https://github.com/andor-pierdelacabeza
 .. _@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
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py
index ed5c71760..b3f0a388b 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/taskapp/celery.py
@@ -20,7 +20,9 @@ class CeleryAppConfig(AppConfig):
     def ready(self):
         # Using a string here means the worker will not have to
         # pickle the object when using Windows.
-        app.config_from_object('django.conf:settings')
+        # - namespace='CELERY' means all celery-related configuration keys
+        #   should have a `CELERY_` prefix.
+        app.config_from_object('django.conf:settings', namespace='CELERY')
         installed_apps = [app_config.name for app_config in apps.get_app_configs()]
         app.autodiscover_tasks(lambda: installed_apps, force=True)
 

From ee2bb3f2efef6add9a598597354ef5b3d3541f0b Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Fri, 22 Jun 2018 02:50:02 +0200
Subject: [PATCH 52/69] Update pytest-django to 3.3.2 (#1692)

This PR updates [pytest-django](https://pypi.org/project/pytest-django) from **3.3.0** to **3.3.2**.



<details>
  <summary>Changelog</summary>


   ### 3.3.1
   ```
   ------------------

Bug fixes
^^^^^^^^^

* Fixed test for classmethod with Django TestCases again (618,
  introduced in 598 (3.3.0)).

Compatibility
^^^^^^^^^^^^^

* Support Django 2.1 (no changes necessary) (614).
   ```


</details>




<details>
  <summary>Links</summary>

  - PyPI: https://pypi.org/project/pytest-django
  - Changelog: https://pyup.io/changelogs/pytest-django/
  - Docs: https://pytest-django.readthedocs.io/
</details>
---
 {{cookiecutter.project_slug}}/requirements/local.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 14903b1af..27655b3f2 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -27,4 +27,4 @@ django-test-plus==1.1.0  # https://github.com/revsys/django-test-plus
 django-debug-toolbar==1.9.1  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==2.0.7  # https://github.com/django-extensions/django-extensions
 django-coverage-plugin==1.5.0  # https://github.com/nedbat/django_coverage_plugin
-pytest-django==3.3.0  # https://github.com/pytest-dev/pytest-django
+pytest-django==3.3.2  # https://github.com/pytest-dev/pytest-django

From 0d1cfe548c933c489416d3f81d07cf2e8e0a10a5 Mon Sep 17 00:00:00 2001
From: Denis <delneg@yandex.ru>
Date: Sun, 24 Jun 2018 02:34:08 +0300
Subject: [PATCH 53/69] Make 'duplicate_username' message translatable

Added ugettext_lazy and used it on the 'duplicate_username' message
---
 .../{{cookiecutter.project_slug}}/users/admin.py              | 4 ++--
 1 file changed, 2 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 8da8f86a5..9c9fd8403 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 import admin
 from django.contrib.auth.admin import UserAdmin as AuthUserAdmin
 from django.contrib.auth.forms import UserChangeForm, UserCreationForm
 from .models import User
-
+from django.utils.translation import ugettext_lazy as _
 
 class MyUserChangeForm(UserChangeForm):
 
@@ -14,7 +14,7 @@ class MyUserChangeForm(UserChangeForm):
 class MyUserCreationForm(UserCreationForm):
 
     error_message = UserCreationForm.error_messages.update(
-        {"duplicate_username": "This username has already been taken."}
+        {"duplicate_username": _("This username has already been taken.")}
     )
 
     class Meta(UserCreationForm.Meta):

From 548a92a9390d8c56b4eb3d7b14f7ed246cbd89e5 Mon Sep 17 00:00:00 2001
From: Denis <delneg@yandex.ru>
Date: Sun, 24 Jun 2018 02:36:43 +0300
Subject: [PATCH 54/69] Update CONTRIBUTORS.rst

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

diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst
index 55ae6d722..6b3f00660 100644
--- a/CONTRIBUTORS.rst
+++ b/CONTRIBUTORS.rst
@@ -162,6 +162,7 @@ Listed in alphabetical order.
   Will Farley              `@goldhand`_                 @g01dhand
   William Archinal         `@archinal`_
   Yaroslav Halchenko
+  Denis Bobrov             `@delneg`_       
 ========================== ============================ ==============
 
 .. _@a7p: https://github.com/a7p
@@ -265,7 +266,7 @@ Listed in alphabetical order.
 .. _@brentpayne: https://github.com/brentpayne
 .. _@afrowave: https://github.com/afrowave
 .. _@pchiquet: https://github.com/pchiquet
-
+.. _@delneg: https://github.com/delneg
 Special Thanks
 ~~~~~~~~~~~~~~
 

From 2a7ab8be2f01fed4a9c9b7d8fdcae6d4e6daf658 Mon Sep 17 00:00:00 2001
From: Denis <delneg@yandex.ru>
Date: Mon, 25 Jun 2018 21:08:33 +0300
Subject: [PATCH 55/69] Try to fix flake8

---
 .../{{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 9c9fd8403..6b5a60c7e 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py
@@ -5,6 +5,7 @@ from django.contrib.auth.forms import UserChangeForm, UserCreationForm
 from .models import User
 from django.utils.translation import ugettext_lazy as _
 
+
 class MyUserChangeForm(UserChangeForm):
 
     class Meta(UserChangeForm.Meta):

From eb0297aeb32491de14fa2ae8fe2b6e85191c4198 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 26 Jun 2018 09:53:36 +0200
Subject: [PATCH 56/69] Update django-environ from 0.4.4 to 0.4.5 (#1695)

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

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 5e8f78468..b553bb838 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -16,7 +16,7 @@ celery==4.2.0  # pyup: <5.0  # https://github.com/celery/celery
 # Django
 # ------------------------------------------------------------------------------
 django==2.0.6  # pyup: < 2.1  # https://www.djangoproject.com/
-django-environ==0.4.4  # https://github.com/joke2k/django-environ
+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.36.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.7.2  # https://github.com/django-crispy-forms/django-crispy-forms

From 275c13292c4d35a808fcb50ae57a05795395350a Mon Sep 17 00:00:00 2001
From: Nikita Shupeyko <webyneter@gmail.com>
Date: Wed, 27 Jun 2018 19:33:21 +0300
Subject: [PATCH 57/69] Integrate Flower with Docker Compose setup (#1655)

* Integrate Flower with Docker Compose setup locally

* Remove alien worker celeryd option

* Move Flower COPY section below the worker's

* Remove set -o pipefail command from Flower start script

* Flower client authentication

* Override flower service image name

* Move flower service to the end of local.yml

* Install flower==0.9.2 in all environments

* Introduce production flower service

* Fix local flower start script

* Document Flower integration

* Prettify *.django envs

Rationale: consistency.

* Reference local environment Flower docs from the production's

* 'two more services' -> 'three more services'
---
 README.rst                                    |  3 +-
 docs/deployment-with-docker.rst               |  7 ++-
 docs/developing-locally-docker.rst            | 17 ++++++
 hooks/post_gen_project.py                     | 58 ++++++++++++++++---
 .../.envs/.local/.django                      |  8 +++
 .../.envs/.production/.django                 |  8 +++
 .../compose/local/django/Dockerfile           |  4 ++
 .../compose/local/django/celery/flower/start  | 10 ++++
 .../compose/production/django/Dockerfile      |  4 ++
 .../production/django/celery/flower/start     | 10 ++++
 {{cookiecutter.project_slug}}/local.yml       |  7 +++
 {{cookiecutter.project_slug}}/production.yml  |  7 +++
 .../requirements/base.txt                     |  3 +
 13 files changed, 134 insertions(+), 12 deletions(-)
 create mode 100644 {{cookiecutter.project_slug}}/compose/local/django/celery/flower/start
 create mode 100644 {{cookiecutter.project_slug}}/compose/production/django/celery/flower/start

diff --git a/README.rst b/README.rst
index 0eaea5194..a69712d07 100644
--- a/README.rst
+++ b/README.rst
@@ -65,7 +65,7 @@ Optional Integrations
 *These features can be enabled during initial project setup.*
 
 * Serve static files from Amazon S3 or Whitenoise_
-* Configuration for Celery_
+* Configuration for Celery_ and Flower_ (the latter in Docker setup only)
 * Integration with MailHog_ for local email testing
 * Integration with Sentry_ for error logging
 
@@ -78,6 +78,7 @@ Optional Integrations
 .. _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/
diff --git a/docs/deployment-with-docker.rst b/docs/deployment-with-docker.rst
index 42798aae8..0115e3a44 100644
--- a/docs/deployment-with-docker.rst
+++ b/docs/deployment-with-docker.rst
@@ -21,10 +21,13 @@ Before you begin, check out the ``production.yml`` file in the root of this proj
 * ``redis``: Redis instance for caching;
 * ``caddy``: Caddy web server with HTTPS on by default.
 
-Provided you have opted for Celery (via setting ``use_celery`` to ``y``) there are two more services:
+Provided you have opted for Celery (via setting ``use_celery`` to ``y``) there are three more services:
 
 * ``celeryworker`` running a Celery worker process;
-* ``celerybeat`` running a Celery beat process.
+* ``celerybeat`` running a Celery beat process;
+* ``flower`` running Flower_ (for more info, check out :ref:`CeleryFlower` instructions for local environment).
+
+.. _`Flower`: https://github.com/mher/flower
 
 
 Configuring the Stack
diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index 207f0ea2c..c6af1d96f 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -170,3 +170,20 @@ When developing locally you can go with MailHog_ for email testing provided ``us
 #. open up ``http://127.0.0.1:8025``.
 
 .. _Mailhog: https://github.com/mailhog/MailHog/
+
+
+.. _`CeleryFlower`:
+
+Celery Flower
+~~~~~~~~~~~~~
+
+`Flower`_ is a "real-time monitor and web admin for Celery distributed task queue".
+
+Prerequisites:
+
+* ``use_docker`` was set to ``y`` on project initialization;
+* ``use_celery`` was set to ``y`` on project initialization.
+
+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
diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index 6b48471e5..9118f6c93 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -162,8 +162,12 @@ def set_django_admin_url(file_path):
     return django_admin_url
 
 
+def generate_random_user():
+    return generate_random_string(length=32, using_ascii_letters=True)
+
+
 def generate_postgres_user(debug=False):
-    return DEBUG_VALUE if debug else generate_random_string(length=32, using_ascii_letters=True)
+    return DEBUG_VALUE if debug else generate_random_user()
 
 
 def set_postgres_user(file_path, value):
@@ -187,25 +191,56 @@ def set_postgres_password(file_path, value=None):
     return postgres_password
 
 
+def set_celery_flower_user(file_path, value):
+    celery_flower_user = set_flag(
+        file_path,
+        "!!!SET CELERY_FLOWER_USER!!!",
+        value=value,
+    )
+    return celery_flower_user
+
+
+def set_celery_flower_password(file_path, value=None):
+    celery_flower_password = set_flag(
+        file_path,
+        "!!!SET CELERY_FLOWER_PASSWORD!!!",
+        value=value,
+        length=64,
+        using_digits=True,
+        using_ascii_letters=True,
+    )
+    return celery_flower_password
+
+
 def append_to_gitignore_file(s):
     with open(".gitignore", "a") as gitignore_file:
         gitignore_file.write(s)
         gitignore_file.write(os.linesep)
 
 
-def set_flags_in_envs(postgres_user, debug=False):
-    local_postgres_envs_path = os.path.join(".envs", ".local", ".postgres")
-    set_postgres_user(local_postgres_envs_path, value=postgres_user)
-    set_postgres_password(local_postgres_envs_path, value=DEBUG_VALUE if debug else None)
-
+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")
+    production_postgres_envs_path = os.path.join(".envs", ".production", ".postgres")
+
     set_django_secret_key(production_django_envs_path)
     set_django_admin_url(production_django_envs_path)
 
-    production_postgres_envs_path = os.path.join(".envs", ".production", ".postgres")
+    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_user(production_postgres_envs_path, value=postgres_user)
     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_user(production_django_envs_path, value=celery_flower_user)
+    set_celery_flower_password(production_django_envs_path, value=DEBUG_VALUE if debug else None)
+
 
 def set_flags_in_settings_files():
     set_django_secret_key(os.path.join("config", "settings", "local.py"))
@@ -223,8 +258,13 @@ def remove_celery_compose_dirs():
 
 
 def main():
-    postgres_user = generate_postgres_user(debug="{{ cookiecutter.debug }}".lower() == "y")
-    set_flags_in_envs(postgres_user, debug="{{ cookiecutter.debug }}".lower() == "y")
+    debug = "{{ cookiecutter.debug }}".lower() == "y"
+
+    set_flags_in_envs(
+        DEBUG_VALUE if debug else generate_random_user(),
+        DEBUG_VALUE if debug else generate_random_user(),
+        debug=debug,
+    )
     set_flags_in_settings_files()
 
     if "{{ cookiecutter.open_source_license }}" == "Not open source":
diff --git a/{{cookiecutter.project_slug}}/.envs/.local/.django b/{{cookiecutter.project_slug}}/.envs/.local/.django
index 8aa9a9946..d94a17e59 100644
--- a/{{cookiecutter.project_slug}}/.envs/.local/.django
+++ b/{{cookiecutter.project_slug}}/.envs/.local/.django
@@ -5,3 +5,11 @@ USE_DOCKER=yes
 # Redis
 # ------------------------------------------------------------------------------
 REDIS_URL=redis://redis:6379/0
+{% if cookiecutter.use_celery == 'y' %}
+# Celery
+# ------------------------------------------------------------------------------
+
+# Flower
+CELERY_FLOWER_USER=!!!SET CELERY_FLOWER_USER!!!
+CELERY_FLOWER_PASSWORD=!!!SET CELERY_FLOWER_PASSWORD!!!
+{% endif %}
diff --git a/{{cookiecutter.project_slug}}/.envs/.production/.django b/{{cookiecutter.project_slug}}/.envs/.production/.django
index 5cb90897b..4175f8944 100644
--- a/{{cookiecutter.project_slug}}/.envs/.production/.django
+++ b/{{cookiecutter.project_slug}}/.envs/.production/.django
@@ -43,3 +43,11 @@ SENTRY_DSN=
 # Redis
 # ------------------------------------------------------------------------------
 REDIS_URL=redis://redis:6379/0
+{% if cookiecutter.use_celery == 'y' %}
+# Celery
+# ------------------------------------------------------------------------------
+
+# Flower
+CELERY_FLOWER_USER=!!!SET CELERY_FLOWER_USER!!!
+CELERY_FLOWER_PASSWORD=!!!SET CELERY_FLOWER_PASSWORD!!!
+{% endif %}
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
index 274249548..e2e9e5f3c 100644
--- a/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/local/django/Dockerfile
@@ -34,6 +34,10 @@ RUN chmod +x /start-celeryworker
 COPY ./compose/local/django/celery/beat/start /start-celerybeat
 RUN sed -i 's/\r//' /start-celerybeat
 RUN chmod +x /start-celerybeat
+
+COPY ./compose/local/django/celery/flower/start /start-flower
+RUN sed -i 's/\r//' /start-flower
+RUN chmod +x /start-flower
 {% endif %}
 WORKDIR /app
 
diff --git a/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start
new file mode 100644
index 000000000..f0abae7ef
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/compose/local/django/celery/flower/start
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -o errexit
+set -o nounset
+
+
+celery flower \
+    --app={{cookiecutter.project_slug}}.taskapp \
+    --broker="${CELERY_BROKER_URL}" \
+    --basic_auth="${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}"
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
index b204a4810..68d72327f 100644
--- a/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
+++ b/{{cookiecutter.project_slug}}/compose/production/django/Dockerfile
@@ -38,6 +38,10 @@ COPY ./compose/production/django/celery/beat/start /start-celerybeat
 RUN sed -i 's/\r//' /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 chmod +x /start-flower
 {% endif %}
 COPY . /app
 
diff --git a/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start b/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start
new file mode 100644
index 000000000..f0abae7ef
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/compose/production/django/celery/flower/start
@@ -0,0 +1,10 @@
+#!/bin/sh
+
+set -o errexit
+set -o nounset
+
+
+celery flower \
+    --app={{cookiecutter.project_slug}}.taskapp \
+    --broker="${CELERY_BROKER_URL}" \
+    --basic_auth="${CELERY_FLOWER_USER}:${CELERY_FLOWER_PASSWORD}"
diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index 5ad26dfd0..ac13d1857 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -71,4 +71,11 @@ services:
     ports: []
     command: /start-celerybeat
 
+  flower:
+    <<: *django
+    image: {{ cookiecutter.project_slug }}_local_flower
+    ports:
+      - "5555:5555"
+    command: /start-flower
+
   {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index 4ee178d82..9415db618 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -59,4 +59,11 @@ services:
     image: {{ cookiecutter.project_slug }}_production_celerybeat
     command: /start-celerybeat
 
+  flower:
+    <<: *django
+    image: {{ cookiecutter.project_slug }}_production_flower
+    ports:
+      - "5555:5555"
+    command: /start-flower
+
   {%- endif %}
diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index b553bb838..5dd5d99e6 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -11,6 +11,9 @@ whitenoise==3.3.1  # https://github.com/evansd/whitenoise
 redis>=2.10.5  # https://github.com/antirez/redis
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.2.0  # pyup: <5.0  # https://github.com/celery/celery
+{%- if cookiecutter.use_docker == 'y' %}
+flower==0.9.2  # https://github.com/mher/flower
+{%- endif %}
 {%- endif %}
 
 # Django

From 8ad7adb11ae276bc8452ba32e5fc7cb53d880b81 Mon Sep 17 00:00:00 2001
From: Nikita Shupeyko <webyneter@gmail.com>
Date: Wed, 27 Jun 2018 19:33:38 +0300
Subject: [PATCH 58/69] Re-write users app tests in pytest style & perform
 minor refactoring (#1680)

---
 .../{tests___all.xml => pytest___.xml}        | 19 ++---
 ...___module__users.xml => pytest__users.xml} | 19 ++---
 .../tests___class__TestUser.xml               | 30 -------
 .../tests___file__test_models.xml             | 30 -------
 ...ests___specific__test_get_absolute_url.xml | 30 -------
 .../requirements/local.txt                    |  1 -
 .../{{cookiecutter.project_slug}}/conftest.py | 20 +++++
 .../users/adapters.py                         |  9 ++-
 .../users/admin.py                            | 43 +++-------
 .../users/apps.py                             |  7 +-
 .../users/forms.py                            | 31 ++++++++
 .../users/models.py                           |  7 +-
 .../users/tests/factories.py                  | 32 ++++++--
 .../users/tests/test_admin.py                 | 44 -----------
 .../users/tests/test_forms.py                 | 41 ++++++++++
 .../users/tests/test_models.py                | 20 ++---
 .../users/tests/test_urls.py                  | 52 +++++-------
 .../users/tests/test_views.py                 | 79 ++++++++++---------
 .../users/urls.py                             | 19 ++---
 .../users/views.py                            | 57 +++++++------
 20 files changed, 258 insertions(+), 332 deletions(-)
 rename {{cookiecutter.project_slug}}/.idea/runConfigurations/{tests___all.xml => pytest___.xml} (52%)
 rename {{cookiecutter.project_slug}}/.idea/runConfigurations/{tests___module__users.xml => pytest__users.xml} (50%)
 delete mode 100644 {{cookiecutter.project_slug}}/.idea/runConfigurations/tests___class__TestUser.xml
 delete mode 100644 {{cookiecutter.project_slug}}/.idea/runConfigurations/tests___file__test_models.xml
 delete mode 100644 {{cookiecutter.project_slug}}/.idea/runConfigurations/tests___specific__test_get_absolute_url.xml
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/conftest.py
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
 delete mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py
 create mode 100644 {{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py

diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/tests___all.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/pytest___.xml
similarity index 52%
rename from {{cookiecutter.project_slug}}/.idea/runConfigurations/tests___all.xml
rename to {{cookiecutter.project_slug}}/.idea/runConfigurations/pytest___.xml
index be70ffcd6..08f76c454 100644
--- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/tests___all.xml
+++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/pytest___.xml
@@ -1,18 +1,14 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tests - all" type="DjangoTestsConfigurationType" factoryName="Django tests" singleton="true">
+  <configuration default="false" name="pytest: ." type="tests" factoryName="py.test" 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.test" />
-    </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" />
-    <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <PathMappingSettings>
       <option name="pathMappings">
         <list>
@@ -20,11 +16,10 @@
         </list>
       </option>
     </PathMappingSettings>
-    <option name="TARGET" value="." />
-    <option name="SETTINGS_FILE" value="" />
-    <option name="CUSTOM_SETTINGS" value="false" />
-    <option name="USE_OPTIONS" value="false" />
-    <option name="OPTIONS" value="" />
+    <option name="_new_keywords" value="&quot;&quot;" />
+    <option name="_new_additionalArguments" value="&quot;&quot;" />
+    <option name="_new_target" value="&quot;.&quot;" />
+    <option name="_new_targetType" value="&quot;PATH&quot;" />
     <method />
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/tests___module__users.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/pytest__users.xml
similarity index 50%
rename from {{cookiecutter.project_slug}}/.idea/runConfigurations/tests___module__users.xml
rename to {{cookiecutter.project_slug}}/.idea/runConfigurations/pytest__users.xml
index d838b5da6..574361fea 100644
--- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/tests___module__users.xml
+++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/pytest__users.xml
@@ -1,18 +1,14 @@
 <component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tests - module: users" type="DjangoTestsConfigurationType" factoryName="Django tests" singleton="true">
+  <configuration default="false" name="pytest: users" type="tests" factoryName="py.test" 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.test" />
-    </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" />
-    <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
+    <EXTENSION ID="PythonCoverageRunConfigurationExtension" runner="coverage.py" />
     <PathMappingSettings>
       <option name="pathMappings">
         <list>
@@ -20,11 +16,10 @@
         </list>
       </option>
     </PathMappingSettings>
-    <option name="TARGET" value="{{ cookiecutter.project_slug }}.users" />
-    <option name="SETTINGS_FILE" value="" />
-    <option name="CUSTOM_SETTINGS" value="false" />
-    <option name="USE_OPTIONS" value="false" />
-    <option name="OPTIONS" value="" />
+    <option name="_new_keywords" value="&quot;&quot;" />
+    <option name="_new_additionalArguments" value="&quot;&quot;" />
+    <option name="_new_target" value="&quot;./{{ cookiecutter.project_slug }}/users/&quot;" />
+    <option name="_new_targetType" value="&quot;PATH&quot;" />
     <method />
   </configuration>
-</component>
+</component>
\ No newline at end of file
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/tests___class__TestUser.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/tests___class__TestUser.xml
deleted file mode 100644
index 204de9dd1..000000000
--- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/tests___class__TestUser.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tests - class: TestUser" type="DjangoTestsConfigurationType" factoryName="Django tests" 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.test" />
-    </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" />
-    <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-    <PathMappingSettings>
-      <option name="pathMappings">
-        <list>
-          <mapping local-root="$PROJECT_DIR$" remote-root="/app" />
-        </list>
-      </option>
-    </PathMappingSettings>
-    <option name="TARGET" value="{{ cookiecutter.project_slug }}.users.tests.test_models.TestUser" />
-    <option name="SETTINGS_FILE" value="" />
-    <option name="CUSTOM_SETTINGS" value="false" />
-    <option name="USE_OPTIONS" value="false" />
-    <option name="OPTIONS" value="" />
-    <method />
-  </configuration>
-</component>
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/tests___file__test_models.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/tests___file__test_models.xml
deleted file mode 100644
index ddb6d3d6d..000000000
--- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/tests___file__test_models.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tests - file: test_models" type="DjangoTestsConfigurationType" factoryName="Django tests" 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.test" />
-    </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" />
-    <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-    <PathMappingSettings>
-      <option name="pathMappings">
-        <list>
-          <mapping local-root="$PROJECT_DIR$" remote-root="/app" />
-        </list>
-      </option>
-    </PathMappingSettings>
-    <option name="TARGET" value="{{ cookiecutter.project_slug }}.users.tests.test_models" />
-    <option name="SETTINGS_FILE" value="" />
-    <option name="CUSTOM_SETTINGS" value="false" />
-    <option name="USE_OPTIONS" value="false" />
-    <option name="OPTIONS" value="" />
-    <method />
-  </configuration>
-</component>
diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/tests___specific__test_get_absolute_url.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/tests___specific__test_get_absolute_url.xml
deleted file mode 100644
index c391058f2..000000000
--- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/tests___specific__test_get_absolute_url.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="tests - specific: test_get_absolute_url" type="DjangoTestsConfigurationType" factoryName="Django tests" 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.test" />
-    </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" />
-    <EXTENSION ID="PythonCoverageRunConfigurationExtension" enabled="false" sample_coverage="true" runner="coverage.py" />
-    <PathMappingSettings>
-      <option name="pathMappings">
-        <list>
-          <mapping local-root="$PROJECT_DIR$" remote-root="/app" />
-        </list>
-      </option>
-    </PathMappingSettings>
-    <option name="TARGET" value="{{ cookiecutter.project_slug }}.users.tests.test_models.TestUser.test_get_absolute_url" />
-    <option name="SETTINGS_FILE" value="" />
-    <option name="CUSTOM_SETTINGS" value="false" />
-    <option name="USE_OPTIONS" value="false" />
-    <option name="OPTIONS" value="" />
-    <method />
-  </configuration>
-</component>
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 27655b3f2..63799d990 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -22,7 +22,6 @@ coverage==4.5.1  # https://github.com/nedbat/coveragepy
 # Django
 # ------------------------------------------------------------------------------
 factory-boy==2.11.1  # https://github.com/FactoryBoy/factory_boy
-django-test-plus==1.1.0  # https://github.com/revsys/django-test-plus
 
 django-debug-toolbar==1.9.1  # https://github.com/jazzband/django-debug-toolbar
 django-extensions==2.0.7  # https://github.com/django-extensions/django-extensions
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/conftest.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/conftest.py
new file mode 100644
index 000000000..aae11d269
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/conftest.py
@@ -0,0 +1,20 @@
+import pytest
+from django.conf import settings
+from django.test import RequestFactory
+
+from {{ cookiecutter.project_slug }}.users.tests.factories import UserFactory
+
+
+@pytest.fixture(autouse=True)
+def media_storage(settings, tmpdir):
+    settings.MEDIA_ROOT = tmpdir.strpath
+
+
+@pytest.fixture
+def user() -> settings.AUTH_USER_MODEL:
+    return UserFactory()
+
+
+@pytest.fixture
+def request_factory() -> RequestFactory:
+    return RequestFactory()
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/adapters.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/adapters.py
index 5b63593b2..9361d6eca 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/adapters.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/adapters.py
@@ -1,15 +1,18 @@
-from django.conf import settings
+from typing import Any
+
 from allauth.account.adapter import DefaultAccountAdapter
 from allauth.socialaccount.adapter import DefaultSocialAccountAdapter
+from django.conf import settings
+from django.http import HttpRequest
 
 
 class AccountAdapter(DefaultAccountAdapter):
 
-    def is_open_for_signup(self, request):
+    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, sociallogin):
+    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/admin.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py
index 6b5a60c7e..cc6efed5f 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/admin.py
@@ -1,40 +1,17 @@
-from django import forms
 from django.contrib import admin
-from django.contrib.auth.admin import UserAdmin as AuthUserAdmin
-from django.contrib.auth.forms import UserChangeForm, UserCreationForm
-from .models import User
-from django.utils.translation import ugettext_lazy as _
+from django.contrib.auth import admin as auth_admin
+from django.contrib.auth import get_user_model
 
+from {{ cookiecutter.project_slug }}.users.forms import UserChangeForm, UserCreationForm
 
-class MyUserChangeForm(UserChangeForm):
-
-    class Meta(UserChangeForm.Meta):
-        model = User
-
-
-class MyUserCreationForm(UserCreationForm):
-
-    error_message = UserCreationForm.error_messages.update(
-        {"duplicate_username": _("This username has already been taken.")}
-    )
-
-    class Meta(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 forms.ValidationError(self.error_messages["duplicate_username"])
+User = get_user_model()
 
 
 @admin.register(User)
-class MyUserAdmin(AuthUserAdmin):
-    form = MyUserChangeForm
-    add_form = MyUserCreationForm
-    fieldsets = (("User Profile", {"fields": ("name",)}),) + AuthUserAdmin.fieldsets
-    list_display = ("username", "name", "is_superuser")
+class UserAdmin(auth_admin.UserAdmin):
+
+    form = UserChangeForm
+    add_form = UserCreationForm
+    fieldsets = (("User", {"fields": ("name",)}),) + auth_admin.UserAdmin.fieldsets
+    list_display = ["username", "name", "is_superuser"]
     search_fields = ["name"]
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/apps.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/apps.py
index 32fab76d7..854665fd3 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/apps.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/apps.py
@@ -2,14 +2,11 @@ from django.apps import AppConfig
 
 
 class UsersAppConfig(AppConfig):
-    name = "{{cookiecutter.project_slug}}.users"
+
+    name = "{{ cookiecutter.project_slug }}.users"
     verbose_name = "Users"
 
     def ready(self):
-        """Override this to put in:
-            Users system checks
-            Users signal registration
-        """
         try:
             import users.signals  # noqa F401
         except ImportError:
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
new file mode 100644
index 000000000..7bba81ff3
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/forms.py
@@ -0,0 +1,31 @@
+from django.contrib.auth import get_user_model, forms
+from django.core.exceptions import ValidationError
+from django.utils.translation import ugettext_lazy as _
+
+User = get_user_model()
+
+
+class UserChangeForm(forms.UserChangeForm):
+
+    class Meta(forms.UserChangeForm.Meta):
+        model = User
+
+
+class UserCreationForm(forms.UserCreationForm):
+
+    error_message = forms.UserCreationForm.error_messages.update(
+        {"duplicate_username": _("This username has already been taken.")}
+    )
+
+    class Meta(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"])
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
index 304758713..8f07b15a1 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/models.py
@@ -1,5 +1,5 @@
 from django.contrib.auth.models import AbstractUser
-from django.db import models
+from django.db.models import CharField
 from django.urls import reverse
 from django.utils.translation import ugettext_lazy as _
 
@@ -8,10 +8,7 @@ class User(AbstractUser):
 
     # First Name and Last Name do not cover name patterns
     # around the globe.
-    name = models.CharField(_("Name of User"), blank=True, max_length=255)
-
-    def __str__(self):
-        return self.username
+    name = CharField(_("Name of User"), blank=True, max_length=255)
 
     def get_absolute_url(self):
         return reverse("users:detail", kwargs={"username": self.username})
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 8a871b64d..009905768 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/factories.py
@@ -1,11 +1,29 @@
-import factory
+from typing import Any, Sequence
+
+from django.contrib.auth import get_user_model
+from factory import DjangoModelFactory, Faker, post_generation
 
 
-class UserFactory(factory.django.DjangoModelFactory):
-    username = factory.Sequence(lambda n: f"user-{n}")
-    email = factory.Sequence(lambda n: f"user-{n}@example.com")
-    password = factory.PostGenerationMethodCall("set_password", "password")
+class UserFactory(DjangoModelFactory):
+
+    username = Faker("user_name")
+    email = Faker("email")
+    name = Faker("name")
+
+    @post_generation
+    def password(self, create: bool, extracted: Sequence[Any], **kwargs):
+        password = Faker(
+            "password",
+            length=42,
+            special_chars=True,
+            digits=True,
+            upper_case=True,
+            lower_case=True,
+        ).generate(
+            extra_kwargs={}
+        )
+        self.set_password(password)
 
     class Meta:
-        model = "users.User"
-        django_get_or_create = ("username",)
+        model = get_user_model()
+        django_get_or_create = ["username"]
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
deleted file mode 100644
index a3307103f..000000000
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_admin.py
+++ /dev/null
@@ -1,44 +0,0 @@
-from test_plus.test import TestCase
-
-from ..admin import MyUserCreationForm
-
-
-class TestMyUserCreationForm(TestCase):
-
-    def setUp(self):
-        self.user = self.make_user("notalamode", "notalamodespassword")
-
-    def test_clean_username_success(self):
-        # Instantiate the form with a new username
-        form = MyUserCreationForm(
-            {
-                "username": "alamode",
-                "password1": "7jefB#f@Cc7YJB]2v",
-                "password2": "7jefB#f@Cc7YJB]2v",
-            }
-        )
-        # Run is_valid() to trigger the validation
-        valid = form.is_valid()
-        self.assertTrue(valid)
-
-        # Run the actual clean_username method
-        username = form.clean_username()
-        self.assertEqual("alamode", username)
-
-    def test_clean_username_false(self):
-        # Instantiate the form with the same username as self.user
-        form = MyUserCreationForm(
-            {
-                "username": self.user.username,
-                "password1": "notalamodespassword",
-                "password2": "notalamodespassword",
-            }
-        )
-        # Run is_valid() to trigger the validation, which is going to fail
-        # because the username is already taken
-        valid = form.is_valid()
-        self.assertFalse(valid)
-
-        # The form.errors dict should contain a single error called 'username'
-        self.assertTrue(len(form.errors) == 1)
-        self.assertTrue("username" in form.errors)
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
new file mode 100644
index 000000000..e80661648
--- /dev/null
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/tests/test_forms.py
@@ -0,0 +1,41 @@
+import pytest
+
+from {{ cookiecutter.project_slug }}.users.forms import UserCreationForm
+from {{ cookiecutter.project_slug }}.users.tests.factories import UserFactory
+
+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()
+
+        form = UserCreationForm(
+            {
+                "username": proto_user.username,
+                "password1": proto_user._password,
+                "password2": proto_user._password,
+            }
+        )
+
+        assert form.is_valid()
+        assert form.clean_username() == proto_user.username
+
+        # Creating a user.
+        form.save()
+
+        # The user with proto_user params already exists,
+        # hence cannot be created.
+        form = UserCreationForm(
+            {
+                "username": proto_user.username,
+                "password1": proto_user._password,
+                "password2": proto_user._password,
+            }
+        )
+
+        assert not form.is_valid()
+        assert len(form.errors) == 1
+        assert "username" in form.errors
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 13121a011..548636323 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,16 +1,8 @@
-from test_plus.test import TestCase
+import pytest
+from django.conf import settings
+
+pytestmark = pytest.mark.django_db
 
 
-class TestUser(TestCase):
-
-    def setUp(self):
-        self.user = self.make_user()
-
-    def test__str__(self):
-        self.assertEqual(
-            self.user.__str__(),
-            "testuser",  # This is the default username for self.make_user()
-        )
-
-    def test_get_absolute_url(self):
-        self.assertEqual(self.user.get_absolute_url(), "/users/testuser/")
+def test_user_get_absolute_url(user: settings.AUTH_USER_MODEL):
+    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 6b072436d..20bd3dbad 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,44 +1,28 @@
+import pytest
+from django.conf import settings
 from django.urls import reverse, resolve
 
-from test_plus.test import TestCase
+pytestmark = pytest.mark.django_db
 
 
-class TestUserURLs(TestCase):
-    """Test URL patterns for users app."""
+def test_detail(user: settings.AUTH_USER_MODEL):
+    assert (
+        reverse("users:detail", kwargs={"username": user.username})
+        == f"/users/{user.username}/"
+    )
+    assert resolve(f"/users/{user.username}/").view_name == "users:detail"
 
-    def setUp(self):
-        self.user = self.make_user()
 
-    def test_list_reverse(self):
-        """users:list should reverse to /users/."""
-        self.assertEqual(reverse("users:list"), "/users/")
+def test_list():
+    assert reverse("users:list") == "/users/"
+    assert resolve("/users/").view_name == "users:list"
 
-    def test_list_resolve(self):
-        """/users/ should resolve to users:list."""
-        self.assertEqual(resolve("/users/").view_name, "users:list")
 
-    def test_redirect_reverse(self):
-        """users:redirect should reverse to /users/~redirect/."""
-        self.assertEqual(reverse("users:redirect"), "/users/~redirect/")
+def test_update():
+    assert reverse("users:update") == "/users/~update/"
+    assert resolve("/users/~update/").view_name == "users:update"
 
-    def test_redirect_resolve(self):
-        """/users/~redirect/ should resolve to users:redirect."""
-        self.assertEqual(resolve("/users/~redirect/").view_name, "users:redirect")
 
-    def test_detail_reverse(self):
-        """users:detail should reverse to /users/testuser/."""
-        self.assertEqual(
-            reverse("users:detail", kwargs={"username": "testuser"}), "/users/testuser/"
-        )
-
-    def test_detail_resolve(self):
-        """/users/testuser/ should resolve to users:detail."""
-        self.assertEqual(resolve("/users/testuser/").view_name, "users:detail")
-
-    def test_update_reverse(self):
-        """users:update should reverse to /users/~update/."""
-        self.assertEqual(reverse("users:update"), "/users/~update/")
-
-    def test_update_resolve(self):
-        """/users/~update/ should resolve to users:update."""
-        self.assertEqual(resolve("/users/~update/").view_name, "users:update")
+def test_redirect():
+    assert reverse("users:redirect") == "/users/~redirect/"
+    assert resolve("/users/~redirect/").view_name == "users:redirect"
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 07cbda669..0992e4626 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,52 +1,53 @@
+import pytest
+from django.conf import settings
 from django.test import RequestFactory
 
-from test_plus.test import TestCase
+from {{ cookiecutter.project_slug }}.users.views import UserRedirectView, UserUpdateView
 
-from ..views import UserRedirectView, UserUpdateView
+pytestmark = pytest.mark.django_db
 
 
-class BaseUserTestCase(TestCase):
+class TestUserUpdateView:
+    """
+    TODO:
+        extracting view initialization code as class-scoped fixture
+        would be great if only pytest-django supported non-function-scoped
+        fixture db access -- this is a work-in-progress for now:
+        https://github.com/pytest-dev/pytest-django/pull/258
+    """
 
-    def setUp(self):
-        self.user = self.make_user()
-        self.factory = RequestFactory()
+    def test_get_success_url(
+        self, user: settings.AUTH_USER_MODEL, request_factory: RequestFactory
+    ):
+        view = UserUpdateView()
+        request = request_factory.get("/fake-url/")
+        request.user = user
 
-
-class TestUserRedirectView(BaseUserTestCase):
-
-    def test_get_redirect_url(self):
-        # Instantiate the view directly. Never do this outside a test!
-        view = UserRedirectView()
-        # Generate a fake request
-        request = self.factory.get("/fake-url")
-        # Attach the user to the request
-        request.user = self.user
-        # Attach the request to the view
         view.request = request
-        # Expect: '/users/testuser/', as that is the default username for
-        #   self.make_user()
-        self.assertEqual(view.get_redirect_url(), "/users/testuser/")
+
+        assert view.get_success_url() == f"/users/{user.username}/"
+
+    def test_get_object(
+        self, user: settings.AUTH_USER_MODEL, request_factory: RequestFactory
+    ):
+        view = UserUpdateView()
+        request = request_factory.get("/fake-url/")
+        request.user = user
+
+        view.request = request
+
+        assert view.get_object() == user
 
 
-class TestUserUpdateView(BaseUserTestCase):
+class TestUserRedirectView:
 
-    def setUp(self):
-        # call BaseUserTestCase.setUp()
-        super(TestUserUpdateView, self).setUp()
-        # Instantiate the view directly. Never do this outside a test!
-        self.view = UserUpdateView()
-        # Generate a fake request
-        request = self.factory.get("/fake-url")
-        # Attach the user to the request
-        request.user = self.user
-        # Attach the request to the view
-        self.view.request = request
+    def test_get_redirect_url(
+        self, user: settings.AUTH_USER_MODEL, request_factory: RequestFactory
+    ):
+        view = UserRedirectView()
+        request = request_factory.get("/fake-url")
+        request.user = user
 
-    def test_get_success_url(self):
-        # Expect: '/users/testuser/', as that is the default username for
-        #   self.make_user()
-        self.assertEqual(self.view.get_success_url(), "/users/testuser/")
+        view.request = request
 
-    def test_get_object(self):
-        # Expect: self.user, as that is the request's user object
-        self.assertEqual(self.view.get_object(), self.user)
+        assert view.get_redirect_url() == f"/users/{user.username}/"
diff --git a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py
index fef93ad58..2502a0c0c 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py
@@ -1,15 +1,16 @@
 from django.urls import path
 
-from . import views
+from {{ cookiecutter.project_slug }}.users.views import (
+    user_list_view,
+    user_redirect_view,
+    user_update_view,
+    user_detail_view,
+)
 
 app_name = "users"
 urlpatterns = [
-    path("", view=views.UserListView.as_view(), name="list"),
-    path("~redirect/", view=views.UserRedirectView.as_view(), name="redirect"),
-    path("~update/", view=views.UserUpdateView.as_view(), name="update"),
-    path(
-        "<str:username>/",
-        view=views.UserDetailView.as_view(),
-        name="detail",
-    ),
+    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 a9038b71e..35e26e94f 100644
--- a/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
+++ b/{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/views.py
@@ -1,43 +1,52 @@
+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 .models import User
+User = get_user_model()
 
 
 class UserDetailView(LoginRequiredMixin, DetailView):
+
     model = User
-    # These next two lines tell the view to index lookups by username
     slug_field = "username"
     slug_url_kwarg = "username"
 
 
+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
+    fields = ["name"]
+
+    def get_success_url(self):
+        return reverse("users:detail", kwargs={"username": self.request.user.username})
+
+    def get_object(self):
+        return User.objects.get(username=self.request.user.username)
+
+
+user_update_view = UserUpdateView.as_view()
+
+
 class UserRedirectView(LoginRequiredMixin, RedirectView):
+
     permanent = False
 
     def get_redirect_url(self):
         return reverse("users:detail", kwargs={"username": self.request.user.username})
 
 
-class UserUpdateView(LoginRequiredMixin, UpdateView):
-
-    fields = ["name"]
-
-    # we already imported User in the view code above, remember?
-    model = User
-
-    # send the user back to their own page after a successful update
-
-    def get_success_url(self):
-        return reverse("users:detail", kwargs={"username": self.request.user.username})
-
-    def get_object(self):
-        # Only get the User record for the user making the request
-        return User.objects.get(username=self.request.user.username)
-
-
-class UserListView(LoginRequiredMixin, ListView):
-    model = User
-    # These next two lines tell the view to index lookups by username
-    slug_field = "username"
-    slug_url_kwarg = "username"
+user_redirect_view = UserRedirectView.as_view()

From 0a9c0cb06acc4325f0fd2b5f33dff57db9747f2a Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Wed, 27 Jun 2018 19:45:36 +0300
Subject: [PATCH 59/69] Upgrade Docker Compose project template configs to
 version 3

---
 {{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 ac13d1857..41808e604 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '3'
 
 volumes:
   postgres_data_local: {}
diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index 9415db618..edcc7e7bb 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -1,4 +1,4 @@
-version: '2'
+version: '3'
 
 volumes:
   postgres_data: {}

From 3ac990267000baa673dafc79cca442459b33b840 Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Wed, 27 Jun 2018 19:52:06 +0300
Subject: [PATCH 60/69] Rename project template Docker Compose volumes

Rationale: consistent image, volume etc. naming conventions
---
 docs/deployment-with-docker.rst              |  2 +-
 docs/developing-locally-docker.rst           |  4 ++--
 {{cookiecutter.project_slug}}/local.yml      |  8 ++++----
 {{cookiecutter.project_slug}}/production.yml | 12 ++++++------
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/docs/deployment-with-docker.rst b/docs/deployment-with-docker.rst
index 0115e3a44..b21668241 100644
--- a/docs/deployment-with-docker.rst
+++ b/docs/deployment-with-docker.rst
@@ -73,7 +73,7 @@ You can read more about this here at `Automatic HTTPS`_ in the Caddy docs.
 (Optional) Postgres Data Volume Modifications
 ---------------------------------------------
 
-Postgres is saving its database files to the ``postgres_data`` volume by default. Change that if you want something else and make sure to make backups since this is not done automatically.
+Postgres is saving its database files to the ``production_postgres_data`` volume by default. Change that if you want something else and make sure to make backups since this is not done automatically.
 
 
 Building & Running Production Stack
diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst
index c6af1d96f..08b25f3bc 100644
--- a/docs/developing-locally-docker.rst
+++ b/docs/developing-locally-docker.rst
@@ -91,8 +91,8 @@ This is the excerpt from your project's ``local.yml``: ::
       context: .
       dockerfile: ./compose/production/postgres/Dockerfile
     volumes:
-      - postgres_data_local:/var/lib/postgresql/data
-      - postgres_backup_local:/backups
+      - local_postgres_data:/var/lib/postgresql/data
+      - local_postgres_data_backups:/backups
     env_file:
       - ./.envs/.local/.postgres
 
diff --git a/{{cookiecutter.project_slug}}/local.yml b/{{cookiecutter.project_slug}}/local.yml
index 41808e604..366389320 100644
--- a/{{cookiecutter.project_slug}}/local.yml
+++ b/{{cookiecutter.project_slug}}/local.yml
@@ -1,8 +1,8 @@
 version: '3'
 
 volumes:
-  postgres_data_local: {}
-  postgres_backup_local: {}
+  local_postgres_data: {}
+  local_postgres_data_backups: {}
 
 services:
   django:{% if cookiecutter.use_celery == 'y' %} &django{% endif %}
@@ -30,8 +30,8 @@ services:
       dockerfile: ./compose/production/postgres/Dockerfile
     image: {{ cookiecutter.project_slug }}_production_postgres
     volumes:
-      - postgres_data_local:/var/lib/postgresql/data
-      - postgres_backup_local:/backups
+      - local_postgres_data:/var/lib/postgresql/data
+      - local_postgres_data_backups:/backups
     env_file:
       - ./.envs/.local/.postgres
   {%- if cookiecutter.use_mailhog == 'y' %}
diff --git a/{{cookiecutter.project_slug}}/production.yml b/{{cookiecutter.project_slug}}/production.yml
index edcc7e7bb..fd8388acb 100644
--- a/{{cookiecutter.project_slug}}/production.yml
+++ b/{{cookiecutter.project_slug}}/production.yml
@@ -1,9 +1,9 @@
 version: '3'
 
 volumes:
-  postgres_data: {}
-  postgres_backup: {}
-  caddy: {}
+  production_postgres_data: {}
+  production_postgres_data_backups: {}
+  production_caddy: {}
 
 services:
   django:{% if cookiecutter.use_celery == 'y' %} &django{% endif %}
@@ -25,8 +25,8 @@ services:
       dockerfile: ./compose/production/postgres/Dockerfile
     image: {{ cookiecutter.project_slug }}_production_postgres
     volumes:
-      - postgres_data:/var/lib/postgresql/data
-      - postgres_backup:/backups
+      - 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:
-      - caddy:/root/.caddy
+      - production_caddy:/root/.caddy
     env_file:
       - ./.envs/.production/.caddy
     ports:

From 49c73feebb20bc29db51512028713bd6754c954e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?=
 <bnafta@gmail.com>
Date: Thu, 28 Jun 2018 09:00:53 -0300
Subject: [PATCH 61/69] remove inline comments of on heroku tutorial

---
 docs/deployment-on-heroku.rst | 20 +++++++++++++++-----
 1 file changed, 15 insertions(+), 5 deletions(-)

diff --git a/docs/deployment-on-heroku.rst b/docs/deployment-on-heroku.rst
index 7006a2877..d7d95184d 100644
--- a/docs/deployment-on-heroku.rst
+++ b/docs/deployment-on-heroku.rst
@@ -21,17 +21,27 @@ Run these commands to deploy the project to Heroku:
     heroku addons:create sentry:f1
 
     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":
     heroku config:set DJANGO_ADMIN_URL="$(openssl rand -base64 4096 | tr -dc 'A-HJ-NP-Za-km-z2-9' | head -c 32)/"
-    heroku config:set DJANGO_ALLOWED_HOSTS=  # Set this to your Heroku app url, e.g. 'bionic-beaver-28392.herokuapp.com'
-
-    heroku config:set DJANGO_AWS_ACCESS_KEY_ID=  # Assign with AWS_ACCESS_KEY_ID
-    heroku config:set DJANGO_AWS_SECRET_ACCESS_KEY=  # Assign with AWS_SECRET_ACCESS_KEY
-    heroku config:set DJANGO_AWS_STORAGE_BUCKET_NAME=  # Assign with AWS_STORAGE_BUCKET_NAME
+    
+    # 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=
 
     git push heroku master
 

From ac61117b59e8aaf8a644501f432cb71e8e5df9a2 Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Thu, 28 Jun 2018 16:35:35 +0300
Subject: [PATCH 62/69] Prevent AWS S3 bucket from being created automatically

Rationale: most of the time you want to create a bucket yourself in order to assign/tweak polices etc.
---
 {{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 ecd517ddd..39df0cbfa 100644
--- a/{{cookiecutter.project_slug}}/config/settings/production.py
+++ b/{{cookiecutter.project_slug}}/config/settings/production.py
@@ -73,8 +73,6 @@ 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')
 # https://django-storages.readthedocs.io/en/latest/backends/amazon-S3.html#settings
-AWS_AUTO_CREATE_BUCKET = True
-# 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

From c5c6bace995473ab3d7a6c9c7927614660a430cd Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Thu, 28 Jun 2018 16:39:51 +0300
Subject: [PATCH 63/69] Remove LICENSE for non open source projects

---
 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 9118f6c93..b75ec3d90 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -32,7 +32,10 @@ DEBUG_VALUE = "debug"
 
 
 def remove_open_source_files():
-    file_names = ["CONTRIBUTORS.txt"]
+    file_names = [
+        "CONTRIBUTORS.txt",
+        "LICENSE",
+    ]
     for file_name in file_names:
         os.remove(file_name)
 

From ed7609f7153f297b674019df3a58f053f68f25c2 Mon Sep 17 00:00:00 2001
From: "Nikita P. Shupeyko" <webyneter@gmail.com>
Date: Thu, 28 Jun 2018 16:43:34 +0300
Subject: [PATCH 64/69] Remove utility/ when use_docker=y

---
 hooks/post_gen_project.py | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py
index b75ec3d90..669edb0ef 100644
--- a/hooks/post_gen_project.py
+++ b/hooks/post_gen_project.py
@@ -64,6 +64,10 @@ def remove_docker_files():
         os.remove(file_name)
 
 
+def remove_utility_files():
+    shutil.rmtree("utility")
+
+
 def remove_heroku_files():
     file_names = ["Procfile", "runtime.txt", "requirements.txt"]
     for file_name in file_names:
@@ -278,7 +282,9 @@ def main():
     if "{{ cookiecutter.use_pycharm }}".lower() == "n":
         remove_pycharm_files()
 
-    if "{{ cookiecutter.use_docker }}".lower() == "n":
+    if "{{ cookiecutter.use_docker }}".lower() == "y":
+        remove_utility_files()
+    else:
         remove_docker_files()
 
     if "{{ cookiecutter.use_heroku }}".lower() == "n":

From f13c99f0a50892dbd35206176390e1821ae270bc Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Sat, 30 Jun 2018 10:59:23 +0200
Subject: [PATCH 65/69] Update pytz from 2018.4 to 2018.5 (#1699)

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

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 5dd5d99e6..74a417e2d 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,4 +1,4 @@
-pytz==2018.4  # https://github.com/stub42/pytz
+pytz==2018.5  # https://github.com/stub42/pytz
 python-slugify==1.2.5  # https://github.com/un33k/python-slugify
 Pillow==5.1.0  # https://github.com/python-pillow/Pillow
 {%- if cookiecutter.use_compressor == "y" %}

From 8586cb0cefe7b6b3467e57b17021ac66599edc90 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 2 Jul 2018 21:17:46 +0200
Subject: [PATCH 66/69] Update pillow from 5.1.0 to 5.2.0 (#1704)

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

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 74a417e2d..26296fe11 100644
--- a/{{cookiecutter.project_slug}}/requirements/base.txt
+++ b/{{cookiecutter.project_slug}}/requirements/base.txt
@@ -1,6 +1,6 @@
 pytz==2018.5  # https://github.com/stub42/pytz
 python-slugify==1.2.5  # https://github.com/un33k/python-slugify
-Pillow==5.1.0  # https://github.com/python-pillow/Pillow
+Pillow==5.2.0  # 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
 {%- endif %}

From ed389e7401b92b988d04d4bb8bf0fd66007eb7bc Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Mon, 2 Jul 2018 21:18:13 +0200
Subject: [PATCH 67/69] Update django from 2.0.6 to 2.0.7 (#1707)

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

diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt
index 26296fe11..9d49be2a9 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.6  # pyup: < 2.1  # https://www.djangoproject.com/
+django==2.0.7  # 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.36.0  # https://github.com/pennersr/django-allauth

From f92acfacc4742867a1ed8584963db188dd97e965 Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Thu, 5 Jul 2018 16:41:25 +0200
Subject: [PATCH 68/69] Update pytest to 3.6.3 (#1709)

* Update pytest from 3.6.2 to 3.6.3

* Update pytest from 3.6.2 to 3.6.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 77770fa9e..68a36940e 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -9,5 +9,5 @@ flake8==3.5.0
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.0.0
-pytest==3.6.2
+pytest==3.6.3
 pytest-cookies==0.3.0
diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt
index 63799d990..c88fe8853 100644
--- a/{{cookiecutter.project_slug}}/requirements/local.txt
+++ b/{{cookiecutter.project_slug}}/requirements/local.txt
@@ -11,7 +11,7 @@ psycopg2-binary==2.7.5  # https://github.com/psycopg/psycopg2
 
 # Testing
 # ------------------------------------------------------------------------------
-pytest==3.6.2  # https://github.com/pytest-dev/pytest
+pytest==3.6.3  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.1  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

From 494492b1dbba8b96c03b700064c5956f225695fb Mon Sep 17 00:00:00 2001
From: "pyup.io bot" <github-bot@pyup.io>
Date: Tue, 10 Jul 2018 04:27:59 +0200
Subject: [PATCH 69/69] Update tox to 3.1.1 (#1715)

This PR updates [tox](https://pypi.org/project/tox) from **3.0.0** to **3.1.1**.



<details>
  <summary>Changelog</summary>


   ### 3.1.0
   ```
   ------------------

Bugfixes
^^^^^^^^

- Add ``ignore_basepython_conflict``, which determines whether conflicting
  ``basepython`` settings for environments containing default factors, such as
  ``py27`` or ``django18-py35``, should be ignored or result in warnings. This
  was a common source of misconfiguration and is rarely, if ever, desirable from
  a user perspective - by :user:`stephenfin` (`477 &lt;https://github.com/tox-dev/tox/issues/477&gt;`_)
- Fix bug with incorrectly defactorized dependencies (deps passed to pip were not de-factorized) - by :user:`bartsanchez` (`706 &lt;https://github.com/tox-dev/tox/issues/706&gt;`_)


Features
^^^^^^^^

- Add support for multiple PyPy versions using default factors. This allows you
  to use, for example, ``pypy27`` knowing that the correct intepreter will be
  used by default - by :user:`stephenfin` (`19 &lt;https://github.com/tox-dev/tox/issues/19&gt;`_)
- Add support to explicitly invoke interpreter directives for environments with
  long path lengths. In the event that ``tox`` cannot invoke scripts with a
  system-limited shebang (e.x. a Linux host running a Jenkins Pipeline), a user
  can set the environment variable ``TOX_LIMITED_SHEBANG`` to workaround the
  system&#39;s limitation (e.x. ``export TOX_LIMITED_SHEBANG=1``) - by :user:`jdknight` (`794 &lt;https://github.com/tox-dev/tox/issues/794&gt;`_)
- introduce a constants module to be used internally and as experimental API - by :user:`obestwalter` (`798 &lt;https://github.com/tox-dev/tox/issues/798&gt;`_)
- Make ``py2`` and ``py3`` aliases also resolve via ``py`` on windows by :user:`asottile`. This enables the following things:
  ``tox -e py2`` and ``tox -e py3`` work on windows (they already work on posix); and setting ``basepython=python2`` or ``basepython=python3`` now works on windows. (`856 &lt;https://github.com/tox-dev/tox/issues/856&gt;`_)
- Replace the internal version parsing logic from the not well tested `PEP-386 &lt;https://www.python.org/dev/peps/pep-0386/&gt;`_ parser for the more general `PEP-440 &lt;https://www.python.org/dev/peps/pep-0440/&gt;`_. `packaging &gt;= 17.1 &lt;https://pypi.org/project/packaging/&gt;`_ is now an install dependency by :user:`gaborbernat`. (`860 &lt;https://github.com/tox-dev/tox/issues/860&gt;`_)


Documentation
^^^^^^^^^^^^^

- extend the plugin documentation and make lot of small fixes and improvements - by :user:`obestwalter` (`797 &lt;https://github.com/tox-dev/tox/issues/797&gt;`_)
- tidy up tests - remove unused fixtures, update old cinstructs, etc. - by :user:`obestwalter` (`799 &lt;https://github.com/tox-dev/tox/issues/799&gt;`_)
- Various improvements to documentation: open browser once documentation generation is done, show Github/Travis info on documentation page, remove duplicate header for changelog, generate unreleased news as DRAFT on top of changelog, make the changelog page more compact and readable (width up to 1280px) by :user:`gaborbernat` (`859 &lt;https://github.com/tox-dev/tox/issues/859&gt;`_)


Miscellaneous
^^^^^^^^^^^^^

- filter out unwanted files in package - by :user:`obestwalter` (`754 &lt;https://github.com/tox-dev/tox/issues/754&gt;`_)
- make the already existing implicit API explicit - by :user:`obestwalter` (`800 &lt;https://github.com/tox-dev/tox/issues/800&gt;`_)
- improve tox quickstart and corresponding tests - by :user:`obestwalter` (`801 &lt;https://github.com/tox-dev/tox/issues/801&gt;`_)
- tweak codecov settings via .codecov.yml - by :user:`obestwalter` (`802 &lt;https://github.com/tox-dev/tox/issues/802&gt;`_)
   ```


</details>




<details>
  <summary>Links</summary>

  - PyPI: https://pypi.org/project/tox
  - Changelog: https://pyup.io/changelogs/tox/
  - Docs: https://tox.readthedocs.org/
</details>
---
 requirements.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/requirements.txt b/requirements.txt
index 68a36940e..fca457e76 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -8,6 +8,6 @@ flake8==3.5.0
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.0.0
+tox==3.1.1
 pytest==3.6.3
 pytest-cookies==0.3.0