Merge e09d63bfeb into 3a9bde715e

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

@@ -238,9 +238,9 @@ else:
 ########## END CELERY
 {% endif %}
 
+{% if cookiecutter.use_compressor == 'y'-%}
 # django-compressor
 # ------------------------------------------------------------------------------
-{% if cookiecutter.use_compressor == 'y'-%}
 INSTALLED_APPS += ("compressor", )
 STATICFILES_FINDERS += ("compressor.finders.CompressorFinder", )
 {%- endif %}
@@ -262,3 +262,4 @@ WEBPACK_LOADER = {
 {% endif %}
 
 # Your common stuff: Below this line define 3rd party library settings
+# ------------------------------------------------------------------------------

{{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)
@@ -80,3 +81,4 @@ CELERY_ALWAYS_EAGER = True
 ########## END CELERY
 {% endif %}
 # Your local stuff: Below this line define 3rd party library settings
+# ------------------------------------------------------------------------------

{{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
 
@@ -318,3 +318,4 @@ WEBPACK_LOADER = {
 {% endif %}
 
 # Your production stuff: Below this line define 3rd party library settings
+# ------------------------------------------------------------------------------

{{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