Merge pull request #1192 from alphagov/deps

update dependencies

app/__init__.py

@@ -5,7 +5,7 @@ import uuid
 
 from flask import Flask, _request_ctx_stack
 from flask import request, g, jsonify
-from flask.ext.sqlalchemy import SQLAlchemy
+from flask_sqlalchemy import SQLAlchemy
 from flask_marshmallow import Marshmallow
 from monotonic import monotonic
 from notifications_utils.clients.statsd.statsd_client import StatsdClient

app/commands.py

@@ -1,7 +1,7 @@
 import uuid
 from datetime import datetime
 from decimal import Decimal
-from flask.ext.script import Command, Manager, Option
+from flask_script import Command, Manager, Option
 
 from app import db
 from app.dao.monthly_billing_dao import (

app/dao/notifications_dao.py

@@ -270,27 +270,6 @@ def get_notifications_for_job(service_id, job_id, filter_dict=None, page=1, page
     )
 
 
-@statsd(namespace="dao")
-def get_notification_billable_unit_count_per_month(service_id, year):
-    month = get_london_month_from_utc_column(NotificationHistory.created_at)
-
-    start_date, end_date = get_financial_year(year)
-    notifications = db.session.query(
-        month,
-        func.sum(NotificationHistory.billable_units)
-    ).filter(
-        NotificationHistory.billable_units != 0,
-        NotificationHistory.service_id == service_id,
-        NotificationHistory.created_at.between(start_date, end_date)
-    ).group_by(
-        month
-    ).order_by(
-        month
-    ).all()
-
-    return [(datetime.strftime(x[0], "%B"), x[1]) for x in notifications]
-
-
 @statsd(namespace="dao")
 def get_notification_with_personalisation(service_id, notification_id, key_type):
     filter_dict = {'service_id': service_id, 'id': notification_id}

app/encryption.py

@@ -1,4 +1,4 @@
-from flask.ext.bcrypt import generate_password_hash, check_password_hash
+from flask_bcrypt import generate_password_hash, check_password_hash
 
 from itsdangerous import URLSafeSerializer
 

app/service/rest.py

@@ -450,16 +450,6 @@ def resume_service(service_id):
     return '', 204
 
 
-@service_blueprint.route('/<uuid:service_id>/billable-units')
-def get_billable_unit_count(service_id):
-    try:
-        return jsonify(notifications_dao.get_notification_billable_unit_count_per_month(
-            service_id, int(request.args.get('year'))
-        ))
-    except TypeError:
-        return jsonify(result='error', message='No valid year provided'), 400
-
-
 @service_blueprint.route('/<uuid:service_id>/notifications/templates/monthly', methods=['GET'])
 def get_monthly_template_stats(service_id):
     service = dao_fetch_service_by_id(service_id)