python-semantic-release 9.3.0__tar.gz → 9.3.1__tar.gz

{python-semantic-release-9.3.0/python_semantic_release.egg-info → python-semantic-release-9.3.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-semantic-release
-Version: 9.3.0
+Version: 9.3.1
 Summary: Automatic Semantic Versioning for Python projects
 Author-email: Rolf Erik Lekang <me@rolflekang.com>
 License: MIT
@@ -53,7 +53,7 @@ Requires-Dist: types-pytest-lazy-fixture>=0.6.3.3; extra == "test"
 Provides-Extra: dev
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: tox; extra == "dev"
-Requires-Dist: ruff==0.3.2; extra == "dev"
+Requires-Dist: ruff==0.3.3; extra == "dev"
 Provides-Extra: mypy
 Requires-Dist: mypy; extra == "mypy"
 Requires-Dist: types-requests; extra == "mypy"

{python-semantic-release-9.3.0 → python-semantic-release-9.3.1}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-semantic-release"
-version = "9.3.0"
+version = "9.3.1"
 description = "Automatic Semantic Versioning for Python projects"
 requires-python = ">=3.8"
 license = { text = "MIT" }
@@ -68,7 +68,7 @@ test = [
   "requests-mock>=1.10.0,<2",
   "types-pytest-lazy-fixture>=0.6.3.3",
 ]
-dev = ["pre-commit", "tox", "ruff==0.3.2"]
+dev = ["pre-commit", "tox", "ruff==0.3.3"]
 mypy = ["mypy", "types-requests"]
 
 [tool.pytest.ini_options]

{python-semantic-release-9.3.0 → python-semantic-release-9.3.1/python_semantic_release.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-semantic-release
-Version: 9.3.0
+Version: 9.3.1
 Summary: Automatic Semantic Versioning for Python projects
 Author-email: Rolf Erik Lekang <me@rolflekang.com>
 License: MIT
@@ -53,7 +53,7 @@ Requires-Dist: types-pytest-lazy-fixture>=0.6.3.3; extra == "test"
 Provides-Extra: dev
 Requires-Dist: pre-commit; extra == "dev"
 Requires-Dist: tox; extra == "dev"
-Requires-Dist: ruff==0.3.2; extra == "dev"
+Requires-Dist: ruff==0.3.3; extra == "dev"
 Provides-Extra: mypy
 Requires-Dist: mypy; extra == "mypy"
 Requires-Dist: types-requests; extra == "mypy"

{python-semantic-release-9.3.0 → python-semantic-release-9.3.1}/python_semantic_release.egg-info/requires.txt

@@ -14,7 +14,7 @@ shellingham>=1.5.0.post1
 [dev]
 pre-commit
 tox
-ruff==0.3.2
+ruff==0.3.3
 
 [docs]
 Sphinx<=6.0.0

{python-semantic-release-9.3.0 → python-semantic-release-9.3.1}/semantic_release/__init__.py

@@ -24,7 +24,7 @@ from semantic_release.version import (
     tags_and_versions,
 )
 
-__version__ = "9.3.0"
+__version__ = "9.3.1"
 
 
 def setup_hook(argv: list[str]) -> None:

{python-semantic-release-9.3.0 → python-semantic-release-9.3.1}/semantic_release/cli/commands/version.py

@@ -585,12 +585,17 @@ def version(  # noqa: C901
                 indented(
                     f"""
                     would have run:
-                        git push --tags {runtime.masker.mask(remote_url)} {active_branch}
+                        git push {runtime.masker.mask(remote_url)} tag {new_version.as_tag()}
                     """  # noqa: E501
                 )
             )
         elif create_tag:
-            repo.git.push("--tags", remote_url, active_branch)
+            # push specific tag refspec (that we made) to remote
+            # ---------------
+            # Resolves issue #803 where a tag that already existed was pushed and caused
+            # a failure. Its not clear why there was an incorrect tag (likely user error change)
+            # but we will avoid possibly pushing an separate tag that we didn't create.
+            repo.git.push(remote_url, "tag", new_version.as_tag())
 
     gha_output.released = True
 

{python-semantic-release-9.3.0 → python-semantic-release-9.3.1}/semantic_release/errors.py

@@ -31,3 +31,10 @@ class CommitParseError(SemanticReleaseBaseError):
     Raised when a commit cannot be parsed by a commit parser. Custom commit parsers
     should also raise this Exception
     """
+
+
+class MissingMergeBaseError(SemanticReleaseBaseError):
+    """
+    Raised when the merge base cannot be found with the current history. Generally
+    because of a shallow git clone.
+    """

{python-semantic-release-9.3.0 → python-semantic-release-9.3.1}/semantic_release/version/algorithm.py

@@ -4,12 +4,10 @@ import logging
 from queue import Queue
 from typing import TYPE_CHECKING, Iterable
 
-from semantic_release.commit_parser import (
-    ParsedCommit,
-)
+from semantic_release.commit_parser import ParsedCommit
 from semantic_release.const import DEFAULT_VERSION
 from semantic_release.enums import LevelBump
-from semantic_release.errors import InvalidVersion
+from semantic_release.errors import InvalidVersion, MissingMergeBaseError
 from semantic_release.version.version import Version
 
 if TYPE_CHECKING:
@@ -278,9 +276,9 @@ def next_version(
     """
     # Step 1. All tags, sorted descending by semver ordering rules
     all_git_tags_as_versions = tags_and_versions(repo.tags, translator)
-    all_full_release_tags_and_versions = [
-        (t, v) for t, v in all_git_tags_as_versions if not v.is_prerelease
-    ]
+    all_full_release_tags_and_versions = list(
+        filter(lambda t_v: not t_v[1].is_prerelease, all_git_tags_as_versions)
+    )
     log.info(
         "Found %s full releases (excluding prereleases)",
         len(all_full_release_tags_and_versions),
@@ -291,30 +289,59 @@ def next_version(
         iter(all_full_release_tags_and_versions),
         (None, translator.from_string(DEFAULT_VERSION)),
     )
-    if latest_full_release_tag is None:
-        # Workaround - we can safely scan the extra commits on this
-        # branch if it's never been released, but we have no other
-        # guarantees that other branches exist
-        log.info(
-            "No full releases have been made yet, the default version to use is %s",
-            latest_full_release_version,
+
+    # we can safely scan the extra commits on this
+    # branch if it's never been released, but we have no other
+    # guarantees that other branches exist
+    # Note the merge_base might be on our current branch, it's not
+    # necessarily the merge base of the current branch with `main`
+    other_ref = (
+        repo.active_branch
+        if latest_full_release_tag is None
+        else latest_full_release_tag.name
+    )
+
+    # Conditional log message to inform what was chosen as the comparison point
+    # to find the merge base of the current branch with the latest full release
+    log_msg = (
+        str.join(
+            ", ",
+            [
+                "No full releases have been made yet",
+                f"the default version to use is {latest_full_release_version}",
+            ],
         )
-        merge_bases = repo.merge_base(repo.active_branch, repo.active_branch)
-    else:
-        # Note the merge_base might be on our current branch, it's not
-        # necessarily the merge base of the current branch with `main`
-        log.info(
-            "The last full release was %s, tagged as %r",
-            latest_full_release_version,
-            latest_full_release_tag,
+        if latest_full_release_tag is None
+        else str.join(
+            ", ",
+            [
+                f"The last full release was {latest_full_release_version}",
+                f"tagged as {latest_full_release_tag!r}",
+            ],
         )
-        merge_bases = repo.merge_base(latest_full_release_tag.name, repo.active_branch)
+    )
+
+    log.info(log_msg)
+    merge_bases = repo.merge_base(other_ref, repo.active_branch)
+
+    if len(merge_bases) < 1:
+        raise MissingMergeBaseError(
+            f"Unable to find merge-base between {other_ref} and {repo.active_branch.name}"
+        )
+
     if len(merge_bases) > 1:
         raise NotImplementedError(
-            "This branch has more than one merge-base with the "
-            "latest version, which is not yet supported"
+            str.join(
+                " ",
+                [
+                    "This branch has more than one merge-base with the",
+                    "latest version, which is not yet supported",
+                ],
+            )
         )
+
     merge_base = merge_bases[0]
+
     if merge_base is None:
         str_tag_name = (
             "None" if latest_full_release_tag is None else latest_full_release_tag.name
@@ -350,6 +377,23 @@ def next_version(
         tag_format=translator.tag_format,
     )
 
+    # We only include pre-releases here if doing a prerelease.
+    # If it's not a prerelease, we need to include commits back
+    # to the last full version in consideration for what kind of
+    # bump to produce. However if we're doing a prerelease, we can
+    # include prereleases here to potentially consider a smaller portion
+    # of history (from a prerelease since the last full release, onwards)
+
+    # Note that a side-effect of this is, if at some point the configuration
+    # for a particular branch pattern changes w.r.t. prerelease=True/False,
+    # the new kind of version will be produced from the commits already
+    # included in a prerelease since the last full release on the branch
+    tag_sha_2_version_lookup = {
+        tag.commit.hexsha: (tag, version)
+        for tag, version in all_git_tags_as_versions
+        if prerelease or not version.is_prerelease
+    }
+
     # N.B. these should be sorted so long as we iterate the commits in reverse order
     for commit in commits_since_last_full_release:
         parse_result = commit_parser.parse(commit)
@@ -360,44 +404,24 @@ def next_version(
             )
             parsed_levels.add(parse_result.bump)
 
-        # We only include pre-releases here if doing a prerelease.
-        # If it's not a prerelease, we need to include commits back
-        # to the last full version in consideration for what kind of
-        # bump to produce. However if we're doing a prerelease, we can
-        # include prereleases here to potentially consider a smaller portion
-        # of history (from a prerelease since the last full release, onwards)
-
-        # Note that a side-effect of this is, if at some point the configuration
-        # for a particular branch pattern changes w.r.t. prerelease=True/False,
-        # the new kind of version will be produced from the commits already
-        # included in a prerelease since the last full release on the branch
-        for tag, version in (
-            (tag, version)
-            for tag, version in all_git_tags_as_versions
-            if prerelease or not version.is_prerelease
-        ):
-            log.debug(
-                "testing if tag %r (%s) matches commit %s",
-                tag.name,
-                tag.commit.hexsha,
-                commit.hexsha,
-            )
-            if tag.commit == commit:
-                latest_version = version
-                log.debug(
-                    "tag %r (%s) matches commit %s. the latest version is %s",
-                    tag.name,
-                    tag.commit.hexsha,
-                    commit.hexsha,
-                    latest_version,
-                )
-                break
-        else:
+        log.debug("checking if commit %s matches any tags", commit.hexsha)
+        t_v = tag_sha_2_version_lookup.get(commit.hexsha, None)
+
+        if t_v is None:
             # If we haven't found the latest prerelease on the branch,
-            # keep the outer loop going to look for it
+            # keep the loop going to look for it
             log.debug("no tags correspond to commit %s", commit.hexsha)
             continue
-        # If we found it in the inner loop, break the outer loop too
+
+        # Unpack the tuple
+        tag, latest_version = t_v
+        log.debug(
+            "tag %r (%s) matches commit %s. the latest version is %s",
+            tag.name,
+            tag.commit.hexsha,
+            commit.hexsha,
+            latest_version,
+        )
         break
 
     log.debug(