From 073666e09ccf214f178a99f0326dfdc96aea716e Mon Sep 17 00:00:00 2001 From: Jay Date: Sun, 12 Oct 2014 10:32:17 +0200 Subject: [PATCH] now passes flake8 --- {{cookiecutter.repo_name}}/config/settings/common.py | 2 -- {{cookiecutter.repo_name}}/config/settings/local.py | 2 -- 2 files changed, 4 deletions(-) diff --git a/{{cookiecutter.repo_name}}/config/settings/common.py b/{{cookiecutter.repo_name}}/config/settings/common.py index a3c9b38d..324a8efd 100644 --- a/{{cookiecutter.repo_name}}/config/settings/common.py +++ b/{{cookiecutter.repo_name}}/config/settings/common.py @@ -255,7 +255,6 @@ LOGGING = { }, } } - {% if cookiecutter.use_celery == "y" %} ########## CELERY # if you are not using the django database broker (e.g. rabbitmq, redis, memcached), you can remove the next line. @@ -263,5 +262,4 @@ INSTALLED_APPS += ('kombu.transport.django',) BROKER_URL = env("CELERY_BROKER_URL", default='django://') ########## END CELERY {% endif %} - # Your common stuff: Below this line define 3rd party library settings diff --git a/{{cookiecutter.repo_name}}/config/settings/local.py b/{{cookiecutter.repo_name}}/config/settings/local.py index 050ac23b..2124fcc6 100644 --- a/{{cookiecutter.repo_name}}/config/settings/local.py +++ b/{{cookiecutter.repo_name}}/config/settings/local.py @@ -58,12 +58,10 @@ INSTALLED_APPS += ('django_extensions', ) # TESTING # ------------------------------------------------------------------------------ TEST_RUNNER = 'django.test.runner.DiscoverRunner' - {% if cookiecutter.celery_support == "y" %} ########## CELERY # In development, all tasks will be executed locally by blocking until the task returns CELERY_ALWAYS_EAGER = True ########## END CELERY {% endif %} - # Your local stuff: Below this line define 3rd party library settings