cookiecutter/cookiecutter-django
1
1
Fork 0
mirror of https://github.com/cookiecutter/cookiecutter-django.git synced 2024-09-24 21:09:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master'

Browse Source
This commit is contained in:
Trung Dong Huynh 2017-01-08 13:49:16 +00:00
commit a29d671e66
6 changed files with 23 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.rst
View File

@ -16,12 +16,14 @@ Powered by Cookiecutter_, Cookiecutter Django is a framework for jumpstarting pr
* Documentation: https://cookiecutter-django.readthedocs.io/en/latest/ * Documentation: https://cookiecutter-django.readthedocs.io/en/latest/
* See Troubleshooting_ for common errors and obstacles * See Troubleshooting_ for common errors and obstacles
* If you have problems with Cookiecutter Django, please open issues_ before sending emails to the maintainers. You will get a much, MUCH faster response.
.. _cookiecutter: https://github.com/audreyr/cookiecutter .. _cookiecutter: https://github.com/audreyr/cookiecutter
.. _Troubleshooting: https://cookiecutter-django.readthedocs.io/en/latest/troubleshooting.html .. _Troubleshooting: https://cookiecutter-django.readthedocs.io/en/latest/troubleshooting.html
.. _528: https://github.com/pydanny/cookiecutter-django/issues/528#issuecomment-212650373 .. _528: https://github.com/pydanny/cookiecutter-django/issues/528#issuecomment-212650373
.. _issues: https://github.com/pydanny/cookiecutter-django/issues/new
Features Features
--------- ---------

6
requirements.txt
View File

@ -1,11 +1,11 @@
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.7 sh==1.12.8
binaryornot==0.4.0 binaryornot==0.4.0
# Testing # Testing
pytest==3.0.5 pytest==3.0.5
pep8==1.7.0 pep8==1.7.0
pyflakes==1.3.0 pyflakes==1.4.0
tox==2.5.0 tox==2.5.0
pytest-cookies==0.2.0 pytest-cookies==0.2.0

10
{{cookiecutter.project_slug}}/requirements/base.txt
View File

@ -7,12 +7,12 @@ wheel==0.29.0
{%- endif %} {%- endif %}
# Bleeding edge Django # Bleeding edge Django
django==1.10.4 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.2 whitenoise==3.2.3
{%- endif %} {%- endif %}
@ -24,11 +24,11 @@ django-crispy-forms==1.6.1
django-model-utils==2.6 django-model-utils==2.6
# Images # Images
Pillow==3.4.2 Pillow==4.0.0
# For user registration, either via email or social # For user registration, either via email or social
# Well-built with regular release cycles! # Well-built with regular release cycles!
django-allauth==0.29.0 django-allauth==0.30.0
{% if cookiecutter.windows == 'y' -%} {% if cookiecutter.windows == 'y' -%}
# On Windows, you must download/install psycopg2 manually # On Windows, you must download/install psycopg2 manually
@ -45,7 +45,7 @@ awesome-slugify==1.6.5
pytz==2016.10 pytz==2016.10
# Redis support # Redis support
django-redis==4.6.0 django-redis==4.7.0
redis>=2.10.5 redis>=2.10.5
{% if cookiecutter.use_celery == "y" %} {% if cookiecutter.use_celery == "y" %}

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

@ -1,12 +1,12 @@
# Local development dependencies go here # Local development dependencies go here
-r base.txt -r base.txt
coverage==4.2 coverage==4.3.1
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.15
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
@ -14,4 +14,4 @@ django-debug-toolbar==1.6
ipdb==0.10.1 ipdb==0.10.1
pytest-django==3.1.2 pytest-django==3.1.2
pytest-sugar==0.7.1 pytest-sugar==0.8.0

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

@ -11,20 +11,20 @@ psycopg2==2.6.2
# WSGI Handler # WSGI Handler
# ------------------------------------------------ # ------------------------------------------------
gevent==1.2a1 gevent==1.2.0
gunicorn==19.6.0 gunicorn==19.6.0
# Static and Media Storage # Static and Media Storage
# ------------------------------------------------ # ------------------------------------------------
boto==2.44.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.1
{%- endif %} {%- endif %}
# Email backends for Mailgun, Postmark, SendGrid and more # Email backends for Mailgun, Postmark, SendGrid and more
# ------------------------------------------------------- # -------------------------------------------------------
django-anymail==0.6.1 django-anymail==0.7
{% 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
@ -35,5 +35,5 @@ raven==5.32.0
{% if cookiecutter.use_opbeat == "y" -%} {% if cookiecutter.use_opbeat == "y" -%}
# Opbeat agent for performance monitoring # Opbeat agent for performance monitoring
# ----------------------------------------- # -----------------------------------------
opbeat==3.5.1 opbeat==3.5.2
{%- endif %} {%- endif %}

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

@ -7,11 +7,11 @@
psycopg2==2.6.2 psycopg2==2.6.2
{%- endif %} {%- endif %}
coverage==4.2 coverage==4.3.1
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
pytest-sugar==0.7.1 pytest-sugar==0.8.0