Merge branch 'master' into pyup-update-pytest-3.3.0-to-3.3.1

app/config.py

@@ -392,19 +392,19 @@ class Staging(Config):
     FROM_NUMBER = 'stage'
     API_RATE_LIMIT_ENABLED = True
     CHECK_PROXY_HEADER = True
-    REDIS_ENABLED = False
+    REDIS_ENABLED = True
 
     API_KEY_LIMITS = {
         KEY_TYPE_TEAM: {
-            "limit": 21000,
+            "limit": 24000,
             "interval": 60
         },
         KEY_TYPE_NORMAL: {
-            "limit": 21000,
+            "limit": 24000,
             "interval": 60
         },
         KEY_TYPE_TEST: {
-            "limit": 21000,
+            "limit": 24000,
             "interval": 60
         }
     }

manifest-api-staging.yml

@@ -1,7 +1,6 @@
 ---
 
 inherit: manifest-api-base.yml
-command: scripts/run_app_paas.sh gunicorn -c /home/vcap/app/gunicorn_config.py --error-logfile /home/vcap/logs/gunicorn_error.log -w 6 -b 0.0.0.0:$PORT application
 services:
   - notify-aws
   - notify-config

migrations/versions/0150_another_letter_org.py

@@ -0,0 +1,38 @@
+"""empty message
+
+Revision ID: 0150_another_letter_org
+Revises: 0149_add_crown_to_services
+Create Date: 2017-06-29 12:44:16.815039
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = '0150_another_letter_org'
+down_revision = '0149_add_crown_to_services'
+
+from alembic import op
+
+
+NEW_ORGANISATIONS = [
+    ('006', 'DWP (Welsh)'),
+    ('007', 'Department for Communities'),
+    ('008', 'Marine Management Organisation'),
+]
+
+
+def upgrade():
+    for numeric_id, name in NEW_ORGANISATIONS:
+        op.execute("""
+            INSERT
+                INTO dvla_organisation
+                VALUES ('{}', '{}')
+        """.format(numeric_id, name))
+
+
+def downgrade():
+    for numeric_id, _ in NEW_ORGANISATIONS:
+        op.execute("""
+            DELETE
+                FROM dvla_organisation
+                WHERE id = '{}'
+        """.format(numeric_id))