Merge branch 'master' into month-billing-table

migrations/versions/0109_rem_old_noti_status.py

@@ -0,0 +1,45 @@
+"""
+
+Revision ID: 0109_rem_old_noti_status
+Revises: 0108_change_logo_not_nullable
+Create Date: 2017-07-10 14:25:15.712055
+
+"""
+from alembic import op
+import sqlalchemy as sa
+from sqlalchemy.dialects import postgresql
+
+revision = '0109_rem_old_noti_status'
+down_revision = '0108_change_logo_not_nullable'
+
+
+def upgrade():
+    op.drop_column('notification_history', 'status')
+    op.drop_column('notifications', 'status')
+
+
+def downgrade():
+    op.add_column(
+        'notifications',
+        sa.Column(
+            'status',
+            postgresql.ENUM(
+                'created', 'sending', 'delivered', 'pending', 'failed', 'technical-failure',
+                'temporary-failure', 'permanent-failure', 'sent', name='notify_status_type'
+            ),
+            autoincrement=False,
+            nullable=True
+        )
+    )
+    op.add_column(
+        'notification_history',
+        sa.Column(
+            'status',
+            postgresql.ENUM(
+                'created', 'sending', 'delivered', 'pending', 'failed', 'technical-failure',
+                'temporary-failure', 'permanent-failure', 'sent', name='notify_status_type'
+            ),
+            autoincrement=False,
+            nullable=True
+        )
+    )

requirements.txt

@@ -33,8 +33,9 @@ awscli-cwlogs>=1.4,<1.5
 git+https://github.com/alphagov/notifications-utils.git@17.5.3#egg=notifications-utils==17.5.3
 
 # Kombu is a library that celery uses under the hood.
-# Kombu is pinned to a specific commit that brings in fixes for SQS - see https://github.com/celery/kombu/pull/693
 # Kombu v4.0.2 (which ships with celery v4.0.2) doesn't work with SQS due to problems with their use of boto2, so
 # Kombu migrated to boto3 - We're waiting for that to get a release version, and then to get a new version of celery
 # that pulls that in. Until that point, we should override the kombu version to get these SQS fixes.
-git+https://github.com/celery/kombu@09bd23bbd83344b09cbf38b7257107e560db9f25
+# Additionally, kombu master also includes a fix for the main process taking 100% CPU and not distributing tasks (!)
+# See https://github.com/celery/kombu/pull/693 and https://github.com/celery/kombu/pull/760
+https://github.com/celery/kombu/zipball/b2f21289284496efd89acea003ff9c24105b970e