From 77606bcc9549d8986e7cf28cedf979fd66822c63 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Mon, 24 Oct 2016 13:25:05 -0700 Subject: [PATCH 001/118] Update django-braces from 1.9.0 to 1.10.0 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index ed964ef2..8792649f 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -17,7 +17,7 @@ whitenoise==3.2.2 # Forms -django-braces==1.9.0 +django-braces==1.10.0 django-crispy-forms==1.6.1 # Models From e1a7215e988daf750c4a788ebdce4a9617f11e18 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 25 Oct 2016 06:27:47 -0700 Subject: [PATCH 002/118] Update opbeat from 3.4.0 to 3.5.0 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index b4d14fb5..b149a64b 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -35,5 +35,5 @@ raven==5.30.0 {% if cookiecutter.use_opbeat == "y" -%} # Opbeat agent for performance monitoring # ----------------------------------------- -opbeat==3.4.0 +opbeat==3.5.0 {%- endif %} From b3c9dc6a3031fcfc726a5de95aba3151d5815c59 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Tue, 25 Oct 2016 11:59:52 -0700 Subject: [PATCH 003/118] Update django-anymail from 0.5 to 0.6 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index b4d14fb5..b4447a64 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -24,7 +24,7 @@ Collectfast==0.2.3 # Email backends for Mailgun, Postmark, SendGrid and more # ------------------------------------------------------- -django-anymail==0.5 +django-anymail==0.6 {% if cookiecutter.use_sentry_for_error_reporting == "y" -%} # Raven is the Sentry client From a37b368668623a6ab46d7b2a6cf2f14395b2086e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 2 Nov 2016 10:10:59 +0100 Subject: [PATCH 004/118] Update django from 1.10.2 to 1.10.3 (#872) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 8792649f..9993878b 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -7,7 +7,7 @@ wheel==0.29.0 {%- endif %} # Bleeding edge Django -django==1.10.2 +django==1.10.3 # Configuration django-environ==0.4.0 From 4212eb5446a06011477ead315d7c3d22298c8b4f Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 2 Nov 2016 10:11:38 +0100 Subject: [PATCH 005/118] Update django-anymail from 0.6 to 0.6.1 (#873) --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 85ae4736..4c94e3c4 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -24,7 +24,7 @@ Collectfast==0.2.3 # Email backends for Mailgun, Postmark, SendGrid and more # ------------------------------------------------------- -django-anymail==0.6 +django-anymail==0.6.1 {% if cookiecutter.use_sentry_for_error_reporting == "y" -%} # Raven is the Sentry client From 3a7a75ad9cdda2d5a8c264795c66d5ce185e1185 Mon Sep 17 00:00:00 2001 From: Michael Gecht Date: Wed, 2 Nov 2016 10:12:06 +0100 Subject: [PATCH 006/118] Add documentation for Docker users on Windows (#845) * Added usage notice for Windows users with Docker * Updated CONTRIBUTORS.rst --- CONTRIBUTORS.rst | 2 ++ docs/developing-locally-docker.rst | 10 ++++++++++ 2 files changed, 12 insertions(+) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 3a068e31..684ddbe1 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -111,6 +111,7 @@ Listed in alphabetical order. Matt Warren `@mfwarren`_ Matthew Sisley `@mjsisley`_ Meghan Heintz `@dot2dotseurat`_ + Michael Gecht `@mimischi`_ @_mischi mozillazg `@mozillazg`_ Pablo `@oubiga`_ Parbhat Puri `@parbhat`_ @@ -192,6 +193,7 @@ Listed in alphabetical order. .. _@MathijsHoogland: https://github.com/MathijsHoogland .. _@menzenski: https://github.com/menzenski .. _@mfwarren: https://github.com/mfwarren +.. _@mimischi: https://github.com/mimischi .. _@mjsisley: https://github.com/mjsisley .. _@mozillazg: https://github.com/mozillazg .. _@noisy: https://github.com/noisy diff --git a/docs/developing-locally-docker.rst b/docs/developing-locally-docker.rst index 65312e8d..0a14c3ce 100644 --- a/docs/developing-locally-docker.rst +++ b/docs/developing-locally-docker.rst @@ -20,6 +20,16 @@ If you don't already have it installed, follow the instructions for your OS: .. _`Docker for Windows`: https://docs.docker.com/engine/installation/windows/ .. _`docker-engine`: https://docs.docker.com/engine/installation/ +Attention Windows users +------------- + +Currently PostgreSQL (``psycopg2`` python package) is not installed inside Docker containers for Windows users, while it is required by the generated Django project. To fix this, add ``psycopg2`` to the list of requirements inside ``requirements/base.txt``:: + + # Python-PostgreSQL Database Adapter + psycopg2==2.6.2 + +Doing this will prevent the project from being installed in an Windows-only environment (thus without usage of Docker). If you want to use this project without Docker, make sure to remove ``psycopg2`` from the requirements again. + Build the Stack --------------- From 01fe56aaa206041a684e729c7ea5d9beb7e422b3 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 2 Nov 2016 08:36:39 -0700 Subject: [PATCH 007/118] Update django-redis from 4.5.0 to 4.6.0 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 9993878b..4b7a9e4b 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -45,7 +45,7 @@ awesome-slugify==1.6.5 pytz==2016.7 # Redis support -django-redis==4.5.0 +django-redis==4.6.0 redis>=2.10.5 {% if cookiecutter.use_celery == "y" %} From 4f3e18d0ccae4a50cab53ccf0c71b3a436b41197 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=B4me=20Hugon?= Date: Wed, 2 Nov 2016 18:03:52 +0100 Subject: [PATCH 008/118] read the env, so the env works (#863) Spend a whole afternoon tryin to make it works after reading your book... that was the solution --- {{cookiecutter.project_slug}}/config/settings/common.py | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.project_slug}}/config/settings/common.py b/{{cookiecutter.project_slug}}/config/settings/common.py index 04998575..c0c86b39 100644 --- a/{{cookiecutter.project_slug}}/config/settings/common.py +++ b/{{cookiecutter.project_slug}}/config/settings/common.py @@ -16,6 +16,7 @@ ROOT_DIR = environ.Path(__file__) - 3 # ({{ cookiecutter.project_slug }}/config APPS_DIR = ROOT_DIR.path('{{ cookiecutter.project_slug }}') env = environ.Env() +env.read_env() # APP CONFIGURATION # ------------------------------------------------------------------------------ From 16dd3c498aa3af1553e5437df1e95a61654898c0 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 2 Nov 2016 12:20:40 -0700 Subject: [PATCH 009/118] Update opbeat from 3.5.0 to 3.5.1 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 4c94e3c4..85e64a0c 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -35,5 +35,5 @@ raven==5.31.0 {% if cookiecutter.use_opbeat == "y" -%} # Opbeat agent for performance monitoring # ----------------------------------------- -opbeat==3.5.0 +opbeat==3.5.1 {%- endif %} From 270bcef89c1212597e811d69b41015844bbb8bca Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 2 Nov 2016 15:20:40 -0700 Subject: [PATCH 010/118] Update collectfast from 0.2.3 to 0.3.1 --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 4c94e3c4..c72de926 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -19,7 +19,7 @@ gunicorn==19.6.0 boto==2.43.0 django-storages-redux==1.3.2 {% if cookiecutter.use_whitenoise != 'y' -%} -Collectfast==0.2.3 +Collectfast==0.3.1 {%- endif %} # Email backends for Mailgun, Postmark, SendGrid and more From 313aff19a139f1d14bfc73599f8789275cda23a9 Mon Sep 17 00:00:00 2001 From: Audrey Roy Greenfeld Date: Tue, 8 Nov 2016 09:50:51 -0800 Subject: [PATCH 011/118] Enable gzip compression on Elastic Beanstalk per @realpython https://realpython.com/blog/python/deploying-a-django-app-to-aws-elastic-beanstalk/ --- .../.ebextensions/50_apache.config | 3 +++ .../.ebextensions/enable_mod_deflate.conf | 25 +++++++++++++++++++ 2 files changed, 28 insertions(+) create mode 100644 {{cookiecutter.project_slug}}/.ebextensions/50_apache.config create mode 100644 {{cookiecutter.project_slug}}/.ebextensions/enable_mod_deflate.conf diff --git a/{{cookiecutter.project_slug}}/.ebextensions/50_apache.config b/{{cookiecutter.project_slug}}/.ebextensions/50_apache.config new file mode 100644 index 00000000..672cb625 --- /dev/null +++ b/{{cookiecutter.project_slug}}/.ebextensions/50_apache.config @@ -0,0 +1,3 @@ +container_commands: + 01_setup_apache: + command: "cp .ebextensions/enable_mod_deflate.conf /etc/httpd/conf.d/enable_mod_deflate.conf" diff --git a/{{cookiecutter.project_slug}}/.ebextensions/enable_mod_deflate.conf b/{{cookiecutter.project_slug}}/.ebextensions/enable_mod_deflate.conf new file mode 100644 index 00000000..7a77cc23 --- /dev/null +++ b/{{cookiecutter.project_slug}}/.ebextensions/enable_mod_deflate.conf @@ -0,0 +1,25 @@ +# mod_deflate configuration + + # Restrict compression to these MIME types + AddOutputFilterByType DEFLATE text/plain + AddOutputFilterByType DEFLATE text/html + AddOutputFilterByType DEFLATE application/xhtml+xml + AddOutputFilterByType DEFLATE text/xml + AddOutputFilterByType DEFLATE application/xml + AddOutputFilterByType DEFLATE application/xml+rss + AddOutputFilterByType DEFLATE application/x-javascript + AddOutputFilterByType DEFLATE text/javascript + AddOutputFilterByType DEFLATE text/css + # Level of compression (Highest 9 - Lowest 1) + DeflateCompressionLevel 9 + # Netscape 4.x has some problems. + BrowserMatch ^Mozilla/4 gzip-only-text/html + # Netscape 4.06-4.08 have some more problems + BrowserMatch ^Mozilla/4\.0[678] no-gzip + # MSIE masquerades as Netscape, but it is fine + BrowserMatch \bMSI[E] !no-gzip !gzip-only-text/html + + # Make sure proxies don't deliver the wrong content + Header append Vary User-Agent env=!dont-vary + + From a05292347c133e62b87319d681d15a995619bc70 Mon Sep 17 00:00:00 2001 From: Jannis Gebauer Date: Mon, 14 Nov 2016 11:52:29 +0100 Subject: [PATCH 012/118] upgrade gevent (#882) --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index c7ed6b27..57a0d0ed 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -11,7 +11,7 @@ psycopg2==2.6.2 # WSGI Handler # ------------------------------------------------ -gevent==1.1.2 +gevent==1.2a1 gunicorn==19.6.0 # Static and Media Storage From 629ab3a956034e9d9a209fd09b8025f1a85b4fbb Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 14 Nov 2016 11:52:38 +0100 Subject: [PATCH 013/118] Update pytest from 3.0.3 to 3.0.4 (#883) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 73e90f9a..db72ef94 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ sh==1.11 binaryornot==0.4.0 # Testing -pytest==3.0.3 +pytest==3.0.4 pep8==1.7.0 pyflakes==1.3.0 tox==2.4.1 From 74e8296b8e3d475d3116150f01503c715990be1a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 14 Nov 2016 11:52:45 +0100 Subject: [PATCH 014/118] Update django-environ from 0.4.0 to 0.4.1 (#885) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 4b7a9e4b..e9669f15 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -10,7 +10,7 @@ wheel==0.29.0 django==1.10.3 # Configuration -django-environ==0.4.0 +django-environ==0.4.1 {% if cookiecutter.use_whitenoise == 'y' -%} whitenoise==3.2.2 {%- endif %} From 6ec8583f602d4d75e400b2e5afc02e2ae4ab0c7d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 16 Nov 2016 09:32:44 +0100 Subject: [PATCH 015/118] Update raven from 5.31.0 to 5.32.0 (#889) --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 57a0d0ed..a8fbf468 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -29,7 +29,7 @@ django-anymail==0.6.1 {% if cookiecutter.use_sentry_for_error_reporting == "y" -%} # Raven is the Sentry client # -------------------------- -raven==5.31.0 +raven==5.32.0 {%- endif %} {% if cookiecutter.use_opbeat == "y" -%} From b32a2ed8aaf2391f1ec7f1e953bc757b5883d65b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 16 Nov 2016 09:32:50 +0100 Subject: [PATCH 016/118] Update flake8 to 3.2.0 (#888) * Update flake8 from 3.0.4 to 3.2.0 * Update flake8 from 3.0.4 to 3.2.0 --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/test.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index db72ef94..1052e217 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ cookiecutter==1.4.0 -flake8==3.0.4 # pyup: != 2.6.0 +flake8==3.2.0 # pyup: != 2.6.0 sh==1.11 binaryornot==0.4.0 diff --git a/{{cookiecutter.project_slug}}/requirements/test.txt b/{{cookiecutter.project_slug}}/requirements/test.txt index 5578aaca..855aef3a 100644 --- a/{{cookiecutter.project_slug}}/requirements/test.txt +++ b/{{cookiecutter.project_slug}}/requirements/test.txt @@ -8,7 +8,7 @@ psycopg2==2.6.2 {%- endif %} coverage==4.2 -flake8==3.0.4 # pyup: != 2.6.0 +flake8==3.2.0 # pyup: != 2.6.0 django-test-plus==1.0.16 factory_boy==2.7.0 From d00074d27bc5c739ba611b08081411a03814e5b0 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 21 Nov 2016 16:07:41 +0100 Subject: [PATCH 017/118] Update pytest-django to 3.1.1 (#897) * Update pytest-django from 3.0.0 to 3.1.1 * Update pytest-django from 3.0.0 to 3.1.1 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- {{cookiecutter.project_slug}}/requirements/test.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 812a01e8..41f830f6 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -13,5 +13,5 @@ django-debug-toolbar==1.6 # improved REPL ipdb==0.10.1 -pytest-django==3.0.0 +pytest-django==3.1.1 pytest-sugar==0.7.1 diff --git a/{{cookiecutter.project_slug}}/requirements/test.txt b/{{cookiecutter.project_slug}}/requirements/test.txt index 855aef3a..2dc42bd4 100644 --- a/{{cookiecutter.project_slug}}/requirements/test.txt +++ b/{{cookiecutter.project_slug}}/requirements/test.txt @@ -13,5 +13,5 @@ django-test-plus==1.0.16 factory_boy==2.7.0 # pytest -pytest-django==3.0.0 +pytest-django==3.1.1 pytest-sugar==0.7.1 From d5805a71b480368cf37801821ad1e6e5134268cb Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 23 Nov 2016 11:36:24 +0100 Subject: [PATCH 018/118] Update tox from 2.4.1 to 2.5.0 (#890) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 1052e217..9284ad97 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,5 +7,5 @@ binaryornot==0.4.0 pytest==3.0.4 pep8==1.7.0 pyflakes==1.3.0 -tox==2.4.1 +tox==2.5.0 pytest-cookies==0.2.0 From efad68867124e067ee9278bb7aa500b5f3834fba Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 23 Nov 2016 11:36:31 +0100 Subject: [PATCH 019/118] Update flake8 to 3.2.1 (#900) * Update flake8 from 3.2.0 to 3.2.1 * Update flake8 from 3.2.0 to 3.2.1 --- requirements.txt | 2 +- {{cookiecutter.project_slug}}/requirements/test.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements.txt b/requirements.txt index 9284ad97..88938821 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,5 +1,5 @@ cookiecutter==1.4.0 -flake8==3.2.0 # pyup: != 2.6.0 +flake8==3.2.1 # pyup: != 2.6.0 sh==1.11 binaryornot==0.4.0 diff --git a/{{cookiecutter.project_slug}}/requirements/test.txt b/{{cookiecutter.project_slug}}/requirements/test.txt index 2dc42bd4..704a508c 100644 --- a/{{cookiecutter.project_slug}}/requirements/test.txt +++ b/{{cookiecutter.project_slug}}/requirements/test.txt @@ -8,7 +8,7 @@ psycopg2==2.6.2 {%- endif %} coverage==4.2 -flake8==3.2.0 # pyup: != 2.6.0 +flake8==3.2.1 # pyup: != 2.6.0 django-test-plus==1.0.16 factory_boy==2.7.0 From ea4c3f49aa56b5cbe4bad9f21e3b254378097db7 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 23 Nov 2016 11:36:40 +0100 Subject: [PATCH 020/118] Update django-allauth from 0.28.0 to 0.29.0 (#898) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index e9669f15..56743c21 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -28,7 +28,7 @@ Pillow==3.4.2 # For user registration, either via email or social # Well-built with regular release cycles! -django-allauth==0.28.0 +django-allauth==0.29.0 {% if cookiecutter.windows == 'y' -%} # On Windows, you must download/install psycopg2 manually From 75c84b870dc38a22bf2568e684edbe14063c342f Mon Sep 17 00:00:00 2001 From: sreyemnayr Date: Wed, 23 Nov 2016 04:36:58 -0600 Subject: [PATCH 021/118] Add PostgreSQL 9.6 as an option (#891) * Added PostgreSQL 9.6 option * Spacing --- cookiecutter.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cookiecutter.json b/cookiecutter.json index bf729b67..84bbe5ef 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -19,7 +19,7 @@ "use_heroku": "n", "use_elasticbeanstalk_experimental": "n", "use_compressor": "n", - "postgresql_version": ["9.5", "9.4", "9.3", "9.2"], + "postgresql_version": ["9.6", "9.5", "9.4", "9.3", "9.2"], "js_task_runner": ["Gulp", "Grunt", "None"], "use_lets_encrypt": "n", "open_source_license": ["MIT", "BSD", "GPLv3", "Apache Software License 2.0", "Not open source"] From 613587f88920afca7093c9e301020ed6e5d2e275 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 24 Nov 2016 08:31:40 +0100 Subject: [PATCH 022/118] Update sphinx from 1.4.8 to 1.4.9 (#901) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 41f830f6..00145eb2 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -2,7 +2,7 @@ -r base.txt coverage==4.2 django-coverage-plugin==1.3.1 -Sphinx==1.4.8 +Sphinx==1.4.9 django-extensions==1.7.4 Werkzeug==0.11.11 django-test-plus==1.0.16 From 770abf960dab3a2d3a69f4a7745145081c6303b1 Mon Sep 17 00:00:00 2001 From: Paul Brown Date: Thu, 24 Nov 2016 10:21:47 -0600 Subject: [PATCH 023/118] nginx-secure.conf mixed tabs/spaces to only spaces (#902) --- .../compose/nginx/nginx-secure.conf | 80 +++++++++---------- 1 file changed, 40 insertions(+), 40 deletions(-) diff --git a/{{cookiecutter.project_slug}}/compose/nginx/nginx-secure.conf b/{{cookiecutter.project_slug}}/compose/nginx/nginx-secure.conf index cd0fe9a3..10a53eec 100755 --- a/{{cookiecutter.project_slug}}/compose/nginx/nginx-secure.conf +++ b/{{cookiecutter.project_slug}}/compose/nginx/nginx-secure.conf @@ -11,7 +11,7 @@ events { http { - include /etc/nginx/mime.types; + include /etc/nginx/mime.types; default_type application/octet-stream; log_format main '$remote_addr - $remote_user [$time_local] "$request" ' @@ -32,57 +32,57 @@ http { upstream app { server django:5000; } - server { - listen 80; - server_name ___my.example.com___ www.___my.example.com___; + server { + listen 80; + server_name ___my.example.com___ www.___my.example.com___; - location /.well-known/acme-challenge { - # Since the certbot container isn't up constantly, need to resolve ip dynamically using docker's dns - resolver ___NAMESERVER___; - set $certbot_addr_port certbot:80; - proxy_pass http://$certbot_addr_port; - proxy_set_header Host $host; - proxy_set_header X-Forwarded-For $remote_addr; + location /.well-known/acme-challenge { + # Since the certbot container isn't up constantly, need to resolve ip dynamically using docker's dns + resolver ___NAMESERVER___; + set $certbot_addr_port certbot:80; + proxy_pass http://$certbot_addr_port; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $remote_addr; proxy_set_header X-Forwarded-Proto $scheme; - } + } - location / { - return 301 https://$server_name$request_uri; - } + location / { + return 301 https://$server_name$request_uri; + } - } + } - server { - listen 443; - server_name ___my.example.com___ www.___my.example.com___; + server { + listen 443; + server_name ___my.example.com___ www.___my.example.com___; - ssl on; - ssl_certificate /etc/letsencrypt/live/___my.example.com___/fullchain.pem; - ssl_certificate_key /etc/letsencrypt/live/___my.example.com___/privkey.pem; - ssl_session_timeout 5m; - ssl_protocols TLSv1 TLSv1.1 TLSv1.2; - ssl_ciphers 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH'; - ssl_prefer_server_ciphers on; + ssl on; + ssl_certificate /etc/letsencrypt/live/___my.example.com___/fullchain.pem; + ssl_certificate_key /etc/letsencrypt/live/___my.example.com___/privkey.pem; + ssl_session_timeout 5m; + ssl_protocols TLSv1 TLSv1.1 TLSv1.2; + ssl_ciphers 'EECDH+AESGCM:EDH+AESGCM:AES256+EECDH:AES256+EDH'; + ssl_prefer_server_ciphers on; - ssl_session_cache shared:SSL:10m; - ssl_dhparam /etc/ssl/private/dhparams.pem; + ssl_session_cache shared:SSL:10m; + ssl_dhparam /etc/ssl/private/dhparams.pem; - location /.well-known/acme-challenge { - resolver ___NAMESERVER___; - set $certbot_addr_port certbot:443; - proxy_pass http://$certbot_addr_port; - proxy_set_header Host $host; - proxy_set_header X-Forwarded-For $remote_addr; - proxy_set_header X-Forwarded-Proto https; - } + location /.well-known/acme-challenge { + resolver ___NAMESERVER___; + set $certbot_addr_port certbot:443; + proxy_pass http://$certbot_addr_port; + proxy_set_header Host $host; + proxy_set_header X-Forwarded-For $remote_addr; + proxy_set_header X-Forwarded-Proto https; + } - location / { + location / { # checks for static file, if not found proxy to app try_files $uri @proxy_to_app; } - # cookiecutter-django app - location @proxy_to_app { + # cookiecutter-django app + location @proxy_to_app { proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for; proxy_set_header Host $http_host; proxy_redirect off; @@ -91,6 +91,6 @@ http { } - } + } } From 0919cc438b6b0ef80978842834daf51b00d5113c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?= Date: Mon, 28 Nov 2016 20:12:01 -0300 Subject: [PATCH 024/118] Update common.py --- {{cookiecutter.project_slug}}/config/settings/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/common.py b/{{cookiecutter.project_slug}}/config/settings/common.py index c0c86b39..83c94e22 100644 --- a/{{cookiecutter.project_slug}}/config/settings/common.py +++ b/{{cookiecutter.project_slug}}/config/settings/common.py @@ -16,7 +16,7 @@ ROOT_DIR = environ.Path(__file__) - 3 # ({{ cookiecutter.project_slug }}/config APPS_DIR = ROOT_DIR.path('{{ cookiecutter.project_slug }}') env = environ.Env() -env.read_env() +env.read_env(str(ROOT_DIR.path('.env'))) # APP CONFIGURATION # ------------------------------------------------------------------------------ From a5c179594dfac2616187e496a8f87ee00c4fd869 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?= Date: Mon, 28 Nov 2016 20:20:56 -0300 Subject: [PATCH 025/118] revert last commit --- {{cookiecutter.project_slug}}/config/settings/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/common.py b/{{cookiecutter.project_slug}}/config/settings/common.py index 83c94e22..c0c86b39 100644 --- a/{{cookiecutter.project_slug}}/config/settings/common.py +++ b/{{cookiecutter.project_slug}}/config/settings/common.py @@ -16,7 +16,7 @@ ROOT_DIR = environ.Path(__file__) - 3 # ({{ cookiecutter.project_slug }}/config APPS_DIR = ROOT_DIR.path('{{ cookiecutter.project_slug }}') env = environ.Env() -env.read_env(str(ROOT_DIR.path('.env'))) +env.read_env() # APP CONFIGURATION # ------------------------------------------------------------------------------ From 85dfec3ce3f5c9ac33cf735f08c349fe7953fd19 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 29 Nov 2016 18:06:50 +0100 Subject: [PATCH 026/118] Update pytest-django to 3.1.2 (#903) * Update pytest-django from 3.1.1 to 3.1.2 * Update pytest-django from 3.1.1 to 3.1.2 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- {{cookiecutter.project_slug}}/requirements/test.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 00145eb2..e8ad219f 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -13,5 +13,5 @@ django-debug-toolbar==1.6 # improved REPL ipdb==0.10.1 -pytest-django==3.1.1 +pytest-django==3.1.2 pytest-sugar==0.7.1 diff --git a/{{cookiecutter.project_slug}}/requirements/test.txt b/{{cookiecutter.project_slug}}/requirements/test.txt index 704a508c..759deb1c 100644 --- a/{{cookiecutter.project_slug}}/requirements/test.txt +++ b/{{cookiecutter.project_slug}}/requirements/test.txt @@ -13,5 +13,5 @@ django-test-plus==1.0.16 factory_boy==2.7.0 # pytest -pytest-django==3.1.1 +pytest-django==3.1.2 pytest-sugar==0.7.1 From 605c7eae63291c9cbaa16e4b57d6790647dcc3b5 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 29 Nov 2016 18:07:34 +0100 Subject: [PATCH 027/118] Update sh from 1.11 to 1.12.2 (#913) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 88938821..20494233 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ cookiecutter==1.4.0 flake8==3.2.1 # pyup: != 2.6.0 -sh==1.11 +sh==1.12.2 binaryornot==0.4.0 # Testing From 59948514ab684896a0bd1d8cf9a248f0ad3a1025 Mon Sep 17 00:00:00 2001 From: Tim Freund Date: Wed, 30 Nov 2016 17:32:38 -0500 Subject: [PATCH 028/118] Update doc links from getsentry.com to sentry.io (#917) Sentry changed their name and URLs: https://blog.sentry.io/2016/08/30/sentry-io.html Links in the cookiecutter-django project are updated to reflect the new locations. --- CONTRIBUTORS.rst | 2 ++ README.rst | 2 +- {{cookiecutter.project_slug}}/README.rst | 2 +- {{cookiecutter.project_slug}}/config/settings/production.py | 2 +- 4 files changed, 5 insertions(+), 3 deletions(-) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 684ddbe1..6905454d 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -130,6 +130,7 @@ Listed in alphabetical order. Sule Marshall `@suledev`_ Taylor Baldwin Théo Segonds `@show0k`_ + Tim Freund `@timfreund`_ Tom Atkins `@knitatoms`_ Tom Offermann Travis McNeill `@Travistock`_ @tavistock_esq @@ -211,6 +212,7 @@ Listed in alphabetical order. .. _@ssteinerX: https://github.com/ssteinerx .. _@stepmr: https://github.com/stepmr .. _@suledev: https://github.com/suledev +.. _@timfreund: https://github.com/timfreund .. _@Travistock: https://github.com/Tavistock .. _@trungdong: https://github.com/trungdong .. _@viviangb: httpsL//github.com/viviangb diff --git a/README.rst b/README.rst index 95e90afb..6a114aef 100644 --- a/README.rst +++ b/README.rst @@ -70,7 +70,7 @@ Optional Integrations .. _Celery: http://www.celeryproject.org/ .. _Anymail: https://github.com/anymail/django-anymail .. _MailHog: https://github.com/mailhog/MailHog -.. _Sentry: https://getsentry.com/welcome/ +.. _Sentry: https://sentry.io/welcome/ .. _docker-compose: https://github.com/docker/compose .. _Opbeat: https://opbeat.com/ .. _PythonAnywhere: https://www.pythonanywhere.com/ diff --git a/{{cookiecutter.project_slug}}/README.rst b/{{cookiecutter.project_slug}}/README.rst index 4640f265..0248eee3 100644 --- a/{{cookiecutter.project_slug}}/README.rst +++ b/{{cookiecutter.project_slug}}/README.rst @@ -107,7 +107,7 @@ The email server will exit when you exit the Grunt task on the CLI with Ctrl+C. Sentry ^^^^^^ -Sentry is an error logging aggregator service. You can sign up for a free account at https://getsentry.com/signup/?code=cookiecutter or download and host it yourself. +Sentry is an error logging aggregator service. You can sign up for a free account at https://sentry.io/signup/?code=cookiecutter or download and host it yourself. The system is setup with reasonable defaults, including 404 logging and integration with the WSGI application. You must set the DSN url in production. diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index 7fa726f6..c1fccc95 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -35,7 +35,7 @@ SECURE_PROXY_SSL_HEADER = ('HTTP_X_FORWARDED_PROTO', 'https') {%- if cookiecutter.use_sentry_for_error_reporting == 'y' %} # raven sentry client -# See https://docs.getsentry.com/hosted/clients/python/integrations/django/ +# See https://docs.sentry.io/clients/python/integrations/django/ INSTALLED_APPS += ('raven.contrib.django.raven_compat', ) {% endif %} {%- if cookiecutter.use_whitenoise == 'y' %} From 269efc3f45c0150768f2ce04802cb52823170e25 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 1 Dec 2016 11:19:49 +0100 Subject: [PATCH 029/118] Update sh from 1.12.2 to 1.12.5 (#919) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 20494233..227fba22 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ cookiecutter==1.4.0 flake8==3.2.1 # pyup: != 2.6.0 -sh==1.12.2 +sh==1.12.5 binaryornot==0.4.0 # Testing From 110f0f6ce88b22fe4de71d20cf46ec8d8941acf0 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 1 Dec 2016 11:19:57 +0100 Subject: [PATCH 030/118] Update django-extensions from 1.7.4 to 1.7.5 (#904) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index e8ad219f..3df762f8 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -3,7 +3,7 @@ coverage==4.2 django-coverage-plugin==1.3.1 Sphinx==1.4.9 -django-extensions==1.7.4 +django-extensions==1.7.5 Werkzeug==0.11.11 django-test-plus==1.0.16 factory_boy==2.7.0 From 6c4085fce4c9bba980867bffb616a6b9816c85ce Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 7 Dec 2016 05:43:54 +0100 Subject: [PATCH 031/118] Update django from 1.10.3 to 1.10.4 (#920) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 56743c21..39f868b2 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -7,7 +7,7 @@ wheel==0.29.0 {%- endif %} # Bleeding edge Django -django==1.10.3 +django==1.10.4 # Configuration django-environ==0.4.1 From 275e0b4b8cb8e58a524aab7e06145fdc0af99e14 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 7 Dec 2016 05:44:10 +0100 Subject: [PATCH 032/118] Update sh from 1.12.5 to 1.12.6 (#922) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 227fba22..6b497fd0 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ cookiecutter==1.4.0 flake8==3.2.1 # pyup: != 2.6.0 -sh==1.12.5 +sh==1.12.6 binaryornot==0.4.0 # Testing From 7d4cfee45c24939ad972688f235c6130b72b7125 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 7 Dec 2016 05:44:15 +0100 Subject: [PATCH 033/118] Update sphinx from 1.4.9 to 1.5 (#923) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 3df762f8..bd07432b 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -2,7 +2,7 @@ -r base.txt coverage==4.2 django-coverage-plugin==1.3.1 -Sphinx==1.4.9 +Sphinx==1.5 django-extensions==1.7.5 Werkzeug==0.11.11 django-test-plus==1.0.16 From 75d8827681cc1e6419f1e7762863a9dffe5c2a2a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 7 Dec 2016 05:44:20 +0100 Subject: [PATCH 034/118] Update pytest from 3.0.4 to 3.0.5 (#924) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 6b497fd0..a9f14d35 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ sh==1.12.6 binaryornot==0.4.0 # Testing -pytest==3.0.4 +pytest==3.0.5 pep8==1.7.0 pyflakes==1.3.0 tox==2.5.0 From 98a2e1705aea6b7c5494852837d182011a0eb0b6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 7 Dec 2016 05:44:24 +0100 Subject: [PATCH 035/118] Update pytz from 2016.7 to 2016.10 (#925) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 39f868b2..915825e4 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -42,7 +42,7 @@ psycopg2==2.6.2 awesome-slugify==1.6.5 # Time zones support -pytz==2016.7 +pytz==2016.10 # Redis support django-redis==4.6.0 From 2838789560439126b062980ceddd0460adfb572c Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 9 Dec 2016 04:14:18 +0100 Subject: [PATCH 036/118] Update sh from 1.12.6 to 1.12.7 (#929) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a9f14d35..33c0f9b6 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ cookiecutter==1.4.0 flake8==3.2.1 # pyup: != 2.6.0 -sh==1.12.6 +sh==1.12.7 binaryornot==0.4.0 # Testing From 5db3b39c19076a0595e11c64c76510b4d75fb588 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 9 Dec 2016 04:15:51 +0100 Subject: [PATCH 037/118] Update boto from 2.43.0 to 2.44.0 (#931) --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index a8fbf468..4fa542d5 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -16,7 +16,7 @@ gunicorn==19.6.0 # Static and Media Storage # ------------------------------------------------ -boto==2.43.0 +boto==2.44.0 django-storages-redux==1.3.2 {% if cookiecutter.use_whitenoise != 'y' -%} Collectfast==0.3.1 From 37a359bd41d19ee5f0ff685e13f3cf726f0154ac Mon Sep 17 00:00:00 2001 From: Jimmy Gitonga Date: Fri, 9 Dec 2016 22:37:06 +0300 Subject: [PATCH 038/118] Update CONTRIBUTORS.rst (#935) --- CONTRIBUTORS.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 6905454d..414d2a33 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -89,6 +89,7 @@ Listed in alphabetical order. Ian Lee `@IanLee1521`_ Jan Van Bruggen `@jvanbrug`_ Jens Nilsson `@phiberjenz`_ + Jimmy Gitonga `@afrowave`_ @afrowave Julien Almarcha `@sladinji`_ Julio Castillo `@juliocc`_ Kaido Kert `@kaidokert`_ From c67b171139f407a4ff686baa46d845e83b153573 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 16 Dec 2016 09:24:34 +0100 Subject: [PATCH 039/118] Update boto from 2.44.0 to 2.45.0 (#943) --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 4fa542d5..26846268 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -16,7 +16,7 @@ gunicorn==19.6.0 # Static and Media Storage # ------------------------------------------------ -boto==2.44.0 +boto==2.45.0 django-storages-redux==1.3.2 {% if cookiecutter.use_whitenoise != 'y' -%} Collectfast==0.3.1 From 0a37aa57bd8680a291df82bd933a89ccdcd18667 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 16 Dec 2016 09:24:42 +0100 Subject: [PATCH 040/118] Update sphinx from 1.5 to 1.5.1 (#940) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index bd07432b..c18094d7 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -2,7 +2,7 @@ -r base.txt coverage==4.2 django-coverage-plugin==1.3.1 -Sphinx==1.5 +Sphinx==1.5.1 django-extensions==1.7.5 Werkzeug==0.11.11 django-test-plus==1.0.16 From 0abfa781f798fb2246f7a895791d2dad23249399 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 16 Dec 2016 09:24:50 +0100 Subject: [PATCH 041/118] Update gevent from 1.2a1 to 1.2a2 (#933) --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 26846268..a0e3051e 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -11,7 +11,7 @@ psycopg2==2.6.2 # WSGI Handler # ------------------------------------------------ -gevent==1.2a1 +gevent==1.2a2 gunicorn==19.6.0 # Static and Media Storage From dc559f76498edd90e6ee5444231905d25fb40097 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 17 Dec 2016 12:07:38 +0100 Subject: [PATCH 042/118] Update sh from 1.12.7 to 1.12.8 (#946) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 33c0f9b6..763a2e85 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ cookiecutter==1.4.0 flake8==3.2.1 # pyup: != 2.6.0 -sh==1.12.7 +sh==1.12.8 binaryornot==0.4.0 # Testing From 7bdc95818a21457cd5da1640924ecfa142e6f576 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 17 Dec 2016 12:07:47 +0100 Subject: [PATCH 043/118] Update factory-boy to 2.8.1 (#947) * Update factory-boy from 2.7.0 to 2.8.1 * Update factory-boy from 2.7.0 to 2.8.1 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- {{cookiecutter.project_slug}}/requirements/test.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index c18094d7..f208fe7c 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -6,7 +6,7 @@ Sphinx==1.5.1 django-extensions==1.7.5 Werkzeug==0.11.11 django-test-plus==1.0.16 -factory_boy==2.7.0 +factory-boy==2.8.1 django-debug-toolbar==1.6 diff --git a/{{cookiecutter.project_slug}}/requirements/test.txt b/{{cookiecutter.project_slug}}/requirements/test.txt index 759deb1c..14f7c391 100644 --- a/{{cookiecutter.project_slug}}/requirements/test.txt +++ b/{{cookiecutter.project_slug}}/requirements/test.txt @@ -10,7 +10,7 @@ psycopg2==2.6.2 coverage==4.2 flake8==3.2.1 # pyup: != 2.6.0 django-test-plus==1.0.16 -factory_boy==2.7.0 +factory-boy==2.8.1 # pytest pytest-django==3.1.2 From f00acba613a03494a8b35bd1d2a7b87415885357 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sat, 17 Dec 2016 12:07:57 +0100 Subject: [PATCH 044/118] Update collectfast from 0.3.1 to 0.4.0 (#948) --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index a0e3051e..f169523b 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -19,7 +19,7 @@ gunicorn==19.6.0 boto==2.45.0 django-storages-redux==1.3.2 {% if cookiecutter.use_whitenoise != 'y' -%} -Collectfast==0.3.1 +Collectfast==0.4.0 {%- endif %} # Email backends for Mailgun, Postmark, SendGrid and more From 8f1a6e20e460d0cdc89e37e2aee3648e2b079fec Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Sun, 18 Dec 2016 23:13:09 +0100 Subject: [PATCH 045/118] Update cookiecutter from 1.4.0 to 1.5.0 (#952) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 763a2e85..a46890d7 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -cookiecutter==1.4.0 +cookiecutter==1.5.0 flake8==3.2.1 # pyup: != 2.6.0 sh==1.12.8 binaryornot==0.4.0 From cf8c05265768914e71e02ba874013f5c02b89a25 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 21 Dec 2016 15:49:29 +0100 Subject: [PATCH 046/118] Update opbeat from 3.5.1 to 3.5.2 (#955) --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index f169523b..81f9a31f 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -35,5 +35,5 @@ raven==5.32.0 {% if cookiecutter.use_opbeat == "y" -%} # Opbeat agent for performance monitoring # ----------------------------------------- -opbeat==3.5.1 +opbeat==3.5.2 {%- endif %} From d25f35a90a4c0964b2c45a434f06cd185f62b072 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 28 Dec 2016 22:32:56 +0100 Subject: [PATCH 047/118] Update coverage to 4.3.1 (#962) * Update coverage from 4.2 to 4.3.1 * Update coverage from 4.2 to 4.3.1 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- {{cookiecutter.project_slug}}/requirements/test.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index f208fe7c..28ebb5df 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -1,6 +1,6 @@ # Local development dependencies go here -r base.txt -coverage==4.2 +coverage==4.3.1 django-coverage-plugin==1.3.1 Sphinx==1.5.1 django-extensions==1.7.5 diff --git a/{{cookiecutter.project_slug}}/requirements/test.txt b/{{cookiecutter.project_slug}}/requirements/test.txt index 14f7c391..4932f3df 100644 --- a/{{cookiecutter.project_slug}}/requirements/test.txt +++ b/{{cookiecutter.project_slug}}/requirements/test.txt @@ -7,7 +7,7 @@ psycopg2==2.6.2 {%- endif %} -coverage==4.2 +coverage==4.3.1 flake8==3.2.1 # pyup: != 2.6.0 django-test-plus==1.0.16 factory-boy==2.8.1 From ed0ce0d630cf24d9273c68ee144766631879b9a6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 28 Dec 2016 22:33:07 +0100 Subject: [PATCH 048/118] Update gevent from 1.2a2 to 1.2.0 (#957) --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 81f9a31f..92bca9dd 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -11,7 +11,7 @@ psycopg2==2.6.2 # WSGI Handler # ------------------------------------------------ -gevent==1.2a2 +gevent==1.2.0 gunicorn==19.6.0 # Static and Media Storage From a838a7c90ce7ebc39478f5b6ca1f0aad769bfdce Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 28 Dec 2016 22:33:21 +0100 Subject: [PATCH 049/118] Update werkzeug from 0.11.11 to 0.11.13 (#960) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 28ebb5df..7e00601d 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -4,7 +4,7 @@ coverage==4.3.1 django-coverage-plugin==1.3.1 Sphinx==1.5.1 django-extensions==1.7.5 -Werkzeug==0.11.11 +Werkzeug==0.11.13 django-test-plus==1.0.16 factory-boy==2.8.1 From 28a512d0adbcb0ad123ef96026dad89e3f02b830 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 28 Dec 2016 22:33:35 +0100 Subject: [PATCH 050/118] Update pytest-sugar to 0.8.0 (#963) * Update pytest-sugar from 0.7.1 to 0.8.0 * Update pytest-sugar from 0.7.1 to 0.8.0 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- {{cookiecutter.project_slug}}/requirements/test.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 7e00601d..f73417d7 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -14,4 +14,4 @@ django-debug-toolbar==1.6 ipdb==0.10.1 pytest-django==3.1.2 -pytest-sugar==0.7.1 +pytest-sugar==0.8.0 diff --git a/{{cookiecutter.project_slug}}/requirements/test.txt b/{{cookiecutter.project_slug}}/requirements/test.txt index 4932f3df..f5090f05 100644 --- a/{{cookiecutter.project_slug}}/requirements/test.txt +++ b/{{cookiecutter.project_slug}}/requirements/test.txt @@ -14,4 +14,4 @@ factory-boy==2.8.1 # pytest pytest-django==3.1.2 -pytest-sugar==0.7.1 +pytest-sugar==0.8.0 From cd463b29dab66dacbccc204e83ac96fd1523e9f6 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 30 Dec 2016 23:05:02 +0100 Subject: [PATCH 051/118] Update collectfast from 0.4.0 to 0.4.1 (#966) --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 92bca9dd..f1e8da9f 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -19,7 +19,7 @@ gunicorn==19.6.0 boto==2.45.0 django-storages-redux==1.3.2 {% if cookiecutter.use_whitenoise != 'y' -%} -Collectfast==0.4.0 +Collectfast==0.4.1 {%- endif %} # Email backends for Mailgun, Postmark, SendGrid and more From 79371f4b00285b5e9b4e882b9cfd772af821da0c Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 30 Dec 2016 23:05:16 +0100 Subject: [PATCH 052/118] Update pyflakes from 1.3.0 to 1.4.0 (#967) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a46890d7..42dbe518 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,6 @@ binaryornot==0.4.0 # Testing pytest==3.0.5 pep8==1.7.0 -pyflakes==1.3.0 +pyflakes==1.4.0 tox==2.5.0 pytest-cookies==0.2.0 From b905f066bee280b1e5d1251a250fd0dcca33c8f3 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 4 Jan 2017 13:53:17 +0100 Subject: [PATCH 053/118] Update django-allauth from 0.29.0 to 0.30.0 (#973) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 915825e4..da24f494 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -28,7 +28,7 @@ Pillow==3.4.2 # For user registration, either via email or social # Well-built with regular release cycles! -django-allauth==0.29.0 +django-allauth==0.30.0 {% if cookiecutter.windows == 'y' -%} # On Windows, you must download/install psycopg2 manually From 067e40d0983963bae631e3a36261d943bff9c3bd Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 4 Jan 2017 13:53:27 +0100 Subject: [PATCH 054/118] Update django-anymail from 0.6.1 to 0.7 (#970) --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index f1e8da9f..f0d81fc3 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -24,7 +24,7 @@ Collectfast==0.4.1 # 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" -%} # Raven is the Sentry client From ef5417c82b07e516e13a9ad3d65d6752e48a223d Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 4 Jan 2017 13:53:36 +0100 Subject: [PATCH 055/118] Update werkzeug from 0.11.13 to 0.11.15 (#969) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index f73417d7..42e0a593 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -4,7 +4,7 @@ coverage==4.3.1 django-coverage-plugin==1.3.1 Sphinx==1.5.1 django-extensions==1.7.5 -Werkzeug==0.11.13 +Werkzeug==0.11.15 django-test-plus==1.0.16 factory-boy==2.8.1 From 8910552ab69c8e693dcb619b3b380a66c55dc5a4 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 4 Jan 2017 13:53:46 +0100 Subject: [PATCH 056/118] Update pillow from 3.4.2 to 4.0.0 (#976) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index da24f494..ae1696cf 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -24,7 +24,7 @@ django-crispy-forms==1.6.1 django-model-utils==2.6 # Images -Pillow==3.4.2 +Pillow==4.0.0 # For user registration, either via email or social # Well-built with regular release cycles! From d9edcbbd27eade01be785035b936217a3a0059f1 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 4 Jan 2017 13:53:57 +0100 Subject: [PATCH 057/118] Update django-redis from 4.6.0 to 4.7.0 (#977) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index ae1696cf..1c05ad8a 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -45,7 +45,7 @@ awesome-slugify==1.6.5 pytz==2016.10 # Redis support -django-redis==4.6.0 +django-redis==4.7.0 redis>=2.10.5 {% if cookiecutter.use_celery == "y" %} From ff067ff31d6872dcbc5290ce5069cc53f10ffdc9 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 4 Jan 2017 13:54:07 +0100 Subject: [PATCH 058/118] Update whitenoise from 3.2.2 to 3.2.3 (#978) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 1c05ad8a..8eb18752 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -12,7 +12,7 @@ django==1.10.4 # Configuration django-environ==0.4.1 {% if cookiecutter.use_whitenoise == 'y' -%} -whitenoise==3.2.2 +whitenoise==3.2.3 {%- endif %} From a87858a41352289548dd68e8aeddea0aab694851 Mon Sep 17 00:00:00 2001 From: pyup-bot Date: Wed, 4 Jan 2017 12:52:37 -0800 Subject: [PATCH 059/118] Update django from 1.10.4 to 1.10.5 --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 8eb18752..033d88ff 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -7,7 +7,7 @@ wheel==0.29.0 {%- endif %} # Bleeding edge Django -django==1.10.4 +django==1.10.5 # Configuration django-environ==0.4.1 From a6f2dd3a0a5a248bbda81d416972e86b5fcc4abd Mon Sep 17 00:00:00 2001 From: Daniel Roy Greenfeld Date: Fri, 6 Jan 2017 11:30:03 -0800 Subject: [PATCH 060/118] Update README.rst --- README.rst | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.rst b/README.rst index 6a114aef..b27ab9da 100644 --- a/README.rst +++ b/README.rst @@ -16,12 +16,14 @@ Powered by Cookiecutter_, Cookiecutter Django is a framework for jumpstarting pr * Documentation: https://cookiecutter-django.readthedocs.io/en/latest/ * 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 .. _Troubleshooting: https://cookiecutter-django.readthedocs.io/en/latest/troubleshooting.html .. _528: https://github.com/pydanny/cookiecutter-django/issues/528#issuecomment-212650373 +.. _issues: https://github.com/pydanny/cookiecutter-django/issues/new Features --------- From ced25f1f39ebab53c152a4b16067492e9c200f8a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 9 Jan 2017 10:31:11 +0100 Subject: [PATCH 061/118] Update sh from 1.12.8 to 1.12.9 (#980) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 42dbe518..a42834e8 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ cookiecutter==1.5.0 flake8==3.2.1 # pyup: != 2.6.0 -sh==1.12.8 +sh==1.12.9 binaryornot==0.4.0 # Testing From a542a7e51c3a737cf69306567139b6e51e6d6110 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Mon, 9 Jan 2017 10:31:21 +0100 Subject: [PATCH 062/118] Update collectfast from 0.4.1 to 0.5.0 (#981) --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index f0d81fc3..c47cae2a 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -19,7 +19,7 @@ gunicorn==19.6.0 boto==2.45.0 django-storages-redux==1.3.2 {% if cookiecutter.use_whitenoise != 'y' -%} -Collectfast==0.4.1 +Collectfast==0.5.0 {%- endif %} # Email backends for Mailgun, Postmark, SendGrid and more From 2af079f7aa8ae480afa7e3a122b9186935274c2d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?= Date: Mon, 9 Jan 2017 15:35:13 -0300 Subject: [PATCH 063/118] load .env file if DJANGO_READ_DOT_ENV_FILE is True --- .../config/settings/common.py | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/common.py b/{{cookiecutter.project_slug}}/config/settings/common.py index c0c86b39..34ff52d9 100644 --- a/{{cookiecutter.project_slug}}/config/settings/common.py +++ b/{{cookiecutter.project_slug}}/config/settings/common.py @@ -16,7 +16,21 @@ ROOT_DIR = environ.Path(__file__) - 3 # ({{ cookiecutter.project_slug }}/config APPS_DIR = ROOT_DIR.path('{{ cookiecutter.project_slug }}') env = environ.Env() -env.read_env() + +# Load operating system environment variables and then prepare to use them +env = environ.Env() + +# .env file, should load only in development environment +READ_DOT_ENV_FILE = env('DJANGO_READ_DOT_ENV_FILE', default=False) + +if READ_DOT_ENV_FILE: + # Operating System Environment variables have precende over variables defined in the .env file, + # that is to say variables from the .env files will only be used if not defined + # as environment variables. + env_file = str(ROOT_DIR.path('.env')) + print('Loading : {}'.format(env_file)) + env.read_env(env_file) + print('The .env file has been loaded. See common.py for more information') # APP CONFIGURATION # ------------------------------------------------------------------------------ From 06603dda17a500ba8a63b1184168e0712c43dc7f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?= Date: Mon, 9 Jan 2017 15:39:27 -0300 Subject: [PATCH 064/118] fix W291 trailing whitespace on common.py --- {{cookiecutter.project_slug}}/config/settings/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/common.py b/{{cookiecutter.project_slug}}/config/settings/common.py index 34ff52d9..5afa7d99 100644 --- a/{{cookiecutter.project_slug}}/config/settings/common.py +++ b/{{cookiecutter.project_slug}}/config/settings/common.py @@ -24,7 +24,7 @@ env = environ.Env() READ_DOT_ENV_FILE = env('DJANGO_READ_DOT_ENV_FILE', default=False) if READ_DOT_ENV_FILE: - # Operating System Environment variables have precende over variables defined in the .env file, + # Operating System Environment variables have precende over variables defined in the .env file, # that is to say variables from the .env files will only be used if not defined # as environment variables. env_file = str(ROOT_DIR.path('.env')) From b0c771b6457a1c2e1983e78afd27b15193ee5f61 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?= Date: Mon, 9 Jan 2017 15:53:30 -0300 Subject: [PATCH 065/118] include DJANGO_READ_DOT_ENV_FILE on env.example --- {{cookiecutter.project_slug}}/env.example | 1 + 1 file changed, 1 insertion(+) diff --git a/{{cookiecutter.project_slug}}/env.example b/{{cookiecutter.project_slug}}/env.example index 66a3570d..138b75fd 100644 --- a/{{cookiecutter.project_slug}}/env.example +++ b/{{cookiecutter.project_slug}}/env.example @@ -4,6 +4,7 @@ POSTGRES_PASSWORD=mysecretpass POSTGRES_USER=postgresuser # General settings +# DJANGO_READ_DOT_ENV_FILE=True DJANGO_ADMIN_URL= DJANGO_SETTINGS_MODULE=config.settings.production DJANGO_SECRET_KEY=CHANGEME!!! From 10fa9065998346176ec1bb9eedf20a8a4b50105f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?= Date: Mon, 9 Jan 2017 16:02:53 -0300 Subject: [PATCH 066/118] add DJANGO_READ_DOT_ENV_FILE to settings docs --- docs/settings.rst | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/docs/settings.rst b/docs/settings.rst index eb6e92a4..893a47e9 100644 --- a/docs/settings.rst +++ b/docs/settings.rst @@ -3,7 +3,14 @@ Settings This project relies extensively on environment settings which **will not work with Apache/mod_wsgi setups**. It has been deployed successfully with both Gunicorn/Nginx and even uWSGI/Nginx. -For configuration purposes, the following table maps environment variables to their Django setting: +For configuration purposes, the following table maps environment variables to their Django setting and project settings: + + +======================================= =========================== ============================================== ====================================================================== +Environment Variable Django Setting Development Default Production Default +======================================= =========================== ============================================== ====================================================================== +DJANGO_READ_DOT_ENV_FILE READ_DOT_ENV_FILE False False +======================================= =========================== ============================================== ====================================================================== ======================================= =========================== ============================================== ====================================================================== From a2a2a517a1e000faaadb5a41650c34217b970e3f Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 11 Jan 2017 08:45:17 +0100 Subject: [PATCH 067/118] Update collectfast from 0.5.0 to 0.5.1 (#988) --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index c47cae2a..419f335c 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -19,7 +19,7 @@ gunicorn==19.6.0 boto==2.45.0 django-storages-redux==1.3.2 {% if cookiecutter.use_whitenoise != 'y' -%} -Collectfast==0.5.0 +Collectfast==0.5.1 {%- endif %} # Email backends for Mailgun, Postmark, SendGrid and more From 580d90a4beb1a572d2fd6929fab2c2f1db981d56 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Wed, 11 Jan 2017 08:45:28 +0100 Subject: [PATCH 068/118] Update pyflakes from 1.4.0 to 1.5.0 (#986) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index a42834e8..87a6bf50 100644 --- a/requirements.txt +++ b/requirements.txt @@ -6,6 +6,6 @@ binaryornot==0.4.0 # Testing pytest==3.0.5 pep8==1.7.0 -pyflakes==1.4.0 +pyflakes==1.5.0 tox==2.5.0 pytest-cookies==0.2.0 From b61b985527f63a43f486870f0a1fcb6b910d98e9 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 12 Jan 2017 16:05:20 +0100 Subject: [PATCH 069/118] Update gevent from 1.2.0 to 1.2.1 (#991) --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 419f335c..8714ec4a 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -11,7 +11,7 @@ psycopg2==2.6.2 # WSGI Handler # ------------------------------------------------ -gevent==1.2.0 +gevent==1.2.1 gunicorn==19.6.0 # Static and Media Storage From 3a337e4350eb524bfd3c8f0832c19fc190625ab0 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 12 Jan 2017 16:05:31 +0100 Subject: [PATCH 070/118] Update django-model-utils from 2.6 to 2.6.1 (#990) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 033d88ff..c32a0324 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -21,7 +21,7 @@ django-braces==1.10.0 django-crispy-forms==1.6.1 # Models -django-model-utils==2.6 +django-model-utils==2.6.1 # Images Pillow==4.0.0 From 12a8875dce4d7848eed116eee2b3b8b44e720e79 Mon Sep 17 00:00:00 2001 From: statwonk Date: Mon, 16 Jan 2017 21:18:07 -0600 Subject: [PATCH 071/118] Two Scoops 1.8 on p. 56 indicates base.txt is preferred for consistency --- .../config/settings/{common.py => base.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename {{cookiecutter.project_slug}}/config/settings/{common.py => base.py} (100%) diff --git a/{{cookiecutter.project_slug}}/config/settings/common.py b/{{cookiecutter.project_slug}}/config/settings/base.py similarity index 100% rename from {{cookiecutter.project_slug}}/config/settings/common.py rename to {{cookiecutter.project_slug}}/config/settings/base.py From 62d86877e40f3ca9ff03d7423635634c23570ced Mon Sep 17 00:00:00 2001 From: statwonk Date: Mon, 16 Jan 2017 21:38:52 -0600 Subject: [PATCH 072/118] Missed a few references to the renamed settings file. This brings them inline. --- {{cookiecutter.project_slug}}/config/settings/local.py | 2 +- {{cookiecutter.project_slug}}/config/settings/production.py | 2 +- {{cookiecutter.project_slug}}/config/settings/test.py | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/local.py b/{{cookiecutter.project_slug}}/config/settings/local.py index c72d3af1..969694bc 100644 --- a/{{cookiecutter.project_slug}}/config/settings/local.py +++ b/{{cookiecutter.project_slug}}/config/settings/local.py @@ -14,7 +14,7 @@ Local settings import socket import os -from .common import * # noqa +from .base import * # noqa # DEBUG # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/config/settings/production.py b/{{cookiecutter.project_slug}}/config/settings/production.py index c1fccc95..94f78191 100644 --- a/{{cookiecutter.project_slug}}/config/settings/production.py +++ b/{{cookiecutter.project_slug}}/config/settings/production.py @@ -20,7 +20,7 @@ from django.utils import six import logging {% endif %} -from .common import * # noqa +from .base import * # noqa # SECRET CONFIGURATION # ------------------------------------------------------------------------------ diff --git a/{{cookiecutter.project_slug}}/config/settings/test.py b/{{cookiecutter.project_slug}}/config/settings/test.py index 6d07eb50..b1a43cd6 100644 --- a/{{cookiecutter.project_slug}}/config/settings/test.py +++ b/{{cookiecutter.project_slug}}/config/settings/test.py @@ -5,7 +5,7 @@ Test settings - Used to run tests fast on the continuous integration server and locally ''' -from .common import * # noqa +from .base import * # noqa # DEBUG From 5af837d184bcfa0af9ee83364fea8e43c7079e20 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 17 Jan 2017 16:12:11 +0100 Subject: [PATCH 073/118] Update django-coverage-plugin to 1.4 (#993) * Update django-coverage-plugin from 1.3.1 to 1.4 * Update django-coverage-plugin from 1.3.1 to 1.4 --- requirements_to_watch.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements_to_watch.txt b/requirements_to_watch.txt index 34f0fe62..dc5193a6 100644 --- a/requirements_to_watch.txt +++ b/requirements_to_watch.txt @@ -1,4 +1,4 @@ # These requirements prevented an upgrade to Django 1.10. -django-coverage-plugin==1.3.1 +django-coverage-plugin==1.4 django-autoslug==1.9.3 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 42e0a593..01a5f3f4 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -1,7 +1,7 @@ # Local development dependencies go here -r base.txt coverage==4.3.1 -django-coverage-plugin==1.3.1 +django-coverage-plugin==1.4 Sphinx==1.5.1 django-extensions==1.7.5 Werkzeug==0.11.15 From 191fcf847a9cfdbc87c99c45be219c4342ac64fd Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 17 Jan 2017 16:13:04 +0100 Subject: [PATCH 074/118] Update coverage to 4.3.3 (#997) * Update coverage from 4.3.1 to 4.3.3 * Update coverage from 4.3.1 to 4.3.3 --- {{cookiecutter.project_slug}}/requirements/local.txt | 4 +++- {{cookiecutter.project_slug}}/requirements/test.txt | 2 +- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 01a5f3f4..5ea7e033 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -1,7 +1,9 @@ # Local development dependencies go here -r base.txt -coverage==4.3.1 + +coverage==4.3.3 django-coverage-plugin==1.4 + Sphinx==1.5.1 django-extensions==1.7.5 Werkzeug==0.11.15 diff --git a/{{cookiecutter.project_slug}}/requirements/test.txt b/{{cookiecutter.project_slug}}/requirements/test.txt index f5090f05..da665b34 100644 --- a/{{cookiecutter.project_slug}}/requirements/test.txt +++ b/{{cookiecutter.project_slug}}/requirements/test.txt @@ -7,7 +7,7 @@ psycopg2==2.6.2 {%- endif %} -coverage==4.3.1 +coverage==4.3.3 flake8==3.2.1 # pyup: != 2.6.0 django-test-plus==1.0.16 factory-boy==2.8.1 From de4c8c4012757aa544b68cae4904c0383b418bd9 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 19 Jan 2017 10:01:29 +0100 Subject: [PATCH 075/118] Update coverage to 4.3.4 (#999) * Update coverage from 4.3.3 to 4.3.4 * Update coverage from 4.3.3 to 4.3.4 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- {{cookiecutter.project_slug}}/requirements/test.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 5ea7e033..c541aeb5 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -1,7 +1,7 @@ # Local development dependencies go here -r base.txt -coverage==4.3.3 +coverage==4.3.4 django-coverage-plugin==1.4 Sphinx==1.5.1 diff --git a/{{cookiecutter.project_slug}}/requirements/test.txt b/{{cookiecutter.project_slug}}/requirements/test.txt index da665b34..cf409547 100644 --- a/{{cookiecutter.project_slug}}/requirements/test.txt +++ b/{{cookiecutter.project_slug}}/requirements/test.txt @@ -7,7 +7,7 @@ psycopg2==2.6.2 {%- endif %} -coverage==4.3.3 +coverage==4.3.4 flake8==3.2.1 # pyup: != 2.6.0 django-test-plus==1.0.16 factory-boy==2.8.1 From 6cac408f32e828c0b5741085303c33c73ebf7372 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 26 Jan 2017 16:15:27 +0100 Subject: [PATCH 076/118] Update django-coverage-plugin to 1.4.1 (#1008) * Update django-coverage-plugin from 1.4 to 1.4.1 * Update django-coverage-plugin from 1.4 to 1.4.1 --- requirements_to_watch.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements_to_watch.txt b/requirements_to_watch.txt index dc5193a6..aecc8e7c 100644 --- a/requirements_to_watch.txt +++ b/requirements_to_watch.txt @@ -1,4 +1,4 @@ # These requirements prevented an upgrade to Django 1.10. -django-coverage-plugin==1.4 +django-coverage-plugin==1.4.1 django-autoslug==1.9.3 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index c541aeb5..26b2057a 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -2,7 +2,7 @@ -r base.txt coverage==4.3.4 -django-coverage-plugin==1.4 +django-coverage-plugin==1.4.1 Sphinx==1.5.1 django-extensions==1.7.5 From 29e957cd77c3ab10919c68ac471edd5017bd4d20 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 26 Jan 2017 16:15:45 +0100 Subject: [PATCH 077/118] Update ipdb from 0.10.1 to 0.10.2 (#1007) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 26b2057a..729dd14a 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -13,7 +13,7 @@ factory-boy==2.8.1 django-debug-toolbar==1.6 # improved REPL -ipdb==0.10.1 +ipdb==0.10.2 pytest-django==3.1.2 pytest-sugar==0.8.0 From 6085feb36c4bb1d77a09cd87c30167b4a396a8f4 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 26 Jan 2017 16:15:56 +0100 Subject: [PATCH 078/118] Update django-extensions from 1.7.5 to 1.7.6 (#1006) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 729dd14a..4de7285c 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -5,7 +5,7 @@ coverage==4.3.4 django-coverage-plugin==1.4.1 Sphinx==1.5.1 -django-extensions==1.7.5 +django-extensions==1.7.6 Werkzeug==0.11.15 django-test-plus==1.0.16 factory-boy==2.8.1 From 515e55c5ab645fdf7654cba118ae1ae57b254456 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 26 Jan 2017 16:16:08 +0100 Subject: [PATCH 079/118] Update pytest from 3.0.5 to 3.0.6 (#1003) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 87a6bf50..188fe018 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ sh==1.12.9 binaryornot==0.4.0 # Testing -pytest==3.0.5 +pytest==3.0.6 pep8==1.7.0 pyflakes==1.5.0 tox==2.5.0 From 01063b8b8b0efe67e92a79735cd85e71ad54e035 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 2 Feb 2017 14:46:13 +0100 Subject: [PATCH 080/118] Update sphinx from 1.5.1 to 1.5.2 (#1010) --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 4de7285c..2757acdd 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -4,7 +4,7 @@ coverage==4.3.4 django-coverage-plugin==1.4.1 -Sphinx==1.5.1 +Sphinx==1.5.2 django-extensions==1.7.6 Werkzeug==0.11.15 django-test-plus==1.0.16 From cd5a742d50e388dc93cea28710be019fb6e20f4a Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 2 Feb 2017 14:46:25 +0100 Subject: [PATCH 081/118] Update whitenoise from 3.2.3 to 3.3.0 (#1011) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index c32a0324..c414136f 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -12,7 +12,7 @@ django==1.10.5 # Configuration django-environ==0.4.1 {% if cookiecutter.use_whitenoise == 'y' -%} -whitenoise==3.2.3 +whitenoise==3.3.0 {%- endif %} From 572df4f359fafb1ad6431fe316355e273aba42a5 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 2 Feb 2017 14:46:50 +0100 Subject: [PATCH 082/118] Update django-test-plus to 1.0.17 (#1012) * Update django-test-plus from 1.0.16 to 1.0.17 * Update django-test-plus from 1.0.16 to 1.0.17 --- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- {{cookiecutter.project_slug}}/requirements/test.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 2757acdd..855a1f4b 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -7,7 +7,7 @@ django-coverage-plugin==1.4.1 Sphinx==1.5.2 django-extensions==1.7.6 Werkzeug==0.11.15 -django-test-plus==1.0.16 +django-test-plus==1.0.17 factory-boy==2.8.1 django-debug-toolbar==1.6 diff --git a/{{cookiecutter.project_slug}}/requirements/test.txt b/{{cookiecutter.project_slug}}/requirements/test.txt index cf409547..5c46d128 100644 --- a/{{cookiecutter.project_slug}}/requirements/test.txt +++ b/{{cookiecutter.project_slug}}/requirements/test.txt @@ -9,7 +9,7 @@ psycopg2==2.6.2 coverage==4.3.4 flake8==3.2.1 # pyup: != 2.6.0 -django-test-plus==1.0.16 +django-test-plus==1.0.17 factory-boy==2.8.1 # pytest From ec3daa58e4c0a216b0a1ce6ea2395c7f76d6d03e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 2 Feb 2017 14:47:02 +0100 Subject: [PATCH 083/118] Update django-braces from 1.10.0 to 1.11.0 (#1013) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index c414136f..0ce3b3eb 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -17,7 +17,7 @@ whitenoise==3.3.0 # Forms -django-braces==1.10.0 +django-braces==1.11.0 django-crispy-forms==1.6.1 # Models From 9be889a9016c7889de1991a8ce949347e5bcccc7 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 2 Feb 2017 14:47:15 +0100 Subject: [PATCH 084/118] Update django-anymail from 0.7 to 0.8 (#1014) --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 8714ec4a..9827cee5 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -24,7 +24,7 @@ Collectfast==0.5.1 # Email backends for Mailgun, Postmark, SendGrid and more # ------------------------------------------------------- -django-anymail==0.7 +django-anymail==0.8 {% if cookiecutter.use_sentry_for_error_reporting == "y" -%} # Raven is the Sentry client From ce27703731e702b275d87af41f3ad41fb5dab2bf Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 2 Feb 2017 14:47:27 +0100 Subject: [PATCH 085/118] Update django-compressor from 2.1 to 2.1.1 (#1015) --- {{cookiecutter.project_slug}}/requirements/base.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/base.txt b/{{cookiecutter.project_slug}}/requirements/base.txt index 0ce3b3eb..49e5ed18 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -54,7 +54,7 @@ celery==3.1.24 {% if cookiecutter.use_compressor == "y" %} rcssmin==1.0.6 {% if cookiecutter.windows == 'y' %}--install-option="--without-c-extensions"{% endif %} -django-compressor==2.1 +django-compressor==2.1.1 {% endif %} # Your custom requirements go here From 83900ddfd39818411868ec9d2469ae0151c73baa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?F=C3=A1bio=20C=2E=20Barrionuevo=20da=20Luz?= Date: Fri, 3 Feb 2017 14:12:52 -0300 Subject: [PATCH 086/118] fix typo --- {{cookiecutter.project_slug}}/config/settings/common.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/config/settings/common.py b/{{cookiecutter.project_slug}}/config/settings/common.py index 5afa7d99..60ca7e6d 100644 --- a/{{cookiecutter.project_slug}}/config/settings/common.py +++ b/{{cookiecutter.project_slug}}/config/settings/common.py @@ -24,7 +24,7 @@ env = environ.Env() READ_DOT_ENV_FILE = env('DJANGO_READ_DOT_ENV_FILE', default=False) if READ_DOT_ENV_FILE: - # Operating System Environment variables have precende over variables defined in the .env file, + # Operating System Environment variables have precedence over variables defined in the .env file, # that is to say variables from the .env files will only be used if not defined # as environment variables. env_file = str(ROOT_DIR.path('.env')) From a2fe9199a6e35994912cdc3006abe9d744427433 Mon Sep 17 00:00:00 2001 From: Daniel Roy Greenfeld Date: Wed, 8 Feb 2017 09:02:24 -0800 Subject: [PATCH 087/118] Added bullet about security --- README.rst | 1 + 1 file changed, 1 insertion(+) diff --git a/README.rst b/README.rst index b27ab9da..18fb3612 100644 --- a/README.rst +++ b/README.rst @@ -32,6 +32,7 @@ Features * Renders Django projects with 100% starting test coverage * Twitter Bootstrap_ v4.0.0 - `alpha 4`_ (`maintained Foundation fork`_ also available) * 12-Factor_ based settings via django-environ_ +* Secure by default. We believe in SSL. * Optimized development and production settings * Registration via django-allauth_ * Comes with custom user model ready to go From 19a4de576a378052affb83ca6a8f1866c0d0ad4e Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 9 Feb 2017 09:08:43 +0100 Subject: [PATCH 088/118] Update tox from 2.5.0 to 2.6.0 (#1017) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 188fe018..2610ea31 100644 --- a/requirements.txt +++ b/requirements.txt @@ -7,5 +7,5 @@ binaryornot==0.4.0 pytest==3.0.6 pep8==1.7.0 pyflakes==1.5.0 -tox==2.5.0 +tox==2.6.0 pytest-cookies==0.2.0 From 7a50dcc89af09260501fbdb785f284495de81ca4 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 9 Feb 2017 09:08:55 +0100 Subject: [PATCH 089/118] Update collectfast from 0.5.1 to 0.5.2 (#1024) --- {{cookiecutter.project_slug}}/requirements/production.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/production.txt b/{{cookiecutter.project_slug}}/requirements/production.txt index 9827cee5..38ddb222 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -19,7 +19,7 @@ gunicorn==19.6.0 boto==2.45.0 django-storages-redux==1.3.2 {% if cookiecutter.use_whitenoise != 'y' -%} -Collectfast==0.5.1 +Collectfast==0.5.2 {%- endif %} # Email backends for Mailgun, Postmark, SendGrid and more From 9bc7027fb0830ed62cea59f150e600e3359f8e44 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 9 Feb 2017 09:09:19 +0100 Subject: [PATCH 090/118] Update cookiecutter from 1.5.0 to 1.5.1 (#1018) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 2610ea31..0e548687 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -cookiecutter==1.5.0 +cookiecutter==1.5.1 flake8==3.2.1 # pyup: != 2.6.0 sh==1.12.9 binaryornot==0.4.0 From b430efa0edc6739ef845adb94888cabd6ed0cf5c Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 9 Feb 2017 09:10:22 +0100 Subject: [PATCH 091/118] Update flake8 to 3.3.0 (#1021) * Update flake8 from 3.2.1 to 3.3.0 * Update flake8 from 3.2.1 to 3.3.0 --- {{cookiecutter.project_slug}}/requirements/test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/{{cookiecutter.project_slug}}/requirements/test.txt b/{{cookiecutter.project_slug}}/requirements/test.txt index 5c46d128..afb97ded 100644 --- a/{{cookiecutter.project_slug}}/requirements/test.txt +++ b/{{cookiecutter.project_slug}}/requirements/test.txt @@ -8,7 +8,7 @@ psycopg2==2.6.2 {%- endif %} coverage==4.3.4 -flake8==3.2.1 # pyup: != 2.6.0 +flake8==3.3.0 # pyup: != 2.6.0 django-test-plus==1.0.17 factory-boy==2.8.1 From 51609953a87f88d109a075240d67845dbdfb3b0b Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Thu, 9 Feb 2017 09:10:37 +0100 Subject: [PATCH 092/118] Update django-coverage-plugin to 1.4.2 (#1022) * Update django-coverage-plugin from 1.4.1 to 1.4.2 * Update django-coverage-plugin from 1.4.1 to 1.4.2 --- requirements_to_watch.txt | 2 +- {{cookiecutter.project_slug}}/requirements/local.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/requirements_to_watch.txt b/requirements_to_watch.txt index aecc8e7c..3e154af2 100644 --- a/requirements_to_watch.txt +++ b/requirements_to_watch.txt @@ -1,4 +1,4 @@ # These requirements prevented an upgrade to Django 1.10. -django-coverage-plugin==1.4.1 +django-coverage-plugin==1.4.2 django-autoslug==1.9.3 diff --git a/{{cookiecutter.project_slug}}/requirements/local.txt b/{{cookiecutter.project_slug}}/requirements/local.txt index 855a1f4b..03cf457b 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -2,7 +2,7 @@ -r base.txt coverage==4.3.4 -django-coverage-plugin==1.4.1 +django-coverage-plugin==1.4.2 Sphinx==1.5.2 django-extensions==1.7.6 From 5b75a9ccf2a1269db7915e1c0dbf5156d13adbed Mon Sep 17 00:00:00 2001 From: Matt Braymer-Hayes Date: Fri, 10 Feb 2017 00:21:04 -0800 Subject: [PATCH 093/118] 1029: Fix typo in Docker deployment docs (#1030) * #1029 Replace "wan't" with "want" * #1029 Add self to CONTRIBUTORS.rst --- CONTRIBUTORS.rst | 2 ++ docs/deployment-with-docker.rst | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/CONTRIBUTORS.rst b/CONTRIBUTORS.rst index 414d2a33..7163cec1 100644 --- a/CONTRIBUTORS.rst +++ b/CONTRIBUTORS.rst @@ -107,6 +107,7 @@ Listed in alphabetical order. Lyla Fischer Martin Blech Mathijs Hoogland `@MathijsHoogland`_ + Matt Braymer-Hayes `@mattayes`_ @mattayes Matt Linares Matt Menzenski `@menzenski`_ Matt Warren `@mfwarren`_ @@ -193,6 +194,7 @@ Listed in alphabetical order. .. _@knitatoms: https://github.com/knitatoms .. _@krzysztofzuraw: https://github.com/krzysztofzuraw .. _@MathijsHoogland: https://github.com/MathijsHoogland +.. _@mattayes: https://github.com/mattayes .. _@menzenski: https://github.com/menzenski .. _@mfwarren: https://github.com/mfwarren .. _@mimischi: https://github.com/mimischi diff --git a/docs/deployment-with-docker.rst b/docs/deployment-with-docker.rst index 03aefd48..ac266993 100644 --- a/docs/deployment-with-docker.rst +++ b/docs/deployment-with-docker.rst @@ -143,7 +143,7 @@ If you have errors, you can always check your stack with `docker-compose`. Switc Supervisor Example ------------------- -Once you are ready with your initial setup, you wan't to make sure that your application is run by a process manager to +Once you are ready with your initial setup, you want to make sure that your application is run by a process manager to survive reboots and auto restarts in case of an error. You can use the process manager you are most familiar with. All it needs to do is to run `docker-compose up` in your projects root directory. From d4f6f0b99c41fb06cfc3d41b49396e449bea7eae Mon Sep 17 00:00:00 2001 From: "Nikita P. Shupeyko" Date: Fri, 10 Feb 2017 14:33:29 +0300 Subject: [PATCH 094/118] Fix Docker test PyCharm Run Configurations settings file Switch from env name="DJANGO_SETTINGS_MODULE" value="config.settings.local" to env name="DJANGO_SETTINGS_MODULE" value="config.settings.test" --- .../.idea/runConfigurations/Docker__tests___all.xml | 2 +- .../.idea/runConfigurations/Docker__tests___class__TestUser.xml | 2 +- .../runConfigurations/Docker__tests___file__test_models.xml | 2 +- .../.idea/runConfigurations/Docker__tests___module__users.xml | 2 +- .../Docker__tests___specific__test_get_absolute_url.xml | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___all.xml b/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___all.xml index 7ede8bfb..02fba079 100644 --- a/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___all.xml +++ b/{{cookiecutter.project_slug}}/.idea/runConfigurations/Docker__tests___all.xml @@ -4,7 +4,7 @@