From 184b3584a05173ed15272bc45369d37ebb25bedb Mon Sep 17 00:00:00 2001 From: pdehaye Date: Fri, 5 Jan 2018 02:54:58 +0100 Subject: [PATCH 1/6] Helpful warning for Beanstalk/python 3.6 (#1432) --- docs/deployment-with-elastic-beanstalk.rst | 3 +++ 1 file changed, 3 insertions(+) diff --git a/docs/deployment-with-elastic-beanstalk.rst b/docs/deployment-with-elastic-beanstalk.rst index e8aae8853..d481c93ba 100644 --- a/docs/deployment-with-elastic-beanstalk.rst +++ b/docs/deployment-with-elastic-beanstalk.rst @@ -21,6 +21,9 @@ Instructions If you haven't done so, create a directory of environments:: eb init -p python3.4 MY_PROJECT_SLUG + # Warning: If you use python3.6, you will run into problems later due to some incompatibility with + # mod_wgsi 3.5 (packaged in 64bit Amazon Linux 2017.09 v2.6.1 running Python 3.6). See: + # https://serverfault.com/questions/884469/mod-wsgi-call-to-site-addsitedir-failed-on-aws-elastic-beanstalk-python-3/885445 Replace `MY_PROJECT_SLUG` with the value you entered for `project_slug`. From 0bf587c139533811d80b4958b68bdefe70a81107 Mon Sep 17 00:00:00 2001 From: Bruno Alla Date: Fri, 5 Jan 2018 02:55:20 +0100 Subject: [PATCH 2/6] Fix duplicated and missing links in README (#1430) --- {{cookiecutter.project_slug}}/README.rst | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/{{cookiecutter.project_slug}}/README.rst b/{{cookiecutter.project_slug}}/README.rst index 924e238dd..c4bf9fe36 100644 --- a/{{cookiecutter.project_slug}}/README.rst +++ b/{{cookiecutter.project_slug}}/README.rst @@ -79,8 +79,6 @@ Email Server {% if cookiecutter.use_docker == 'y' %} In development, it is often nice to be able to see emails that are being sent from your application. For that reason local SMTP server `MailHog`_ with a web interface is available as docker container. -.. _mailhog: https://github.com/mailhog/MailHog - Container mailhog will start automatically when you will run all docker containers. Please check `cookiecutter-django Docker documentation`_ for more details how to start all containers. @@ -88,8 +86,6 @@ With MailHog running, to view messages that are sent by your application, open y {% else %} In development, it is often nice to be able to see emails that are being sent from your application. If you choose to use `MailHog`_ when generating the project a local SMTP server with a web interface will be available. -.. _mailhog: https://github.com/mailhog/MailHog - To start the service, make sure you have nodejs installed, and then type the following:: $ npm install @@ -101,6 +97,7 @@ To view messages that are sent by your application, open your browser and go to The email server will exit when you exit the Grunt task on the CLI with Ctrl+C. {% endif %} +.. _mailhog: https://github.com/mailhog/MailHog {% endif %} {% if cookiecutter.use_sentry_for_error_reporting == "y" %} @@ -142,7 +139,7 @@ Elastic Beanstalk See detailed `cookiecutter-django Elastic Beanstalk documentation`_. -.. _`cookiecutter-django Docker documentation`: http://cookiecutter-django.readthedocs.io/en/latest/deployment-with-elastic-beanstalk.html +.. _`cookiecutter-django Elastic Beanstalk documentation`: http://cookiecutter-django.readthedocs.io/en/latest/deployment-with-elastic-beanstalk.html {% endif %} {% if cookiecutter.custom_bootstrap_compilation == "y" %} From 14868fad8bf0df201a4a9db29c04331a6fc333bd Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 5 Jan 2018 17:10:05 +0100 Subject: [PATCH 3/6] Update werkzeug from 0.13 to 0.14.1 (#1423) --- {{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 f86cae8cc..0f1e286f6 100644 --- a/{{cookiecutter.project_slug}}/requirements/local.txt +++ b/{{cookiecutter.project_slug}}/requirements/local.txt @@ -6,7 +6,7 @@ django-coverage-plugin==1.5.0 Sphinx==1.6.5 django-extensions==1.9.8 -Werkzeug==0.13 +Werkzeug==0.14.1 django-test-plus==1.0.21 factory-boy==2.9.2 From 44e90477a5e26e339fa7d1e851dec71dc81c59b9 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 5 Jan 2018 17:20:00 +0100 Subject: [PATCH 4/6] Update pytest from 3.3.1 to 3.3.2 (#1433) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index addeef31e..1790a0216 100644 --- a/requirements.txt +++ b/requirements.txt @@ -4,7 +4,7 @@ sh==1.12.14 binaryornot==0.4.4 # Testing -pytest==3.3.1 +pytest==3.3.2 pycodestyle==2.3.1 pyflakes==1.6.0 tox==2.9.1 From 47bf26bd0e3e0bf5a8804f659c67748aa3085b30 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 5 Jan 2018 17:25:01 +0100 Subject: [PATCH 5/6] Update boto3 from 1.5.6 to 1.5.8 (#1427) --- {{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 603fdb805..cdc8643aa 100644 --- a/{{cookiecutter.project_slug}}/requirements/production.txt +++ b/{{cookiecutter.project_slug}}/requirements/production.txt @@ -16,7 +16,7 @@ gunicorn==19.7.1 # Static and Media Storage # ------------------------------------------------ -boto3==1.5.6 +boto3==1.5.8 django-storages==1.6.5 {% if cookiecutter.use_whitenoise != 'y' -%} Collectfast==0.6.0 From f141ea655c6c85a7e90e736f3e86831c1857f281 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Fri, 5 Jan 2018 17:29:16 +0100 Subject: [PATCH 6/6] Update pillow from 4.3.0 to 5.0.0 (#1424) --- {{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 85451a451..97f370b7c 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -22,7 +22,7 @@ django-crispy-forms==1.7.0 django-model-utils==3.0.0 # Images -Pillow==4.3.0 +Pillow==5.0.0 # Password storage argon2-cffi==16.3.0