cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2025-08-05 04:30:16 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into pyup-update-flake8-3.2.1-to-3.3.0

Browse Source
This commit is contained in:
Jannis Gebauer 2017-02-09 09:10:12 +01:00 committed by GitHub
commit dc0e66dbc2
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
README.rst
View File

@ -32,6 +32,7 @@ Features
* Renders Django projects with 100% starting test coverage * Renders Django projects with 100% starting test coverage
* Twitter Bootstrap_ v4.0.0 - `alpha 4`_ (`maintained Foundation fork`_ also available) * Twitter Bootstrap_ v4.0.0 - `alpha 4`_ (`maintained Foundation fork`_ also available)
* 12-Factor_ based settings via django-environ_ * 12-Factor_ based settings via django-environ_
* Secure by default. We believe in SSL.
* Optimized development and production settings * Optimized development and production settings
* Registration via django-allauth_ * Registration via django-allauth_
* Comes with custom user model ready to go * Comes with custom user model ready to go

6
requirements.txt
View File

@ -1,5 +1,5 @@
cookiecutter==1.5.0 cookiecutter==1.5.1
flake8==3.3.0 # pyup: != 2.6.0 flake8==3.2.1 # pyup: != 2.6.0
sh==1.12.9 sh==1.12.9
binaryornot==0.4.0 binaryornot==0.4.0
@ -7,5 +7,5 @@ binaryornot==0.4.0
pytest==3.0.6 pytest==3.0.6
pep8==1.7.0 pep8==1.7.0
pyflakes==1.5.0 pyflakes==1.5.0
tox==2.5.0 tox==2.6.0
pytest-cookies==0.2.0 pytest-cookies==0.2.0

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

@ -19,7 +19,7 @@ gunicorn==19.6.0
boto==2.45.0 boto==2.45.0
django-storages-redux==1.3.2 django-storages-redux==1.3.2
{% if cookiecutter.use_whitenoise != 'y' -%} {% if cookiecutter.use_whitenoise != 'y' -%}
Collectfast==0.5.1 Collectfast==0.5.2
{%- endif %} {%- endif %}
# Email backends for Mailgun, Postmark, SendGrid and more # Email backends for Mailgun, Postmark, SendGrid and more