From 8b86257a8b11153051290293b486ee0d79bc01c7 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Wed, 26 Sep 2018 10:16:45 +0100 Subject: [PATCH 1/3] Bump utils to 30.3.1 Brings in stripping of the line separator character from emails. https://github.com/alphagov/notifications-utils/pull/531 --- requirements-app.txt | 2 +- requirements.txt | 12 ++++++------ 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/requirements-app.txt b/requirements-app.txt index 6a95df533..57dca94e6 100644 --- a/requirements-app.txt +++ b/requirements-app.txt @@ -25,6 +25,6 @@ notifications-python-client==5.0.0 # PaaS awscli-cwlogs>=1.4,<1.5 -git+https://github.com/alphagov/notifications-utils.git@30.2.0#egg=notifications-utils==30.2.0 +git+https://github.com/alphagov/notifications-utils.git@30.3.1#egg=notifications-utils==30.3.1 git+https://github.com/alphagov/boto.git@2.43.0-patch3#egg=boto==2.43.0-patch3 diff --git a/requirements.txt b/requirements.txt index 0bca6056f..c0ea4e334 100644 --- a/requirements.txt +++ b/requirements.txt @@ -27,7 +27,7 @@ notifications-python-client==5.0.0 # PaaS awscli-cwlogs>=1.4,<1.5 -git+https://github.com/alphagov/notifications-utils.git@30.2.0#egg=notifications-utils==30.2.0 +git+https://github.com/alphagov/notifications-utils.git@30.3.1#egg=notifications-utils==30.3.1 git+https://github.com/alphagov/boto.git@2.43.0-patch3#egg=boto==2.43.0-patch3 @@ -35,20 +35,20 @@ git+https://github.com/alphagov/boto.git@2.43.0-patch3#egg=boto==2.43.0-patch3 alembic==1.0.0 amqp==1.4.9 anyjson==0.3.3 -awscli==1.15.82 +awscli==1.16.20 bcrypt==3.1.4 billiard==3.3.0.23 bleach==2.1.3 boto3==1.6.16 -botocore==1.10.81 -certifi==2018.8.13 +botocore==1.12.10 +certifi==2018.8.24 chardet==3.0.4 click==6.7 colorama==0.3.9 docutils==0.14 Flask-Redis==0.3.0 future==0.16.0 -greenlet==0.4.14 +greenlet==0.4.15 html5lib==1.0.1 idna==2.7 itsdangerous==0.24 @@ -62,7 +62,7 @@ monotonic==1.5 orderedset==2.0.1 phonenumbers==8.9.4 pyasn1==0.4.4 -pycparser==2.18 +pycparser==2.19 PyPDF2==1.26.0 python-dateutil==2.7.3 python-editor==1.0.3 From c126859efcf99f9bf8f2e3c126eac8763a0da07a Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Thu, 27 Sep 2018 14:35:08 +0100 Subject: [PATCH 2/3] Lock botocore library to <1.11.0 Using version 1.11.0 or above causes an error with the moto library where it makes real HTTP requests instead of mocking them: https://github.com/spulec/moto/issues/1793 Until this is resolved, botocore needs to be locked. This copies the approach the Digital Marketplace team took to the same problem: https://github.com/alphagov/digitalmarketplace-utils/pull/452 --- requirements-app.txt | 1 + requirements.txt | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/requirements-app.txt b/requirements-app.txt index 57dca94e6..13b6b79e1 100644 --- a/requirements-app.txt +++ b/requirements-app.txt @@ -24,6 +24,7 @@ notifications-python-client==5.0.0 # PaaS awscli-cwlogs>=1.4,<1.5 +botocore<1.11.0 git+https://github.com/alphagov/notifications-utils.git@30.3.1#egg=notifications-utils==30.3.1 diff --git a/requirements.txt b/requirements.txt index c0ea4e334..f1340a447 100644 --- a/requirements.txt +++ b/requirements.txt @@ -26,6 +26,7 @@ notifications-python-client==5.0.0 # PaaS awscli-cwlogs>=1.4,<1.5 +botocore<1.11.0 git+https://github.com/alphagov/notifications-utils.git@30.3.1#egg=notifications-utils==30.3.1 @@ -35,15 +36,14 @@ git+https://github.com/alphagov/boto.git@2.43.0-patch3#egg=boto==2.43.0-patch3 alembic==1.0.0 amqp==1.4.9 anyjson==0.3.3 -awscli==1.16.20 +awscli==1.16.22 bcrypt==3.1.4 billiard==3.3.0.23 bleach==2.1.3 boto3==1.6.16 -botocore==1.12.10 certifi==2018.8.24 chardet==3.0.4 -click==6.7 +Click==7.0 colorama==0.3.9 docutils==0.14 Flask-Redis==0.3.0 From 78cc503a91cf70eb112b69e6c06c8b682999b0a3 Mon Sep 17 00:00:00 2001 From: Tom Byers Date: Fri, 28 Sep 2018 10:02:16 +0100 Subject: [PATCH 3/3] Bump utils to 30.4.0 Brings in changes to allow letter timings to include 1st class letters. https://github.com/alphagov/notifications-utils/pull/533 --- requirements-app.txt | 2 +- requirements.txt | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/requirements-app.txt b/requirements-app.txt index 13b6b79e1..9337b58ab 100644 --- a/requirements-app.txt +++ b/requirements-app.txt @@ -26,6 +26,6 @@ notifications-python-client==5.0.0 awscli-cwlogs>=1.4,<1.5 botocore<1.11.0 -git+https://github.com/alphagov/notifications-utils.git@30.3.1#egg=notifications-utils==30.3.1 +git+https://github.com/alphagov/notifications-utils.git@30.4.0#egg=notifications-utils==30.4.0 git+https://github.com/alphagov/boto.git@2.43.0-patch3#egg=boto==2.43.0-patch3 diff --git a/requirements.txt b/requirements.txt index f1340a447..f9a4d8158 100644 --- a/requirements.txt +++ b/requirements.txt @@ -28,7 +28,7 @@ notifications-python-client==5.0.0 awscli-cwlogs>=1.4,<1.5 botocore<1.11.0 -git+https://github.com/alphagov/notifications-utils.git@30.3.1#egg=notifications-utils==30.3.1 +git+https://github.com/alphagov/notifications-utils.git@30.4.0#egg=notifications-utils==30.4.0 git+https://github.com/alphagov/boto.git@2.43.0-patch3#egg=boto==2.43.0-patch3 @@ -36,7 +36,7 @@ git+https://github.com/alphagov/boto.git@2.43.0-patch3#egg=boto==2.43.0-patch3 alembic==1.0.0 amqp==1.4.9 anyjson==0.3.3 -awscli==1.16.22 +awscli==1.16.23 bcrypt==3.1.4 billiard==3.3.0.23 bleach==2.1.3