bmsdna-devtools 0.2.1__tar.gz → 0.2.2__tar.gz

{bmsdna_devtools-0.2.1 → bmsdna_devtools-0.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: bmsdna-devtools
-Version: 0.2.1
+Version: 0.2.2
 Summary: Shared Azure DevOps / GitHub / git / Azure Monitor developer tooling for BMS projects
 Requires-Python: >=3.11
 Requires-Dist: requests>=2.32.0
@@ -77,6 +77,12 @@ title/body from commit info so it never blocks on an interactive prompt).
 Extra arguments pass through either way, e.g.
 `bdt pr create --target main -- --title "..."`.
 
+If `--target` has a build policy configured (an Azure DevOps Build policy,
+or a GitHub branch protection rule requiring status checks), a successful
+create prints a reminder to run `bdt pr status` afterward to check whether
+the CI build passes. This is a best-effort check — failures reading policy
+config (auth, permissions) fail open and simply skip the reminder.
+
 ## `bdt worktree`
 
 ```bash

{bmsdna_devtools-0.2.1 → bmsdna_devtools-0.2.2}/README.md

@@ -67,6 +67,12 @@ title/body from commit info so it never blocks on an interactive prompt).
 Extra arguments pass through either way, e.g.
 `bdt pr create --target main -- --title "..."`.
 
+If `--target` has a build policy configured (an Azure DevOps Build policy,
+or a GitHub branch protection rule requiring status checks), a successful
+create prints a reminder to run `bdt pr status` afterward to check whether
+the CI build passes. This is a best-effort check — failures reading policy
+config (auth, permissions) fail open and simply skip the reminder.
+
 ## `bdt worktree`
 
 ```bash

{bmsdna_devtools-0.2.1 → bmsdna_devtools-0.2.2}/bmsdna/devtools/cli.py

