From b085f023e6127ec73931ba4c92a65e323246c455 Mon Sep 17 00:00:00 2001 From: yunti Date: Fri, 18 Sep 2015 17:37:15 +0100 Subject: [PATCH 01/13] Add python3 runtime option for Heroku deployment --- {{cookiecutter.repo_name}}/runtime.txt | 3 +++ 1 file changed, 3 insertions(+) create mode 100644 {{cookiecutter.repo_name}}/runtime.txt diff --git a/{{cookiecutter.repo_name}}/runtime.txt b/{{cookiecutter.repo_name}}/runtime.txt new file mode 100644 index 00000000..e75f26b0 --- /dev/null +++ b/{{cookiecutter.repo_name}}/runtime.txt @@ -0,0 +1,3 @@ +{% if cookiecutter.use_python2= 'n' -%} +FROM python:3.4 +{% else %} From 2209a6cd79e1a4f2d316d5abb2d2eba31df64a28 Mon Sep 17 00:00:00 2001 From: yunti Date: Fri, 18 Sep 2015 17:38:48 +0100 Subject: [PATCH 02/13] Add python version option to cookiecutter json --- cookiecutter.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) 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" } From 9bf03454fa6c555748d8b2e3419ac093050c958c Mon Sep 17 00:00:00 2001 From: yunti Date: Fri, 18 Sep 2015 17:39:45 +0100 Subject: [PATCH 03/13] Added python 3 option to docker --- {{cookiecutter.repo_name}}/Dockerfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/Dockerfile b/{{cookiecutter.repo_name}}/Dockerfile index 547a92b3..d7d5e9e2 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"] From 16c3b5f081e59c74bf44cece0b5f7b31fafb9e16 Mon Sep 17 00:00:00 2001 From: yunti Date: Fri, 18 Sep 2015 17:41:16 +0100 Subject: [PATCH 04/13] Fix for heroku runtime file --- {{cookiecutter.repo_name}}/runtime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/runtime.txt b/{{cookiecutter.repo_name}}/runtime.txt index e75f26b0..0c4eaa32 100644 --- a/{{cookiecutter.repo_name}}/runtime.txt +++ b/{{cookiecutter.repo_name}}/runtime.txt @@ -1,3 +1,3 @@ {% if cookiecutter.use_python2= 'n' -%} -FROM python:3.4 +python-3.4.3 {% else %} From 361ab459e8a63fbd88a59d471ee2677a4deed42d Mon Sep 17 00:00:00 2001 From: yunti Date: Fri, 18 Sep 2015 18:24:06 +0100 Subject: [PATCH 05/13] Update Dockerfile --- {{cookiecutter.repo_name}}/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/Dockerfile b/{{cookiecutter.repo_name}}/Dockerfile index d7d5e9e2..a6800b18 100644 --- a/{{cookiecutter.repo_name}}/Dockerfile +++ b/{{cookiecutter.repo_name}}/Dockerfile @@ -1,4 +1,4 @@ -{% if cookiecutter.use_python2= 'n' -%} +{% if cookiecutter.use_python2== 'n' -%} FROM python:3.4 {% else %} FROM python:2.7 From 6662ccbd94be9a67dfa702194da83f3036bd0d66 Mon Sep 17 00:00:00 2001 From: yunti Date: Fri, 18 Sep 2015 18:24:18 +0100 Subject: [PATCH 06/13] Update runtime.txt --- {{cookiecutter.repo_name}}/runtime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/runtime.txt b/{{cookiecutter.repo_name}}/runtime.txt index 0c4eaa32..2180fd5d 100644 --- a/{{cookiecutter.repo_name}}/runtime.txt +++ b/{{cookiecutter.repo_name}}/runtime.txt @@ -1,3 +1,3 @@ -{% if cookiecutter.use_python2= 'n' -%} +{% if cookiecutter.use_python2== 'n' -%} python-3.4.3 {% else %} From c77c8e0b83d5024be171315051fbf00297853501 Mon Sep 17 00:00:00 2001 From: yunti Date: Fri, 18 Sep 2015 19:02:33 +0100 Subject: [PATCH 07/13] Update Dockerfile --- {{cookiecutter.repo_name}}/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/Dockerfile b/{{cookiecutter.repo_name}}/Dockerfile index a6800b18..e1c875ff 100644 --- a/{{cookiecutter.repo_name}}/Dockerfile +++ b/{{cookiecutter.repo_name}}/Dockerfile @@ -1,4 +1,4 @@ -{% if cookiecutter.use_python2== 'n' -%} +{% if cookiecutter.use_python2 == 'n' -%} FROM python:3.4 {% else %} FROM python:2.7 From 2489bf39abf21021b31a08b4c375917ae3c834c7 Mon Sep 17 00:00:00 2001 From: yunti Date: Fri, 18 Sep 2015 19:02:42 +0100 Subject: [PATCH 08/13] Update runtime.txt --- {{cookiecutter.repo_name}}/runtime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/runtime.txt b/{{cookiecutter.repo_name}}/runtime.txt index 2180fd5d..946c5e2a 100644 --- a/{{cookiecutter.repo_name}}/runtime.txt +++ b/{{cookiecutter.repo_name}}/runtime.txt @@ -1,3 +1,3 @@ -{% if cookiecutter.use_python2== 'n' -%} +{% if cookiecutter.use_python2 == 'n' -%} python-3.4.3 {% else %} From cb44293d81451bd296efd05701b0fa8036a400da Mon Sep 17 00:00:00 2001 From: yunti Date: Fri, 18 Sep 2015 19:04:17 +0100 Subject: [PATCH 09/13] Update runtime.txt --- {{cookiecutter.repo_name}}/runtime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/runtime.txt b/{{cookiecutter.repo_name}}/runtime.txt index 946c5e2a..c3ff7c21 100644 --- a/{{cookiecutter.repo_name}}/runtime.txt +++ b/{{cookiecutter.repo_name}}/runtime.txt @@ -1,3 +1,3 @@ {% if cookiecutter.use_python2 == 'n' -%} python-3.4.3 -{% else %} +{% endif %} From e63d9fc7363b14522a372eded21e6535be790f24 Mon Sep 17 00:00:00 2001 From: yunti Date: Fri, 18 Sep 2015 19:07:09 +0100 Subject: [PATCH 10/13] Update runtime.txt --- {{cookiecutter.repo_name}}/runtime.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.repo_name}}/runtime.txt b/{{cookiecutter.repo_name}}/runtime.txt index c3ff7c21..18104d92 100644 --- a/{{cookiecutter.repo_name}}/runtime.txt +++ b/{{cookiecutter.repo_name}}/runtime.txt @@ -1,3 +1,3 @@ {% if cookiecutter.use_python2 == 'n' -%} python-3.4.3 -{% endif %} +{%- endif %} From 379214348e48799d4f3965bc714921697c5673c5 Mon Sep 17 00:00:00 2001 From: Roman Afanaskin Date: Mon, 21 Sep 2015 22:36:06 +0300 Subject: [PATCH 11/13] Remove excess "loggers" from LOGGING setting --- .../config/settings/common.py | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) 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" %} From 4989efaeceab6834079984fb099a0e67ef4923c6 Mon Sep 17 00:00:00 2001 From: Daniel Greenfeld Date: Mon, 21 Sep 2015 15:54:13 -0700 Subject: [PATCH 12/13] Switch back to django-mailgun proper. As I'm now a maintainer, I feel confident that django-mailgun will be supported going forward. --- {{cookiecutter.repo_name}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 1da7e33007627cd150fb8c9ac0e6089470558679 Mon Sep 17 00:00:00 2001 From: Daniel Roy Greenfeld Date: Mon, 21 Sep 2015 21:24:19 -0700 Subject: [PATCH 13/13] Add @siauPatrick to the contributors and changelog --- CHANGELOG.md | 6 ++++++ CONTRIBUTORS.txt | 5 +++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 513a4f98..a83883f4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,12 @@ All enhancements and patches to cookiecutter-django will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). +## [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