Attempting to fix failing tests

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

@@ -39,6 +39,9 @@ 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.
@@ -235,10 +238,8 @@ BROKER_URL = env('CELERY_BROKER_URL', default='django://')
 
 # Location of root django.contrib.admin URL, use {% raw %}{% url 'admin:index' %}{% endraw %}
 ADMIN_URL = r'^admin/'
-
-{% if cookiecutter.use_robots == "y" %}
+{% if cookiecutter.use_robots == "y" -%}
 # django-robots
 ROBOTS_CACHE_TIMEOUT = 60 * 60  # 1 hour
 {% endif %}
-
 # Your common stuff: Below this line define 3rd party library settings

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

@@ -299,8 +299,4 @@ 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

{{cookiecutter.project_slug}}/config/urls.py

@@ -19,6 +19,10 @@ urlpatterns = [
     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
 
 
@@ -33,7 +37,3 @@ 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 %}

{{cookiecutter.project_slug}}/requirements/base.txt

@@ -54,4 +54,9 @@ 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

{{cookiecutter.project_slug}}/requirements/production.txt

@@ -37,8 +37,3 @@ raven
 # -----------------------------------------
 opbeat
 {%- endif %}
-
-{% if cookiecutter.use_robots == "y" %}
-# django-robots
-django-robots==2.0
-{% endif %}