@@ -38,17 +38,25 @@ def pr_create(
     """Create a PR from the current branch into --target (Azure DevOps or GitHub, auto-detected)."""
     remote = current_remote()
     if isinstance(remote, GitHubRemote):
-        raise typer.Exit(gh_pr.create(require_gh(), target, args or []))
-
-    az = require_az()
-    cmd = [
-        az, "repos", "pr", "create",
-        "--target-branch", target,
-        "--source-branch", current_branch(),
-        "--auto-complete", "false",
-        *(args or []),
-    ]
-    raise typer.Exit(subprocess.run(cmd).returncode)
+        gh = require_gh()
+        returncode = gh_pr.create(gh, target, args or [])
+        build_policy = gh_pr.has_build_policy(gh, target)
+    else:
+        az = require_az()
+        cmd = [
+            az, "repos", "pr", "create",
+            "--target-branch", target,
+            "--source-branch", current_branch(),
+            "--auto-complete", "false",
+            *(args or []),
+        ]
+        returncode = subprocess.run(cmd).returncode
+        build_policy = pr_build.has_build_policy(remote, target)
+
+    if returncode == 0 and build_policy:
+        print("\nRun `bdt pr status` to check whether the CI build passes.")
+
+    raise typer.Exit(returncode)
 
 
 @pr_app.command("status")

{bmsdna_devtools-0.2.1 → bmsdna_devtools-0.2.2}/bmsdna/devtools/gh_pr.py

@@ -138,3 +138,31 @@ def create(gh: str, target: str, extra_args: list[str]) -> int:
     """
     cmd = [gh, "pr", "create", "--base", target, "--fill", *extra_args]
     return subprocess.run(cmd).returncode
+
+
+def protection_requires_status_checks(protection: dict) -> bool:
+    """True if a branch's `.../protection` response requires status checks to pass."""
+    return bool(protection.get("required_status_checks"))
+
+
+def has_build_policy(gh: str, branch: str) -> bool:
+    """Best-effort check for whether `branch` has branch protection requiring status checks.
+
+    Only used to decide whether to print a `bdt pr status` reminder after
+    `pr create` — `{owner}`/`{repo}` are resolved by `gh` from the current
+    repo, and any failure (no permission to read protection settings, branch
+    not protected at all, etc.) fails open (returns False) rather than
+    blocking PR creation.
+    """
+    r = subprocess.run(
+        [gh, "api", f"repos/{{owner}}/{{repo}}/branches/{branch}/protection"],
+        capture_output=True,
+        encoding="utf-8",
+    )
+    if r.returncode != 0:
+        return False
+    try:
+        data = json.loads(r.stdout)
+    except json.JSONDecodeError:
+        return False
+    return protection_requires_status_checks(data)

{bmsdna_devtools-0.2.1 → bmsdna_devtools-0.2.2}/bmsdna/devtools/pr_build.py

@@ -28,6 +28,60 @@ def _base_url(remote: AdoRemote) -> str:
     return f"https://dev.azure.com/{remote.org}/{quote(remote.project, safe='')}"
 
 
+# PolicyType.id for the built-in "Build" policy (branch policy requiring a
+# build to pass) — same GUID across every ADO organization.
+BUILD_POLICY_TYPE_ID = "0609b952-1397-4640-95ec-e00a01b2c241"
+
+
+def _scope_matches(scope: dict, repo_id: str, target_ref: str, default_branch: str | None) -> bool:
+    if scope.get("repositoryId") not in (None, repo_id):
+        return False
+    if scope.get("matchKind") == "DefaultBranch":
+        return default_branch == target_ref
+    return scope.get("refName") in (None, target_ref)
+
+
+def policy_configs_include_branch(configs: list, repo_id: str, branch: str, default_branch: str | None) -> bool:
+    """True if any enabled, non-deleted Build-type policy configuration's scope covers `branch`."""
+    target_ref = f"refs/heads/{branch}"
+    for config in configs:
+        if not config.get("isEnabled") or config.get("isDeleted"):
+            continue
+        if config.get("type", {}).get("id") != BUILD_POLICY_TYPE_ID:
+            continue
+        scopes = config.get("settings", {}).get("scope", [])
+        if any(_scope_matches(scope, repo_id, target_ref, default_branch) for scope in scopes):
+            return True
+    return False
+
+
+def has_build_policy(remote: AdoRemote, branch: str, pat: str | None = None) -> bool:
+    """Best-effort check for whether `branch` has an enabled Build policy configured.
+
+    Only used to decide whether to print a `bdt pr status` reminder after
+    `pr create` — failures here (auth, permissions, network) fail open
+    (return False) rather than blocking PR creation.
+    """
+    try:
+        session = requests.Session()
+        session.headers.update(auth_header(pat))
+
+        r = session.get(
+            f"{_base_url(remote)}/_apis/git/repositories/{quote(remote.repo, safe='')}",
+            params={"api-version": "7.1"},
+        )
+        r.raise_for_status()
+        repo = r.json()
+
+        r = session.get(f"{_base_url(remote)}/_apis/policy/configurations", params={"api-version": "7.1"})
+        r.raise_for_status()
+        configs = r.json().get("value", [])
+    except (requests.RequestException, SystemExit):
+        return False
+
+    return policy_configs_include_branch(configs, repo.get("id"), branch, repo.get("defaultBranch"))
+
+
 def merge_conflict_message(pr: dict) -> str | None:
     """None if the PR's mergeStatus is fine; else a human-readable description of the problem."""
     merge_status = pr.get("mergeStatus")

{bmsdna_devtools-0.2.1 → bmsdna_devtools-0.2.2}/pyproject.toml

@@ -10,7 +10,7 @@ packages = ["bmsdna"]
 
 [project]
 name = "bmsdna-devtools"
-version = "0.2.1"
+version = "0.2.2"
 description = "Shared Azure DevOps / GitHub / git / Azure Monitor developer tooling for BMS projects"
 readme = "README.md"
 requires-python = ">=3.11"

{bmsdna_devtools-0.2.1 → bmsdna_devtools-0.2.2}/skills/bmsdna-devtools/SKILL.md

@@ -66,6 +66,9 @@ info, so it never blocks waiting on an interactive prompt). Extra args pass
 straight through either way, e.g.
 `bdt pr create --target main -- --title "..." --description "..."`.
 
