From 7ad879193782c2933722dfbcb3ea273a88aa62f1 Mon Sep 17 00:00:00 2001 From: Dani Hodovic Date: Wed, 21 Aug 2019 17:28:55 +0200 Subject: [PATCH 1/8] Remove EMAIL_HOST, EMAIL_PORT for console backend django.core.mail.backends.console.EmailBackend is an in memory backend so EMAIL_HOST and EMAIL_PORT does not need to be specified in this case. --- {{cookiecutter.project_slug}}/config/settings/local.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py index bbc9ab35..2ab0a7cb 100644 --- a/{{cookiecutter.project_slug}}/config/settings/local.py +++ b/{{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 # ------------------------------------------------------------------------------ From d4d8f1b5be114ce840ac863c4fdd725ebd436261 Mon Sep 17 00:00:00 2001 From: Dani Hodovic Date: Sun, 25 Aug 2019 14:08:28 +0200 Subject: [PATCH 2/8] Remove AWS_PRELOAD_METADATA https://github.com/antonagestam/collectfast/pull/140 --- {{cookiecutter.project_slug}}/config/settings/production.py | 1 - 1 file changed, 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 214353de..e3741165 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{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 # ------------------------------------------------------------------------------ From 180ab9bbb192fc0e648c67e52f3d7701792b552f Mon Sep 17 00:00:00 2001 From: Dani Hodovic Date: Mon, 26 Aug 2019 16:25:36 +0200 Subject: [PATCH 3/8] Remove redundant DEBUG = False in test.py This is already set to False by default in base.py --- {{cookiecutter.project_slug}}/config/settings/test.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/test.py b/{{cookiecutter.project_slug}}/config/settings/test.py index 89660a3f..fad41afd 100644 --- a/{{cookiecutter.project_slug}}/config/settings/test.py +++ b/{{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", From c0554db343ed79197422a27e3d7da82fe20966c9 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Sat, 31 Aug 2019 13:00:33 +0200 Subject: [PATCH 4/8] Update sentry-sdk from 0.11.1 to 0.11.2 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index eadd410d..1714398f 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -8,7 +8,7 @@ psycopg2==2.8.3 --no-binary psycopg2 # https://github.com/psycopg/psycopg2 Collectfast==1.0.0 # https://github.com/antonagestam/collectfast {%- endif %} {%- if cookiecutter.use_sentry == "y" %} -sentry-sdk==0.11.1 # https://github.com/getsentry/sentry-python +sentry-sdk==0.11.2 # https://github.com/getsentry/sentry-python {%- endif %} # Django From df36bf1f550a95103def6b667f5de893867fc0db Mon Sep 17 00:00:00 2001 From: browniebroke Date: Mon, 2 Sep 2019 12:00:29 +0100 Subject: [PATCH 5/8] Update django from 2.2.4 to 2.2.5 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index f5c4f338..170a888f 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -19,7 +19,7 @@ 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 From c6bd37adcc51f2c22cb06bf8d504163da01fc803 Mon Sep 17 00:00:00 2001 From: Dani Hodovic Date: Wed, 4 Sep 2019 15:58:20 +0200 Subject: [PATCH 6/8] Add default tests.py file pattern to pytest `./manage.py startapp` generates a tests.py file by default. This is ignored by pytest unless specified. --- {{cookiecutter.project_slug}}/pytest.ini | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.project_slug}}/pytest.ini b/{{cookiecutter.project_slug}}/pytest.ini index 9fb488cb..52b48ab0 100644 --- a/{{cookiecutter.project_slug}}/pytest.ini +++ b/{{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 %} From c29795b1dc7e2d125bf07b027b88a2d853fb9966 Mon Sep 17 00:00:00 2001 From: browniebroke Date: Thu, 5 Sep 2019 13:00:31 +0200 Subject: [PATCH 7/8] Update djangorestframework from 3.10.2 to 3.10.3 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 3fe638e6..24198e55 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -30,5 +30,5 @@ 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 From fb3d4ff25ceb4bb01f0fdb4f40d739435962097d Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Thu, 5 Sep 2019 08:35:31 -0700 Subject: [PATCH 8/8] Update pytest_cases from 1.11.1 to 1.11.2 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index b9cff303..c7652899 100644 --- a/requirements.txt +++ b/requirements.txt @@ -11,7 +11,7 @@ flake8==3.7.8 # ------------------------------------------------------------------------------ tox==3.14.0 pytest==5.1.1 -pytest_cases==1.11.1 +pytest_cases==1.11.2 pytest-cookies==0.4.0 pytest-xdist==1.29.0 pyyaml==5.1.2