From 69e42b7a7434b8852dfb68b5c837605376290ffb Mon Sep 17 00:00:00 2001 From: Athanasios Voutsadakis Date: Fri, 17 Nov 2017 15:00:26 +0000 Subject: [PATCH 1/3] Bump utils to 23.0.1 --- requirements.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements.txt b/requirements.txt index 67ecafcad..2ffde9501 100644 --- a/requirements.txt +++ b/requirements.txt @@ -26,6 +26,6 @@ notifications-python-client==4.6.0 awscli>=1.11,<1.12 awscli-cwlogs>=1.4,<1.5 -git+https://github.com/alphagov/notifications-utils.git@22.1.0#egg=notifications-utils==22.1.0 +git+https://github.com/alphagov/notifications-utils.git@23.0.1#egg=notifications-utils==23.0.1 git+https://github.com/alphagov/boto.git@2.43.0-patch3#egg=boto==2.43.0-patch3 From 32e19b6552f1a4b8b2467495e033ff05511f11a3 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Thu, 16 Nov 2017 13:24:33 +0000 Subject: [PATCH 2/3] Bump utils to 23.0.0 Changes arguments to `SMSMessageTemplate` to better describe what they do. --- app/delivery/send_to_providers.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/delivery/send_to_providers.py b/app/delivery/send_to_providers.py index ab56a7e05..e0dff9422 100644 --- a/app/delivery/send_to_providers.py +++ b/app/delivery/send_to_providers.py @@ -54,7 +54,7 @@ def send_sms_to_provider(notification): template_model.__dict__, values=notification.personalisation, prefix=service.name, - sender=sender_has_been_customised, + show_prefix=service.prefix_sms, ) if service.research_mode or notification.key_type == KEY_TYPE_TEST: From b0546f4886d022f5450701ee81f9f64bd30237b6 Mon Sep 17 00:00:00 2001 From: Athanasios Voutsadakis Date: Fri, 17 Nov 2017 16:22:36 +0000 Subject: [PATCH 3/3] Remove unused variable --- app/delivery/send_to_providers.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/app/delivery/send_to_providers.py b/app/delivery/send_to_providers.py index e0dff9422..de9977968 100644 --- a/app/delivery/send_to_providers.py +++ b/app/delivery/send_to_providers.py @@ -48,8 +48,6 @@ def send_sms_to_provider(notification): ) template_model = dao_get_template_by_id(notification.template_id, notification.template_version) - sender_has_been_customised = (not service.get_prefix_sms_with_service_name()) - template = SMSMessageTemplate( template_model.__dict__, values=notification.personalisation,