python-semantic-release 10.1.0__tar.gz → 10.3.0__tar.gz

{python_semantic_release-10.1.0 → python_semantic_release-10.3.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-semantic-release
-Version: 10.1.0
+Version: 10.3.0
 Summary: Automatic Semantic Versioning for Python projects
 Author-email: Rolf Erik Lekang <me@rolflekang.com>
 License: MIT
@@ -62,7 +62,7 @@ Requires-Dist: pre-commit~=3.5; extra == "dev"
 Requires-Dist: tox~=4.11; extra == "dev"
 Requires-Dist: ruff==0.6.1; extra == "dev"
 Provides-Extra: mypy
-Requires-Dist: mypy==1.16.0; extra == "mypy"
+Requires-Dist: mypy==1.16.1; extra == "mypy"
 Requires-Dist: types-Deprecated~=1.2; extra == "mypy"
 Requires-Dist: types-requests~=2.32.0; extra == "mypy"
 Requires-Dist: types-pyyaml~=6.0; extra == "mypy"
@@ -88,5 +88,5 @@ The usage information and examples for this GitHub Action is available under
 the `GitHub Actions section`_ of `python-semantic-release.readthedocs.io`_.
 
 .. _python-semantic-release: https://pypi.org/project/python-semantic-release/
-.. _python-semantic-release.readthedocs.io: https://python-semantic-release.readthedocs.io/en/latest/
-.. _GitHub Actions section: https://python-semantic-release.readthedocs.io/en/latest/automatic-releases/github-actions.html
+.. _python-semantic-release.readthedocs.io: https://python-semantic-release.readthedocs.io/en/stable/
+.. _GitHub Actions section: https://python-semantic-release.readthedocs.io/en/stable/configuration/automatic-releases/github-actions.html

{python_semantic_release-10.1.0 → python_semantic_release-10.3.0}/README.rst

@@ -18,5 +18,5 @@ The usage information and examples for this GitHub Action is available under
 the `GitHub Actions section`_ of `python-semantic-release.readthedocs.io`_.
 
 .. _python-semantic-release: https://pypi.org/project/python-semantic-release/
-.. _python-semantic-release.readthedocs.io: https://python-semantic-release.readthedocs.io/en/latest/
-.. _GitHub Actions section: https://python-semantic-release.readthedocs.io/en/latest/automatic-releases/github-actions.html
+.. _python-semantic-release.readthedocs.io: https://python-semantic-release.readthedocs.io/en/stable/
+.. _GitHub Actions section: https://python-semantic-release.readthedocs.io/en/stable/configuration/automatic-releases/github-actions.html

{python_semantic_release-10.1.0 → python_semantic_release-10.3.0}/docs/concepts/getting_started.rst

@@ -215,7 +215,7 @@ To set commit exclusion patterns for a conventional commits parsers, add the fol
 
 .. code-block:: toml
 
-    [tool.semantic_release.changelog.exclude_commit_patterns]
+    [tool.semantic_release.changelog]
     # Recommended patterns for conventional commits parser that is scope aware
     exclude_commit_patterns = [
         '''chore(?:\([^)]*?\))?: .+''',

{python_semantic_release-10.1.0 → python_semantic_release-10.3.0}/docs/configuration/automatic-releases/github-actions.rst

@@ -513,6 +513,20 @@ and any actions that were taken.
 
 ----
 
+.. _gh_actions-psr-outputs-commit_sha:
+
+``commit_sha``
+""""""""""""""
+
+**Type:** ``string``
+
+The commit SHA of the release if a release was made, otherwise an empty string.
+
+Example upon release: ``d4c3b2a1e0f9c8b7a6e5d4c3b2a1e0f9c8b7a6e5``
+Example when no release was made: ``""``
+
+----
+
 .. _gh_actions-psr-outputs-is_prerelease:
 
 ``is_prerelease``
@@ -524,6 +538,32 @@ A boolean value indicating whether the released version is a prerelease.
 
 ----
 
+.. _gh_actions-psr-outputs-link:
+
+``link``
+""""""""
+
+**Type:** ``string``
+
+The URL link to the release if a release was made, otherwise an empty string.
+
+Example upon release: ``https://github.com/user/repo/releases/tag/v1.2.3``
+Example when no release was made: ``""``
+
+----
+
+.. _gh_actions-psr-outputs-previous_version:
+
+``previous_version``
+""""""""""""""""""""
+
+**Type:** ``string``
+
+The previous version before the release, if a release was or will be made. If no release is detected,
+this will be the current version or an empty string if no previous version exists.
+
+----
+
 .. _gh_actions-psr-outputs-released:
 
 ``released``
@@ -535,6 +575,18 @@ A boolean value indicating whether a release was made.
 
 ----
 
+.. _gh_actions-psr-outputs-release_notes:
+
+``release_notes``
+"""""""""""""""""""
+
+**Type:** ``string``
+
+The release notes generated by the release, if any. If no release was made,
+this will be an empty string.
+
+----
+
 .. _gh_actions-psr-outputs-version:
 
 ``version``
@@ -873,14 +925,14 @@ to the GitHub Release Assets as well.
           - name: Action | Semantic Version Release
             id: release
             # Adjust tag with desired version if applicable.
-            uses: python-semantic-release/python-semantic-release@v10.1.0
+            uses: python-semantic-release/python-semantic-release@v10.3.0
             with:
               github_token: ${{ secrets.GITHUB_TOKEN }}
               git_committer_name: "github-actions"
               git_committer_email: "actions@users.noreply.github.com"
 
           - name: Publish | Upload to GitHub Release Assets
-            uses: python-semantic-release/publish-action@v10.1.0
+            uses: python-semantic-release/publish-action@v10.3.0
             if: steps.release.outputs.released == 'true'
             with:
               github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -979,7 +1031,7 @@ The equivalent GitHub Action configuration would be:
 
   - name: Action | Semantic Version Release
     # Adjust tag with desired version if applicable.
-    uses: python-semantic-release/python-semantic-release@v10.1.0
+    uses: python-semantic-release/python-semantic-release@v10.3.0
     with:
       github_token: ${{ secrets.GITHUB_TOKEN }}
       force: patch
@@ -1038,14 +1090,14 @@ Publish Action.
 
         - name: Release submodule 1
           id: release-submod-1
-          uses: python-semantic-release/python-semantic-release@v10.1.0
+          uses: python-semantic-release/python-semantic-release@v10.3.0
           with:
             directory: ${{ env.SUBMODULE_1_DIR }}
             github_token: ${{ secrets.GITHUB_TOKEN }}
 
         - name: Release submodule 2
           id: release-submod-2
-          uses: python-semantic-release/python-semantic-release@v10.1.0
+          uses: python-semantic-release/python-semantic-release@v10.3.0
           with:
             directory: ${{ env.SUBMODULE_2_DIR }}
             github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -1057,7 +1109,7 @@ Publish Action.
         # ------------------------------------------------------------------- #
 
         - name: Publish | Upload package 1 to GitHub Release Assets
-          uses: python-semantic-release/publish-action@v10.1.0
+          uses: python-semantic-release/publish-action@v10.3.0
           if: steps.release-submod-1.outputs.released == 'true'
           with:
             directory: ${{ env.SUBMODULE_1_DIR }}
@@ -1065,7 +1117,7 @@ Publish Action.
             tag: ${{ steps.release-submod-1.outputs.tag }}
 
         - name: Publish | Upload package 2 to GitHub Release Assets
-          uses: python-semantic-release/publish-action@v10.1.0
+          uses: python-semantic-release/publish-action@v10.3.0
           if: steps.release-submod-2.outputs.released == 'true'
           with:
             directory: ${{ env.SUBMODULE_2_DIR }}

{python_semantic_release-10.1.0 → python_semantic_release-10.3.0}/docs/configuration/configuration-guides/uv_integration.rst

@@ -44,18 +44,21 @@ resolve this issue depending on your preference:
 
       [tool.semantic_release]
       build_command = """
-        uv lock --offline
-        git add uv.lock
-        uv build
+          uv lock --upgrade-package "$PACKAGE_NAME"
+          git add uv.lock
+          uv build
       """
 
-    The ``--offline`` flag is used to ensure that the lock file is updated without
-    updating any dependency versions. The intent of this call is **ONLY** to update
+    The intent of the lock upgrade-package call is **ONLY** to update
     the version of your project within the lock file after PSR has updated the version
     in your project's definition file (e.g., ``pyproject.toml``). When you are running
     PSR, you have already tested the project as is and you don't want to actually
     update the dependencies if a new one just became available.
 
+    For ease of use, PSR provides the ``$PACKAGE_NAME`` environment variable that
+    contains the name of your package from the project's definition file
+    (``pyproject.toml:project.name``).
+
     If you are using the :ref:`PSR GitHub Action <gh_actions-psr>`, you will need to add an
     installation command for ``uv`` to the :ref:`build_command <config-build_command>`
     because the action runs in a Docker environment does not include ``uv`` by default.
@@ -71,21 +74,23 @@ resolve this issue depending on your preference:
 
       [tool.semantic_release]
       build_command = """
-        python -m pip install -e .[build]
-        uv lock --offline
-        git add uv.lock
-        uv build
+          python -m pip install -e '.[build]'
+          uv lock --upgrade-package "$PACKAGE_NAME"
+          git add uv.lock
+          uv build
       """
 
 #.  **Stamp the code first & then separately run release**: If you prefer to not modify the
-    build command, then you will need to run the ``uv lock --offline`` command prior to actually
-    creating the release. Essentially, you will run PSR twice: (1) once to update the version
-    in the project's definition file, and (2) a second time to generate the release.
-
-    The intent of the ``uv lock --offline`` command is **ONLY** to update the version of your
-    project within the lock file after PSR has updated the version in your project's definition
-    file (e.g., ``pyproject.toml``). When you are running PSR, you have already tested the project
-    as is and you don't want to actually update the dependencies if a new one just became available.
+    build command, then you will need to run the ``uv lock --upgrade-package <your-package-name>``
+    command prior to actually creating the release. Essentially, you will run PSR twice:
+    (1) once to update the version in the project's definition file, and (2) a second time
+    to generate the release.
+
+    The intent of the ``uv lock --upgrade-package <your-package-name>`` command is **ONLY**
+    to update the version of your project within the lock file after PSR has updated the
+    version in your project's definition file (e.g., ``pyproject.toml``). When you are
+    running PSR, you have already tested the project as is and you don't want to actually
+    update the dependencies if a new one just became available.
 
     .. code-block:: bash
 
@@ -94,7 +99,7 @@ resolve this issue depending on your preference:
       semantic-release -v version --skip-build --no-commit --no-tag --no-changelog
 
       # 2. run UV lock as pyproject.toml is updated with the next version
-      uv lock --offline
+      uv lock --upgrade-package <your-package-name>
 
       # 3. stage the lock file to ensure it is included in the PSR commit
       git add uv.lock
@@ -129,7 +134,7 @@ look like this:
 
   [tool.semantic_release]
   build_command = """
-    uv lock --offline
+    uv lock --upgrade-package "$PACKAGE_NAME"
     uv build
   """
 

{python_semantic_release-10.1.0 → python_semantic_release-10.3.0}/docs/configuration/configuration.rst

@@ -210,6 +210,7 @@ GITLAB_CI                 Pass-through ``true`` if exists in process env, unset
 HOME                      Pass-through ``HOME`` of parent process
 NEW_VERSION               Semantically determined next version (ex. ``1.2.3``)
 PATH                      Pass-through ``PATH`` of parent process
+PACKAGE_NAME              Project name as defined in ``pyproject.toml:project.name``
 PSR_DOCKER_GITHUB_ACTION  Pass-through ``true`` if exists in process env, unset otherwise
 VIRTUAL_ENV               Pass-through ``VIRTUAL_ENV`` if exists in process env, unset otherwise
 ========================  ======================================================================

{python_semantic_release-10.1.0 → python_semantic_release-10.3.0}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-semantic-release"
-version = "10.1.0"
+version = "10.3.0"
 description = "Automatic Semantic Versioning for Python projects"
 requires-python = ">=3.8"
 license = { text = "MIT" }
@@ -84,7 +84,7 @@ dev = [
   "ruff == 0.6.1"
 ]
 mypy = [
-  "mypy == 1.16.0",
+  "mypy == 1.16.1",
   "types-Deprecated ~= 1.2",
   "types-requests ~= 2.32.0",
   "types-pyyaml ~= 6.0",

{python_semantic_release-10.1.0 → python_semantic_release-10.3.0}/src/python_semantic_release.egg-info/SOURCES.txt

@@ -141,6 +141,7 @@ tests/e2e/cmd_version/bump_version/git_flow/test_repo_3_channels.py
 tests/e2e/cmd_version/bump_version/git_flow/test_repo_4_channels.py
 tests/e2e/cmd_version/bump_version/github_flow/__init__.py
 tests/e2e/cmd_version/bump_version/github_flow/test_repo_1_channel.py
+tests/e2e/cmd_version/bump_version/github_flow/test_repo_1_channel_branch_update_merge.py
 tests/e2e/cmd_version/bump_version/github_flow/test_repo_2_channels.py
 tests/e2e/cmd_version/bump_version/trunk_based_dev/__init__.py
 tests/e2e/cmd_version/bump_version/trunk_based_dev/test_repo_trunk.py
@@ -161,6 +162,7 @@ tests/fixtures/repos/git_flow/repo_w_3_release_channels.py
 tests/fixtures/repos/git_flow/repo_w_4_release_channels.py
 tests/fixtures/repos/github_flow/__init__.py
 tests/fixtures/repos/github_flow/repo_w_default_release.py
+tests/fixtures/repos/github_flow/repo_w_default_release_w_branch_update_merge.py
 tests/fixtures/repos/github_flow/repo_w_release_channels.py
 tests/fixtures/repos/trunk_based_dev/__init__.py
 tests/fixtures/repos/trunk_based_dev/repo_w_dual_version_support.py

{python_semantic_release-10.1.0 → python_semantic_release-10.3.0}/src/semantic_release/cli/commands/version.py

@@ -30,6 +30,7 @@ from semantic_release.errors import (
 )
 from semantic_release.gitproject import GitProject
 from semantic_release.globals import logger
+from semantic_release.hvcs.github import Github
 from semantic_release.hvcs.remote_hvcs_base import RemoteHvcsBase
 from semantic_release.version.algorithm import (
     next_version,
@@ -466,7 +467,12 @@ def version(  # noqa: C901
     major_on_zero = runtime.major_on_zero
     no_verify = runtime.no_git_verify
     opts = runtime.global_cli_options
-    gha_output = VersionGitHubActionsOutput(released=False)
+    gha_output = VersionGitHubActionsOutput(
+        hvcs_client
+        if isinstance(hvcs_client, Github)
+        else Github(hvcs_client.remote_url(use_token=False)),
+        released=False,
+    )
 
     forced_level_bump = None if not force_level else LevelBump.from_string(force_level)
     prerelease = is_forced_prerelease(
@@ -572,6 +578,12 @@ def version(  # noqa: C901
     if print_only or print_only_tag:
         return
 
+    # TODO: need a better way as this is inconsistent if releasing older version patches
+    if last_release := last_released(config.repo_dir, tag_format=config.tag_format):
+        # If we have a last release, we can set the previous version for the
+        # GitHub Actions output
+        gha_output.prev_version = last_release[1]
+
     with Repo(str(runtime.repo_dir)) as git_repo:
         release_history = ReleaseHistory.from_git_history(
             repo=git_repo,
@@ -632,6 +644,7 @@ def version(  # noqa: C901
                     **runtime.build_command_env,
                     # PSR injected environment variables
                     "NEW_VERSION": str(new_version),
+                    "PACKAGE_NAME": runtime.project_metadata.get("name", ""),
                 },
                 noop=opts.noop,
             )
@@ -640,6 +653,29 @@ def version(  # noqa: C901
             click.echo("Build failed, aborting release", err=True)
             ctx.exit(1)
 
+    license_cfg = runtime.project_metadata.get(
+        "license-expression",
+        runtime.project_metadata.get(
+            "license",
+            "",
+        ),
+    )
+
+    license_cfg = "" if not isinstance(license_cfg, (str, dict)) else license_cfg
+    license_cfg = (
+        license_cfg.get("text", "") if isinstance(license_cfg, dict) else license_cfg
+    )
+
+    gha_output.release_notes = release_notes = generate_release_notes(
+        hvcs_client,
+        release=release_history.released[new_version],
+        template_dir=runtime.template_dir,
+        history=release_history,
+        style=runtime.changelog_style,
+        mask_initial_release=runtime.changelog_mask_initial_release,
+        license_name="" if not isinstance(license_cfg, str) else license_cfg,
+    )
+
     project = GitProject(
         directory=runtime.repo_dir,
         commit_author=runtime.commit_author,
@@ -675,6 +711,9 @@ def version(  # noqa: C901
             noop=opts.noop,
         )
 
+        with Repo(str(runtime.repo_dir)) as git_repo:
+            gha_output.commit_sha = git_repo.head.commit.hexsha
+
     if push_changes:
         remote_url = runtime.hvcs_client.remote_url(
             use_token=not runtime.ignore_token_for_push
@@ -709,33 +748,6 @@ def version(  # noqa: C901
         logger.info("Remote does not support releases. Skipping release creation...")
         return
 
-    license_cfg = runtime.project_metadata.get(
-        "license-expression",
-        runtime.project_metadata.get(
-            "license",
-            "",
-        ),
-    )
-
-    if not isinstance(license_cfg, (str, dict)) or license_cfg is None:
-        license_cfg = ""
-
-    license_name = (
-        license_cfg.get("text", "")
-        if isinstance(license_cfg, dict)
-        else license_cfg or ""
-    )
-
-    release_notes = generate_release_notes(
-        hvcs_client,
-        release=release_history.released[new_version],
-        template_dir=runtime.template_dir,
-        history=release_history,
-        style=runtime.changelog_style,
-        mask_initial_release=runtime.changelog_mask_initial_release,
-        license_name=license_name,
-    )
-
     exception: Exception | None = None
     help_message = ""
     try:

python_semantic_release-10.3.0/src/semantic_release/cli/github_actions_output.py

@@ -0,0 +1,150 @@
+from __future__ import annotations
+
+import os
+from re import compile as regexp
+from typing import TYPE_CHECKING
+
+from semantic_release.globals import logger
+from semantic_release.version.version import Version
+
+if TYPE_CHECKING:
+    from typing import Any
+
+    from semantic_release.hvcs.github import Github
+
+
+class VersionGitHubActionsOutput:
+    OUTPUT_ENV_VAR = "GITHUB_OUTPUT"
+
+    def __init__(
+        self,
+        gh_client: Github,
+        released: bool | None = None,
+        version: Version | None = None,
+        commit_sha: str | None = None,
+        release_notes: str | None = None,
+        prev_version: Version | None = None,
+    ) -> None:
+        self._gh_client = gh_client
+        self._released = released
+        self._version = version
+        self._commit_sha = commit_sha
+        self._release_notes = release_notes
+        self._prev_version = prev_version
+
+    @property
+    def released(self) -> bool | None:
+        return self._released
+
+    @released.setter
+    def released(self, value: bool) -> None:
+        if not isinstance(value, bool):
+            raise TypeError("output 'released' is boolean")
+        self._released = value
+
+    @property
+    def version(self) -> Version | None:
+        return self._version if self._version is not None else None
+
+    @version.setter
+    def version(self, value: Version) -> None:
+        if not isinstance(value, Version):
+            raise TypeError("output 'released' should be a Version")
+        self._version = value
+
+    @property
+    def tag(self) -> str | None:
+        return self.version.as_tag() if self.version is not None else None
+
+    @property
+    def is_prerelease(self) -> bool | None:
+        return self.version.is_prerelease if self.version is not None else None
+
+    @property
+    def commit_sha(self) -> str | None:
+        return self._commit_sha if self._commit_sha else None
+
+    @commit_sha.setter
+    def commit_sha(self, value: str) -> None:
+        if not isinstance(value, str):
+            raise TypeError("output 'commit_sha' should be a string")
+
+        if not regexp(r"^[0-9a-f]{40}$").match(value):
+            raise ValueError(
+                "output 'commit_sha' should be a valid 40-hex-character SHA"
+            )
+
+        self._commit_sha = value
+
+    @property
+    def release_notes(self) -> str | None:
+        return self._release_notes if self._release_notes else None
+
+    @release_notes.setter
+    def release_notes(self, value: str) -> None:
+        if not isinstance(value, str):
+            raise TypeError("output 'release_notes' should be a string")
+        self._release_notes = value
+
+    @property
+    def prev_version(self) -> Version | None:
+        if not self.released:
+            return self.version
+        return self._prev_version if self._prev_version else None
+
+    @prev_version.setter
+    def prev_version(self, value: Version) -> None:
+        if not isinstance(value, Version):
+            raise TypeError("output 'prev_version' should be a Version")
+        self._prev_version = value
+
+    def to_output_text(self) -> str:
+        missing: set[str] = set()
+        if self.version is None:
+            missing.add("version")
+        if self.released is None:
+            missing.add("released")
+        if self.released and self.commit_sha is None:
+            missing.add("commit_sha")
+        if self.released and self.release_notes is None:
+            missing.add("release_notes")
+
+        if missing:
+            raise ValueError(
+                f"some required outputs were not set: {', '.join(missing)}"
+            )
+
+        output_values: dict[str, Any] = {
+            "released": str(self.released).lower(),
+            "version": str(self.version),
+            "tag": self.tag,
+            "is_prerelease": str(self.is_prerelease).lower(),
+            "link": self._gh_client.create_release_url(self.tag) if self.tag else "",
+            "previous_version": str(self.prev_version) if self.prev_version else "",
+            "commit_sha": self.commit_sha if self.commit_sha else "",
+        }
+
+        multiline_output_values: dict[str, str] = {
+            "release_notes": self.release_notes if self.release_notes else "",
+        }
+
+        output_lines = [
+            *[f"{key}={value!s}{os.linesep}" for key, value in output_values.items()],
+            *[
+                f"{key}<<EOF{os.linesep}{value}EOF{os.linesep}"
+                if value
+                else f"{key}={os.linesep}"
+                for key, value in multiline_output_values.items()
+            ],
+        ]
+
+        return str.join("", output_lines)
+
+    def write_if_possible(self, filename: str | None = None) -> None:
+        output_file = filename or os.getenv(self.OUTPUT_ENV_VAR)
+        if not output_file:
+            logger.info("not writing GitHub Actions output, as no file specified")
+            return
+
+        with open(output_file, "ab") as f:
+            f.write(self.to_output_text().encode("utf-8"))

{python_semantic_release-10.1.0 → python_semantic_release-10.3.0}/src/semantic_release/cli/util.py

@@ -9,6 +9,7 @@ from textwrap import dedent, indent
 from typing import Any
 
 import rich
+import rich.markup
 import tomlkit
 from tomlkit.exceptions import TOMLKitError
 
@@ -26,8 +27,7 @@ def noop_report(msg: str) -> None:
     Rich-prints a msg with a standard prefix to report when an action is not being
     taken due to a "noop" flag
     """
-    fullmsg = "[bold cyan][:shield: NOP] " + msg
-    rprint(fullmsg)
+    rprint(f"[bold cyan][:shield: NOP] {rich.markup.escape(msg)}")
 
 
 def indented(msg: str, prefix: str = " " * 4) -> str:

{python_semantic_release-10.1.0 → python_semantic_release-10.3.0}/tests/const.py

@@ -328,3 +328,4 @@ EXAMPLE_RELEASE_NOTES_TEMPLATE = r"""
 """.lstrip()  # noqa: E501
 
 RELEASE_NOTES = "# Release Notes"
+DEFAULT_MERGE_STRATEGY_OPTION = "theirs"