Merge commit 'f3d76a413422092a38b58167bdd4e7a3aea7b405'

.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. If you need quick professional paid support for your project, contact support@cookiecutter.io.
+## [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
-
-* **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)

.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)
+
+

.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.")
+
+

.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.")
+
+

.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 Python/Django, hands-on DevOps and frontend experience.

.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.

.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)
+
+

.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.")
+
+

.gitignore

@@ -215,7 +215,6 @@ tags
 [Ii]nclude
 [Ll]ib
 [Ll]ib64
-[Ll]ocal
 [Ss]cripts
 pyvenv.cfg
 pip-selfcheck.json

.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
+  - tox -e $TOX_ENV
-    - sh tests/test_docker.sh
+  - sh tests/test_docker.sh
 
 install:
-    - pip install tox
+  - pip install tox
 
 notifications:
   email:

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
@@ -141,6 +142,7 @@ Listed in alphabetical order.
   Roman Afanaskin          `@siauPatrick`_
   Roman Osipenko           `@romanosipenko`_
   Russell Davies
+  Sascha                   `@saschalalala`              @saschalalala
   Sam Collins              `@MightySCollins`_
   Shupeyko Nikita          `@webyneter`_
   Sławek Ehlert            `@slafs`_
@@ -217,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

README.rst

@@ -27,9 +27,6 @@ production-ready Django projects quickly.
 * See Troubleshooting_ for common errors and obstacles
 * If you have problems with Cookiecutter Django, please open issues_ don't send
   emails to the maintainers.
-* Need quick professional paid support? Contact `support@cookiecutter.io`_.
-  This includes configuring your servers, fixing bugs, reviewing your code and
-  everything in between.
 
 .. _cookiecutter: https://github.com/audreyr/cookiecutter
 
@@ -37,7 +34,6 @@ production-ready Django projects quickly.
 
 .. _528: https://github.com/pydanny/cookiecutter-django/issues/528#issuecomment-212650373
 .. _issues: https://github.com/pydanny/cookiecutter-django/issues/new
-.. _support@cookiecutter.io: support@cookiecutter.io
 
 Features
 ---------
@@ -102,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:
 
@@ -162,13 +160,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:
@@ -283,6 +281,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
@@ -294,6 +294,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/

cookiecutter.json

@@ -3,8 +3,8 @@
   "project_slug": "{{ cookiecutter.project_name.lower()|replace(' ', '_')|replace('-', '_') }}",
   "description": "Behold My Awesome Project!",
   "author_name": "Daniel Roy Greenfeld",
-  "email": "{{ cookiecutter.author_name.lower()|replace(' ', '-') }}@example.com",
   "domain_name": "example.com",
