Merge pull request #2281 from GSA/fix_adr_accepted

comment out

.ds.baseline

@@ -133,7 +133,7 @@
         "filename": ".github/workflows/checks.yml",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 28,
+        "line_number": 29,
         "is_secret": false
       },
       {
@@ -141,7 +141,7 @@
         "filename": ".github/workflows/checks.yml",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 45,
+        "line_number": 46,
         "is_secret": false
       }
     ],
@@ -151,7 +151,7 @@
         "filename": ".github/workflows/daily_checks.yml",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 63,
+        "line_number": 66,
         "is_secret": false
       },
       {
@@ -159,7 +159,7 @@
         "filename": ".github/workflows/daily_checks.yml",
         "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
         "is_verified": false,
-        "line_number": 79,
+        "line_number": 82,
         "is_secret": false
       }
     ],
@@ -374,5 +374,5 @@
       }
     ]
   },
-  "generated_at": "2025-09-11T16:22:46Z"
+  "generated_at": "2026-06-02T14:59:28Z"
 }

.github/actions/setup-project/action.yml

@@ -10,12 +10,12 @@ runs:
         && sudo apt-get install -y --no-install-recommends \
         libcurl4-openssl-dev
     - name: Set up Python 3.13.2
-      uses: actions/setup-python@v4
+      uses: actions/setup-python@v6
       with:
         python-version: "3.13.2"
     - name: Install poetry
       shell: bash
-      run: pip install poetry==2.1.3
+      run: pip install poetry==2.3.4
     - name: Install poetry export
       shell: bash
       run: poetry self add poetry-plugin-export

.github/dependabot.yml

@@ -3,16 +3,19 @@
 # Please see the documentation for all configuration options:
 # https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
 
+# Note: Setting open-pull-requests-limit to 0 disables automatic version update PRs.
+# Security updates are still active and managed separately in repository settings under
+# "Security & analysis" > "Dependabot security updates"
+
 version: 2
 updates:
   - package-ecosystem: "pip" # See documentation for possible values
     directory: "/" # Location of package manifests
     schedule:
       interval: "daily"
+    open-pull-requests-limit: 0 # Disable version update PRs; security updates still active
     labels:
       - "dependabot" # Custom label to identify Dependabot PRs
-    assignees:
-      - "alexjanousekGSA"
     ignore:
       # gevent 25.8+ breaks Celery/Kombu compatibility (potentially)
       - dependency-name: "gevent"

.github/workflows/adr-accepted.yml

