darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-02 17:48:50 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into 121-127

Browse Source
This commit is contained in:
Pete Herlihy
2017-12-28 11:16:34 +00:00
committed by GitHub
parent d24fe480fd c8088f5062
commit 68f5c0940b
3 changed files with 7 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/notify_client/__init__.py
View File

@@ -1,7 +1,7 @@
from flask_login import current_user from flask_login import current_user
from flask import has_request_context, request, abort from flask import has_request_context, request, abort
from notifications_python_client.base import BaseAPIClient 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): def _attach_current_user(data):

14
requirements.txt
View File

@@ -3,10 +3,10 @@ Flask==0.12.2
Flask-WTF==0.14.2 Flask-WTF==0.14.2
Flask-Login==0.4.1 Flask-Login==0.4.1
boto3==1.4.8 boto3==1.5.6
blinker==1.4 blinker==1.4
pyexcel==0.5.6 pyexcel==0.5.6
pyexcel-io==0.5.4 pyexcel-io==0.5.5
pyexcel-xls==0.5.5 pyexcel-xls==0.5.5
pyexcel-xlsx==0.5.5 pyexcel-xlsx==0.5.5
pyexcel-ods3==0.5.2 pyexcel-ods3==0.5.2
@@ -14,14 +14,10 @@ pytz==2017.3
gunicorn==19.7.1 gunicorn==19.7.1
whitenoise==3.3.1 #manages static assets whitenoise==3.3.1 #manages static assets
# pin to minor version 3.1.x notifications-python-client==4.7.1
notifications-python-client==4.6.0
# PaaS # PaaS
awscli==1.14.2 awscli==1.14.16
awscli-cwlogs>=1.4,<1.5 awscli-cwlogs>=1.4,<1.5
git+https://github.com/alphagov/notifications-utils.git@23.3.4#egg=notifications-utils==23.3.4 git+https://github.com/alphagov/notifications-utils.git@23.3.5#egg=notifications-utils==23.3.5
# required by utils
git+https://github.com/leohemsted/smartypants.py.git@regex-speedup#egg=smartypants==2.1.0

2
requirements_for_test.txt
View File

@@ -2,7 +2,7 @@
pytest==3.3.1 pytest==3.3.1
pytest-mock==1.6.3 pytest-mock==1.6.3
pytest-cov==2.5.1 pytest-cov==2.5.1
pytest-xdist==1.20.1 pytest-xdist==1.21.0
coveralls==1.2.0 coveralls==1.2.0
httpretty==0.8.14 httpretty==0.8.14
beautifulsoup4==4.6.0 beautifulsoup4==4.6.0