From 89d20033a863b44c370540d7de0dbb8a5f7b0509 Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 17 Jul 2018 11:22:22 +0100 Subject: [PATCH 1/2] Bump utils to fix smart quotes in email addresses Brings in: - [ ] https://github.com/alphagov/notifications-utils/pull/500 --- requirements-app.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements-app.txt b/requirements-app.txt index 264f568f7..bc8eec9b4 100644 --- a/requirements-app.txt +++ b/requirements-app.txt @@ -25,6 +25,6 @@ notifications-python-client==4.8.2 # PaaS awscli-cwlogs>=1.4,<1.5 -git+https://github.com/alphagov/notifications-utils.git@29.3.0#egg=notifications-utils==29.3.0 +git+https://github.com/alphagov/notifications-utils.git@29.3.0#egg=notifications-utils==29.3.2 git+https://github.com/alphagov/boto.git@2.43.0-patch3#egg=boto==2.43.0-patch3 From 222dc3fe959d5d68d0338135a7fa915c890ffe1d Mon Sep 17 00:00:00 2001 From: Chris Hill-Scott Date: Tue, 17 Jul 2018 11:38:27 +0100 Subject: [PATCH 2/2] Use debian jessie instead of stretch until npm is installed differently --- docker/Dockerfile | 2 +- requirements-app.txt | 2 +- requirements.txt | 8 ++++---- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index 3100a8e20..1060824cf 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.5-slim +FROM python:3.5-slim-jessie ARG HTTP_PROXY ARG HTTPS_PROXY diff --git a/requirements-app.txt b/requirements-app.txt index bc8eec9b4..369024bac 100644 --- a/requirements-app.txt +++ b/requirements-app.txt @@ -25,6 +25,6 @@ notifications-python-client==4.8.2 # PaaS awscli-cwlogs>=1.4,<1.5 -git+https://github.com/alphagov/notifications-utils.git@29.3.0#egg=notifications-utils==29.3.2 +git+https://github.com/alphagov/notifications-utils.git@29.3.2#egg=notifications-utils==29.3.2 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 b9c187119..c696af14d 100644 --- a/requirements.txt +++ b/requirements.txt @@ -26,20 +26,20 @@ notifications-python-client==4.8.2 # PaaS awscli-cwlogs>=1.4,<1.5 -git+https://github.com/alphagov/notifications-utils.git@29.3.0#egg=notifications-utils==29.3.0 +git+https://github.com/alphagov/notifications-utils.git@29.3.2#egg=notifications-utils==29.3.2 git+https://github.com/alphagov/boto.git@2.43.0-patch3#egg=boto==2.43.0-patch3 ## The following requirements were added by pip freeze: -alembic==0.9.10 +alembic==1.0.0 amqp==1.4.9 anyjson==0.3.3 -awscli==1.15.55 +awscli==1.15.59 bcrypt==3.1.4 billiard==3.3.0.23 bleach==2.1.3 boto3==1.6.16 -botocore==1.10.54 +botocore==1.10.58 certifi==2018.4.16 chardet==3.0.4 click==6.7