+  "email": "{{ cookiecutter.author_name.lower()|replace(' ', '-') }}@example.com",
   "version": "0.1.0",
   "open_source_license": [
     "MIT",
@@ -18,6 +18,7 @@
   "use_pycharm": "n",
   "use_docker": "n",
   "postgresql_version": [
+    "10.4",
     "10.3",
     "10.2",
     "10.1",
@@ -28,15 +29,14 @@
   ],
   "js_task_runner": [
     "None",
-    "Gulp",
+    "Gulp"
-    "Grunt"
   ],
   "custom_bootstrap_compilation": "n",
   "use_compressor": "n",
   "use_celery": "n",
   "use_mailhog": "n",
-  "use_sentry": "y",
+  "use_sentry": "n",
-  "use_whitenoise": "y",
+  "use_whitenoise": "n",
   "use_heroku": "n",
   "use_travisci": "n",
   "keep_local_envs_in_vcs": "y",

docs/deployment-on-heroku.rst

@@ -14,25 +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
+    # If using mailgun:
-    # Generating a 32 character-long random string without any of the visually similiar characters "IOl01":
+    heroku addons:create mailgun:starter
-    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'
 
-    heroku config:set DJANGO_AWS_ACCESS_KEY_ID=YOUR_AWS_ID_HERE
+    heroku addons:create sentry:f1
-    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 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 check --deploy
+
+    heroku run python manage.py migrate
     heroku run python manage.py createsuperuser
+    heroku run python manage.py collectstatic --no-input
+
+    heroku run python manage.py check --deploy
+
     heroku open

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.
 
@@ -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

docs/developing-locally-docker.rst

@@ -115,6 +115,7 @@ Consider the aforementioned ``.envs/.local/.postgres``: ::
 
     # PostgreSQL
     # ------------------------------------------------------------------------------
+    POSTGRES_HOST=postgres
     POSTGRES_DB=<your project slug>
     POSTGRES_USER=XgOWtQtJecsAbaIyslwGvFvPawftNaqO
     POSTGRES_PASSWORD=jSljDz4whHuwO3aJIgVBrqEml5Ycbghorep4uVJ4xjDYQu0LfuTZdctj7y0YcCLu

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,46 +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. Gulp_
+    1. None
-    2. Grunt_
+    2. Gulp_
-    3. None
 
-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.
 
@@ -114,7 +113,6 @@ debug [n]
 .. _PostgreSQL: https://www.postgresql.org/docs/
 
 .. _Gulp: https://github.com/gulpjs/gulp
-.. _Grunt: https://github.com/gruntjs/grunt
 
 .. _Django Compressor: https://github.com/django-compressor/django-compressor
 

docs/settings.rst

@@ -18,7 +18,7 @@ DJANGO_READ_DOT_ENV_FILE                READ_DOT_ENV_FILE           False
 ======================================= =========================== ============================================== ======================================================================
 Environment Variable                    Django Setting              Development Default                            Production Default
 ======================================= =========================== ============================================== ======================================================================
-DJANGO_ADMIN_URL                        n/a                         r'^admin/'                                     raises error
+DJANGO_ADMIN_URL                        n/a                         'admin/'                                       raises error
 DJANGO_CACHES                           CACHES (default)            locmem                                         redis
 DJANGO_DATABASES                        DATABASES (default)         See code                                       See code
 DJANGO_DEBUG                            DEBUG                       True                                           False
@@ -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

hooks/post_gen_project.py

@@ -67,12 +67,6 @@ def remove_heroku_files():
         os.remove(file_name)
 
 
-def remove_grunt_files():
-    file_names = ["Gruntfile.js"]
-    for file_name in file_names:
-        os.remove(file_name)
-
-
 def remove_gulp_files():
     file_names = ["gulpfile.js"]
     for file_name in file_names:
@@ -160,7 +154,7 @@ def set_django_admin_url(file_path):
     django_admin_url = set_flag(
         file_path,
         "!!!SET DJANGO_ADMIN_URL!!!",
-        formatted="^{}/",
+        formatted="{}/",
         length=32,
         using_digits=True,
         using_ascii_letters=True,
@@ -264,16 +258,11 @@ def main():
         if "{{ cookiecutter.keep_local_envs_in_vcs }}".lower() == "y":
             append_to_gitignore_file("!.envs/.local/")
 
-    if "{{ cookiecutter.js_task_runner}}".lower() == "gulp":
+    if "{{ cookiecutter.js_task_runner}}".lower() == "none":
-        remove_grunt_files()
-    elif "{{ cookiecutter.js_task_runner}}".lower() == "grunt":
         remove_gulp_files()
-    else:
-        remove_gulp_files()
-        remove_grunt_files()
         remove_packagejson_file()
     if (
-        "{{ cookiecutter.js_task_runner }}".lower() in ["grunt", "gulp"]
+        "{{ cookiecutter.js_task_runner }}".lower() != "none"
         and "{{ cookiecutter.use_docker }}".lower() == "y"
     ):
         print(

requirements.txt

@@ -9,5 +9,5 @@ flake8==3.5.0
 # Testing
 # ------------------------------------------------------------------------------
 tox==3.0.0
-pytest==3.5.1
+pytest==3.6.1
 pytest-cookies==0.3.0

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

{{cookiecutter.project_slug}}/.envs/.local/.postgres

@@ -1,5 +1,7 @@
 # PostgreSQL
 # ------------------------------------------------------------------------------
+POSTGRES_HOST=postgres
+POSTGRES_PORT=5432
 POSTGRES_DB={{ cookiecutter.project_slug }}
 POSTGRES_USER=!!!SET POSTGRES_USER!!!
 POSTGRES_PASSWORD=!!!SET POSTGRES_PASSWORD!!!

{{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

{{cookiecutter.project_slug}}/.envs/.production/.postgres

@@ -1,5 +1,7 @@
 # PostgreSQL
 # ------------------------------------------------------------------------------
+POSTGRES_HOST=postgres
+POSTGRES_PORT=5432
 POSTGRES_DB={{ cookiecutter.project_slug }}
 POSTGRES_USER=!!!SET POSTGRES_USER!!!
 POSTGRES_PASSWORD=!!!SET POSTGRES_PASSWORD!!!

{{cookiecutter.project_slug}}/.gitignore

@@ -105,9 +105,6 @@ coverage
 # nyc test coverage
 .nyc_output
 
-# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files)
-.grunt
-
 # Bower dependency directory (https://bower.io/)
 bower_components
 
@@ -333,7 +330,6 @@ tags
 [Ii]nclude
 [Ll]ib
 [Ll]ib64
-[Ll]ocal
 [Ss]cripts
 pyvenv.cfg
 pip-selfcheck.json
@@ -344,3 +340,5 @@ pip-selfcheck.json
 MailHog
 {%- endif %}
 {{ cookiecutter.project_slug }}/media/
+
+.pytest_cache/

{{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>

{{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>

{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__runserver.xml

@@ -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>

{{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="" />

{{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>

{{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>

{{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>

{{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">

{{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">

{{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">

{{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">

{{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">

{{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">
+    {% 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" />

{{cookiecutter.project_slug}}/Gruntfile.js

@@ -1,144 +0,0 @@
-module.exports = function (grunt) {
-
-  var appConfig = grunt.file.readJSON('package.json');
-
-  // Load grunt tasks automatically
-  // see: https://github.com/sindresorhus/load-grunt-tasks
-  require('load-grunt-tasks')(grunt);
-
-  // Time how long tasks take. Can help when optimizing build times
-  // see: https://npmjs.org/package/time-grunt
-  require('time-grunt')(grunt);
-
-  var pathsConfig = function (appName) {
-    this.app = appName || appConfig.name;
-
-    return {
-      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',
-      manageScript: 'manage.py',
-    }
-  };
-
-  grunt.initConfig({
-
-    paths: pathsConfig(),
-    pkg: appConfig,
-
-    // see: https://github.com/gruntjs/grunt-contrib-watch
-    watch: {
-      gruntfile: {
-        files: ['Gruntfile.js']
-      },
-      sass: {
-        files: ['<%= paths.sass %>/**/*.{scss,sass}'],
-        tasks: ['sass:dev'],
-        options: {
-          atBegin: true
-        }
-      },
-      livereload: {
-        files: [
-          '<%= paths.js %>/**/*.js',
-          '<%= paths.sass %>/**/*.{scss,sass}',
-          '<%= paths.app %>/**/*.html'
-          ],
-        options: {
-          spawn: false,
-          livereload: true,
-        },
-      },
-    },
-
-    // see: https://github.com/sindresorhus/grunt-sass
-    sass: {
-      dev: {
-          options: {
-              outputStyle: 'nested',
-{% if cookiecutter.custom_bootstrap_compilation == 'y' %}
-              includePaths: ['node_modules/bootstrap/scss'],
-{% endif %}
-              sourceMap: false,
-              precision: 10
-          },
-          files: {
-              '<%= paths.css %>/project.css': '<%= paths.sass %>/project.scss'
-          },
-      },
-      dist: {
-          options: {
-              outputStyle: 'compressed',
-{% if cookiecutter.custom_bootstrap_compilation == 'y' %}
-              includePaths: ['node_modules/bootstrap/scss'],
-{% endif %}
-              sourceMap: false,
-              precision: 10
-          },
-          files: {
-              '<%= paths.css %>/project.css': '<%= paths.sass %>/project.scss'
-          },
-      }
-    },
-
-    //see https://github.com/nDmitry/grunt-postcss
-    postcss: {
-      options: {
-        map: true, // inline sourcemaps
-
-        processors: [
-          require('pixrem')(), // add fallbacks for rem units
-          require('autoprefixer')({browsers: [
-            'Android 2.3',
-            'Android >= 4',
-            'Chrome >= 20',
-            'Firefox >= 24',
-            'Explorer >= 8',
-            'iOS >= 6',
-            'Opera >= 12',
-            'Safari >= 6'
-          ]}), // add vendor prefixes
-          require('cssnano')() // minify the result
-        ]
-      },
-      dist: {
-        src: '<%= paths.css %>/*.css'
-      }
-    },
-
-    // see: https://npmjs.org/package/grunt-bg-shell
-    bgShell: {
-      _defaults: {
-        bg: true
-      },
-      runDjango: {
-        cmd: 'python <%= paths.manageScript %> runserver'
-      },
-      {% if cookiecutter.use_mailhog == "y" and cookiecutter.use_docker == 'n' -%}runMailHog: {
-        cmd: './mailhog'
-      },{%- endif %}
-    }
-  });
-
-  grunt.registerTask('serve', [
-    {% if cookiecutter.use_mailhog == "y" and cookiecutter.use_docker == 'n' -%}
-    'bgShell:runMailHog',
-    {%- endif %}
-    'bgShell:runDjango',
-    'watch'
-  ]);
-
-  grunt.registerTask('build', [
-    'sass:dist',
-    'postcss'
-  ]);
-
-  grunt.registerTask('default', [
-    'build'
-  ]);
-
-};

{{cookiecutter.project_slug}}/Procfile

@@ -1,4 +1,3 @@
-release: manage.py migrate
 web: gunicorn config.wsgi:application
 {% if cookiecutter.use_celery == "y" -%}
 worker: celery worker --app={{cookiecutter.project_slug}}.taskapp --loglevel=info

{{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
@@ -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
+COPY ./compose/production/django/entrypoint /entrypoint
-RUN sed -i 's/\r//' /entrypoint.sh
+RUN sed -i 's/\r//' /entrypoint
-RUN chmod +x /entrypoint.sh
+RUN chmod +x /entrypoint
 
-COPY ./compose/local/django/start.sh /start.sh
+COPY ./compose/local/django/start /start
-RUN sed -i 's/\r//' /start.sh
+RUN sed -i 's/\r//' /start
-RUN chmod +x /start.sh
+RUN chmod +x /start
 {% if cookiecutter.use_celery == "y" %}
-COPY ./compose/local/django/celery/worker/start.sh /start-celeryworker.sh
+COPY ./compose/local/django/celery/worker/start /start-celeryworker
-RUN sed -i 's/\r//' /start-celeryworker.sh
+RUN sed -i 's/\r//' /start-celeryworker
-RUN chmod +x /start-celeryworker.sh
+RUN chmod +x /start-celeryworker
 
-COPY ./compose/local/django/celery/beat/start.sh /start-celerybeat.sh
+COPY ./compose/local/django/celery/beat/start /start-celerybeat
-RUN sed -i 's/\r//' /start-celerybeat.sh
+RUN sed -i 's/\r//' /start-celerybeat
-RUN chmod +x /start-celerybeat.sh
+RUN chmod +x /start-celerybeat
 {% endif %}
 WORKDIR /app
 
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/entrypoint"]

{{cookiecutter.project_slug}}/compose/local/django/celery/beat/start

@@ -1,9 +1,7 @@
 #!/bin/sh
 
 set -o errexit
-set -o pipefail
 set -o nounset
-set -o xtrace
 
 
 rm -f './celerybeat.pid'

{{cookiecutter.project_slug}}/compose/local/django/celery/worker/start

@@ -1,9 +1,7 @@
 #!/bin/sh
 
 set -o errexit
-set -o pipefail
 set -o nounset
-set -o xtrace
 
 
 celery -A {{cookiecutter.project_slug}}.taskapp worker -l INFO

{{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

{{cookiecutter.project_slug}}/compose/production/caddy/Dockerfile

@@ -1,3 +1,3 @@
-FROM abiosoft/caddy:0.10.6
+FROM abiosoft/caddy:0.11.0
 
 COPY ./compose/production/caddy/Caddyfile /etc/Caddyfile

{{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
@@ -19,23 +19,25 @@ COPY ./requirements /requirements
 RUN pip install --no-cache-dir -r /requirements/production.txt \
     && rm -rf /requirements
 
-COPY ./compose/production/django/gunicorn.sh /gunicorn.sh
+COPY ./compose/production/django/entrypoint /entrypoint
-RUN sed -i 's/\r//' /gunicorn.sh
+RUN sed -i 's/\r//' /entrypoint
-RUN chmod +x /gunicorn.sh
+RUN chmod +x /entrypoint
-RUN chown django /gunicorn.sh
+RUN chown django /entrypoint
 
-COPY ./compose/production/django/entrypoint.sh /entrypoint.sh
+COPY ./compose/production/django/start /start
-RUN sed -i 's/\r//' /entrypoint.sh
+RUN sed -i 's/\r//' /start
-RUN chmod +x /entrypoint.sh
+RUN chmod +x /start
-RUN chown django /entrypoint.sh
+RUN chown django /start
 {% if cookiecutter.use_celery == "y" %}
-COPY ./compose/production/django/celery/worker/start.sh /start-celeryworker.sh
+COPY ./compose/production/django/celery/worker/start /start-celeryworker
-RUN sed -i 's/\r//' /start-celeryworker.sh
+RUN sed -i 's/\r//' /start-celeryworker
-RUN chmod +x /start-celeryworker.sh
+RUN chmod +x /start-celeryworker
+RUN chown django /start-celeryworker
 
-COPY ./compose/production/django/celery/beat/start.sh /start-celerybeat.sh
+COPY ./compose/production/django/celery/beat/start /start-celerybeat
-RUN sed -i 's/\r//' /start-celerybeat.sh
+RUN sed -i 's/\r//' /start-celerybeat
-RUN chmod +x /start-celerybeat.sh
+RUN chmod +x /start-celerybeat
+RUN chown django /start-celerybeat
 {% endif %}
 COPY . /app
 
@@ -45,4 +47,4 @@ USER django
 
 WORKDIR /app
 
-ENTRYPOINT ["/entrypoint.sh"]
+ENTRYPOINT ["/entrypoint"]

{{cookiecutter.project_slug}}/compose/production/django/entrypoint

@@ -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}"
 
@@ -14,7 +12,7 @@ if [ -z "${POSTGRES_USER}" ]; then
     base_postgres_image_default_user='postgres'
     export POSTGRES_USER="${base_postgres_image_default_user}"
 fi
-export DATABASE_URL="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@postgres:5432/${POSTGRES_DB}"
+export DATABASE_URL="postgres://${POSTGRES_USER}:${POSTGRES_PASSWORD}@${POSTGRES_HOST}:${POSTGRES_PORT}/${POSTGRES_DB}"
 
 postgres_ready() {
 python << END
@@ -27,7 +25,8 @@ try:
         dbname="${POSTGRES_DB}",
         user="${POSTGRES_USER}",
         password="${POSTGRES_PASSWORD}",
-        host="postgres"
+        host="${POSTGRES_HOST}",
+        port="${POSTGRES_PORT}",
     )
 except psycopg2.OperationalError:
     sys.exit(-1)
@@ -35,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 available'
 
->&2 echo 'PostgreSQL is up - continuing...'
+exec "$@"
-
-exec $cmd

{{cookiecutter.project_slug}}/compose/production/django/start

@@ -6,4 +6,4 @@ set -o nounset
 
 
 python /app/manage.py collectstatic --noinput
-/usr/local/bin/gunicorn config.wsgi -b 0.0.0.0:5000 --chdir=/app
+/usr/local/bin/gunicorn config.wsgi --bind 0.0.0.0:5000 --chdir=/app

{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/backup

@@ -25,7 +25,8 @@ if [[ "${POSTGRES_USER}" == "postgres" ]]; then
     exit 1
 fi
 
-export PGHOST="postgres"
+export PGHOST="${POSTGRES_HOST}"
+export PGPORT="${POSTGRES_PORT}"
 export PGUSER="${POSTGRES_USER}"
 export PGPASSWORD="${POSTGRES_PASSWORD}"
 export PGDATABASE="${POSTGRES_DB}"

{{cookiecutter.project_slug}}/compose/production/postgres/maintenance/restore

@@ -37,7 +37,8 @@ if [[ "${POSTGRES_USER}" == "postgres" ]]; then
     exit 1
 fi
 
-export PGHOST="postgres"
+export PGHOST="${POSTGRES_HOST}"
+export PGPORT="${POSTGRES_PORT}"
 export PGUSER="${POSTGRES_USER}"
 export PGPASSWORD="${POSTGRES_PASSWORD}"
 export PGDATABASE="${POSTGRES_DB}"

{{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
@@ -216,8 +216,8 @@ EMAIL_BACKEND = env('DJANGO_EMAIL_BACKEND', default='django.core.mail.backends.s
 
 # ADMIN
 # ------------------------------------------------------------------------------
-# Django Admin URL regex.
+# Django Admin URL.
-ADMIN_URL = r'^admin/'
+ADMIN_URL = 'admin/'
 # https://docs.djangoproject.com/en/dev/ref/settings/#admins
 ADMINS = [
     ("""{{cookiecutter.author_name}}""", '{{cookiecutter.email}}'),
@@ -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

{{cookiecutter.project_slug}}/config/settings/local.py

@@ -4,7 +4,7 @@ from .base import env
 # GENERAL
 # ------------------------------------------------------------------------------
 # https://docs.djangoproject.com/en/dev/ref/settings/#debug
-DEBUG = env.bool('DJANGO_DEBUG', default=True)
+DEBUG = True
 # https://docs.djangoproject.com/en/dev/ref/settings/#secret-key
 SECRET_KEY = env('DJANGO_SECRET_KEY', default='!!!SET DJANGO_SECRET_KEY!!!')
 # https://docs.djangoproject.com/en/dev/ref/settings/#allowed-hosts
@@ -62,9 +62,8 @@ DEBUG_TOOLBAR_CONFIG = {
 # https://django-debug-toolbar.readthedocs.io/en/latest/installation.html#internal-ips
 INTERNAL_IPS = ['127.0.0.1', '10.0.2.2']
 {% if cookiecutter.use_docker == 'y' -%}
-import socket
+if env('USE_DOCKER') == 'yes':
-import os
+    import socket
-if os.environ.get('USE_DOCKER') == 'yes':
     hostname, _, ips = socket.gethostbyname_ex(socket.gethostname())
     INTERNAL_IPS += [ip[:-1] + '1' for ip in ips]
 {%- endif %}

{{cookiecutter.project_slug}}/config/settings/production.py

@@ -1,5 +1,7 @@
+{% if cookiecutter.use_sentry == 'y' -%}
 import logging
 
+{% endif -%}
 from .base import *  # noqa
 from .base import env
 
@@ -87,7 +89,7 @@ AWS_S3_OBJECT_PARAMETERS = {
 STATICFILES_STORAGE = 'whitenoise.storage.CompressedManifestStaticFilesStorage'
 {%- else %}
 STATICFILES_STORAGE = 'config.settings.production.StaticRootS3BotoStorage'
-STATIC_URL = 'https://s3.amazonaws.com/%s/static/' % AWS_STORAGE_BUCKET_NAME
+STATIC_URL = f'https://s3.amazonaws.com/{AWS_STORAGE_BUCKET_NAME}/static/'
 {%- endif %}
 
 # MEDIA
@@ -97,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
@@ -156,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 %}
+{% endif %}
-{% if cookiecutter.use_compressor == 'y' -%}
+{%- if cookiecutter.use_compressor == 'y' -%}
 # django-compressor
 # ------------------------------------------------------------------------------
 # https://django-compressor.readthedocs.io/en/latest/settings/#django.conf.settings.COMPRESS_ENABLED
@@ -167,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 %}
+{% endif %}
-{% if cookiecutter.use_whitenoise == 'n' -%}
+{%- if cookiecutter.use_whitenoise == 'n' -%}
 # Collectfast
 # ------------------------------------------------------------------------------
 # https://github.com/antonagestam/collectfast#installation
 INSTALLED_APPS = ['collectfast'] + INSTALLED_APPS  # noqa F405
 AWS_PRELOAD_METADATA = True
 
-{%- endif %}
+{% endif %}
-{% if cookiecutter.use_sentry == 'y' -%}
+{%- if cookiecutter.use_sentry == 'y' -%}
 # raven
 # ------------------------------------------------------------------------------
 # https://docs.sentry.io/clients/python/integrations/django/
@@ -185,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,
@@ -239,6 +241,7 @@ SENTRY_CELERY_LOGLEVEL = env.int('DJANGO_SENTRY_LOG_LEVEL', logging.INFO)
 RAVEN_CONFIG = {
     'dsn': SENTRY_DSN
 }
+
 {%- else %}
 # LOGGING
 # ------------------------------------------------------------------------------
@@ -288,6 +291,6 @@ LOGGING = {
     }
 }
 
-{%- endif %}
+{% endif %}
 # Your stuff...
 # ------------------------------------------------------------------------------

{{cookiecutter.project_slug}}/config/urls.py

@@ -1,25 +1,25 @@
 from django.conf import settings
-from django.conf.urls import include, url
+from django.urls import include, path
 from django.conf.urls.static import static
 from django.contrib import admin
 from django.views.generic import TemplateView
 from django.views import defaults as default_views
 
 urlpatterns = [
-    url(r"^$", TemplateView.as_view(template_name="pages/home.html"), name="home"),
+    path("", TemplateView.as_view(template_name="pages/home.html"), name="home"),
-    url(
+    path(
-        r"^about/$",
+        "about/",
         TemplateView.as_view(template_name="pages/about.html"),
         name="about",
     ),
     # Django Admin, use {% raw %}{% url 'admin:index' %}{% endraw %}
-    url(settings.ADMIN_URL, admin.site.urls),
+    path(settings.ADMIN_URL, admin.site.urls),
     # User management
-    url(
+    path(
-        r"^users/",
+        "users/",
         include("{{ cookiecutter.project_slug }}.users.urls", namespace="users"),
     ),
-    url(r"^accounts/", include("allauth.urls")),
+    path("accounts/", include("allauth.urls")),
     # Your stuff: custom urls includes go here
 ] + static(
     settings.MEDIA_URL, document_root=settings.MEDIA_ROOT
@@ -29,24 +29,24 @@ if settings.DEBUG:
     # This allows the error pages to be debugged during development, just visit
     # these url in browser to see how these error pages look like.
     urlpatterns += [
-        url(
+        path(
-            r"^400/$",
+            "400/",
             default_views.bad_request,
             kwargs={"exception": Exception("Bad Request!")},
         ),
-        url(
+        path(
-            r"^403/$",
+            "403/",
             default_views.permission_denied,
             kwargs={"exception": Exception("Permission Denied")},
         ),
-        url(
+        path(
-            r"^404/$",
+            "404/",
             default_views.page_not_found,
             kwargs={"exception": Exception("Page not Found")},
         ),
-        url(r"^500/$", default_views.server_error),
+        path("500/", default_views.server_error),
     ]
     if "debug_toolbar" in settings.INSTALLED_APPS:
         import debug_toolbar
 
-        urlpatterns = [url(r"^__debug__/", include(debug_toolbar.urls))] + urlpatterns
+        urlpatterns = [path("__debug__/", include(debug_toolbar.urls))] + urlpatterns

{{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

{{cookiecutter.project_slug}}/local.yml

@@ -22,7 +22,7 @@ services:
       - ./.envs/.local/.postgres
     ports:
       - "8000:8000"
-    command: /start.sh
+    command: /start
 
   postgres:
     build:
@@ -56,11 +56,8 @@ services:
       {% if cookiecutter.use_mailhog == 'y' -%}
       - mailhog
       {%- endif %}
-    env_file:
-      - ./.envs/.local/.django
-      - ./.envs/.local/.postgres
     ports: []
-    command: /start-celeryworker.sh
+    command: /start-celeryworker
 
   celerybeat:
     <<: *django
@@ -71,10 +68,7 @@ services:
       {% if cookiecutter.use_mailhog == 'y' -%}
       - mailhog
       {%- endif %}
-    env_file:
-      - ./.envs/.local/.django
-      - ./.envs/.local/.postgres
     ports: []
-    command: /start-celerybeat.sh
+    command: /start-celerybeat
 
   {%- endif %}

{{cookiecutter.project_slug}}/package.json

@@ -3,28 +3,7 @@
   "version": "{{ cookiecutter.version }}",
   "dependencies": {},
   "devDependencies": {
-    {% if cookiecutter.js_task_runner == 'Grunt' %}
+    {% if cookiecutter.js_task_runner == 'Gulp' %}
-    "autoprefixer": "~8.1.0",
-    {% if cookiecutter.custom_bootstrap_compilation == 'y' %}
-    "bootstrap": "^4.0.0",
-    {% endif %}
-    "connect-livereload": "~0.6.0",
-    "cssnano": "~3.10.0",
-    "grunt": "~1.0.2",
-    "grunt-bg-shell": "~2.3.1",
-    "grunt-contrib-watch": "~1.0.0",
-    "grunt-postcss": "~0.9.0",
-    "grunt-sass": "~2.1.0",
-    {% if cookiecutter.custom_bootstrap_compilation == 'y' %}
-    "jquery": "^3.2.1-slim",
-    {% endif %}
-    "load-grunt-tasks": "~3.2.0",
-    "pixrem": "~4.0.1",
-    {% if cookiecutter.custom_bootstrap_compilation == 'y' %}
-    "popper.js": "^1.12.3",
-    {% endif %}
-    "time-grunt": "~1.2.1"
-    {% elif cookiecutter.js_task_runner == 'Gulp' %}
     {% if cookiecutter.custom_bootstrap_compilation == 'y' %}
     "bootstrap": "^4.0.0",
     {% endif %}
@@ -54,11 +33,8 @@
     "node": ">=0.8.0"
   },
   "scripts": {
-    {% if cookiecutter.js_task_runner == 'Grunt' %}
+    {% if cookiecutter.js_task_runner == 'Gulp' %}
-    "dev": "grunt serve"
-    {% elif cookiecutter.js_task_runner == 'Gulp' %}
     "dev": "gulp"
     {% endif %}
-
   }
 }

{{cookiecutter.project_slug}}/production.yml

@@ -17,7 +17,7 @@ services:
     env_file:
       - ./.envs/.production/.django
       - ./.envs/.production/.postgres
-    command: /gunicorn.sh
+    command: /start
 
   postgres:
     build:
@@ -52,23 +52,11 @@ services:
   celeryworker:
     <<: *django
     image: {{ cookiecutter.project_slug }}_production_celeryworker
-    depends_on:
+    command: /start-celeryworker
-     - postgres
-     - redis
-    env_file:
-      - ./.envs/.production/.django
-      - ./.envs/.production/.postgres
-    command: /start-celeryworker.sh
 
   celerybeat:
     <<: *django
     image: {{ cookiecutter.project_slug }}_production_celerybeat
-    depends_on:
+    command: /start-celerybeat
-      - postgres
-      - redis
-    env_file:
-      - ./.envs/.production/.django
-      - ./.envs/.production/.postgres
-    command: /start-celerybeat.sh
 
   {%- endif %}

{{cookiecutter.project_slug}}/requirements/base.txt

@@ -1,5 +1,5 @@
 pytz==2018.4  # https://github.com/stub42/pytz
-awesome-slugify==1.6.5  # https://github.com/dimka665/awesome-slugify
+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" %}
 rcssmin==1.0.6{% if cookiecutter.windows == 'y' %} --install-option="--without-c-extensions"{% endif %}  # https://github.com/ndparker/rcssmin
@@ -10,14 +10,14 @@ 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
 # ------------------------------------------------------------------------------
-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.1  # https://github.com/jazzband/django-model-utils
+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
 {%- if cookiecutter.use_compressor == "y" %}

{{cookiecutter.project_slug}}/requirements/local.txt

@@ -2,16 +2,16 @@
 
 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 %}
-psycopg2-binary==2.7.4  # https://github.com/psycopg/psycopg2
+psycopg2-binary==2.7.5  # https://github.com/psycopg/psycopg2
 {%- endif %}
 
 # Testing
 # ------------------------------------------------------------------------------
-pytest==3.5.1  # 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
@@ -22,9 +22,9 @@ 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
 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

{{cookiecutter.project_slug}}/requirements/production.txt

@@ -8,10 +8,10 @@ psycopg2==2.7.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 Collectfast==0.6.2  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-raven==6.7.0  # https://github.com/getsentry/raven-python
+raven==6.9.0  # https://github.com/getsentry/raven-python
 {%- endif %}
 
 # 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]==3.0  # https://github.com/anymail/django-anymail

{{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'
 

{{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"
 

{{cookiecutter.project_slug}}/{{cookiecutter.project_slug}}/users/urls.py

@@ -1,14 +1,14 @@
-from django.conf.urls import url
+from django.urls import path
 
 from . import views
 
 app_name = "users"
 urlpatterns = [
-    url(regex=r"^$", view=views.UserListView.as_view(), name="list"),
+    path("", view=views.UserListView.as_view(), name="list"),
-    url(regex=r"^~redirect/$", view=views.UserRedirectView.as_view(), name="redirect"),
+    path("~redirect/", view=views.UserRedirectView.as_view(), name="redirect"),
-    url(regex=r"^~update/$", view=views.UserUpdateView.as_view(), name="update"),
+    path("~update/", view=views.UserUpdateView.as_view(), name="update"),
-    url(
+    path(
-        regex=r"^(?P<username>[\w.@+-]+)/$",
+        "<str:username>/",
         view=views.UserDetailView.as_view(),
         name="detail",
     ),