@@ -1,83 +0,0 @@
-name: ADR accepted
-
-on:
-  issues:
-    types:
-      - closed
-
-permissions:
-  contents: read
-
-jobs:
-  accept:
-    runs-on: ubuntu-latest
-    steps:
-
-    - name: check for tags
-      if: "${{ !contains(github.event.issue.labels.*.name, 'ADR: accepted' )}}"
-      shell: bash
-      run: exit 0
-
-    - name: checkout main branch
-      uses: actions/checkout@v4
-      with:
-        ref: main
-        ssh-key: ${{ secrets.SSH_PRIVATE_KEY }}
-
-    - name: get ADR number
-      id: next
-      shell: bash
-      run: |
-        mkdir -p docs/adrs
-        LAST_ADR=$(ls docs/adrs/*.md | grep -Eo "/[0-9]+-" | sort | tail -n1 | grep -Eo "[0-9]+")
-        LAST_ADR=$(echo "$LAST_ADR" | sed -E 's/^0+//')
-        NEXT_ADR=$(($LAST_ADR + 1))
-        NEXT_ADR=$(printf "%04i" "$NEXT_ADR")
-        echo "number=$NEXT_ADR" >> "$GITHUB_OUTPUT"
-
-    - name: get date
-      id: date
-      shell: bash
-      run: echo "date=$(date +'%B %d, %Y')" >> "$GITHUB_OUTPUT"
-
-    - name: build filename
-      id: filename
-      shell: bash
-      run: |
-        SLUG=$(printf '%q\n' "${{ github.event.issue.title }}" | tr A-Z a-z)
-        SLUG=$(printf '%q\n' "$SLUG" | iconv -c -t ascii//TRANSLIT)
-        SLUG=$(printf '%q\n' "$SLUG" | sed -E 's/[^a-z0-9]+/-/g' | sed -E 's/-+/-/g' | sed -E 's/^-+|-+$//g')
-
-        FILENAME="docs/adrs/${{ steps.next.outputs.number }}-$SLUG.md"
-        echo "slug=$SLUG" >> "$GITHUB_OUTPUT"
-        echo "filename=$FILENAME" >> "$GITHUB_OUTPUT"
-
-    - name: write the ADR
-      uses: DamianReeves/write-file-action@v1.3
-      with:
-        path: ${{ steps.filename.outputs.filename }}
-        write-mode: overwrite
-        contents: |
-          # ${{ github.event.issue.title }}
-
-          Status: Accepted
-          Date: ${{ steps.date.outputs.date }}
-
-          ${{ github.event.issue.body }}
-
-    - name: branch, commit, and open PR
-      shell: bash
-      env:
-        GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-      run: |
-        BRANCH="adr/auto/${{ steps.filename.outputs.slug }}"
-        git config --global user.email "tts@gsa.gov"
-        git config --global user.name "Notify ADR Automation"
-        git checkout -b $BRANCH
-        git add docs/adrs/*.md
-        git commit -m "add ADR ${{ steps.next.outputs.number }}: ${{ github.event.issue.title }}"
-        git push -f origin $BRANCH
-        gh pr create \
-          --title "Add ADR ${{ steps.next.outputs.number }} to the repo" \
-          --body "This pull request was opened automatically because #${{ github.event.issue.number }} was closed after being marked as an approved ADR. It contains a markdown file capturing the ADR body at the time the issue was closed. Please verify that the markdown is correct before merging!" || true
-        gh pr merge $BRANCH --auto --squash || true

.github/workflows/checks.yml

@@ -14,6 +14,7 @@ env:
   WERKZEUG_DEBUG_PIN: off
   REDIS_ENABLED: 0
   AWS_US_TOLL_FREE_NUMBER: "+18556438890"
+  ACTIONS_ALLOW_USE_UNSECURE_NODE_VERSION: true
 
 jobs:
 
@@ -37,7 +38,7 @@ jobs:
           - 5432:5432
 
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
     - uses: ./.github/actions/setup-project
     - name: Install application dependencies
       run: make bootstrap
@@ -70,7 +71,7 @@ jobs:
     runs-on: ubuntu-latest
     environment: staging
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/setup-project
       - name: Install poetry packages
         run: poetry install
@@ -84,7 +85,7 @@ jobs:
   pip-audit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/setup-project
       - name: Create requirements.txt
         run: poetry export --output requirements.txt
@@ -93,11 +94,12 @@ jobs:
           inputs: requirements.txt
           ignore-vulns: |
             PYSEC-2023-312
+            CVE-2026-4539
 
   static-scan:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/setup-project
       - name: Install bandit
         run: pip install bandit
@@ -122,7 +124,7 @@ jobs:
           # Maps tcp port 5432 on service container to the host
           - 5432:5432
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/setup-project
       - name: Install application dependencies
         run: make bootstrap

.github/workflows/codeql.yml

@@ -56,7 +56,7 @@ jobs:
         # your codebase is analyzed, see https://docs.github.com/en/code-security/code-scanning/creating-an-advanced-setup-for-code-scanning/codeql-code-scanning-for-compiled-languages
     steps:
     - name: Checkout repository
-      uses: actions/checkout@v4
+      uses: actions/checkout@v6
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL

.github/workflows/daily_checks.yml

@@ -19,11 +19,13 @@ env:
   REDIS_ENABLED: 0
   AWS_US_TOLL_FREE_NUMBER: "+18556438890"
 
+
+
 jobs:
   pip-audit:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/setup-project
       - name: Create requirements.txt
         run: poetry export --output requirements.txt
@@ -32,8 +34,9 @@ jobs:
           inputs: requirements.txt
           ignore-vulns: |
             PYSEC-2023-312
+            CVE-2026-4539
       - name: Upload pip-audit artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: pip-audit-report
           path: /tmp/pip-audit-output.txt
@@ -41,14 +44,14 @@ jobs:
   static-scan:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/setup-project
       - name: Install bandit
         run: pip install bandit
       - name: Run scan
         run: bandit -r app/ -f txt -o /tmp/bandit-output.txt --confidence-level medium
       - name: Upload bandit artifact
-        uses: actions/upload-artifact@v4
+        uses: actions/upload-artifact@v7
         with:
           name: bandit-report
           path: /tmp/bandit-output.txt
@@ -71,7 +74,7 @@ jobs:
           # Maps tcp port 5432 on service container to the host
           - 5432:5432
     steps:
-      - uses: actions/checkout@v4
+      - uses: actions/checkout@v6
       - uses: ./.github/actions/setup-project
       - name: Install application dependencies
         run: make bootstrap

.github/workflows/deploy-demo.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     environment: demo
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 2
 

.github/workflows/deploy-prod.yml

@@ -16,7 +16,7 @@ jobs:
     runs-on: ubuntu-latest
     environment: production
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 2
 

.github/workflows/deploy.yml

@@ -18,7 +18,7 @@ jobs:
 
     environment: staging
     steps:
-    - uses: actions/checkout@v4
+    - uses: actions/checkout@v6
       with:
         fetch-depth: 2
 
@@ -113,6 +113,6 @@ jobs:
     runs-on: ubuntu-latest
     if: ${{ github.event.workflow_run.conclusion == 'failure' }}
     steps:
-      - uses: actions/github-script@v6
+      - uses: actions/github-script@v9
         with:
           script: core.setFailed('Checks failed, not deploying')

.github/workflows/drift.yml

@@ -13,7 +13,7 @@ jobs:
     environment: staging
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Looks like we need to install Terraform ourselves now!
       # https://github.com/actions/runner-images/issues/10796#issuecomment-2417064348
@@ -50,7 +50,7 @@ jobs:
   #   environment: demo
   #   steps:
   #     - name: Checkout
-  #       uses: actions/checkout@v4
+  #       uses: actions/checkout@v6
   #       with:
   #         ref: 'production'
 
@@ -89,7 +89,7 @@ jobs:
     environment: production
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
         with:
           ref: 'production'
 

.github/workflows/terraform-demo.yml

@@ -16,7 +16,7 @@ jobs:
     environment: demo
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Looks like we need to install Terraform ourselves now!
       # https://github.com/actions/runner-images/issues/10796#issuecomment-2417064348
@@ -59,7 +59,7 @@ jobs:
 
       # inspiration: https://learn.hashicorp.com/tutorials/terraform/github-actions#review-actions-workflow
       - name: Update PR
-        uses: actions/github-script@v7
+        uses: actions/github-script@v9
         # we would like to update the PR even when a prior step failed
         if: ${{ always() }}
         with:

.github/workflows/terraform-production.yml

@@ -16,7 +16,7 @@ jobs:
     environment: production
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Looks like we need to install Terraform ourselves now!
       # https://github.com/actions/runner-images/issues/10796#issuecomment-2417064348
@@ -59,7 +59,7 @@ jobs:
 
       # inspiration: https://learn.hashicorp.com/tutorials/terraform/github-actions#review-actions-workflow
       - name: Update PR
-        uses: actions/github-script@v7
+        uses: actions/github-script@v9
         # we would like to update the PR even when a prior step failed
         if: ${{ always() }}
         with:

.github/workflows/terraform-staging.yml

@@ -16,7 +16,7 @@ jobs:
     environment: staging
     steps:
       - name: Checkout
-        uses: actions/checkout@v4
+        uses: actions/checkout@v6
 
       # Looks like we need to install Terraform ourselves now!
       # https://github.com/actions/runner-images/issues/10796#issuecomment-2417064348
@@ -60,7 +60,7 @@ jobs:
 
       # inspiration: https://learn.hashicorp.com/tutorials/terraform/github-actions#review-actions-workflow
       - name: Update PR
-        uses: actions/github-script@v7
+        uses: actions/github-script@v9
         # we would like to update the PR even when a prior step failed
         if: ${{ always() }}
         with:

app/celery/scheduled_tasks.py

@@ -285,13 +285,11 @@ def process_delivery_receipts(self):
         retry_count = self.request.retries
         wait_time = 3600 * 2**retry_count
 
-        current_app.logger.exception(str(ex))
-
         try:
             raise self.retry(ex=ex, countdown=wait_time)
         except self.MaxRetriesExceededError:
             current_app.logger.error(
-                "Failed process delivery receipts after max retries"
+                f"Failed process delivery receipts after max retries with exception {str(ex)}"
             )
 
 

app/clients/cloudwatch/aws_cloudwatch.py

@@ -197,15 +197,19 @@ class AwsCloudwatchClient(Client):
 
     def _get_receipts(self, log_group_name, start, end):
         event_set = set()
-        all_events = self._get_log(log_group_name, start, end)
-        for event in all_events:
-            try:
-                actual_event = self.event_to_db_format(event["message"])
-                event_set.add(json.dumps(actual_event))
-            except Exception:
-                current_app.logger.exception(
-                    f"Could not format delivery receipt {event} for db insert"
-                )
+        try:
+            all_events = self._get_log(log_group_name, start, end)
+            for event in all_events:
+                try:
+                    actual_event = self.event_to_db_format(event["message"])
+                    event_set.add(json.dumps(actual_event))
+                except Exception:
+                    current_app.logger.exception(
+                        f"Could not format delivery receipt {event} for db insert"
+                    )
+        except Exception as e:
+            current_app.logger.error(f"Could not find log group {log_group_name}")
+            raise e
         return event_set
 
     def _aws_value_or_default(self, event, top_level, second_level):

app/cloudfoundry_config.py

@@ -9,8 +9,8 @@ class CloudfoundryConfig:
         self.s3_buckets = {bucket["name"]: bucket["credentials"] for bucket in buckets}
         self._empty_bucket_credentials = {
             "bucket": "",
-            "access_key_id": "",   # nosec B105
-            "secret_access_key": "",   # nosec B105
+            "access_key_id": "",  # nosec B105
+            "secret_access_key": "",  # nosec B105
             "region": "",
         }
 

app/commands.py

@@ -8,7 +8,8 @@ from os import getenv
 
 import click
 import flask
-from click_datetime import Datetime as click_dt
+
+# from click_datetime import Datetime as click_dt
 from faker import Faker
 from flask import current_app, json
 from sqlalchemy import and_, select, text, update
@@ -59,7 +60,8 @@ from app.models import (
     TemplateHistory,
     User,
 )
-from app.utils import utc_now
+
+# from app.utils import utc_now
 from notifications_python_client.authentication import create_jwt_token
 from notifications_utils.recipients import RecipientCSV
 from notifications_utils.template import SMSMessageTemplate
@@ -260,50 +262,55 @@ def bulk_invite_user_to_service(file_name, service_id, user_id, auth_type, permi
     file.close()
 
 
-@notify_command(name="archive-jobs-created-between-dates")
-@click.option(
-    "-s",
-    "--start_date",
-    required=True,
-    help="start date inclusive",
-    type=click_dt(format="%Y-%m-%d"),
-)
-@click.option(
-    "-e",
-    "--end_date",
-    required=True,
-    help="end date inclusive",
-    type=click_dt(format="%Y-%m-%d"),
-)
-def update_jobs_archived_flag(start_date, end_date):
-    current_app.logger.info(
-        f"Archiving jobs created between {start_date} to {end_date}"
-    )
+# TODO this is commented out because there is a conflict between
+# the version of wheel we need to be on (0.46.2 or greater) and
+# the click-datetime dependency, which insists wheel be 0.45.0 or lower.
+# So need to rewrite this command to not use click-datetime, or see
+# if the owners of click-datetime updated it (not as of 1/22/2026).
+# @notify_command(name="archive-jobs-created-between-dates")
+# @click.option(
+#     "-s",
+#     "--start_date",
+#     required=True,
+#     help="start date inclusive",
+#     type=click_dt(format="%Y-%m-%d"),
+# )
+# @click.option(
+#     "-e",
+#     "--end_date",
+#     required=True,
+#     help="end date inclusive",
+#     type=click_dt(format="%Y-%m-%d"),
+# )
+# def update_jobs_archived_flag(start_date, end_date):
+#     current_app.logger.info(
+#         f"Archiving jobs created between {start_date} to {end_date}"
+#     )
 
-    process_date = start_date
-    total_updated = 0
+#     process_date = start_date
+#     total_updated = 0
 
-    while process_date < end_date:
-        start_time = utc_now()
-        sql = """update
-                    jobs set archived = true
-                where
-                    created_at >= (date :start + time '00:00:00')
-                    and created_at < (date :end + time '00:00:00')
-        """
-        result = db.session.execute(
-            text(sql), {"start": process_date, "end": process_date + timedelta(days=1)}
-        )
-        db.session.commit()
-        current_app.logger.info(
-            f"jobs: --- Completed took {datetime.now() - start_time}ms. Archived "
-            f"{result.rowcount} jobs for {process_date}"
-        )
+#     while process_date < end_date:
+#         start_time = utc_now()
+#         sql = """update
+#                     jobs set archived = true
+#                 where
+#                     created_at >= (date :start + time '00:00:00')
+#                     and created_at < (date :end + time '00:00:00')
+#         """
+#         result = db.session.execute(
+#             text(sql), {"start": process_date, "end": process_date + timedelta(days=1)}
+#         )
+#         db.session.commit()
+#         current_app.logger.info(
+#             f"jobs: --- Completed took {datetime.now() - start_time}ms. Archived "
+#             f"{result.rowcount} jobs for {process_date}"
+#         )
 
-        process_date += timedelta(days=1)
+#         process_date += timedelta(days=1)
 
-        total_updated += result.rowcount
-    current_app.logger.info(f"Total archived jobs = {total_updated}")
+#         total_updated += result.rowcount
+#     current_app.logger.info(f"Total archived jobs = {total_updated}")
 
 
 @notify_command(name="populate-organizations-from-file")

app/dao/notifications_dao.py

@@ -308,8 +308,8 @@ def dao_get_notification_count_for_service(*, service_id):
 
 
 def dao_get_notification_count_for_service_message_ratio(service_id, current_year):
-    start_date = datetime(current_year, 6, 16)
-    end_date = datetime(current_year + 1, 6, 16)
+    start_date = datetime(current_year - 1, 6, 16)
+    end_date = datetime(current_year, 6, 16)
     stmt1 = (
         select(func.count())
         .select_from(Notification)
@@ -976,10 +976,8 @@ def dao_update_delivery_receipts(receipts, delivered):
     db.session.execute(stmt)
     db.session.commit()
     elapsed_time = (time() * 1000) - start_time_millis
-    current_app.logger.info(
-        f"#loadtestperformance batch update query time: \
-        updated {len(receipts)} notification in {elapsed_time} ms"
-    )
+    current_app.logger.info(f"#loadtestperformance batch update query time: \
+        updated {len(receipts)} notification in {elapsed_time} ms")
 
 
 def dao_close_out_delivery_receipts():

app/service/rest.py

@@ -1240,12 +1240,10 @@ def get_service_message_ratio():
     messages_remaining = my_service.total_message_limit - messages_sent
 
     if my_service.total_message_limit - messages_sent < 0:
-        raise Exception(
-            f"Math error get_service_message_ratio(), \
+        raise Exception(f"Math error get_service_message_ratio(), \
                         total {my_service.total_message_limit} \
                         messages_sent {messages_sent} remaining {messages_remaining} \
-                        service_id {service_id} current_year {current_year}"
-        )
+                        service_id {service_id} current_year {current_year}")
 
     return {
         "messages_sent": messages_sent,

migrations/versions/0042_notification_history.py

@@ -115,8 +115,7 @@ def upgrade():
         unique=False,
     )
 
-    op.execute(
-        """
+    op.execute("""
     INSERT INTO notification_history
     (
       id,
@@ -154,8 +153,7 @@ def upgrade():
       status,
       reference
     FROM notifications
-    """
-    )
+    """)
     ### end Alembic commands ###
 
 

migrations/versions/0045_billable_units.py

@@ -34,11 +34,9 @@ def upgrade():
     # caveats
     # only adjusts notifications for services that have never been in research mode. On live, research mode was
     # limited to only services that we have set up ourselves so deemed this acceptable.
-    billable_services_query = text(
-        """
+    billable_services_query = text("""
         SELECT id FROM services_history WHERE id NOT IN (SELECT id FROM services_history WHERE research_mode)
-    """
-    )
+    """)
     billable_services = conn.execute(billable_services_query)
     # set to 'null' if there are no billable services so we don't get a syntax error in the update statement
     service_ids = ",".join(f"{service.id}" for service in billable_services) or "null"
@@ -102,11 +100,9 @@ def downgrade():
     # caveats
     # only adjusts notifications for services that have never been in research mode. On live, research mode was
     # limited to only services that we have set up ourselves
-    billable_services = conn.execute(
-        """
+    billable_services = conn.execute("""
         SELECT id FROM services_history WHERE id not in (select id from services_history where research_mode)
-    """
-    )
+    """)
     # set to 'null' if there are no billable services so we don't get a syntax error in the update statement
     service_ids = ",".join(f"{service.id}" for service in billable_services) or "null"
 

migrations/versions/0046_organisations_and_branding.py

@@ -42,14 +42,12 @@ def upgrade():
     op.execute("INSERT INTO branding_type VALUES ('govuk'), ('org'), ('both')")
 
     # insert UKVI data as initial test data. hex and crest pulled from alphagov/whitehall
-    op.execute(
-        """INSERT INTO organisation VALUES (
+    op.execute("""INSERT INTO organisation VALUES (
         '9d25d02d-2915-4e98-874b-974e123e8536',
         '#9325b2',
         'ho_crest_27px_x2.png',
         'UK Visas and Immigration'
-    )"""
-    )
+    )""")
     op.execute("UPDATE services SET branding='govuk'")
     op.execute("UPDATE services_history SET branding='govuk'")
 

migrations/versions/0070_fix_notify_user_email.py

@@ -15,20 +15,16 @@ from alembic import op
 
 
 def upgrade():
-    op.execute(
-        """
+    op.execute("""
         UPDATE users
         SET email_address = 'testsender@dispostable.com'
         WHERE email_address = 'notify-service-user@digital.cabinet-office'
-    """
-    )
+    """)
 
 
 def downgrade():
-    op.execute(
-        """
+    op.execute("""
         UPDATE users
         SET email_address = 'notify-service-user@digital.cabinet-office'
         WHERE email_address = 'testsender@dispostable.com'
-    """
-    )
+    """)

migrations/versions/0072_add_dvla_orgs.py

@@ -24,13 +24,11 @@ def upgrade():
     )
 
     # insert initial values - HMG and Land Reg
-    op.execute(
-        """
+    op.execute("""
         INSERT INTO dvla_organisation VALUES
         ('001', 'HM Government'),
         ('500', 'Land Registry')
-    """
-    )
+    """)
 
     op.add_column(
         "services",

migrations/versions/0095_migrate_existing_svc_perms.py

@@ -39,44 +39,36 @@ def upgrade():
 
     conn = op.get_bind()
 
-    query = text(
-        """
+    query = text("""
         INSERT INTO service_permissions (service_id, permission, created_at)
         SELECT id, 'sms', '2017-05-26 17:30:00.000000' FROM services
         WHERE id NOT IN (SELECT service_id FROM service_permissions
         WHERE service_id=id AND permission='sms')
-    """
-    )
+    """)
     conn.execute(query)
 
-    query = text(
-        """
+    query = text("""
         INSERT INTO service_permissions (service_id, permission, created_at)
         SELECT id, 'email', '2017-05-26 17:30:00.000000' FROM services
         WHERE id NOT IN (SELECT service_id FROM service_permissions
         WHERE service_id=id AND permission='email')
-     """
-    )
+     """)
     conn.execute(query)
 
-    query = text(
-        """
+    query = text("""
         INSERT INTO service_permissions (service_id, permission, created_at)
         SELECT id, 'letter', '2017-05-26 17:30:00.000000' FROM services
         WHERE can_send_letters AND id NOT IN (SELECT service_id FROM service_permissions
         WHERE service_id=id AND permission='letter')
-    """
-    )
+    """)
     conn.execute(query)
 
-    query = text(
-        """
+    query = text("""
         INSERT INTO service_permissions (service_id, permission, created_at)
         SELECT id, 'international_sms', '2017-05-26 17:30:00.000000' FROM services
         WHERE can_send_international_sms AND id NOT IN (SELECT service_id FROM service_permissions
         WHERE service_id=id AND permission='international_sms')
-    """
-    )
+    """)
     conn.execute(query)
 
 

migrations/versions/0096_update_job_stats.py

@@ -17,28 +17,24 @@ from sqlalchemy.dialects import postgresql
 
 
 def upgrade():
-    query = text(
-        """
+    query = text("""
         UPDATE job_statistics
         SET sent = sms_sent + emails_sent + letters_sent,
         delivered = sms_delivered + emails_delivered,
         failed = sms_failed + emails_failed + letters_failed
-    """
-    )
+    """)
 
     conn = op.get_bind()
     conn.execute(query)
 
 
 def downgrade():
-    query = text(
-        """
+    query = text("""
         UPDATE job_statistics
         SET sent = 0,
         delivered = 0,
         failed = 0
-    """
-    )
+    """)
 
     conn = op.get_bind()
     conn.execute(query)

migrations/versions/0099_tfl_dar.py

@@ -23,14 +23,12 @@ def upgrade():
     conn = op.get_bind()
     input_params = {"tfl_dar_id": TFL_DAR_ID}
     conn.execute(
-        text(
-            """INSERT INTO organisation VALUES (
+        text("""INSERT INTO organisation VALUES (
         :tfl_dar_id,
         '',
         'tfl_dar_x2.png',
         'tfl'
-    )"""
-        ),
+    )"""),
         input_params,
     )
 
@@ -39,10 +37,8 @@ def downgrade():
     conn = op.get_bind()
     input_params = {"tfl_dar_id": TFL_DAR_ID}
     conn.execute(
-        text(
-            """
+        text("""
         DELETE FROM organisation WHERE "id" = :tfl_dar_id
-    """
-        ),
+    """),
         input_params,
     )

migrations/versions/0101_een_logo.py

@@ -20,14 +20,12 @@ def upgrade():
     input_params = {"network_id": ENTERPRISE_EUROPE_NETWORK_ID}
     conn = op.get_bind()
     conn.execute(
-        text(
-            """INSERT INTO organisation VALUES (
+        text("""INSERT INTO organisation VALUES (
         :network_id,
         '',
         'een_x2.png',
         'een'
-    )"""
-        ),
+    )"""),
         input_params,
     )
 
@@ -36,10 +34,8 @@ def downgrade():
     input_params = {"network_id": ENTERPRISE_EUROPE_NETWORK_ID}
     conn = op.get_bind()
     conn.execute(
-        text(
-            """
+        text("""
         DELETE FROM organisation WHERE "id" = :network_id
-    """
-        ),
+    """),
         input_params,
     )

migrations/versions/0103_add_historical_redact.py

@@ -22,8 +22,7 @@ def upgrade():
     conn = op.get_bind()
     input_params = {"notify_user_id": current_app.config["NOTIFY_USER_ID"]}
     conn.execute(
-        text(
-            """
+        text("""
         INSERT INTO template_redacted
         (
             template_id,
@@ -40,8 +39,7 @@ def upgrade():
             templates
         LEFT JOIN template_redacted on template_redacted.template_id = templates.id
         WHERE template_redacted.template_id IS NULL
-        """
-        ),
+        """),
         input_params,
     )
 

migrations/versions/0105_opg_letter_org.py

@@ -17,12 +17,10 @@ from sqlalchemy.dialects import postgresql
 
 
 def upgrade():
-    op.execute(
-        """
+    op.execute("""
         INSERT INTO dvla_organisation VALUES
         ('002', 'Office of the Public Guardian')
-    """
-    )
+    """)
 
 
 def downgrade():

migrations/versions/0118_service_sms_senders.py

@@ -49,13 +49,11 @@ def upgrade():
     )
 
     # populate govuk seeded service
-    op.execute(
-        """
+    op.execute("""
         INSERT INTO service_sms_senders
         (id, sms_sender, service_id, is_default, inbound_number_id, created_at, updated_at)
         VALUES ('286d6176-adbe-7ea7-ba26-b7606ee5e2a4', 'GOVUK', 'd6aa2c68-a2d9-4437-ab19-3ae8eb202553', true, null, now(), null)
-    """
-    )
+    """)
 
 
 def downgrade():

migrations/versions/0130_service_email_reply_to_row.py

@@ -25,14 +25,12 @@ def upgrade():
         "notify_service_id": NOTIFY_SERVICE_ID,
     }
     conn.execute(
-        text(
-            """
+        text("""
         INSERT INTO service_email_reply_to
         (id, service_id, email_address, is_default, created_at)
         VALUES
         (:email_reply_to, :notify_service_id, 'testsender@dispostable.com', 'f', NOW())
-    """
-        ),
+    """),
         input_params,
     )
 
@@ -43,11 +41,9 @@ def downgrade():
         "email_reply_to": EMAIL_REPLY_TO_ID,
     }
     conn.execute(
-        text(
-            """
+        text("""
         DELETE FROM service_email_reply_to
         WHERE id = :email_reply_to
-    """
-        ),
+    """),
         input_params,
     )

migrations/versions/0133_set_services_sms_prefix.py

@@ -27,34 +27,28 @@ def upgrade():
     conn = op.get_bind()
     input_params = {"default_sms_sender": default_sms_sender}
     conn.execute(
-        text(
-            """
+        text("""
         update services set prefix_sms = True
         where id in (
             select service_id from service_sms_senders
             where is_default = True and sms_sender = :default_sms_sender
         )
-    """
-        ),
+    """),
         input_params,
     )
     conn.execute(
-        text(
-            """
+        text("""
         update services set prefix_sms = False
         where id in (
             select service_id from service_sms_senders
             where is_default = True and sms_sender != :default_sms_sender
         )
-    """
-        ),
+    """),
         input_params,
     )
 
 
 def downgrade():
-    op.execute(
-        """
+    op.execute("""
         UPDATE services set prefix_sms = null
-    """
-    )
+    """)

migrations/versions/0137_notification_template_hist.py

@@ -16,26 +16,22 @@ def upgrade():
     op.drop_constraint(
         "notifications_template_id_fkey", "notifications", type_="foreignkey"
     )
-    op.execute(
-        """
+    op.execute("""
         ALTER TABLE notifications ADD CONSTRAINT "notifications_templates_history_fkey"
         FOREIGN KEY ("template_id", "template_version") REFERENCES "templates_history" ("id", "version")
         NOT VALID
-    """
-    )
+    """)
 
     op.drop_constraint(
         "notification_history_template_id_fkey",
         "notification_history",
         type_="foreignkey",
     )
-    op.execute(
-        """
+    op.execute("""
         ALTER TABLE notification_history ADD CONSTRAINT "notification_history_templates_history_fkey"
         FOREIGN KEY ("template_id", "template_version") REFERENCES "templates_history" ("id", "version")
         NOT VALID
-    """
-    )
+    """)
 
 
 def downgrade():

migrations/versions/0140_sms_prefix_non_nullable.py

@@ -20,13 +20,11 @@ def upgrade():
     conn = op.get_bind()
     input_params = {"id": current_app.config["NOTIFY_SERVICE_ID"]}
     conn.execute(
-        text(
-            """
+        text("""
         update services
         set prefix_sms = false
         where id = :id
-    """
-        ),
+    """),
         input_params,
     )
 
@@ -49,12 +47,10 @@ def downgrade():
     conn = op.get_bind()
     input_params = {"id": current_app.config["NOTIFY_SERVICE_ID"]}
     conn.execute(
-        text(
-            """
+        text("""
         update services
         set prefix_sms = null
         where id = :id
-    """
-        ),
+    """),
         input_params,
     )

migrations/versions/0149_add_crown_to_services.py

@@ -15,45 +15,33 @@ down_revision = "0148_add_letters_as_pdf_svc_perm"
 
 def upgrade():
     op.add_column("services", sa.Column("crown", sa.Boolean(), nullable=True))
-    op.execute(
-        """
+    op.execute("""
         update services set crown = True
         where organisation_type = 'central'
-    """
-    )
-    op.execute(
-        """
+    """)
+    op.execute("""
         update services set crown = True
         where organisation_type is null
-    """
-    )
-    op.execute(
-        """
+    """)
+    op.execute("""
         update services set crown = False
         where crown is null
-    """
-    )
+    """)
     op.alter_column("services", "crown", nullable=False)
 
     op.add_column("services_history", sa.Column("crown", sa.Boolean(), nullable=True))
-    op.execute(
-        """
+    op.execute("""
         update services_history set crown = True
         where organisation_type = 'central'
-    """
-    )
-    op.execute(
-        """
+    """)
+    op.execute("""
         update services_history set crown = True
         where organisation_type is null
-    """
-    )
-    op.execute(
-        """
+    """)
+    op.execute("""
         update services_history set crown = False
         where crown is null
-    """
-    )
+    """)
     op.alter_column("services_history", "crown", nullable=False)
 
 

migrations/versions/0159_add_historical_redact.py

@@ -22,8 +22,7 @@ def upgrade():
     conn = op.get_bind()
     input_params = {"notify_user": current_app.config["NOTIFY_USER_ID"]}
     conn.execute(
-        text(
-            """
+        text("""
         INSERT INTO template_redacted
         (
             template_id,
@@ -40,8 +39,7 @@ def upgrade():
             templates
         LEFT JOIN template_redacted on template_redacted.template_id = templates.id
         WHERE template_redacted.template_id IS NULL
-        """
-        ),
+        """),
         input_params,
     )
 

migrations/versions/0161_email_branding.py

@@ -40,20 +40,16 @@ def upgrade():
         ),
         sa.PrimaryKeyConstraint("service_id"),
     )
-    op.execute(
-        """
+    op.execute("""
         INSERT INTO email_branding (id, colour, logo, name)
         SELECT id, colour, logo, name
         FROM organisation
-    """
-    )
-    op.execute(
-        """
+    """)
+    op.execute("""
         INSERT INTO service_email_branding (service_id, email_branding_id)
         SELECT id, organisation_id
         FROM services where organisation_id is not null
-    """
-    )
+    """)
 
 
 def downgrade():

migrations/versions/0172_deprioritise_examples.py

@@ -15,8 +15,7 @@ down_revision = "0171_add_org_invite_template"
 
 def upgrade():
     op.get_bind()
-    op.execute(
-        """
+    op.execute("""
         update templates
         set process_type = 'normal'
         where templates.id in (
@@ -24,8 +23,7 @@ def upgrade():
             join templates_history on templates.id=templates_history.id
             where templates_history.name = 'Example text message template'
         )
-    """
-    )
+    """)
 
 
 def downgrade():

migrations/versions/0174_add_billing_facts.py

@@ -71,8 +71,7 @@ def upgrade():
     )
 
     # Insert data into table
-    op.execute(
-        """
+    op.execute("""
         INSERT into dm_datetime (
         SELECT
         datum AS bst_date,
@@ -104,8 +103,7 @@ def upgrade():
         ) DQ
         ORDER BY bst_date
         );
-        """
-    )
+        """)
 
 
 def downgrade():

migrations/versions/0183_alter_primary_key.py

@@ -16,14 +16,11 @@ down_revision = "0182_add_upload_document_perm"
 
 def upgrade():
     # Drop the old dm_datetime table and create a new one
-    op.execute(
-        """
+    op.execute("""
         delete from dm_datetime where 1=1;
-        """
-    )
+        """)
 
-    op.execute(
-        """
+    op.execute("""
         INSERT into dm_datetime (
         SELECT
         datum AS bst_date,
@@ -55,8 +52,7 @@ def upgrade():
         ) DQ
         ORDER BY bst_date
         );
-        """
-    )
+        """)
 
     op.drop_constraint("ft_billing_pkey", "ft_billing", type_="primary")
 

migrations/versions/0203_fix_old_incomplete_jobs.py

@@ -14,8 +14,7 @@ from alembic import op
 
 
 def upgrade():
-    op.execute(
-        """
+    op.execute("""
         UPDATE
             jobs
         SET
@@ -24,8 +23,7 @@ def upgrade():
             processing_started IS NULL
             AND
             job_status = 'in progress'
-    """
-    )
+    """)
 
 
 def downgrade():

migrations/versions/0219_default_email_branding.py

@@ -17,16 +17,14 @@ def upgrade():
     conn = op.get_bind()
     input_params = {"branding_org": BrandType.ORG.value}
     conn.execute(
-        text(
-            """
+        text("""
         update
             email_branding
         set
             brand_type = :branding_org
         where
             brand_type is null
-    """
-        ),
+    """),
         input_params,
     )
 

migrations/versions/0221_nullable_service_branding.py

@@ -19,25 +19,21 @@ def upgrade():
     op.alter_column("services_history", "branding", nullable=True)
     op.alter_column("services", "branding", nullable=True)
 
-    op.execute(
-        """
+    op.execute("""
         update
             email_branding
         set
             brand_type = 'org'
         where
             brand_type = 'govuk'
-    """
-    )
+    """)
 
-    op.execute(
-        """
+    op.execute("""
         delete from
             branding_type
         where
             name = 'govuk'
-    """
-    )
+    """)
 
 
 def downgrade():
@@ -56,12 +52,10 @@ def downgrade():
     op.alter_column("services", "branding", nullable=False)
     op.alter_column("services_history", "branding", nullable=False)
 
-    op.execute(
-        """
+    op.execute("""
         insert into
             branding_type
                 (name)
             values
                 ('govuk')
-    """
-    )
+    """)

migrations/versions/0223_add_domain_constraint.py

@@ -11,16 +11,14 @@ down_revision = "0222_drop_service_branding"
 
 
 def upgrade():
-    op.execute(
-        """
+    op.execute("""
         update
             email_branding
         set
             domain = null
         where
             domain = ''
-    """
-    )
+    """)
     op.create_unique_constraint(
         "uq_email_branding_domain", "email_branding", ["domain"]
     )

migrations/versions/0227_postage_constraints.py

@@ -12,14 +12,12 @@ down_revision = "0226_service_postage"
 
 
 def upgrade():
-    op.execute(
-        """
+    op.execute("""
             update
                 services
             set
                 postage = 'second'
-        """
-    )
+        """)
 
     op.create_check_constraint(
         "ck_services_postage", "services", "postage in ('second', 'first')"

migrations/versions/0230_noti_postage_constraint_1.py

@@ -13,8 +13,7 @@ down_revision = "0228_notification_postage"
 
 
 def upgrade():
-    op.execute(
-        """
+    op.execute("""
         ALTER TABLE notifications ADD CONSTRAINT "chk_notifications_postage_null"
         CHECK (
             CASE WHEN notification_type = 'letter' THEN
@@ -24,8 +23,7 @@ def upgrade():
             END
         )
         NOT VALID
-    """
-    )
+    """)
 
 
 def downgrade():

migrations/versions/0231_noti_postage_constraint_2.py

@@ -13,8 +13,7 @@ down_revision = "0230_noti_postage_constraint_1"
 
 
 def upgrade():
-    op.execute(
-        """
+    op.execute("""
         ALTER TABLE notification_history ADD CONSTRAINT "chk_notification_history_postage_null"
         CHECK (
             CASE WHEN notification_type = 'letter' THEN
@@ -24,8 +23,7 @@ def upgrade():
             END
         )
         NOT VALID
-    """
-    )
+    """)
 
 
 def downgrade():

migrations/versions/0237_add_filename_to_dvla_org.py

@@ -49,11 +49,9 @@ def upgrade():
     )
 
     for org_id, org_filename in LOGOS.items():
-        query = text(
-            """
+        query = text("""
             UPDATE dvla_organisation SET filename = :filename WHERE id = :id
-        """
-        )
+        """)
         conn.execute(query, {"filename": org_filename, "id": org_id})
 
 

migrations/versions/0248_enable_choose_postage.py

@@ -18,8 +18,7 @@ def upgrade():
     op.execute("INSERT INTO service_permission_types VALUES ('choose_postage')")
     op.add_column("templates", sa.Column("postage", sa.String(), nullable=True))
     op.add_column("templates_history", sa.Column("postage", sa.String(), nullable=True))
-    op.execute(
-        """
+    op.execute("""
         ALTER TABLE templates ADD CONSTRAINT "chk_templates_postage_null"
         CHECK (
             CASE WHEN template_type = 'letter' THEN
@@ -29,10 +28,8 @@ def upgrade():
                 postage is null
             END
         )
-    """
-    )
-    op.execute(
-        """
+    """)
+    op.execute("""
         ALTER TABLE templates_history ADD CONSTRAINT "chk_templates_history_postage_null"
         CHECK (
             CASE WHEN template_type = 'letter' THEN
@@ -42,8 +39,7 @@ def upgrade():
                 postage is null
             END
         )
-    """
-    )
+    """)
     # ### end Alembic commands ###
 
 

migrations/versions/0253_set_template_postage_.py

@@ -15,10 +15,8 @@ down_revision = "0252_letter_branding_table"
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.execute(
-        """UPDATE templates SET postage = services.postage
-        FROM services WHERE template_type = 'letter' AND service_id = services.id"""
-    )
+    op.execute("""UPDATE templates SET postage = services.postage
+        FROM services WHERE template_type = 'letter' AND service_id = services.id""")
     # ### end Alembic commands ###
 
 

migrations/versions/0254_folders_for_all.py

@@ -13,8 +13,7 @@ down_revision = "0253_set_template_postage"
 
 
 def upgrade():
-    op.execute(
-        """
+    op.execute("""
         INSERT INTO
             service_permissions (service_id, permission, created_at)
         SELECT
@@ -30,8 +29,7 @@ def upgrade():
                     service_id = services.id and
                     permission = 'edit_folders'
             )
-    """
-    )
+    """)
 
 
 def downgrade():

migrations/versions/0256_set_postage_tmplt_hstr.py

@@ -15,10 +15,8 @@ down_revision = "0254_folders_for_all"
 
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
-    op.execute(
-        """UPDATE templates_history SET postage = services.postage
-        FROM services WHERE template_type = 'letter' AND service_id = services.id"""
-    )
+    op.execute("""UPDATE templates_history SET postage = services.postage
+        FROM services WHERE template_type = 'letter' AND service_id = services.id""")
     # ### end Alembic commands ###
 
 

migrations/versions/0257_letter_branding_migration.py

@@ -13,21 +13,17 @@ from alembic import op
 
 
 def upgrade():
-    op.execute(
-        """INSERT INTO letter_branding (id, name, filename, domain)
+    op.execute("""INSERT INTO letter_branding (id, name, filename, domain)
                 SELECT uuid_in(md5(random()::text)::cstring), name, filename, null
-                from dvla_organisation"""
-    )
+                from dvla_organisation""")
 
-    op.execute(
-        """INSERT INTO service_letter_branding (service_id, letter_branding_id)
+    op.execute("""INSERT INTO service_letter_branding (service_id, letter_branding_id)
                SELECT S.id, LB.id
                  FROM services s
                  JOIN dvla_organisation d on (s.dvla_organisation_id = d.id)
                  JOIN letter_branding lb on (lb.filename = d.filename)
                  WHERE d.id != '001'
-                 """
-    )
+                 """)
 
 
 def downgrade():

migrations/versions/0259_remove_service_postage.py

@@ -19,13 +19,10 @@ def upgrade():
     op.drop_column("services_history", "postage")
     op.execute("DELETE FROM service_permissions WHERE permission = 'choose_postage'")
     op.execute("DELETE FROM service_permission_types WHERE name = 'choose_postage'")
-    op.execute(
-        """UPDATE templates_history SET postage = templates.postage
+    op.execute("""UPDATE templates_history SET postage = templates.postage
         FROM templates WHERE templates_history.id = templates.id AND templates_history.template_type = 'letter'
-        AND templates_history.postage is null"""
-    )
-    op.execute(
-        """
+        AND templates_history.postage is null""")
+    op.execute("""
         ALTER TABLE templates ADD CONSTRAINT "chk_templates_postage"
         CHECK (
             CASE WHEN template_type = 'letter' THEN
@@ -34,10 +31,8 @@ def upgrade():
                 postage is null
             END
         )
-    """
-    )
-    op.execute(
-        """
+    """)
+    op.execute("""
         ALTER TABLE templates_history ADD CONSTRAINT "chk_templates_history_postage"
         CHECK (
             CASE WHEN template_type = 'letter' THEN
@@ -46,18 +41,13 @@ def upgrade():
                 postage is null
             END
         )
-    """
-    )
-    op.execute(
-        """
+    """)
+    op.execute("""
         ALTER TABLE templates DROP CONSTRAINT "chk_templates_postage_null"
-    """
-    )
-    op.execute(
-        """
+    """)
+    op.execute("""
         ALTER TABLE templates_history DROP CONSTRAINT "chk_templates_history_postage_null"
-    """
-    )
+    """)
     # ### end Alembic commands ###
 
 
@@ -76,8 +66,7 @@ def downgrade():
         ),
     )
     op.execute("INSERT INTO service_permission_types VALUES ('choose_postage')")
-    op.execute(
-        """
+    op.execute("""
         ALTER TABLE templates ADD CONSTRAINT "chk_templates_postage_null"
         CHECK (
             CASE WHEN template_type = 'letter' THEN
@@ -87,10 +76,8 @@ def downgrade():
                 postage is null
             END
         )
-    """
-    )
-    op.execute(
-        """
+    """)
+    op.execute("""
         ALTER TABLE templates_history ADD CONSTRAINT "chk_templates_history_postage_null"
         CHECK (
             CASE WHEN template_type = 'letter' THEN
@@ -100,16 +87,11 @@ def downgrade():
                 postage is null
             END
         )
-    """
-    )
-    op.execute(
-        """
+    """)
+    op.execute("""
         ALTER TABLE templates DROP CONSTRAINT "chk_templates_postage"
-    """
-    )
-    op.execute(
-        """
+    """)
+    op.execute("""
         ALTER TABLE templates_history DROP CONSTRAINT "chk_templates_history_postage"
-    """
-    )
+    """)
     # ### end Alembic commands ###

migrations/versions/0260_remove_dvla_organisation.py

@@ -33,8 +33,7 @@ def downgrade():
         sa.PrimaryKeyConstraint("id", name="dvla_organisation_pkey"),
     )
     # can't repopulate the services, but we can put the static data back in dvla_organisation
-    op.execute(
-        """
+    op.execute("""
         INSERT INTO dvla_organisation VALUES
         ('001', 'HM Government', 'hm-government'),
         ('002', 'Office of the Public Guardian', 'opg'),
@@ -77,8 +76,7 @@ def downgrade():
         ('528', 'North Yorkshire Council', 'north-yorkshire'),
         ('529', 'Redbridge Council', 'redbridge'),
         ('530', 'Wigan Council', 'wigan')
-    """
-    )
+    """)
 
     op.add_column(
         "services_history",

migrations/versions/0262_remove_edit_folders.py

@@ -21,8 +21,7 @@ def downgrade():
     conn = op.get_bind()
     input_params = {"permission": "edit_folders"}
     conn.execute(
-        text(
-            """
+        text("""
            INSERT INTO
                service_permissions (service_id, permission, created_at)
            SELECT
@@ -38,7 +37,6 @@ def downgrade():
                        service_id = services.id and
                        permission = :permission
                )
-       """
-        ),
+       """),
         input_params,
     )

migrations/versions/0277_consent_to_research_null.py

@@ -29,41 +29,33 @@ def upgrade():
         nullable=True,
         server_default=sa.null(),
     )
-    op.execute(
-        """
+    op.execute("""
         UPDATE
             services
         SET
             consent_to_research = null
-    """
-    )
-    op.execute(
-        """
+    """)
+    op.execute("""
         UPDATE
             services_history
         SET
             consent_to_research = null
-    """
-    )
+    """)
 
 
 def downgrade():
-    op.execute(
-        """
+    op.execute("""
         UPDATE
             services
         SET
             consent_to_research = false
-    """
-    )
-    op.execute(
-        """
+    """)
+    op.execute("""
         UPDATE
             services_history
         SET
             consent_to_research = false
-    """
-    )
+    """)
     op.alter_column(
         "services_history",
         "consent_to_research",

migrations/versions/0284_0283_retry.py

@@ -15,8 +15,7 @@ from alembic import op
 
 
 def upgrade():
-    op.execute(
-        """
+    op.execute("""
         UPDATE
             services
         SET
@@ -28,17 +27,14 @@ def upgrade():
             services_history.version = 1 and
             services_history.created_by_id = users.id
         ;
-    """
-    )
+    """)
 
 
 def downgrade():
-    op.execute(
-        """
+    op.execute("""
         UPDATE
             services
         SET
             count_as_live = true
         ;
-    """
-    )
+    """)

migrations/versions/0285_default_org_branding.py

@@ -15,19 +15,15 @@ from alembic import op
 
 
 def upgrade():
-    op.execute(
-        """UPDATE organisation SET email_branding_id = email_branding.id
+    op.execute("""UPDATE organisation SET email_branding_id = email_branding.id
     FROM email_branding
     WHERE email_branding.domain in (SELECT domain FROM domain WHERE domain.organisation_id = organisation.id)
-    """
-    )
+    """)
 
-    op.execute(
-        """UPDATE organisation SET letter_branding_id = letter_branding.id
+    op.execute("""UPDATE organisation SET letter_branding_id = letter_branding.id
     FROM letter_branding
     WHERE letter_branding.domain in (SELECT domain FROM domain WHERE domain.organisation_id = organisation.id)
-    """
-    )
+    """)
 
 
 def downgrade():

migrations/versions/0289_precompiled_for_all.py

@@ -25,8 +25,7 @@ def downgrade():
     op.execute("INSERT INTO service_permission_types values('precompiled_letter')")
     input_params = {"permission": "precompiled_letter"}
     conn.execute(
-        text(
-            """
+        text("""
            INSERT INTO
                service_permissions (service_id, permission, created_at)
            SELECT
@@ -42,7 +41,6 @@ def downgrade():
                        service_id = services.id and
                        permission = :permission
                )
-       """
-        ),
+       """),
         input_params,
     )

migrations/versions/0297_template_redacted_fix.py

@@ -13,15 +13,13 @@ down_revision = "0296_agreement_signed_by_person"
 
 
 def upgrade():
-    op.execute(
-        """
+    op.execute("""
         INSERT INTO template_redacted (template_id, redact_personalisation, updated_at, updated_by_id)
         SELECT templates.id, FALSE, now(), templates.created_by_id
         FROM templates
         WHERE templates.id NOT IN (SELECT template_id FROM template_redacted WHERE template_id = templates.id)
         ;
-    """
-    )
+    """)
 
 
 def downgrade():

migrations/versions/0298_add_mou_signed_receipt.py

@@ -136,8 +136,7 @@ def upgrade():
             "user_id": current_app.config["NOTIFY_USER_ID"],
         }
         conn.execute(
-            text(
-                """
+            text("""
             INSERT INTO template_redacted
             (
                 template_id,
@@ -145,8 +144,7 @@ def upgrade():
                 updated_at,
                 updated_by_id
             ) VALUES ( :template_id, false, current_timestamp, :user_id )
-            """
-            ),
+            """),
             input_params,
         )
 

migrations/versions/0300_migrate_org_types.py

@@ -18,27 +18,23 @@ environment = os.environ["NOTIFY_ENVIRONMENT"]
 
 def upgrade():
     if environment not in ["live", "production"]:
-        op.execute(
-            """
+        op.execute("""
             UPDATE
                 organisation
             SET
                 organisation_type = 'nhs_local'
             WHERE
                 organisation.organisation_type = 'nhs'
-        """
-        )
+        """)
 
-        op.execute(
-            """
+        op.execute("""
             UPDATE
                 services
             SET
                 organisation_type = 'nhs_local'
             WHERE
                 services.organisation_type = 'nhs'
-        """
-        )
+        """)
 
     op.alter_column(
         "organisation_types",
@@ -81,24 +77,20 @@ def downgrade():
     )
 
     if environment not in ["live", "production"]:
-        op.execute(
-            """
+        op.execute("""
             UPDATE
                 organisation
             SET
                 organisation_type = 'nhs'
             WHERE
                 organisation_type = 'nhs_local'
-        """
-        )
+        """)
 
-        op.execute(
-            """
+        op.execute("""
             UPDATE
                 services
             SET
                 organisation_type = 'nhs'
             WHERE
                 organisation_type = 'nhs_local'
-        """
-        )
+        """)

migrations/versions/0308_delete_loadtesting_provider.py

@@ -27,8 +27,7 @@ def upgrade():
 def downgrade():
     conn = op.get_bind()
     conn.execute(
-        text(
-            """
+        text("""
         INSERT INTO
         provider_details
         (id, display_name, identifier, priority, notification_type, active, version, supports_international)
@@ -39,7 +38,6 @@ def downgrade():
         (id, display_name, identifier, priority, notification_type, active, version, supports_international)
         VALUES
         (:uuid, 'Loadtesting', 'loadtesting', 100, 'sms', true, 1, false)
-        """
-        ),
+        """),
         {"uuid": str(uuid.uuid4())},
     )

migrations/versions/0314_populate_email_access.py

@@ -15,18 +15,15 @@ down_revision = "0313_email_access_validated_at"
 def upgrade():
     # ### commands auto generated by Alembic - please adjust! ###
     # if user has email_auth, set email_access_validated_at on last login, else set it at user created_at date.
-    op.execute(
-        """
+    op.execute("""
         UPDATE
             users
         SET
             email_access_validated_at = created_at
         WHERE
             email_access_validated_at IS NULL
-    """
-    )
-    op.execute(
-        """
+    """)
+    op.execute("""
         UPDATE
             users
         SET
@@ -35,8 +32,7 @@ def upgrade():
             auth_type = 'email_auth'
         AND
             logged_in_at IS NOT NULL
-    """
-    )
+    """)
     op.alter_column("users", "email_access_validated_at", nullable=False)
     # ### end Alembic commands ###
 

migrations/versions/0317_uploads_for_all.py

@@ -13,8 +13,7 @@ down_revision = "0316_int_letters_permission"
 
 
 def upgrade():
-    op.execute(
-        """
+    op.execute("""
         INSERT INTO
             service_permissions (service_id, permission, created_at)
         SELECT
@@ -30,8 +29,7 @@ def upgrade():
                     service_id = services.id and
                     permission = 'upload_letters'
            )
-    """
-    )
+    """)
 
 
 def downgrade():

migrations/versions/0321_drop_postage_constraints.py

@@ -33,8 +33,7 @@ def upgrade():
 def downgrade():
     # The downgrade command must not be run in production - it will lock the tables for a long time
     if environment not in ["live", "production"]:
-        op.execute(
-            """
+        op.execute("""
             ALTER TABLE notifications ADD CONSTRAINT "chk_notifications_postage_null"
             CHECK (
                 CASE WHEN notification_type = 'letter' THEN
@@ -43,10 +42,8 @@ def downgrade():
                     postage is null
                 END
             )
-        """
-        )
-        op.execute(
-            """
+        """)
+        op.execute("""
             ALTER TABLE notification_history ADD CONSTRAINT "chk_notification_history_postage_null"
             CHECK (
                 CASE WHEN notification_type = 'letter' THEN
@@ -55,10 +52,8 @@ def downgrade():
                     postage is null
                 END
             )
-        """
-        )
-        op.execute(
-            """
+        """)
+        op.execute("""
             ALTER TABLE templates ADD CONSTRAINT "chk_templates_postage"
             CHECK (
                 CASE WHEN template_type = 'letter' THEN
@@ -67,10 +62,8 @@ def downgrade():
                     postage is null
                 END
             )
-        """
-        )
-        op.execute(
-            """
+        """)
+        op.execute("""
             ALTER TABLE templates_history ADD CONSTRAINT "chk_templates_history_postage"
             CHECK (
                 CASE WHEN template_type = 'letter' THEN
@@ -79,5 +72,4 @@ def downgrade():
                     postage is null
                 END
             )
-        """
-        )
+        """)

migrations/versions/0327_idx_notification_history.py

@@ -43,24 +43,18 @@ def upgrade():
 
 def downgrade():
     if environment not in ["live", "production"]:
-        op.execute(
-            """
+        op.execute("""
             CREATE INDEX IF NOT EXISTS ix_notifications_service_id_created_at
             ON notifications(service_id, date(created_at))
-            """
-        )
-        op.execute(
-            """
+            """)
+        op.execute("""
             CREATE INDEX IF NOT EXISTS ix_notification_history_created_at
             on notification_history(created_at)
-            """
-        )
-        op.execute(
-            """
+            """)
+        op.execute("""
             CREATE INDEX IF NOT EXISTS ix_notification_history_service_id_created_at
             on notification_history(created_at)
-            """
-        )
+            """)
 
         op.execute("DROP INDEX IF EXISTS ix_notification_history_service_id_composite")
 
@@ -70,20 +64,14 @@ def downgrade():
         op.execute(
             "CREATE INDEX IF NOT EXISTS ix_notification_history_service_id on notification_history (service_id)"
         )
-        op.execute(
-            """
+        op.execute("""
             CREATE INDEX IF NOT EXISTS ix_notification_history_template_id on notification_history (template_id)
-            """
-        )
-        op.execute(
-            """
+            """)
+        op.execute("""
             CREATE INDEX IF NOT EXISTS ix_notification_history_notification_status
             on notification_history (notification_status)
-            """
-        )
-        op.execute(
-            """
+            """)
+        op.execute("""
             CREATE INDEX IF NOT EXISTS ix_notification_history_notification_type
             on notification_history (notification_type)
-            """
-        )
+            """)

migrations/versions/0336_broadcast_msg_content_2.py

@@ -20,9 +20,7 @@ down_revision = "0335_broadcast_msg_content"
 def upgrade():
     conn = op.get_bind()
 
-    results = conn.execute(
-        sa.text(
-            """
+    results = conn.execute(sa.text("""
         UPDATE
             broadcast_message
         SET
@@ -34,9 +32,7 @@ def upgrade():
             broadcast_message.template_id = templates_history.id and
             broadcast_message.template_version = templates_history.version
         ;
-    """
-        )
-    )
+    """))
 
 
 def downgrade():

migrations/versions/0356_add_webautn_auth_type.py

@@ -19,13 +19,11 @@ def upgrade():
     op.drop_constraint(
         "ck_users_mobile_or_email_auth", "users", type_=None, schema=None
     )
-    op.execute(
-        """
+    op.execute("""
         ALTER TABLE users ADD CONSTRAINT "ck_user_has_mobile_or_other_auth"
         CHECK (auth_type in ('email_auth', 'webauthn_auth') or mobile_number is not null)
         NOT VALID
-    """
-    )
+    """)
     # ### end Alembic commands ###
 
 
@@ -41,13 +39,11 @@ def downgrade():
     op.drop_constraint(
         "ck_user_has_mobile_or_other_auth", "users", type_=None, schema=None
     )
-    op.execute(
-        """
+    op.execute("""
         ALTER TABLE users ADD CONSTRAINT "ck_users_mobile_or_email_auth"
         CHECK (auth_type = 'email_auth' or mobile_number is not null)
         NOT VALID
-    """
-    )
+    """)
 
     op.execute("DELETE FROM auth_type WHERE name = 'webauthn_auth'")
     # ### end Alembic commands ###

migrations/versions/0373_add_notifications_view.py

@@ -15,8 +15,7 @@ down_revision = "0364_drop_old_column"
 
 
 def upgrade():
-    op.execute(
-        """
+    op.execute("""
         CREATE VIEW notifications_all_time_view AS
         (
             SELECT
@@ -72,8 +71,7 @@ def upgrade():
                 document_download_count
             FROM notification_history
         )
-    """
-    )
+    """)
 
 
 def downgrade():

migrations/versions/0385_remove postage_.py

@@ -34,8 +34,7 @@ def upgrade():
 
     # we need to replace the entire notifications_all_time_view in order to update it
     op.execute("DROP VIEW notifications_all_time_view;")
-    op.execute(
-        """
+    op.execute("""
         CREATE VIEW notifications_all_time_view AS
         (
             SELECT
@@ -89,8 +88,7 @@ def upgrade():
                 document_download_count
             FROM notification_history
         )
-    """
-    )
+    """)
 
     op.drop_column("notification_history", "postage")
     op.drop_column("notifications", "postage")
@@ -141,8 +139,7 @@ def downgrade():
     )
 
     op.execute("DROP VIEW notifications_all_time_view;")
-    op.execute(
-        """
+    op.execute("""
         CREATE VIEW notifications_all_time_view AS
         (
             SELECT
@@ -198,6 +195,5 @@ def downgrade():
                 document_download_count
             FROM notification_history
         )
-    """
-    )
+    """)
     # ### end Alembic commands ###

migrations/versions/0387_remove_letter_perms_.py

@@ -22,8 +22,7 @@ def upgrade():
 
 def downgrade():
     # this is the inverse of migration 0317
-    op.execute(
-        """
+    op.execute("""
         INSERT INTO
             service_permissions (service_id, permission, created_at)
         SELECT
@@ -39,8 +38,7 @@ def downgrade():
                     service_id = services.id and
                     permission = 'upload_letters'
            )
-    """
-    )
+    """)
 
 
 # ### end Alembic commands ###

migrations/versions/0410_enums_for_everything.py

@@ -151,8 +151,7 @@ def view_handler() -> Iterator[None]:
 
     yield
 
-    op.execute(
-        """
+    op.execute("""
         CREATE VIEW notifications_all_time_view AS
         (
             SELECT
@@ -206,8 +205,7 @@ def view_handler() -> Iterator[None]:
                 document_download_count
             FROM notification_history
         )
-    """
-    )
+    """)
 
 
 def upgrade():
@@ -470,8 +468,7 @@ def upgrade():
             postgresql_using=enum_using("notification_type", NotificationType),
         )
         # Clobbering bad data here. These are values we don't use any more, and anything with them is unnecessary.
-        op.execute(
-            """
+        op.execute("""
             delete from
                 service_permissions
             where
@@ -482,8 +479,7 @@ def upgrade():
                     'international_letters',
                     'broadcast'
                 );
-        """
-        )
+        """)
         op.alter_column(
             "service_permissions",
             "permission",

migrations/versions/0418_user_state_enum.py

@@ -63,8 +63,7 @@ def view_handler() -> Iterator[None]:
 
     yield
 
-    op.execute(
-        """
+    op.execute("""
         CREATE VIEW notifications_all_time_view AS
         (
             SELECT
@@ -118,8 +117,7 @@ def view_handler() -> Iterator[None]:
                 document_download_count
             FROM notification_history
         )
-    """
-    )
+    """)
 
 
 def upgrade():

notifications_utils/clients/redis/redis_client.py

@@ -52,16 +52,14 @@ class RedisClient:
         # delete keys matching a pattern supplied as a parameter. Does so in batches of 5000 to prevent unpack from
         # exceeding lua's stack limit, and also to prevent errors if no keys match the pattern.
         # Inspired by https://gist.github.com/ddre54/0a4751676272e0da8186
-        self.scripts["delete-keys-by-pattern"] = self.redis_store.register_script(
-            """
+        self.scripts["delete-keys-by-pattern"] = self.redis_store.register_script("""
             local keys = redis.call('keys', ARGV[1])
             local deleted = 0
             for i=1, #keys, 5000 do
                 deleted = deleted + redis.call('del', unpack(keys, i, math.min(i + 4999, #keys)))
             end
             return deleted
-            """
-        )
+            """)
 
     def delete_by_pattern(self, pattern, raise_exception=False):
         r"""

pyproject.toml

@@ -9,22 +9,22 @@ readme = "README.md"
 
 [tool.poetry.dependencies]
 python = "^3.13.2"
-alembic = "==1.18.1"
+alembic = "==1.18.4"
 amqp = "==5.3.1"
 beautifulsoup4 = "==4.14.3"
 boto3 = "^1.38.27"
 botocore = "^1.38.27"
-cachetools = "==6.2.4"
+cachetools = "==7.0.1"
 celery = {version = "==5.6.2", extras = ["redis"]}
 certifi = ">=2022.12.7"
 cffi = "==2.0.0"
 charset-normalizer = "^3.4.4"
 click = "==8.3.1"
-click-datetime = "==0.4.0"
 click-didyoumean = "==0.3.1"
 click-plugins = "==1.1.1.2"
 click-repl = "==0.3.0"
 deprecated = "==1.3.1"
+dulwich = "^1.2.5"
 gevent = "==25.5.1"
 expiringdict = "==1.2.2"
 flask = "~=3.1"
@@ -32,82 +32,85 @@ flask-bcrypt = "==1.0.1"
 flask-migrate = "==4.1.0"
 flask-redis = "==0.4.0"
 flask-sqlalchemy = "^3.1.1"
-gunicorn = {version = "==23.0.0", extras = ["gevent"]}
+gunicorn = {version = "==25.1.0", extras = ["gevent"]}
 iso8601 = "==2.1.0"
 jsonschema = {version = "==4.26.0", extras = ["format"]}
-lxml = "==6.0.2"
-marshmallow = "^4.2.0"
+lxml = "==6.1.0"
+marshmallow = "^4.2.2"
 marshmallow-sqlalchemy = "^1.4.2"
-newrelic = "^11.2.0"
-packaging = "==25.0"
+newrelic = "^11.5.0"
+packaging = "==26.0"
 poetry-dotenv-plugin = "==0.2.0"
 psycopg2-binary = "==2.9.11"
-pyjwt = "==2.10.1"
-python-dotenv = "==1.2.1"
-sqlalchemy = "==2.0.45"
+pyjwt = "==2.13.0"
+python-dotenv = "==1.2.2"
+sqlalchemy = "==2.0.47"
 werkzeug = "^3.1.5"
-faker = "^40.1.0"
+faker = "^40.5.1"
 async-timeout = "^5.0.1"
-bleach = "^6.3.0"
+bleach = "^6.4.0"
 geojson = "^3.2.0"
-numpy = "^2.4.0"
+numpy = "^2.4.2"
 ordered-set = "^4.1.0"
-phonenumbers = "^9.0.22"
+phonenumbers = "^9.0.24"
 python-json-logger = "^4.0.0"
-regex = "^2025.11.3"
+regex = "^2026.2.19"
 shapely = "^2.1.2"
 smartypants = "^2.0.1"
-mistune = "^3.2.0"
+mistune = "^3.2.1"
 blinker = "^1.9.0"
-cryptography = "^46.0.3"
-idna = "^3.11"
-jmespath = "^1.0.1"
+cryptography = "^48.0.1"
+idna = "^3.15"
+jmespath = "^1.1.0"
 markupsafe = "^3.0.3"
-pycparser = "^2.23"
+mako = "^1.3.12"
+pycparser = "^3.0"
 python-dateutil = "^2.9.0.post0"
 pyyaml = "^6.0.3"
-s3transfer = "^0.13.1"
+s3transfer = "^0.16.0"
 six = "^1.16.0"
 urllib3 = "^2.6.3"
 webencodings = "^0.5.1"
 itsdangerous = "^2.2.0"
 jinja2 = "^3.1.6"
 redis = "^6.4.0"
-requests = "^2.32.5"
-virtualenv = "^20.36.1"
+requests = "^2.33.0"
+virtualenv = "^21.1.0"
 marshmallow-enum = "^1.5.1"
-awscli = "^1.40.36"
+awscli = "^1.44.38"
 typing-extensions = "^4.15.0"
-aiohttp = "^3.13.3"
+aiohttp = "^3.14.1"
 pytest = "^9.0.2"
 filelock = ">=3.20.3"
-pyasn1 = ">=0.6.2"
+pyasn1 = ">=0.6.3"
+jaraco-context = ">=6.1.0"
+wheel = ">=0.46.2"
 
 
 [tool.poetry.group.dev.dependencies]
 bandit = "*"
-black = "^26.1.0"
+black = "^26.3.1"
 cyclonedx-python-lib = "^11.6.0"
 cloudfoundry-client = "*"
 exceptiongroup = "==1.3.1"
 flake8 = "^7.3.0"
 flake8-bugbear = "^25.11.29"
 freezegun = "^1.5.5"
-hypothesis = "^6.150.2"
+hypothesis = "^6.151.9"
 honcho = "*"
-isort = "^7.0.0"
+isort = "^8.0.0"
 jinja2-cli = {version = "==1.0.0", extras = ["yaml"]}
-moto = "==5.1.19"
+moto = "==5.1.21"
 pip-audit = "*"
 pre-commit = "^4.5.1"
 pytest = "^9.0.2"
-pytest-env = "^1.2.0"
+pytest-env = "^1.5.0"
 pytest-mock = "^3.15.1"
 pytest-cov = "^7.0.0"
 pytest-xdist = "^3.8.0"
 radon = "^6.0.1"
 requests-mock = "^1.11.0"
-setuptools = "^80.9.0"
+setuptools = "^82.0.0"
 sqlalchemy-utils = "^0.41.2"
 vulture = "^2.10"
 detect-secrets = "^1.5.0"

tests/app/authentication/test_authentication.py

@@ -238,12 +238,11 @@ def test_decode_jwt_token_returns_error_with_no_secrets(client):
     assert exc.value.short_message == "Invalid token: API key not found"
 
 
-@pytest.mark.parametrize("service_id", ["not-a-valid-id", 1234])
 def test_requires_auth_should_not_allow_service_id_with_the_wrong_data_type(
-    client, service_jwt_secret, service_id
+    client, service_jwt_secret
 ):
     token = create_jwt_token(
-        client_id=service_id,
+        client_id="not-a-valid-id",
         secret=service_jwt_secret,
     )
 
@@ -256,6 +255,16 @@ def test_requires_auth_should_not_allow_service_id_with_the_wrong_data_type(
     )
 
 
+def test_requires_auth_should_not_allow_service_id_with_a_non_string(
+    client, service_jwt_secret
+):
+    with pytest.raises(TypeError):
+        create_jwt_token(
+            client_id=1234,
+            secret=service_jwt_secret,
+        )
+
+
 def test_requires_auth_returns_error_when_service_doesnt_exist(client, sample_api_key):
     # get service ID and secret the wrong way around
     token = create_jwt_token(

tests/app/test_commands.py

@@ -7,7 +7,7 @@ import pytest
 from sqlalchemy import func, select
 
 from app import db
-from app.commands import (
+from app.commands import (  # update_jobs_archived_flag,
     _clear_templates_from_cache,
     _update_template,
     associate_services_to_organizations,
@@ -32,7 +32,6 @@ from app.commands import (
     promote_user_to_platform_admin,
     purge_csv_bucket,
     purge_functional_test_data,
-    update_jobs_archived_flag,
     update_templates,
 )
 from app.dao.inbound_numbers_dao import dao_get_available_inbound_numbers
@@ -46,23 +45,19 @@ from app.enums import (
     TemplateType,
     UserState,
 )
-from app.models import (
+from app.models import (  # Job,
     AnnualBilling,
-    Job,
     Notification,
     Organization,
     Service,
     Template,
     User,
 )
-from app.utils import utc_now
-from tests.app.db import (
+from tests.app.db import (  # create_job,; create_template,
     create_annual_billing,
-    create_job,
     create_notification,
     create_organization,
     create_service,
-    create_template,
 )
 
 
@@ -120,35 +115,35 @@ def test_purge_functional_test_data_bad_mobile(notify_db_session, notify_api):
     assert user_count == 0
 
 
-def test_update_jobs_archived_flag(notify_db_session, notify_api):
-    service = create_service()
+# def test_update_jobs_archived_flag(notify_db_session, notify_api):
+#     service = create_service()
 
-    sms_template = create_template(service=service, template_type=TemplateType.SMS)
-    create_job(sms_template)
+#     sms_template = create_template(service=service, template_type=TemplateType.SMS)
+#     create_job(sms_template)
 
-    right_now = utc_now()
-    tomorrow = right_now + timedelta(days=1)
+#     right_now = utc_now()
+#     tomorrow = right_now + timedelta(days=1)
 
-    right_now = right_now.strftime("%Y-%m-%d")
-    tomorrow = tomorrow.strftime("%Y-%m-%d")
+#     right_now = right_now.strftime("%Y-%m-%d")
+#     tomorrow = tomorrow.strftime("%Y-%m-%d")
 
-    stmt = select(Job).where(Job.archived is True)
-    archived_jobs = db.session.execute(stmt).scalar() or 0
-    assert archived_jobs == 0
+#     stmt = select(Job).where(Job.archived is True)
+#     archived_jobs = db.session.execute(stmt).scalar() or 0
+#     assert archived_jobs == 0
 
-    notify_api.test_cli_runner().invoke(
-        update_jobs_archived_flag,
-        [
-            "-e",
-            tomorrow,
-            "-s",
-            right_now,
-        ],
-    )
-    jobs = db.session.execute(select(Job)).scalars().all()
-    assert len(jobs) == 1
-    for job in jobs:
-        assert job.archived is True
+#     notify_api.test_cli_runner().invoke(
+#         update_jobs_archived_flag,
+#         [
+#             "-e",
+#             tomorrow,
+#             "-s",
+#             right_now,
+#         ],
+#     )
+#     jobs = db.session.execute(select(Job)).scalars().all()
+#     assert len(jobs) == 1
+#     for job in jobs:
+#         assert job.archived is True
 
 
 def _get_organization_query_count():

tests/notifications_utils/test_formatters.py

@@ -395,20 +395,16 @@ def test_strip_and_remove_obscure_whitespace_only_removes_normal_whitespace_from
 
 def test_remove_smart_quotes_from_email_addresses():
     assert (
-        remove_smart_quotes_from_email_addresses(
-            """
+        remove_smart_quotes_from_email_addresses("""
         line one’s quote
         first.o’last@example.com is someone’s email address
         line ‘three’
-    """
-        )
-        == (
-            """
+    """)
+        == ("""
         line one’s quote
         first.o'last@example.com is someone’s email address
         line ‘three’
-    """
-        )
+    """)
     )
 
 

tests/notifications_utils/test_recipient_csv.py

@@ -1014,9 +1014,7 @@ def test_multiple_sms_recipient_columns_with_missing_data(column_name):
         """
             names, phone number, {}
             "Joanna and Steve", 07900 900111
-        """.format(
-            column_name
-        ),
+        """.format(column_name),
         template=_sample_template("sms"),
         allow_international_sms=True,
     )