Merge branch 'master' into 1623-unable-to-restore-the-database-in-docker-version

{{cookiecutter.project_slug}}/.gitignore

@@ -324,7 +324,7 @@ Session.vim
 
 # Auto-generated tag files
 tags
-
+{% if cookiecutter.use_docker == 'n' %}
 
 ### VirtualEnv template
 # Virtualenv
@@ -337,16 +337,10 @@ tags
 [Ss]cripts
 pyvenv.cfg
 pip-selfcheck.json
+{% endif %}
 
-
-{% if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'n' -%}
+### Project template
+{% if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'n' %}
 MailHog
-{% endif %}
-
+{%- endif %}
 {{ cookiecutter.project_slug }}/media/
-
-{% if cookiecutter.use_docker == 'y' -%}
-# Added to maintain local compose files which are ignored by something above.
-# See issue https://github.com/pydanny/cookiecutter-django/issues/1321
-!/compose/local/
-{% endif %}

{{cookiecutter.project_slug}}/local.yml

@@ -45,7 +45,7 @@ services:
   {%- if cookiecutter.use_celery == 'y' %}
 
   redis:
-    image: redis:3.0
+    image: redis:3.2
 
   celeryworker:
     <<: *django

{{cookiecutter.project_slug}}/production.yml

@@ -46,7 +46,7 @@ services:
       - "0.0.0.0:443:443"
 
   redis:
-    image: redis:3.0
+    image: redis:3.2
   {%- if cookiecutter.use_celery == 'y' %}
 
   celeryworker:

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

@@ -15,7 +15,7 @@ celery==3.1.25  # pyup: <4.0  # https://github.com/celery/celery
 
 # Django
 # ------------------------------------------------------------------------------
-django==2.0.4  # pyup: < 2.1  # https://www.djangoproject.com/
+django==2.0.5  # 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-allauth==0.35.0  # https://github.com/pennersr/django-allauth

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

@@ -21,7 +21,7 @@ coverage==4.5.1  # https://github.com/nedbat/coveragepy
 
 # Django
 # ------------------------------------------------------------------------------
-factory-boy==2.10.0  # https://github.com/FactoryBoy/factory_boy
+factory-boy==2.11.0  # https://github.com/FactoryBoy/factory_boy
 django-test-plus==1.0.22  # https://github.com/revsys/django-test-plus
 
 django-debug-toolbar==1.9.1  # https://github.com/jazzband/django-debug-toolbar

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

@@ -3,7 +3,7 @@
 -r base.txt
 
 gevent==1.2.2
-gunicorn==19.8.0  # https://github.com/benoitc/gunicorn
+gunicorn==19.8.1  # https://github.com/benoitc/gunicorn
 boto3==1.6.2  # pyup: update minor  # https://github.com/boto/boto3
 psycopg2==2.7.4 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}

{{cookiecutter.project_slug}}/runtime.txt

@@ -1 +1 @@
-python-3.6.4
+python-3.6.5