Merge branch 'master' of https://github.com/pydanny/cookiecutter-django into prep-for-django-storages-2.0

This commit is contained in:
Wan Liuyang 2018-09-07 16:42:41 +08:00
commit fc9f372bc2

View File

@ -2,7 +2,7 @@
Werkzeug==0.14.1 # https://github.com/pallets/werkzeug
ipdb==0.11 # https://github.com/gotcha/ipdb
Sphinx==1.7.8 # https://github.com/sphinx-doc/sphinx
Sphinx==1.7.9 # https://github.com/sphinx-doc/sphinx
{%- if cookiecutter.use_docker == 'y' %}
psycopg2==2.7.4 --no-binary psycopg2 # https://github.com/psycopg/psycopg2
{%- else %}
@ -24,7 +24,7 @@ coverage==4.5.1 # https://github.com/nedbat/coveragepy
# ------------------------------------------------------------------------------
factory-boy==2.11.1 # https://github.com/FactoryBoy/factory_boy
django-debug-toolbar==1.9.1 # https://github.com/jazzband/django-debug-toolbar
django-debug-toolbar==1.10 # https://github.com/jazzband/django-debug-toolbar
django-extensions==2.1.2 # https://github.com/django-extensions/django-extensions
django-coverage-plugin==1.5.0 # https://github.com/nedbat/django_coverage_plugin
pytest-django==3.4.2 # https://github.com/pytest-dev/pytest-django