Apply ruff formatting to OT-2 and CloudFront helpers.

No behavior change except removing an unused placeholder variable in
cloudfront invalidation report output.

Co-authored-by: Cursor <cursoragent@cursor.com>

Author: y3rsh

automation/cloudfront_invalidation.py

@@ -164,10 +164,7 @@ def build_invalidation_plan(
 def format_create_invalidation_command(plan: CloudFrontInvalidationPlan, distribution_id: str) -> str:
     """Return a copy-paste aws cloudfront create-invalidation command."""
     path_args = " ".join(f'"{path}"' for path in plan.paths)
-    return (
-        f"aws cloudfront create-invalidation --profile {plan.profile} "
-        f"--distribution-id {distribution_id} --paths {path_args}"
-    )
+    return f"aws cloudfront create-invalidation --profile {plan.profile} --distribution-id {distribution_id} --paths {path_args}"
 
 
 def print_copy_paste_command(command: str) -> None:
@@ -198,8 +195,7 @@ def format_cloudfront_invalidation_report(plan: CloudFrontInvalidationPlan) -> s
         )
         if target.terraform_output is not None:
             lines.append(f"# release-ci prod terraform output alternative: terraform output -raw {target.terraform_output}")
-        placeholder_id = f"<distribution-id-for-{target.host}>"
-        lines.append(f"# aws command printed below (single line)")
+        lines.append("# aws command printed below (single line)")
         return "\n".join(lines)
 
     lines.extend(

automation/ot2_calendar_semver.py

@@ -15,20 +15,12 @@
 OT2_MONTH = r"(?:[1-9]|1[0-2])"
 OT2_MONTH_CAP = r"([1-9]|1[0-2])"
 
-OT2_INTERNAL_VERSION_RE = re.compile(
-    rf"^(\d{{2}})\.{OT2_MONTH_CAP}\.(\d+)(?:-(alpha|beta))?$"
-)
-OT2_INTERNAL_TAG_RE = re.compile(
-    rf"^internal@((\d{{2}})\.{OT2_MONTH_CAP}\.(\d+)(?:-(alpha|beta))?)$"
-)
+OT2_INTERNAL_VERSION_RE = re.compile(rf"^(\d{{2}})\.{OT2_MONTH_CAP}\.(\d+)(?:-(alpha|beta))?$")
+OT2_INTERNAL_TAG_RE = re.compile(rf"^internal@((\d{{2}})\.{OT2_MONTH_CAP}\.(\d+)(?:-(alpha|beta))?)$")
 
 OT2_EXTERNAL_PRERELEASE_NUM = r"\d{1,3}"
-OT2_EXTERNAL_VERSION_RE = re.compile(
-    rf"^(\d{{2}})\.{OT2_MONTH_CAP}\.([0-9])(?:-(alpha|beta)\.({OT2_EXTERNAL_PRERELEASE_NUM}))?$"
-)
-OT2_EXTERNAL_TAG_RE = re.compile(
-    rf"^v((\d{{2}})\.{OT2_MONTH_CAP}\.([0-9])(?:-(alpha|beta)\.({OT2_EXTERNAL_PRERELEASE_NUM}))?)$"
-)
+OT2_EXTERNAL_VERSION_RE = re.compile(rf"^(\d{{2}})\.{OT2_MONTH_CAP}\.([0-9])(?:-(alpha|beta)\.({OT2_EXTERNAL_PRERELEASE_NUM}))?$")
+OT2_EXTERNAL_TAG_RE = re.compile(rf"^v((\d{{2}})\.{OT2_MONTH_CAP}\.([0-9])(?:-(alpha|beta)\.({OT2_EXTERNAL_PRERELEASE_NUM}))?)$")
 
 Ot2Stability = Literal["stable", "alpha", "beta"]
 
@@ -118,9 +110,7 @@ def ot2_internal_version_for_date(release_date: date | None = None, build_num: i
     """Return internal semver for a calendar date (Eastern by default)."""
     if release_date is None:
         release_date = ot2_release_date_today()
-    return encode_ot2_internal_version(
-        release_date.year, release_date.month, release_date.day, build_num
-    )
+    return encode_ot2_internal_version(release_date.year, release_date.month, release_date.day, build_num)
 
 
 def ot2_external_version_for_month(release_date: date | None = None, release_num: int = 0) -> str:

automation/ot2_tag_allocation.py

@@ -42,17 +42,11 @@ def allocate_next_internal_tag(
             year, month, day, build_num, prerelease = decode_ot2_internal_version(version)
         except ValueError:
             continue
-        if (
-            (year, month, day)
-            == (release_date.year, release_date.month, release_date.day)
-            and prerelease == expected_prerelease
-        ):
+        if (year, month, day) == (release_date.year, release_date.month, release_date.day) and prerelease == expected_prerelease:
             same_day_builds.append(build_num)
 
     next_build = max(same_day_builds, default=0) + 1
-    next_version = encode_ot2_internal_version(
-        release_date.year, release_date.month, release_date.day, next_build
-    )
+    next_version = encode_ot2_internal_version(release_date.year, release_date.month, release_date.day, next_build)
     if expected_prerelease is not None:
         next_version = f"{next_version}-{expected_prerelease}"
     return f"internal@{next_version}"
@@ -78,10 +72,7 @@ def allocate_next_external_tag(
                 year, month, release_num, prerelease, _ = decode_ot2_external_version(version)
             except ValueError:
                 continue
-            if (
-                (year, month) == (release_date.year, release_date.month)
-                and prerelease is None
-            ):
+            if (year, month) == (release_date.year, release_date.month) and prerelease is None:
                 same_month_nums.append(release_num)
         next_num = max(same_month_nums, default=-1) + 1
         if next_num > 9:
@@ -105,15 +96,9 @@ def allocate_next_external_tag(
             tag_year, tag_month, tag_num, tag_pre, tag_pre_num = decode_ot2_external_version(version)
         except ValueError:
             continue
-        if (
-            (tag_year, tag_month, tag_num) == (year, month, release_num)
-            and tag_pre == stability
-            and tag_pre_num is not None
-        ):
+        if (tag_year, tag_month, tag_num) == (year, month, release_num) and tag_pre == stability and tag_pre_num is not None:
             same_prerelease_nums.append(tag_pre_num)
 
     next_pre_num = max(same_prerelease_nums, default=-1) + 1
-    next_version = encode_ot2_external_version(
-        year, month, release_num, stability, next_pre_num
-    )
+    next_version = encode_ot2_external_version(year, month, release_num, stability, next_pre_num)
     return f"v{next_version}"