Merge branch 'master' into 121-127

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):

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,14 +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
-
-# 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

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