Merge remote-tracking branch 'upstream/master'

* upstream/master: (23 commits)
  Update pytest_cases from 1.11.1 to 1.11.2
  Update djangorestframework from 3.10.2 to 3.10.3
  Update pytest from 5.1.1 to 5.1.2
  Update pytest from 5.1.1 to 5.1.2
  Add default tests.py file pattern to pytest
  Update tox from 3.13.2 to 3.14.0
  Update django from 2.2.4 to 2.2.5
  Update sentry-sdk from 0.11.1 to 0.11.2
  Update django-allauth from 0.39.1 to 0.40.0
  Remove redundant DEBUG = False in test.py
  Remove AWS_PRELOAD_METADATA
  Remove EMAIL_HOST, EMAIL_PORT for console backend
  Update pytest from 5.1.0 to 5.1.1
  Update pytest from 5.1.0 to 5.1.1
  Update redis from 3.3.7 to 3.3.8
  Update sentry-sdk from 0.11.0 to 0.11.1
  Update sphinx from 2.1.2 to 2.2.0
  Update sentry-sdk from 0.10.2 to 0.11.0
  Update pytest from 5.0.1 to 5.1.0
  Update pytest from 5.0.1 to 5.1.0
  ...

requirements.txt

@@ -9,9 +9,9 @@ flake8==3.7.8
 
 # Testing
 # ------------------------------------------------------------------------------
-tox==3.13.2
-pytest==5.0.1
-pytest_cases==1.11.1
+tox==3.14.0
+pytest==5.1.2
+pytest_cases==1.11.2
 pytest-cookies==0.4.0
 pytest-xdist==1.29.0
 pyyaml==5.1.2

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

