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 01/12] 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 02/12] 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 03/12] 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 04/12] 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 05/12] 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 06/12] 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 07/12] 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 08/12] 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 09/12] 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 10/12] 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 11/12] 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 12/12] 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