+After creating a PR, use `bdt pr status` (see above) to check whether the
+CI build passes.
+
 ## Creating a worktree
 
 ```bash

{bmsdna_devtools-0.2.1 → bmsdna_devtools-0.2.2}/tests/test_gh_pr.py

@@ -1,6 +1,6 @@
 import pytest
 
-from bmsdna.devtools.gh_pr import check_bucket, check_label, merge_conflict_message
+from bmsdna.devtools.gh_pr import check_bucket, check_label, merge_conflict_message, protection_requires_status_checks
 
 # Real statusCheckRollup entries captured from `gh pr view 13902 -R cli/cli --json statusCheckRollup`.
 COMPLETED_SUCCESS_CHECK_RUN = {
@@ -60,3 +60,13 @@ def test_merge_conflict_message_conflicting() -> None:
     assert msg is not None
     assert "PR #42" in msg
     assert "main" in msg
+
+
+def test_protection_requires_status_checks_true_when_configured() -> None:
+    protection = {"required_status_checks": {"strict": True, "contexts": ["build"]}}
+    assert protection_requires_status_checks(protection) is True
+
+
+@pytest.mark.parametrize("protection", [{}, {"required_status_checks": None}])
+def test_protection_requires_status_checks_false_when_absent(protection: dict) -> None:
+    assert protection_requires_status_checks(protection) is False

bmsdna_devtools-0.2.2/tests/test_pr_build.py

@@ -0,0 +1,97 @@
+import pytest
+
+from bmsdna.devtools.pr_build import merge_conflict_message, policy_configs_include_branch
+
+REPO_ID = "0cd3a822-389e-416e-a4fa-b73f988c2930"
+
+# Shape captured from a real `.../_apis/policy/configurations` response.
+BUILD_POLICY_ON_MAIN = {
+    "isEnabled": True,
+    "isDeleted": False,
+    "type": {"id": "0609b952-1397-4640-95ec-e00a01b2c241", "displayName": "Build"},
+    "settings": {
+        "scope": [{"refName": "refs/heads/main", "matchKind": "Exact", "repositoryId": REPO_ID}],
+    },
+}
+REVIEWER_POLICY_ON_EMERGENCY_RELEASE = {
+    "isEnabled": True,
+    "isDeleted": False,
+    "type": {"id": "fd2167ab-b0be-447a-8ec8-39368250530e", "displayName": "Minimum number of reviewers"},
+    "settings": {
+        "scope": [{"refName": "refs/heads/emergency-release", "matchKind": "Exact", "repositoryId": REPO_ID}],
+    },
+}
+
+
+@pytest.mark.parametrize("merge_status", ["notSet", "queued", "succeeded"])
+def test_merge_conflict_message_none_when_mergeable(merge_status: str) -> None:
+    assert merge_conflict_message({"pullRequestId": 1, "title": "x", "mergeStatus": merge_status}) is None
+
+
+def test_merge_conflict_message_missing_field_is_fine() -> None:
+    assert merge_conflict_message({"pullRequestId": 1, "title": "x"}) is None
+
+
+def test_merge_conflict_message_conflicts() -> None:
+    pr = {"pullRequestId": 42, "title": "feat: widgets", "mergeStatus": "conflicts"}
+    msg = merge_conflict_message(pr)
+    assert msg is not None
+    assert "PR #42" in msg
+    assert "conflicts" in msg
+
+
+def test_merge_conflict_message_uses_failure_message_when_present() -> None:
+    pr = {
+        "pullRequestId": 7,
+        "title": "fix: x",
+        "mergeStatus": "failure",
+        "mergeFailureMessage": "object too large to merge",
+    }
+    msg = merge_conflict_message(pr)
+    assert msg is not None
+    assert "object too large to merge" in msg
+
+
+@pytest.mark.parametrize("merge_status", ["conflicts", "failure", "rejectedByPolicy"])
+def test_merge_conflict_message_covers_all_bad_statuses(merge_status: str) -> None:
+    pr = {"pullRequestId": 1, "title": "x", "mergeStatus": merge_status}
+    assert merge_conflict_message(pr) is not None
+
+
+def test_policy_configs_include_branch_matches_build_policy_on_scoped_branch() -> None:
+    configs = [BUILD_POLICY_ON_MAIN, REVIEWER_POLICY_ON_EMERGENCY_RELEASE]
+    assert policy_configs_include_branch(configs, REPO_ID, "main", "refs/heads/main") is True
+
+
+def test_policy_configs_include_branch_false_for_unscoped_branch() -> None:
+    configs = [BUILD_POLICY_ON_MAIN, REVIEWER_POLICY_ON_EMERGENCY_RELEASE]
+    assert policy_configs_include_branch(configs, REPO_ID, "test", "refs/heads/main") is False
+
+
+def test_policy_configs_include_branch_ignores_non_build_policy_types() -> None:
+    assert policy_configs_include_branch([REVIEWER_POLICY_ON_EMERGENCY_RELEASE], REPO_ID, "emergency-release", "refs/heads/main") is False
+
+
+def test_policy_configs_include_branch_ignores_disabled_policy() -> None:
+    disabled = {**BUILD_POLICY_ON_MAIN, "isEnabled": False}
+    assert policy_configs_include_branch([disabled], REPO_ID, "main", "refs/heads/main") is False
+
+
+def test_policy_configs_include_branch_ignores_deleted_policy() -> None:
+    deleted = {**BUILD_POLICY_ON_MAIN, "isDeleted": True}
+    assert policy_configs_include_branch([deleted], REPO_ID, "main", "refs/heads/main") is False
+
+
+def test_policy_configs_include_branch_ignores_other_repo() -> None:
+    assert policy_configs_include_branch([BUILD_POLICY_ON_MAIN], "some-other-repo-id", "main", "refs/heads/main") is False
+
+
+def test_policy_configs_include_branch_matches_default_branch_scope() -> None:
+    default_branch_policy = {
+        "isEnabled": True,
+        "isDeleted": False,
+        "type": {"id": "0609b952-1397-4640-95ec-e00a01b2c241"},
+        "settings": {"scope": [{"matchKind": "DefaultBranch", "repositoryId": REPO_ID}]},
+    }
+    assert policy_configs_include_branch([default_branch_policy], REPO_ID, "main", "refs/heads/main") is True
+    assert policy_configs_include_branch([default_branch_policy], REPO_ID, "test", "refs/heads/main") is False

{bmsdna_devtools-0.2.1 → bmsdna_devtools-0.2.2}/uv.lock

@@ -13,7 +13,7 @@ wheels = [
 
 [[package]]
 name = "bmsdna-devtools"
-version = "0.2.1"
+version = "0.2.2"
 source = { editable = "." }
 dependencies = [
     { name = "requests" },

bmsdna_devtools-0.2.1/tests/test_pr_build.py

@@ -1,38 +0,0 @@
-import pytest
-
-from bmsdna.devtools.pr_build import merge_conflict_message
-
-
-@pytest.mark.parametrize("merge_status", ["notSet", "queued", "succeeded"])
-def test_merge_conflict_message_none_when_mergeable(merge_status: str) -> None:
-    assert merge_conflict_message({"pullRequestId": 1, "title": "x", "mergeStatus": merge_status}) is None
-
-
-def test_merge_conflict_message_missing_field_is_fine() -> None:
-    assert merge_conflict_message({"pullRequestId": 1, "title": "x"}) is None
-
-
-def test_merge_conflict_message_conflicts() -> None:
-    pr = {"pullRequestId": 42, "title": "feat: widgets", "mergeStatus": "conflicts"}
-    msg = merge_conflict_message(pr)
-    assert msg is not None
-    assert "PR #42" in msg
-    assert "conflicts" in msg
-
-
-def test_merge_conflict_message_uses_failure_message_when_present() -> None:
-    pr = {
-        "pullRequestId": 7,
-        "title": "fix: x",
-        "mergeStatus": "failure",
-        "mergeFailureMessage": "object too large to merge",
-    }
-    msg = merge_conflict_message(pr)
-    assert msg is not None
-    assert "object too large to merge" in msg
-
-
-@pytest.mark.parametrize("merge_status", ["conflicts", "failure", "rejectedByPolicy"])
-def test_merge_conflict_message_covers_all_bad_statuses(merge_status: str) -> None:
-    pr = {"pullRequestId": 1, "title": "x", "mergeStatus": merge_status}
-    assert merge_conflict_message(pr) is not None