mirror of
https://github.com/cookiecutter/cookiecutter-django.git
synced 2024-11-28 12:34:01 +03:00
Merge commit '006b8d200df82cc513572c636d15250f320a8011'
This commit is contained in:
commit
52a1c9a7c6
|
@ -1,5 +1,5 @@
|
||||||
cookiecutter==1.5.1
|
cookiecutter==1.6.0
|
||||||
flake8==3.4.1 # pyup: != 2.6.0
|
flake8==3.5.0 # pyup: != 2.6.0
|
||||||
sh==1.12.14
|
sh==1.12.14
|
||||||
binaryornot==0.4.4
|
binaryornot==0.4.4
|
||||||
|
|
||||||
|
@ -8,4 +8,4 @@ pytest==3.2.3
|
||||||
pycodestyle==2.3.1
|
pycodestyle==2.3.1
|
||||||
pyflakes==1.6.0
|
pyflakes==1.6.0
|
||||||
tox==2.9.1
|
tox==2.9.1
|
||||||
pytest-cookies==0.2.0
|
pytest-cookies==0.3.0
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
"""
|
"""
|
||||||
Django settings for {{cookiecutter.project_name}} project.
|
Base settings for {{cookiecutter.project_name}} project.
|
||||||
|
|
||||||
For more information on this file, see
|
For more information on this file, see
|
||||||
https://docs.djangoproject.com/en/dev/topics/settings/
|
https://docs.djangoproject.com/en/dev/topics/settings/
|
||||||
|
|
|
@ -1,9 +1,9 @@
|
||||||
"""
|
"""
|
||||||
Local settings
|
Local settings for {{cookiecutter.project_name}} project.
|
||||||
|
|
||||||
- Run in Debug mode
|
- Run in Debug mode
|
||||||
{% if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'y' %}
|
{% if cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'y' %}
|
||||||
- Use mailhog for emails
|
- Use mailhog for emails via Docker
|
||||||
{% elif cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'n' %}
|
{% elif cookiecutter.use_mailhog == 'y' and cookiecutter.use_docker == 'n' %}
|
||||||
- Use mailhog for emails
|
- Use mailhog for emails
|
||||||
{% else %}
|
{% else %}
|
||||||
|
|
|
@ -1,5 +1,5 @@
|
||||||
"""
|
"""
|
||||||
Production Configurations
|
Production settings for {{cookiecutter.project_name}} project.
|
||||||
|
|
||||||
{% if cookiecutter.use_whitenoise == 'y' -%}
|
{% if cookiecutter.use_whitenoise == 'y' -%}
|
||||||
- Use WhiteNoise for serving static files{% endif %}
|
- Use WhiteNoise for serving static files{% endif %}
|
||||||
|
@ -119,8 +119,8 @@ DEFAULT_FILE_STORAGE = 'storages.backends.s3boto3.S3Boto3Storage'
|
||||||
{% else %}
|
{% else %}
|
||||||
# See:http://stackoverflow.com/questions/10390244/
|
# See:http://stackoverflow.com/questions/10390244/
|
||||||
from storages.backends.s3boto3 import S3Boto3Storage
|
from storages.backends.s3boto3 import S3Boto3Storage
|
||||||
StaticRootS3BotoStorage = lambda: S3Boto3Storage(location='static')
|
StaticRootS3BotoStorage = lambda: S3Boto3Storage(location='static') # noqa
|
||||||
MediaRootS3BotoStorage = lambda: S3Boto3Storage(location='media')
|
MediaRootS3BotoStorage = lambda: S3Boto3Storage(location='media') # noqa
|
||||||
DEFAULT_FILE_STORAGE = 'config.settings.production.MediaRootS3BotoStorage'
|
DEFAULT_FILE_STORAGE = 'config.settings.production.MediaRootS3BotoStorage'
|
||||||
|
|
||||||
MEDIA_URL = 'https://s3.amazonaws.com/%s/media/' % AWS_STORAGE_BUCKET_NAME
|
MEDIA_URL = 'https://s3.amazonaws.com/%s/media/' % AWS_STORAGE_BUCKET_NAME
|
||||||
|
|
|
@ -1,8 +1,8 @@
|
||||||
'''
|
"""
|
||||||
Test settings
|
Test settings for {{cookiecutter.project_name}} project.
|
||||||
|
|
||||||
- Used to run tests fast on the continuous integration server and locally
|
- Used to run tests fast on the continuous integration server and locally
|
||||||
'''
|
"""
|
||||||
|
|
||||||
from .base import * # noqa
|
from .base import * # noqa
|
||||||
|
|
||||||
|
|
|
@ -16,34 +16,34 @@ whitenoise==3.3.1
|
||||||
|
|
||||||
|
|
||||||
# Forms
|
# Forms
|
||||||
django-crispy-forms==1.6.1
|
django-crispy-forms==1.7.0
|
||||||
|
|
||||||
# Models
|
# Models
|
||||||
django-model-utils==3.0.0
|
django-model-utils==3.0.0
|
||||||
|
|
||||||
# Images
|
# Images
|
||||||
Pillow==4.2.1
|
Pillow==4.3.0
|
||||||
|
|
||||||
# Password storage
|
# Password storage
|
||||||
argon2-cffi==16.3.0
|
argon2-cffi==16.3.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.33.0
|
django-allauth==0.34.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
|
||||||
# from http://www.lfd.uci.edu/~gohlke/pythonlibs/#psycopg
|
# from http://www.lfd.uci.edu/~gohlke/pythonlibs/#psycopg
|
||||||
{% else %}
|
{% else %}
|
||||||
# Python-PostgreSQL Database Adapter
|
# Python-PostgreSQL Database Adapter
|
||||||
psycopg2==2.7.3.1
|
psycopg2==2.7.3.2
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
|
||||||
# Unicode slugification
|
# Unicode slugification
|
||||||
awesome-slugify==1.6.5
|
awesome-slugify==1.6.5
|
||||||
|
|
||||||
# Time zones support
|
# Time zones support
|
||||||
pytz==2017.2
|
pytz==2017.3
|
||||||
|
|
||||||
# Redis support
|
# Redis support
|
||||||
django-redis==4.8.0
|
django-redis==4.8.0
|
||||||
|
|
|
@ -4,10 +4,10 @@
|
||||||
coverage==4.4.1
|
coverage==4.4.1
|
||||||
django-coverage-plugin==1.5.0
|
django-coverage-plugin==1.5.0
|
||||||
|
|
||||||
Sphinx==1.6.4
|
Sphinx==1.6.5
|
||||||
django-extensions==1.9.1
|
django-extensions==1.9.7
|
||||||
Werkzeug==0.12.2
|
Werkzeug==0.12.2
|
||||||
django-test-plus==1.0.18
|
django-test-plus==1.0.20
|
||||||
factory-boy==2.9.2
|
factory-boy==2.9.2
|
||||||
|
|
||||||
django-debug-toolbar==1.8
|
django-debug-toolbar==1.8
|
||||||
|
|
|
@ -6,7 +6,7 @@
|
||||||
# Python-PostgreSQL Database Adapter
|
# Python-PostgreSQL Database Adapter
|
||||||
# Assuming Windows is used locally, and *nix -- in production.
|
# Assuming Windows is used locally, and *nix -- in production.
|
||||||
# ------------------------------------------------------------
|
# ------------------------------------------------------------
|
||||||
psycopg2==2.7.3.1
|
psycopg2==2.7.3.2
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
|
||||||
# WSGI Handler
|
# WSGI Handler
|
||||||
|
@ -24,16 +24,16 @@ Collectfast==0.5.2
|
||||||
|
|
||||||
# Email backends for Mailgun, Postmark, SendGrid and more
|
# Email backends for Mailgun, Postmark, SendGrid and more
|
||||||
# -------------------------------------------------------
|
# -------------------------------------------------------
|
||||||
django-anymail==1.0
|
django-anymail==1.2
|
||||||
|
|
||||||
{% 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
|
||||||
# --------------------------
|
# --------------------------
|
||||||
raven==6.2.1
|
raven==6.3.0
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
|
||||||
{% if cookiecutter.use_opbeat == "y" -%}
|
{% if cookiecutter.use_opbeat == "y" -%}
|
||||||
# Opbeat agent for performance monitoring
|
# Opbeat agent for performance monitoring
|
||||||
# -----------------------------------------
|
# -----------------------------------------
|
||||||
opbeat==3.5.2
|
opbeat==3.5.3
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
|
|
@ -4,12 +4,12 @@
|
||||||
{% if cookiecutter.windows == 'y' -%}
|
{% if cookiecutter.windows == 'y' -%}
|
||||||
# Python-PostgreSQL Database Adapter
|
# Python-PostgreSQL Database Adapter
|
||||||
# If using Win for dev, this assumes Unix in test/prod
|
# If using Win for dev, this assumes Unix in test/prod
|
||||||
psycopg2==2.7.3.1
|
psycopg2==2.7.3.2
|
||||||
{%- endif %}
|
{%- endif %}
|
||||||
|
|
||||||
coverage==4.4.1
|
coverage==4.4.1
|
||||||
flake8==3.4.1 # pyup: != 2.6.0
|
flake8==3.5.0 # pyup: != 2.6.0
|
||||||
django-test-plus==1.0.18
|
django-test-plus==1.0.20
|
||||||
factory-boy==2.9.2
|
factory-boy==2.9.2
|
||||||
django-coverage-plugin==1.5.0
|
django-coverage-plugin==1.5.0
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue
Block a user