From 9fca6019ecb4b239ef41a2348343b1f28f9eae47 Mon Sep 17 00:00:00 2001 From: Melanie Crutchfield Date: Mon, 5 Mar 2018 14:55:15 -0800 Subject: [PATCH 1/4] Update project-generation-options.rst (#1547) Change small typo. "ones" should be "once". --- docs/project-generation-options.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/project-generation-options.rst b/docs/project-generation-options.rst index d5ebe07f2..3f7928c50 100644 --- a/docs/project-generation-options.rst +++ b/docs/project-generation-options.rst @@ -19,7 +19,7 @@ email [daniel-roy-greenfeld@example.com]: The email address you want to identify yourself in the project. domain_name [example.com] - The domain name you plan to use for your project ones it goes live. + The domain name you plan to use for your project once it goes live. Note that it can be safely changed later on whenever you need to. version [0.1.0] From 93ad8e6125f8fc226432f92bf7118dccd3090ac1 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 6 Mar 2018 07:13:20 +0100 Subject: [PATCH 2/4] Update django-crispy-forms from 1.7.0 to 1.7.1 (#1546) --- {{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 85c45e993..8bc63a5f6 100644 --- a/{{cookiecutter.project_slug}}/requirements/base.txt +++ b/{{cookiecutter.project_slug}}/requirements/base.txt @@ -16,7 +16,7 @@ whitenoise==3.3.1 # Forms -django-crispy-forms==1.7.0 +django-crispy-forms==1.7.1 # Models django-model-utils==3.1.1 From 5a20dce43125e31590b479afe1b330803f920e37 Mon Sep 17 00:00:00 2001 From: "pyup.io bot" Date: Tue, 6 Mar 2018 09:22:44 +0100 Subject: [PATCH 3/4] Update pytest from 3.4.1 to 3.4.2 (#1549) --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index de0bc868d..18cd5222a 100644 --- a/requirements.txt +++ b/requirements.txt @@ -14,5 +14,5 @@ pyflakes==1.6.0 # ------------------------------------------------------------------------------ tox==2.9.1 -pytest==3.4.1 +pytest==3.4.2 pytest-cookies==0.3.0 From b4738d2ff35d487b3feb76f4fb3ee21840b6b88f Mon Sep 17 00:00:00 2001 From: Nicholas Date: Tue, 6 Mar 2018 17:44:44 +0800 Subject: [PATCH 4/4] Update Heroku deployment docs (#1548) * Update Heroku deployment Remove duplicate DJANGO_ADMIN_URL config, add SENTRY config * Update deployment-on-heroku.rst --- docs/deployment-on-heroku.rst | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/docs/deployment-on-heroku.rst b/docs/deployment-on-heroku.rst index 998c75b67..bf9ac7458 100644 --- a/docs/deployment-on-heroku.rst +++ b/docs/deployment-on-heroku.rst @@ -17,7 +17,8 @@ Run these commands to deploy the project to Heroku: heroku addons:create mailgun heroku config:set WEB_CONCURRENCY=4 - heroku config:set DJANGO_ADMIN_URL="$(openssl rand -base64 32)" + # Generating a 32 character-long random string without any of the visually similiar characters "IOl01": + heroku config:set DJANGO_ADMIN_URL="^$(openssl rand -base64 4096 | tr -dc 'A-HJ-NP-Za-km-z2-9' | head -c 32)/" heroku config:set DJANGO_SECRET_KEY="$(openssl rand -base64 64)" heroku config:set DJANGO_SETTINGS_MODULE='config.settings.production' heroku config:set DJANGO_ALLOWED_HOSTS='.herokuapp.com' @@ -30,8 +31,10 @@ Run these commands to deploy the project to Heroku: heroku config:set DJANGO_MAILGUN_API_KEY=YOUR_MAILGUN_API_KEY heroku config:set MAILGUN_SENDER_DOMAIN=YOUR_MAILGUN_SENDER_DOMAIN + # This is to be set only if you're using Sentry: + heroku config:set DJANGO_SENTRY_DSN=YOUR_SENTRY_DSN + heroku config:set PYTHONHASHSEED=random - heroku config:set DJANGO_ADMIN_URL=\^somelocation/ git push heroku master heroku run python manage.py migrate