@@ -28,19 +28,19 @@ CACHES = {
 {% if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'y' -%}
 # https://docs.djangoproject.com/en/dev/ref/settings/#email-host
 EMAIL_HOST = env("EMAIL_HOST", default="mailhog")
+# https://docs.djangoproject.com/en/dev/ref/settings/#email-port
+EMAIL_PORT = 1025
 {%- elif cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'n' -%}
 # https://docs.djangoproject.com/en/dev/ref/settings/#email-host
 EMAIL_HOST = "localhost"
+# https://docs.djangoproject.com/en/dev/ref/settings/#email-port
+EMAIL_PORT = 1025
 {%- else -%}
 # https://docs.djangoproject.com/en/dev/ref/settings/#email-backend
 EMAIL_BACKEND = env(
     "DJANGO_EMAIL_BACKEND", default="django.core.mail.backends.console.EmailBackend"
 )
-# https://docs.djangoproject.com/en/dev/ref/settings/#email-host
-EMAIL_HOST = "localhost"
 {%- endif %}
-# https://docs.djangoproject.com/en/dev/ref/settings/#email-port
-EMAIL_PORT = 1025
 
 # django-debug-toolbar
 # ------------------------------------------------------------------------------

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

@@ -201,7 +201,6 @@ COMPRESS_URL = STATIC_URL{% if cookiecutter.use_whitenoise == 'y' or cookiecutte
 # ------------------------------------------------------------------------------
 # https://github.com/antonagestam/collectfast#installation
 INSTALLED_APPS = ["collectfast"] + INSTALLED_APPS  # noqa F405
-AWS_PRELOAD_METADATA = True
 {% endif %}
 # LOGGING
 # ------------------------------------------------------------------------------

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

@@ -7,8 +7,6 @@ from .base import env
 
 # GENERAL
 # ------------------------------------------------------------------------------
-# https://docs.djangoproject.com/en/dev/ref/settings/#debug
-DEBUG = False
 # https://docs.djangoproject.com/en/dev/ref/settings/#secret-key
 SECRET_KEY = env(
     "DJANGO_SECRET_KEY",

{{cookiecutter.project_slug}}/pytest.ini

@@ -1,5 +1,6 @@
 [pytest]
 addopts = --ds=config.settings.test
+python_files = tests.py test_*.py
 {%- if cookiecutter.js_task_runner != 'None' %}
 norecursedirs = node_modules
 {%- endif %}

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

@@ -8,7 +8,7 @@ argon2-cffi==19.1.0  # https://github.com/hynek/argon2_cffi
 {%- if cookiecutter.use_whitenoise == 'y' %}
 whitenoise==4.1.3  # https://github.com/evansd/whitenoise
 {%- endif %}
-redis==3.3.5  # https://github.com/antirez/redis
+redis==3.3.8  # https://github.com/antirez/redis
 {%- if cookiecutter.use_celery == "y" %}
 celery==4.3.0  # pyup: < 5.0  # https://github.com/celery/celery
 django-celery-beat==1.5.0  # https://github.com/celery/django-celery-beat
@@ -19,10 +19,10 @@ flower==0.9.3  # https://github.com/mher/flower
 
 # Django
 # ------------------------------------------------------------------------------
-django==2.2.4  # pyup: < 3.0  # https://www.djangoproject.com/
+django==2.2.5  # pyup: < 3.0  # https://www.djangoproject.com/
 django-environ==0.4.5  # https://github.com/joke2k/django-environ
 django-model-utils==3.2.0  # https://github.com/jazzband/django-model-utils
-django-allauth==0.39.1  # https://github.com/pennersr/django-allauth
+django-allauth==0.40.0  # https://github.com/pennersr/django-allauth
 django-crispy-forms==1.7.2  # https://github.com/django-crispy-forms/django-crispy-forms
 {%- if cookiecutter.use_compressor == "y" %}
 django-compressor==2.3  # https://github.com/django-compressor/django-compressor
@@ -30,7 +30,7 @@ django-compressor==2.3  # https://github.com/django-compressor/django-compressor
 django-redis==4.10.0  # https://github.com/niwinz/django-redis
 
 # Django REST Framework
-djangorestframework==3.10.2  # https://github.com/encode/django-rest-framework
+djangorestframework==3.10.3  # https://github.com/encode/django-rest-framework
 coreapi==2.3.3  # https://github.com/core-api/python-client
 
 {% if cookiecutter.js_task_runner == "CreateReactApp" %}

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

@@ -2,7 +2,7 @@
 
 Werkzeug==0.14.1  # pyup: < 0.15 # https://github.com/pallets/werkzeug
 ipdb==0.12.2  # https://github.com/gotcha/ipdb
-Sphinx==2.1.2  # https://github.com/sphinx-doc/sphinx
+Sphinx==2.2.0  # https://github.com/sphinx-doc/sphinx
 {%- if cookiecutter.use_docker == 'y' %}
 psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- else %}
@@ -12,7 +12,7 @@ psycopg2-binary==2.8.3  # https://github.com/psycopg/psycopg2
 # Testing
 # ------------------------------------------------------------------------------
 mypy==0.720  # https://github.com/python/mypy
-pytest==5.0.1  # https://github.com/pytest-dev/pytest
+pytest==5.1.2  # https://github.com/pytest-dev/pytest
 pytest-sugar==0.9.2  # https://github.com/Frozenball/pytest-sugar
 
 # Code quality

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

@@ -5,10 +5,10 @@
 gunicorn==19.9.0  # https://github.com/benoitc/gunicorn
 psycopg2==2.8.3 --no-binary psycopg2  # https://github.com/psycopg/psycopg2
 {%- if cookiecutter.use_whitenoise == 'n' %}
-Collectfast==0.6.2  # https://github.com/antonagestam/collectfast
+Collectfast==1.0.0  # https://github.com/antonagestam/collectfast
 {%- endif %}
 {%- if cookiecutter.use_sentry == "y" %}
-sentry-sdk==0.10.2  # https://github.com/getsentry/sentry-python
+sentry-sdk==0.11.2  # https://github.com/getsentry/sentry-python
 {%- endif %}
 
 # Django