mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2024-12-01 05:54:03 +03:00
Merge remote-tracking branch 'upstream/master'
This commit is contained in:
commit
928c11bf1f
|
@ -4,7 +4,7 @@ sh==1.12.9
|
||||||
binaryornot==0.4.0
|
binaryornot==0.4.0
|
||||||
|
|
||||||
# Testing
|
# Testing
|
||||||
pytest==3.0.5
|
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.5.0
|
||||||
|
|
|
@ -1,4 +1,4 @@
|
||||||
# These requirements prevented an upgrade to Django 1.10.
|
# These requirements prevented an upgrade to Django 1.10.
|
||||||
django-coverage-plugin==1.4
|
django-coverage-plugin==1.4.1
|
||||||
django-autoslug==1.9.3
|
django-autoslug==1.9.3
|
||||||
|
|
||||||
|
|
|
@ -12,12 +12,12 @@ django==1.10.5
|
||||||
# Configuration
|
# Configuration
|
||||||
django-environ==0.4.1
|
django-environ==0.4.1
|
||||||
{% if cookiecutter.use_whitenoise == 'y' -%}
|
{% if cookiecutter.use_whitenoise == 'y' -%}
|
||||||
whitenoise==3.2.3
|
whitenoise==3.3.0
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
|
||||||
|
|
||||||
# Forms
|
# Forms
|
||||||
django-braces==1.10.0
|
django-braces==1.11.0
|
||||||
django-crispy-forms==1.6.1
|
django-crispy-forms==1.6.1
|
||||||
|
|
||||||
# Models
|
# Models
|
||||||
|
@ -54,7 +54,7 @@ celery==3.1.24
|
||||||
|
|
||||||
{% if cookiecutter.use_compressor == "y" %}
|
{% if cookiecutter.use_compressor == "y" %}
|
||||||
rcssmin==1.0.6 {% if cookiecutter.windows == 'y' %}--install-option="--without-c-extensions"{% endif %}
|
rcssmin==1.0.6 {% if cookiecutter.windows == 'y' %}--install-option="--without-c-extensions"{% endif %}
|
||||||
django-compressor==2.1
|
django-compressor==2.1.1
|
||||||
{% endif %}
|
{% endif %}
|
||||||
|
|
||||||
# Your custom requirements go here
|
# Your custom requirements go here
|
||||||
|
|
|
@ -2,18 +2,18 @@
|
||||||
-r base.txt
|
-r base.txt
|
||||||
|
|
||||||
coverage==4.3.4
|
coverage==4.3.4
|
||||||
django-coverage-plugin==1.4
|
django-coverage-plugin==1.4.1
|
||||||
|
|
||||||
Sphinx==1.5.1
|
Sphinx==1.5.2
|
||||||
django-extensions==1.7.5
|
django-extensions==1.7.6
|
||||||
Werkzeug==0.11.15
|
Werkzeug==0.11.15
|
||||||
django-test-plus==1.0.16
|
django-test-plus==1.0.17
|
||||||
factory-boy==2.8.1
|
factory-boy==2.8.1
|
||||||
|
|
||||||
django-debug-toolbar==1.6
|
django-debug-toolbar==1.6
|
||||||
|
|
||||||
# improved REPL
|
# improved REPL
|
||||||
ipdb==0.10.1
|
ipdb==0.10.2
|
||||||
|
|
||||||
pytest-django==3.1.2
|
pytest-django==3.1.2
|
||||||
pytest-sugar==0.8.0
|
pytest-sugar==0.8.0
|
||||||
|
|
|
@ -24,7 +24,7 @@ Collectfast==0.5.1
|
||||||
|
|
||||||
# Email backends for Mailgun, Postmark, SendGrid and more
|
# Email backends for Mailgun, Postmark, SendGrid and more
|
||||||
# -------------------------------------------------------
|
# -------------------------------------------------------
|
||||||
django-anymail==0.7
|
django-anymail==0.8
|
||||||
|
|
||||||
{% if cookiecutter.use_sentry_for_error_reporting == "y" -%}
|
{% if cookiecutter.use_sentry_for_error_reporting == "y" -%}
|
||||||
# Raven is the Sentry client
|
# Raven is the Sentry client
|
||||||
|
|
|
@ -9,7 +9,7 @@ psycopg2==2.6.2
|
||||||
|
|
||||||
coverage==4.3.4
|
coverage==4.3.4
|
||||||
flake8==3.2.1 # pyup: != 2.6.0
|
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
|
factory-boy==2.8.1
|
||||||
|
|
||||||
# pytest
|
# pytest
|
||||||
|
|
Loading…
Reference in New Issue
Block a user