Merge branch 'master' of github.com:pydanny/cookiecutter-django

This commit is contained in:
Audrey Roy Greenfeld 2015-10-22 12:37:35 -07:00
commit dcaa3e91c2
3 changed files with 3 additions and 4 deletions

View File

@ -13,7 +13,6 @@ indent_style = space
indent_size = 4
[*.py]
# https://github.com/timothycrosley/isort/wiki/isort-Settings
line_length=120
known_first_party={{ cookiecutter.repo_name }}
multi_line_output=3

View File

@ -34,7 +34,7 @@ psycopg2==2.6.1
# Unicode slugification
unicode-slugify==0.1.3
django-autoslug==1.9.2
django-autoslug==1.9.3
# Time zones support
pytz==2015.6

View File

@ -1,11 +1,11 @@
# Local development dependencies go here
-r base.txt
coverage==4.0
coverage==4.0.1
Sphinx
django-extensions==1.5.7
Werkzeug==0.10.4
django-test-plus==1.0.9
factory_boy==2.5.2
factory_boy==2.6.0
# django-debug-toolbar that works with Django 1.5+
django-debug-toolbar==1.4