From af8e942ccf279402a7d69806cf6a5cc826d91d92 Mon Sep 17 00:00:00 2001 From: Alexandre Provencio Date: Tue, 5 Jul 2016 21:07:39 -0300 Subject: [PATCH 1/6] Fix docstrings --- {{cookiecutter.project_slug}}/config/settings/local.py | 4 ++++ {{cookiecutter.project_slug}}/config/settings/production.py | 3 +-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py index 504085d61..d1ca1cc56 100644 --- a/{{cookiecutter.project_slug}}/config/settings/local.py +++ b/{{cookiecutter.project_slug}}/config/settings/local.py @@ -3,7 +3,11 @@ Local settings - Run in Debug mode +{% if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'y' %} +- Use mailhog for emails +{% else %} - Use console backend for emails +{% endif %} - Add Django Debug Toolbar - Add django-extensions as app """ diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index e4a919128..198a3e371 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -2,10 +2,9 @@ """ Production Configurations -- Use djangosecure - Use Amazon's S3 for storing static files and uploaded media - Use mailgun to send emails -- Use Redis on Heroku +- Use Redis for cache {% if cookiecutter.use_sentry_for_error_reporting == 'y' %} - Use sentry for error logging {% endif %} From 36bdfd10acb552820c579bdb3fab3de05e9529f1 Mon Sep 17 00:00:00 2001 From: Alexandre Provencio Date: Tue, 5 Jul 2016 21:22:59 -0300 Subject: [PATCH 2/6] Fix compressor section on common.py --- {{cookiecutter.project_slug}}/config/settings/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/common.py b/{{cookiecutter.project_slug}}/config/settings/common.py index 898e60ef9..969d36f2b 100644 --- a/{{cookiecutter.project_slug}}/config/settings/common.py +++ b/{{cookiecutter.project_slug}}/config/settings/common.py @@ -234,9 +234,9 @@ BROKER_URL = env('CELERY_BROKER_URL', default='django://') ########## END CELERY {% endif %} +{% if cookiecutter.use_compressor == 'y'-%} # django-compressor # ------------------------------------------------------------------------------ -{% if cookiecutter.use_compressor == 'y'-%} INSTALLED_APPS += ("compressor", ) STATICFILES_FINDERS += ("compressor.finders.CompressorFinder", ) {%- endif %} From be576e52324d25f555a68166b36fe8b2170f6007 Mon Sep 17 00:00:00 2001 From: Alexandre Provencio Date: Tue, 5 Jul 2016 21:39:29 -0300 Subject: [PATCH 3/6] Pep8 imports --- {{cookiecutter.project_slug}}/config/settings/local.py | 3 ++- {{cookiecutter.project_slug}}/config/settings/production.py | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py index d1ca1cc56..ed22aa80b 100644 --- a/{{cookiecutter.project_slug}}/config/settings/local.py +++ b/{{cookiecutter.project_slug}}/config/settings/local.py @@ -12,10 +12,11 @@ Local settings - Add django-extensions as app """ -from .common import * # noqa import socket import os +from .common import * # noqa + # DEBUG # ------------------------------------------------------------------------------ DEBUG = env.bool('DJANGO_DEBUG', default=True) diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 198a3e371..514905769 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -14,11 +14,11 @@ Production Configurations """ from __future__ import absolute_import, unicode_literals -from boto.s3.connection import OrdinaryCallingFormat -from django.utils import six {% if cookiecutter.use_sentry_for_error_reporting == 'y' %} import logging {% endif %} +from boto.s3.connection import OrdinaryCallingFormat +from django.utils import six from .common import * # noqa From a628d98f54f0e47590c780ca7d6643fc6ff68169 Mon Sep 17 00:00:00 2001 From: Alexandre Provencio Date: Tue, 5 Jul 2016 21:44:39 -0300 Subject: [PATCH 4/6] Put separator line following the current pattern --- {{cookiecutter.project_slug}}/config/settings/common.py | 1 + {{cookiecutter.project_slug}}/config/settings/local.py | 1 + {{cookiecutter.project_slug}}/config/settings/production.py | 1 + 3 files changed, 3 insertions(+) diff --git a/{{cookiecutter.project_slug}}/config/settings/common.py b/{{cookiecutter.project_slug}}/config/settings/common.py index 969d36f2b..8b91f883a 100644 --- a/{{cookiecutter.project_slug}}/config/settings/common.py +++ b/{{cookiecutter.project_slug}}/config/settings/common.py @@ -258,3 +258,4 @@ WEBPACK_LOADER = { {% endif %} # Your common stuff: Below this line define 3rd party library settings +# ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py index ed22aa80b..0053fb4bf 100644 --- a/{{cookiecutter.project_slug}}/config/settings/local.py +++ b/{{cookiecutter.project_slug}}/config/settings/local.py @@ -81,3 +81,4 @@ CELERY_ALWAYS_EAGER = True ########## END CELERY {% endif %} # Your local stuff: Below this line define 3rd party library settings +# ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 514905769..adcfd351a 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -318,3 +318,4 @@ WEBPACK_LOADER = { {% endif %} # Your production stuff: Below this line define 3rd party library settings +# ------------------------------------------------------------------------------ From 3503ead45cae060c4ddd1fd30b8db2864c98a867 Mon Sep 17 00:00:00 2001 From: Alexandre Provencio Date: Tue, 5 Jul 2016 22:04:10 -0300 Subject: [PATCH 5/6] Add F999 ignore to flake8 --- {{cookiecutter.project_slug}}/setup.cfg | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.project_slug}}/setup.cfg b/{{cookiecutter.project_slug}}/setup.cfg index c18b80d95..db48e547b 100644 --- a/{{cookiecutter.project_slug}}/setup.cfg +++ b/{{cookiecutter.project_slug}}/setup.cfg @@ -1,6 +1,7 @@ [flake8] max-line-length = 120 exclude = .tox,.git,*/migrations/*,*/static/CACHE/*,docs,node_modules +ignore = F999 [pep8] max-line-length = 120 From e09d63bfeba9d4b9a46d35eb327fbada600141e3 Mon Sep 17 00:00:00 2001 From: Alexandre Provencio Date: Tue, 5 Jul 2016 22:06:13 -0300 Subject: [PATCH 6/6] Fix whitespace around operator --- {{cookiecutter.project_slug}}/config/settings/local.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py index 0053fb4bf..a23b52ad6 100644 --- a/{{cookiecutter.project_slug}}/config/settings/local.py +++ b/{{cookiecutter.project_slug}}/config/settings/local.py @@ -58,7 +58,7 @@ INTERNAL_IPS = ['127.0.0.1', '10.0.2.2', ] # tricks to have debug toolbar when developing with docker if os.environ.get('USE_DOCKER') == 'yes': ip = socket.gethostbyname(socket.gethostname()) - INTERNAL_IPS += [ip[:-1]+"1"] + INTERNAL_IPS += [ip[:-1] + "1"] DEBUG_TOOLBAR_CONFIG = { 'DISABLE_PANELS': [