From a6d2f9cf4db69586c5269a176ddbcd3d93e05f68 Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Thu, 28 Dec 2017 10:00:55 +0000 Subject: [PATCH 1/4] Update requirements.txt bring in all pyup changes --- requirements.txt | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/requirements.txt b/requirements.txt index 0b98d7a14..9e9cf91f3 100644 --- a/requirements.txt +++ b/requirements.txt @@ -3,10 +3,10 @@ Flask==0.12.2 Flask-WTF==0.14.2 Flask-Login==0.4.1 -boto3==1.4.8 +boto3==1.5.6 blinker==1.4 pyexcel==0.5.6 -pyexcel-io==0.5.4 +pyexcel-io==0.5.5 pyexcel-xls==0.5.5 pyexcel-xlsx==0.5.5 pyexcel-ods3==0.5.2 @@ -14,11 +14,10 @@ pytz==2017.3 gunicorn==19.7.1 whitenoise==3.3.1 #manages static assets -# pin to minor version 3.1.x -notifications-python-client==4.6.0 +notifications-python-client==4.7.1 # PaaS -awscli==1.14.2 +awscli==1.14.16 awscli-cwlogs>=1.4,<1.5 git+https://github.com/alphagov/notifications-utils.git@23.3.4#egg=notifications-utils==23.3.4 From 32db08269dfc59ad9782e8c4b5a770210f71011c Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Thu, 28 Dec 2017 10:01:56 +0000 Subject: [PATCH 2/4] Update requirements_for_test.txt --- requirements_for_test.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/requirements_for_test.txt b/requirements_for_test.txt index 659db7d11..b3196465e 100644 --- a/requirements_for_test.txt +++ b/requirements_for_test.txt @@ -2,7 +2,7 @@ pytest==3.3.1 pytest-mock==1.6.3 pytest-cov==2.5.1 -pytest-xdist==1.20.1 +pytest-xdist==1.21.0 coveralls==1.2.0 httpretty==0.8.14 beautifulsoup4==4.6.0 From 99db15d9754a8bbfcf8b45c5c7eb4ed681a75c7e Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Thu, 28 Dec 2017 10:05:54 +0000 Subject: [PATCH 3/4] fix notifications-python-client version import --- app/notify_client/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/notify_client/__init__.py b/app/notify_client/__init__.py index fb0cb7f19..504af8c9f 100644 --- a/app/notify_client/__init__.py +++ b/app/notify_client/__init__.py @@ -1,7 +1,7 @@ from flask_login import current_user from flask import has_request_context, request, abort from notifications_python_client.base import BaseAPIClient -from notifications_python_client.version import __version__ +from notifications_python_client import __version__ def _attach_current_user(data): From 21961a3bd25fd649fc20034136a0a77781177dbb Mon Sep 17 00:00:00 2001 From: Leo Hemsted Date: Thu, 28 Dec 2017 10:08:16 +0000 Subject: [PATCH 4/4] bump utils utils no longer needs smartypants from git --- requirements.txt | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/requirements.txt b/requirements.txt index 9e9cf91f3..bbc4342a4 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,7 +20,4 @@ notifications-python-client==4.7.1 awscli==1.14.16 awscli-cwlogs>=1.4,<1.5 -git+https://github.com/alphagov/notifications-utils.git@23.3.4#egg=notifications-utils==23.3.4 - -# required by utils -git+https://github.com/leohemsted/smartypants.py.git@regex-speedup#egg=smartypants==2.1.0 +git+https://github.com/alphagov/notifications-utils.git@23.3.5#egg=notifications-utils==23.3.5