Merge remote-tracking branch 'pydanny/master'

This commit is contained in:
Afrowave 2017-02-08 20:48:23 +03:00
commit 00eebb4a25
5 changed files with 8 additions and 7 deletions

View File

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

View File

@ -12,12 +12,12 @@ django==1.10.5
# Configuration
django-environ==0.4.1
{% if cookiecutter.use_whitenoise == 'y' -%}
whitenoise==3.2.3
whitenoise==3.3.0
{%- endif %}
# Forms
django-braces==1.10.0
django-braces==1.11.0
django-crispy-forms==1.6.1
# Models
@ -54,7 +54,7 @@ celery==3.1.24
{% if cookiecutter.use_compressor == "y" %}
rcssmin==1.0.6 {% if cookiecutter.windows == 'y' %}--install-option="--without-c-extensions"{% endif %}
django-compressor==2.1
django-compressor==2.1.1
{% endif %}
# Your custom requirements go here

View File

@ -4,10 +4,10 @@
coverage==4.3.4
django-coverage-plugin==1.4.1
Sphinx==1.5.1
Sphinx==1.5.2
django-extensions==1.7.6
Werkzeug==0.11.15
django-test-plus==1.0.16
django-test-plus==1.0.17
factory-boy==2.8.1
django-debug-toolbar==1.6

View File

@ -24,7 +24,7 @@ Collectfast==0.5.1
# Email backends for Mailgun, Postmark, SendGrid and more
# -------------------------------------------------------
django-anymail==0.7
django-anymail==0.8
{% if cookiecutter.use_sentry_for_error_reporting == "y" -%}
# Raven is the Sentry client

View File

@ -9,7 +9,7 @@ psycopg2==2.6.2
coverage==4.3.4
flake8==3.2.1 # pyup: != 2.6.0
django-test-plus==1.0.16
django-test-plus==1.0.17
factory-boy==2.8.1
# pytest