auto-semver-control 1.8.8.dev0__tar.gz → 1.8.9.dev0__tar.gz

{auto_semver_control-1.8.8.dev0 → auto_semver_control-1.8.9.dev0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: auto-semver-control
-Version: 1.8.8.dev0
+Version: 1.8.9.dev0
 Summary: Automatically bump semver, update changelogs, and open release PRs on merge.
 Author-email: Guy Erreich <gerreich.dev@gmail.com>
 License-Expression: GPL-3.0-or-later

{auto_semver_control-1.8.8.dev0 → auto_semver_control-1.8.9.dev0}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "auto-semver-control"
-version = "1.8.8.dev0"
+version = "1.8.9.dev0"
 description = "Automatically bump semver, update changelogs, and open release PRs on merge."
 authors = [{ name = "Guy Erreich", email = "gerreich.dev@gmail.com" }]
 readme = "README.md"

{auto_semver_control-1.8.8.dev0 → auto_semver_control-1.8.9.dev0}/src/auto_semver/adapters/git/release_pr.py

@@ -33,10 +33,35 @@ if TYPE_CHECKING:
 
 logger = logging.getLogger(__package__)
 
+_HTTP_NOT_FOUND = 404
+
 
 class GitReleasePr(GitOpsBase):
     """Release PR ownership and discovery."""
 
+    def github_release_exists(self, *, tag: str, github_token: str) -> bool:
+        """Return whether a GitHub Release exists for ``tag``.
+
+        Args:
+            tag: Tag name. GitHub uses that name as the release id.
+            github_token: Token used to query the GitHub API.
+
+        Returns:
+            True when the release exists. False when GitHub returns 404.
+
+        Raises:
+            GithubException: For API errors other than a missing release.
+        """
+        gh = self._github_client_for(github_token)
+        repo: Repository = gh.get_repo(full_name_or_id=self._repo_full_name)
+        try:
+            repo.get_release(tag)
+        except GithubException as err:
+            if err.status == _HTTP_NOT_FOUND:
+                return False
+            raise
+        return True
+
     def get_lock_at_ref(self, ref: str) -> SemverLock | None:
         """Load `.semver.lock` from a branch or tag ref."""
         try:

{auto_semver_control-1.8.8.dev0 → auto_semver_control-1.8.9.dev0}/src/auto_semver/cli/bump.py

@@ -162,6 +162,73 @@ def _apply_version_bump(
     return None
 
 
+def _unpublished_notes_base(
+    *,
+    gitops: GitOps,
+    lockfile: SemverLock,
+    github_token: str,
+) -> str | None:
+    """Return an earlier baseline when the current version never shipped.
+
+    A finalized version with no GitHub Release did not publish. The next release
+    notes should include that version's changes, so the commit range starts at
+    the previous finalized baseline instead of the failed release merge.
+
+    Args:
+        gitops: Git operations handler.
+        lockfile: Lock loaded from the integration branch, before it is rewritten.
+        github_token: Token used to check for a GitHub Release.
+
+    Returns:
+        The earlier baseline SHA, or None when the current baseline should be used.
+    """
+    current_base = lockfile.target_base_sha
+    if lockfile.finalized is not True or not isinstance(current_base, str) or not current_base:
+        return None
+
+    version = str(lockfile.version)
+    try:
+        shipped = gitops.github_release_exists(tag=version, github_token=github_token)
+    except Exception as err:
+        logger.warning("Could not check GitHub release for %s: %s", version, err)
+        return None
+    if shipped:
+        return None
+
+    earlier = _previous_finalized_baseline(gitops=gitops, version=version)
+    if earlier is None or earlier == current_base:
+        return None
+
+    logger.info(
+        "Version %s has no GitHub release; including its changes in the next release notes",
+        version,
+    )
+    return earlier
+
+
+def _previous_finalized_baseline(*, gitops: GitOps, version: str) -> str | None:
+    """Return the baseline SHA of the finalized lock before ``version``.
+
+    Args:
+        gitops: Git operations handler.
+        version: Version whose own lock entries should be skipped.
+
+    Returns:
+        The previous finalized lock's ``target_base_sha``, or None when absent.
+    """
+    seen: set[str] = set()
+    for commit in gitops.repo.iter_commits(paths=SemverLock.path):
+        lock = gitops.get_lock_at_ref(commit.hexsha)
+        if lock is None or lock.finalized is not True or not lock.target_base_sha:
+            continue
+        lock_version = str(lock.version)
+        if lock_version == version or lock_version in seen:
+            continue
+        seen.add(lock_version)
+        return lock.target_base_sha
+    return None
+
+
 def _push_release_branch(
     *,
     gitops: GitOps,
@@ -271,6 +338,11 @@ def run(
             target_branch=target_branch,
         )
         baseline_sha = lockfile.target_base_sha
+        notes_base_sha = _unpublished_notes_base(
+            gitops=gitops,
+            lockfile=lockfile,
+            github_token=github_token,
+        )
 
         if not is_tag_promotion:
             with status("Applying version bump..."):
@@ -321,7 +393,9 @@ def run(
                     f"Skipping baseline check. Details: {e}"
                 )
 
-            latest_commit_sha = lockfile.target_base_sha or event.get_merged_commit_sha()
+            latest_commit_sha = (
+                notes_base_sha or lockfile.target_base_sha or event.get_merged_commit_sha()
+            )
 
             commit_messages = gitops.get_recent_commits(latest_commit_sha, config=config)
             changelog.update(

{auto_semver_control-1.8.8.dev0 → auto_semver_control-1.8.9.dev0}/src/auto_semver_control.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: auto-semver-control
-Version: 1.8.8.dev0
+Version: 1.8.9.dev0
 Summary: Automatically bump semver, update changelogs, and open release PRs on merge.
 Author-email: Guy Erreich <gerreich.dev@gmail.com>
 License-Expression: GPL-3.0-or-later