cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2024-11-12 04:38:07 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '98a2e1705aea6b7c5494852837d182011a0eb0b6'

Browse Source
This commit is contained in:
Trung Dong Huynh 2016-12-08 12:03:05 +00:00
commit fc5bb0343b
8 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CONTRIBUTORS.rst
View File

@ -130,6 +130,7 @@ Listed in alphabetical order.
Sule Marshall `@suledev`_ Sule Marshall `@suledev`_
Taylor Baldwin Taylor Baldwin
Théo Segonds `@show0k`_ Théo Segonds `@show0k`_
Tim Freund `@timfreund`_
Tom Atkins `@knitatoms`_ Tom Atkins `@knitatoms`_
Tom Offermann Tom Offermann
Travis McNeill `@Travistock`_ @tavistock_esq Travis McNeill `@Travistock`_ @tavistock_esq
@ -211,6 +212,7 @@ Listed in alphabetical order.
.. _@ssteinerX: https://github.com/ssteinerx .. _@ssteinerX: https://github.com/ssteinerx
.. _@stepmr: https://github.com/stepmr .. _@stepmr: https://github.com/stepmr
.. _@suledev: https://github.com/suledev .. _@suledev: https://github.com/suledev
.. _@timfreund: https://github.com/timfreund
.. _@Travistock: https://github.com/Tavistock .. _@Travistock: https://github.com/Tavistock
.. _@trungdong: https://github.com/trungdong .. _@trungdong: https://github.com/trungdong
.. _@viviangb: httpsL//github.com/viviangb .. _@viviangb: httpsL//github.com/viviangb

2
README.rst
View File

@ -70,7 +70,7 @@ Optional Integrations
.. _Celery: http://www.celeryproject.org/ .. _Celery: http://www.celeryproject.org/
.. _Anymail: https://github.com/anymail/django-anymail .. _Anymail: https://github.com/anymail/django-anymail
.. _MailHog: https://github.com/mailhog/MailHog .. _MailHog: https://github.com/mailhog/MailHog
.. _Sentry: https://getsentry.com/welcome/ .. _Sentry: https://sentry.io/welcome/
.. _docker-compose: https://github.com/docker/compose .. _docker-compose: https://github.com/docker/compose
.. _Opbeat: https://opbeat.com/ .. _Opbeat: https://opbeat.com/
.. _PythonAnywhere: https://www.pythonanywhere.com/ .. _PythonAnywhere: https://www.pythonanywhere.com/

4
requirements.txt
View File

@ -1,10 +1,10 @@
cookiecutter==1.4.0 cookiecutter==1.4.0
flake8==3.2.1 # pyup: != 2.6.0 flake8==3.2.1 # pyup: != 2.6.0
sh==1.11 sh==1.12.6
binaryornot==0.4.0 binaryornot==0.4.0
# Testing # Testing
pytest==3.0.4 pytest==3.0.5
pep8==1.7.0 pep8==1.7.0
pyflakes==1.3.0 pyflakes==1.3.0
tox==2.5.0 tox==2.5.0

2
{{cookiecutter.project_slug}}/README.rst
View File

@ -107,7 +107,7 @@ The email server will exit when you exit the Grunt task on the CLI with Ctrl+C.
Sentry Sentry
^^^^^^ ^^^^^^
Sentry is an error logging aggregator service. You can sign up for a free account at https://getsentry.com/signup/?code=cookiecutter or download and host it yourself. Sentry is an error logging aggregator service. You can sign up for a free account at https://sentry.io/signup/?code=cookiecutter or download and host it yourself.
The system is setup with reasonable defaults, including 404 logging and integration with the WSGI application. The system is setup with reasonable defaults, including 404 logging and integration with the WSGI application.
You must set the DSN url in production. You must set the DSN url in production.

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

@ -35,7 +35,7 @@ SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https')
{%- if cookiecutter.use_sentry_for_error_reporting == 'y' %} {%- if cookiecutter.use_sentry_for_error_reporting == 'y' %}
# raven sentry client # raven sentry client
# See https://docs.getsentry.com/hosted/clients/python/integrations/django/ # See https://docs.sentry.io/clients/python/integrations/django/
INSTALLED_APPS += ('raven.contrib.django.raven_compat', ) INSTALLED_APPS += ('raven.contrib.django.raven_compat', )
{% endif %} {% endif %}
{%- if cookiecutter.use_whitenoise == 'y' %} {%- if cookiecutter.use_whitenoise == 'y' %}

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

@ -7,7 +7,7 @@ wheel==0.29.0
{%- endif %} {%- endif %}
# Bleeding edge Django # Bleeding edge Django
django==1.10.3 django==1.10.4
# Configuration # Configuration
django-environ==0.4.1 django-environ==0.4.1
@ -42,7 +42,7 @@ psycopg2==2.6.2
awesome-slugify==1.6.5 awesome-slugify==1.6.5
# Time zones support # Time zones support
pytz==2016.7 pytz==2016.10
# Redis support # Redis support
django-redis==4.6.0 django-redis==4.6.0

6
{{cookiecutter.project_slug}}/requirements/local.txt
View File

@ -2,8 +2,8 @@
-r base.txt -r base.txt
coverage==4.2 coverage==4.2
django-coverage-plugin==1.3.1 django-coverage-plugin==1.3.1
Sphinx==1.4.9 Sphinx==1.5
django-extensions==1.7.4 django-extensions==1.7.5
Werkzeug==0.11.11 Werkzeug==0.11.11
django-test-plus==1.0.16 django-test-plus==1.0.16
factory_boy==2.7.0 factory_boy==2.7.0
@ -13,5 +13,5 @@ django-debug-toolbar==1.6
# improved REPL # improved REPL
ipdb==0.10.1 ipdb==0.10.1
pytest-django==3.1.1 pytest-django==3.1.2
pytest-sugar==0.7.1 pytest-sugar==0.7.1

2
{{cookiecutter.project_slug}}/requirements/test.txt
View File

@ -13,5 +13,5 @@ django-test-plus==1.0.16
factory_boy==2.7.0 factory_boy==2.7.0
# pytest # pytest
pytest-django==3.1.1 pytest-django==3.1.2
pytest-sugar==0.7.1 pytest-sugar==0.7.1