diff --git a/CHANGELOG.md b/CHANGELOG.md index db040f5d..65186937 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,10 +2,16 @@ All enhancements and patches to cookiecutter-django will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). -## [2015-09-17] +## [2015-09-22] ### Added - Add Python version option for deployment (@yunti) +## [2015-09-21] +### Changed +- django-mailgun-redux to django-mailgun, because @pydanny now has commit rights +### Removed +- Excess "loggers" from LOGGING setting (@siauPatrick) + ## [2015-09-18] ### Changed - Major reorganization of docs (@pydanny) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 471eda70..805d6bb0 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -46,13 +46,14 @@ Daniele Tricoli / @eriol Harry Percival / @hjwp Cullen Rhodes / @c-rhodes Burhan Khalid / @burhan -Audrey Roy Greenfeld / @audreyr (and creator/maintainer of cookiecutter) * +Audrey Roy Greenfeld / @audreyr (and creator/maintainer of cookiecutter) * Jannis Gebauer / @got_nil jayfk / @jayfk -stepmr / @stepmr +stepmr / @stepmr Adam BogdaƂ / @bogdal Barclay Gauld / @yunti Ian Lee / @IanLee1521 +Roman Afanaskin / @siauPatrick * Possesses commit rights diff --git a/cookiecutter.json b/cookiecutter.json index b10b7390..09dcd42e 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -13,5 +13,6 @@ "use_celery": "n", "use_maildump": "n", "use_sentry": "n", - "windows": "n" + "windows": "n", + "use_python2": "n" } diff --git a/{{cookiecutter.repo_name}}/Dockerfile b/{{cookiecutter.repo_name}}/Dockerfile index 547a92b3..e1c875ff 100644 --- a/{{cookiecutter.repo_name}}/Dockerfile +++ b/{{cookiecutter.repo_name}}/Dockerfile @@ -1,4 +1,8 @@ +{% if cookiecutter.use_python2 == 'n' -%} +FROM python:3.4 +{% else %} FROM python:2.7 +{%- endif %} ENV PYTHONUNBUFFERED 1 # Requirements have to be pulled and installed here, otherwise caching won't work @@ -20,4 +24,4 @@ RUN chmod +x /gunicorn.sh && chown django /gunicorn.sh WORKDIR /app -ENTRYPOINT ["/entrypoint.sh"] \ No newline at end of file +ENTRYPOINT ["/entrypoint.sh"] diff --git a/{{cookiecutter.repo_name}}/config/settings/common.py b/{{cookiecutter.repo_name}}/config/settings/common.py index b74f72ba..575bb6fd 100644 --- a/{{cookiecutter.repo_name}}/config/settings/common.py +++ b/{{cookiecutter.repo_name}}/config/settings/common.py @@ -260,15 +260,13 @@ LOGGING = { 'django.request': { 'handlers': ['mail_admins'], 'level': 'ERROR', - 'propagate': True, - }, - 'loggers': { - 'django.security.DisallowedHost': { - 'level': 'ERROR', - 'handlers': ['console', 'mail_admins'], - 'propagate': True, - }, + 'propagate': True }, + 'django.security.DisallowedHost': { + 'level': 'ERROR', + 'handlers': ['console', 'mail_admins'], + 'propagate': True + } } } {% if cookiecutter.use_celery == "y" %} diff --git a/{{cookiecutter.repo_name}}/requirements/production.txt b/{{cookiecutter.repo_name}}/requirements/production.txt index 9910b5e9..e3546169 100644 --- a/{{cookiecutter.repo_name}}/requirements/production.txt +++ b/{{cookiecutter.repo_name}}/requirements/production.txt @@ -17,7 +17,7 @@ Collectfast==0.2.3 # Mailgun Support # --------------- -django-mailgun-redux==0.3.0 +django-mailgun==0.6.0 {% if cookiecutter.use_sentry == "y" -%} # Raven is the Sentry client diff --git a/{{cookiecutter.repo_name}}/runtime.txt b/{{cookiecutter.repo_name}}/runtime.txt new file mode 100644 index 00000000..18104d92 --- /dev/null +++ b/{{cookiecutter.repo_name}}/runtime.txt @@ -0,0 +1,3 @@ +{% if cookiecutter.use_python2 == 'n' -%} +python-3.4.3 +{%- endif %}