From d83493890c1ab5507d2c38f24a1a72e27904236c Mon Sep 17 00:00:00 2001 From: Michael Samoylov Date: Tue, 14 Jun 2016 13:26:12 +0300 Subject: [PATCH] Fixed failing flake8 tests --- {{cookiecutter.project_slug}}/config/settings/common.py | 3 --- .../config/settings/production.py | 4 ++++ {{cookiecutter.project_slug}}/config/urls.py | 8 +++++--- {{cookiecutter.project_slug}}/requirements/base.txt | 5 ----- {{cookiecutter.project_slug}}/requirements/production.txt | 5 +++++ 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/common.py b/{{cookiecutter.project_slug}}/config/settings/common.py index c0805b705..eb5941b09 100644 --- a/{{cookiecutter.project_slug}}/config/settings/common.py +++ b/{{cookiecutter.project_slug}}/config/settings/common.py @@ -39,9 +39,6 @@ THIRD_PARTY_APPS = ( 'allauth', # registration 'allauth.account', # registration 'allauth.socialaccount', # registration - {% if cookiecutter.use_robots == "y" %} - 'robots', # robots.txt - {% endif %} ) # Apps specific for this project go here. diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index e2bac6c9e..75eb8d366 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -299,4 +299,8 @@ LOGGING = { # Custom Admin URL, use {% raw %}{% url 'admin:index' %}{% endraw %} ADMIN_URL = env('DJANGO_ADMIN_URL') +{% if cookiecutter.use_robots == "y" %} +INSTALLED_APPS += ('robots',) # robots.txt +{% endif %} + # Your production stuff: Below this line define 3rd party library settings diff --git a/{{cookiecutter.project_slug}}/config/urls.py b/{{cookiecutter.project_slug}}/config/urls.py index 74043d48d..bf75cac1e 100644 --- a/{{cookiecutter.project_slug}}/config/urls.py +++ b/{{cookiecutter.project_slug}}/config/urls.py @@ -18,9 +18,7 @@ urlpatterns = [ # User management url(r'^users/', include('{{ cookiecutter.project_slug }}.users.urls', namespace='users')), url(r'^accounts/', include('allauth.urls')), - {% if cookiecutter.use_robots == "y" %} - url(r'^robots\.txt$', include('robots.urls')), - {% endif %} + # Your stuff: custom urls includes go here @@ -35,3 +33,7 @@ if settings.DEBUG: url(r'^404/$', default_views.page_not_found, kwargs={'exception': Exception('Page not Found')}), url(r'^500/$', default_views.server_error), ] + +{% if cookiecutter.use_robots == "y" %} +urlpatterns += [url(r'^robots\.txt$', include('robots.urls'))] +{% endif %} diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index d7289476b..5450a0988 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -54,9 +54,4 @@ redis>=2.10.0 celery==3.1.23 {% endif %} -{% if cookiecutter.use_robots == "y" %} -# django-robots -django-robots==2.0 -{% endif %} - # Your custom requirements go here diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 2db9d2678..3cd571bb9 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -37,3 +37,8 @@ raven # ----------------------------------------- opbeat {%- endif %} + +{% if cookiecutter.use_robots == "y" %} +# django-robots +django-robots==2.0 +{% endif %}