cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2025-07-30 17:59:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Attempting to fix failing tests

Browse Source
This commit is contained in:
Michael Samoylov 2016-06-14 14:42:14 +03:00
parent d83493890c
commit 57c4c18deb
5 changed files with 13 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
{{cookiecutter.project_slug}}/config/settings/common.py
View File

@ -39,6 +39,9 @@ THIRD_PARTY_APPS = (
'allauth', # registration 'allauth', # registration
'allauth.account', # registration 'allauth.account', # registration
'allauth.socialaccount', # registration 'allauth.socialaccount', # registration
{% if cookiecutter.use_robots == "y" -%}
'robots', # robots.txt
{%- endif %}
) )
# Apps specific for this project go here. # 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 %} # Location of root django.contrib.admin URL, use {% raw %}{% url 'admin:index' %}{% endraw %}
ADMIN_URL = r'^admin/' ADMIN_URL = r'^admin/'
{% if cookiecutter.use_robots == "y" -%}
{% if cookiecutter.use_robots == "y" %}
# django-robots # django-robots
ROBOTS_CACHE_TIMEOUT = 60 * 60 # 1 hour ROBOTS_CACHE_TIMEOUT = 60 * 60 # 1 hour
{% endif %} {% endif %}
# Your common stuff: Below this line define 3rd party library settings # Your common stuff: Below this line define 3rd party library settings

4
{{cookiecutter.project_slug}}/config/settings/production.py
View File

@ -299,8 +299,4 @@ LOGGING = {
# Custom Admin URL, use {% raw %}{% url 'admin:index' %}{% endraw %} # Custom Admin URL, use {% raw %}{% url 'admin:index' %}{% endraw %}
ADMIN_URL = env('DJANGO_ADMIN_URL') 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 # Your production stuff: Below this line define 3rd party library settings

8
{{cookiecutter.project_slug}}/config/urls.py
View File

@ -19,6 +19,10 @@ urlpatterns = [
url(r'^users/', include('{{ cookiecutter.project_slug }}.users.urls', namespace='users')), url(r'^users/', include('{{ cookiecutter.project_slug }}.users.urls', namespace='users')),
url(r'^accounts/', include('allauth.urls')), 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 # 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'^404/$', default_views.page_not_found, kwargs={'exception': Exception('Page not Found')}),
url(r'^500/$', default_views.server_error), url(r'^500/$', default_views.server_error),
] ]
{% if cookiecutter.use_robots == "y" %}
urlpatterns += [url(r'^robots\.txt$', include('robots.urls'))]
{% endif %}

5
{{cookiecutter.project_slug}}/requirements/base.txt
View File

@ -54,4 +54,9 @@ redis>=2.10.0
celery==3.1.23 celery==3.1.23
{% endif %} {% endif %}
{% if cookiecutter.use_robots == "y" -%}
# django-robots
django-robots==2.0
{%- endif %}
# Your custom requirements go here # Your custom requirements go here

5
{{cookiecutter.project_slug}}/requirements/production.txt
View File

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