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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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


## Description

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

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


## Rationale

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

Ease of use/troubleshooting


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

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

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

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

* Add failing test for travis.yml

I see three options to test travis.yml :

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

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

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

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

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

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

Given that I'm opting to use approach 1.

* Adds missing config to generated .travis.yml

The keys added are as follows:

1. 'script'

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

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

2. 'install'

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

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

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

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

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

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

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

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

Python has released a security update! Please consider upgrading to python-3.6.8
Learn More: https://devcenter.heroku.com/articles/python-runtimes
---
 {{cookiecutter.project_slug}}/runtime.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/{{cookiecutter.project_slug}}/runtime.txt b/{{cookiecutter.project_slug}}/runtime.txt
index 1935e977..9fbd3bf0 100644
--- a/{{cookiecutter.project_slug}}/runtime.txt
+++ b/{{cookiecutter.project_slug}}/runtime.txt
@@ -1 +1 @@
-python-3.6.6
+python-3.6.8

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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