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 feature/927-use-list-in-settings

Browse Source
This commit is contained in:
Juergen Schackmann 2016-12-19 08:25:14 +01:00
commit 5271b90f3f
5 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS.rst
View File

@ -89,6 +89,7 @@ Listed in alphabetical order.
Ian Lee `@IanLee1521`_ Ian Lee `@IanLee1521`_
Jan Van Bruggen `@jvanbrug`_ Jan Van Bruggen `@jvanbrug`_
Jens Nilsson `@phiberjenz`_ Jens Nilsson `@phiberjenz`_
Jimmy Gitonga `@afrowave`_ @afrowave
Julien Almarcha `@sladinji`_ Julien Almarcha `@sladinji`_
Julio Castillo `@juliocc`_ Julio Castillo `@juliocc`_
Kaido Kert `@kaidokert`_ Kaido Kert `@kaidokert`_

4
requirements.txt
View File

@ -1,6 +1,6 @@
cookiecutter==1.4.0 cookiecutter==1.5.0
flake8==3.2.1 # pyup: != 2.6.0 flake8==3.2.1 # pyup: != 2.6.0
sh==1.12.6 sh==1.12.8
binaryornot==0.4.0 binaryornot==0.4.0
# Testing # Testing

4
{{cookiecutter.project_slug}}/requirements/local.txt
View File

@ -2,11 +2,11 @@
-r base.txt -r base.txt
coverage==4.2 coverage==4.2
django-coverage-plugin==1.3.1 django-coverage-plugin==1.3.1
Sphinx==1.5 Sphinx==1.5.1
django-extensions==1.7.5 django-extensions==1.7.5
Werkzeug==0.11.11 Werkzeug==0.11.11
django-test-plus==1.0.16 django-test-plus==1.0.16
factory_boy==2.7.0 factory-boy==2.8.1
django-debug-toolbar==1.6 django-debug-toolbar==1.6

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

@ -11,15 +11,15 @@ psycopg2==2.6.2
# WSGI Handler # WSGI Handler
# ------------------------------------------------ # ------------------------------------------------
gevent==1.2a1 gevent==1.2a2
gunicorn==19.6.0 gunicorn==19.6.0
# Static and Media Storage # Static and Media Storage
# ------------------------------------------------ # ------------------------------------------------
boto==2.43.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.3.1 Collectfast==0.4.0
{%- endif %} {%- endif %}
# Email backends for Mailgun, Postmark, SendGrid and more # Email backends for Mailgun, Postmark, SendGrid and more

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

@ -10,7 +10,7 @@ psycopg2==2.6.2
coverage==4.2 coverage==4.2
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.16
factory_boy==2.7.0 factory-boy==2.8.1
# pytest # pytest
pytest-django==3.1.2 pytest-django==3.1.2