python-semantic-release 9.15.0__tar.gz → 9.15.2__tar.gz

{python_semantic_release-9.15.0/src/python_semantic_release.egg-info → python_semantic_release-9.15.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-semantic-release
-Version: 9.15.0
+Version: 9.15.2
 Summary: Automatic Semantic Versioning for Python projects
 Author-email: Rolf Erik Lekang <me@rolflekang.com>
 License: MIT

{python_semantic_release-9.15.0 → python_semantic_release-9.15.2}/docs/automatic-releases/github-actions.rst

@@ -337,7 +337,7 @@ before the :ref:`version <cmd-version>` subcommand.
 
   .. code:: yaml
 
-    - uses: python-semantic-release/python-semantic-release@v9.15.0
+    - uses: python-semantic-release/python-semantic-release@v9.15.2
       with:
         root_options: "-vv --noop"
 
@@ -684,7 +684,7 @@ 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@v9.15.0
+            uses: python-semantic-release/python-semantic-release@v9.15.2
             with:
               github_token: ${{ secrets.GITHUB_TOKEN }}
               git_committer_name: "github-actions"
@@ -744,7 +744,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@v9.15.0
+    uses: python-semantic-release/python-semantic-release@v9.15.2
     with:
       github_token: ${{ secrets.GITHUB_TOKEN }}
       force: patch
@@ -772,13 +772,13 @@ Publish Action.
 .. code:: yaml
 
    - name: Release Project 1
-     uses: python-semantic-release/python-semantic-release@v9.15.0
+     uses: python-semantic-release/python-semantic-release@v9.15.2
      with:
        directory: ./project1
        github_token: ${{ secrets.GITHUB_TOKEN }}
 
    - name: Release Project 2
-     uses: python-semantic-release/python-semantic-release@v9.15.0
+     uses: python-semantic-release/python-semantic-release@v9.15.2
      with:
        directory: ./project2
        github_token: ${{ secrets.GITHUB_TOKEN }}

{python_semantic_release-9.15.0 → python_semantic_release-9.15.2}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-semantic-release"
-version = "9.15.0"
+version = "9.15.2"
 description = "Automatic Semantic Versioning for Python projects"
 requires-python = ">=3.8"
 license = { text = "MIT" }

{python_semantic_release-9.15.0 → python_semantic_release-9.15.2/src/python_semantic_release.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-semantic-release
-Version: 9.15.0
+Version: 9.15.2
 Summary: Automatic Semantic Versioning for Python projects
 Author-email: Rolf Erik Lekang <me@rolflekang.com>
 License: MIT

{python_semantic_release-9.15.0 → python_semantic_release-9.15.2}/src/python_semantic_release.egg-info/SOURCES.txt

@@ -121,6 +121,21 @@ tests/e2e/cmd_version/test_version_print.py
 tests/e2e/cmd_version/test_version_release_notes.py
 tests/e2e/cmd_version/test_version_stamp.py
 tests/e2e/cmd_version/test_version_strict.py
+tests/e2e/cmd_version/bump_version/__init__.py
+tests/e2e/cmd_version/bump_version/conftest.py
+tests/e2e/cmd_version/bump_version/git_flow/__init__.py
+tests/e2e/cmd_version/bump_version/git_flow/test_repo_1_channel.py
+tests/e2e/cmd_version/bump_version/git_flow/test_repo_2_channels.py
+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_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
+tests/e2e/cmd_version/bump_version/trunk_based_dev/test_repo_trunk_dual_version_support.py
+tests/e2e/cmd_version/bump_version/trunk_based_dev/test_repo_trunk_dual_version_support_w_prereleases.py
+tests/e2e/cmd_version/bump_version/trunk_based_dev/test_repo_trunk_w_prereleases.py
 tests/fixtures/__init__.py
 tests/fixtures/commit_parsers.py
 tests/fixtures/example_project.py
@@ -137,6 +152,8 @@ tests/fixtures/repos/github_flow/__init__.py
 tests/fixtures/repos/github_flow/repo_w_default_release.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
+tests/fixtures/repos/trunk_based_dev/repo_w_dual_version_support_w_prereleases.py
 tests/fixtures/repos/trunk_based_dev/repo_w_no_tags.py
 tests/fixtures/repos/trunk_based_dev/repo_w_prereleases.py
 tests/fixtures/repos/trunk_based_dev/repo_w_tags.py

{python_semantic_release-9.15.0 → python_semantic_release-9.15.2}/src/semantic_release/__init__.py

@@ -24,7 +24,7 @@ from semantic_release.version import (
     tags_and_versions,
 )
 
-__version__ = "9.15.0"
+__version__ = "9.15.2"
 
 __all__ = [
     "CommitParser",

{python_semantic_release-9.15.0 → python_semantic_release-9.15.2}/src/semantic_release/__main__.py

@@ -34,7 +34,15 @@ def main() -> None:
                 ),
                 file=sys.stderr,
             )
+
         print(f"::ERROR:: {err}", file=sys.stderr)
+
+        if not globals.debug:
+            print(
+                "Run semantic-release in very verbose mode (-vv) to see the full traceback.",
+                file=sys.stderr,
+            )
+
         sys.exit(1)
 
 

{python_semantic_release-9.15.0 → python_semantic_release-9.15.2}/src/semantic_release/changelog/template.py

@@ -124,9 +124,9 @@ def recursive_render(
             # is used for inserting into a current changelog. When using stream rendering
             # of the same file, it always came back empty
             log.debug("rendering %s to %s", src_file_path, output_file_path)
-            rendered_file = environment.get_template(src_file_path).render()
+            rendered_file = environment.get_template(src_file_path).render().rstrip()
             with open(output_file_path, "w", encoding="utf-8") as output_file:
-                output_file.write(rendered_file)
+                output_file.write(f"{rendered_file}\n")
 
             rendered_paths.append(output_file_path)
         else:

{python_semantic_release-9.15.0 → python_semantic_release-9.15.2}/src/semantic_release/cli/commands/main.py

@@ -15,6 +15,7 @@ from semantic_release.cli.cli_context import CliContextObj
 from semantic_release.cli.config import GlobalCommandLineOptions
 from semantic_release.cli.const import DEFAULT_CONFIG_FILE
 from semantic_release.cli.util import rprint
+from semantic_release.enums import SemanticReleaseLogLevels
 
 # if TYPE_CHECKING:
 #     pass
@@ -108,7 +109,15 @@ def main(
     """
     console = Console(stderr=True)
 
-    log_level = [logging.WARNING, logging.INFO, logging.DEBUG][verbosity]
+    log_levels = [
+        SemanticReleaseLogLevels.WARNING,
+        SemanticReleaseLogLevels.INFO,
+        SemanticReleaseLogLevels.DEBUG,
+        SemanticReleaseLogLevels.SILLY,
+    ]
+
+    log_level = log_levels[verbosity]
+
     logging.basicConfig(
         level=log_level,
         format=FORMAT,
@@ -123,7 +132,7 @@ def main(
     logger = logging.getLogger(__name__)
     logger.debug("logging level set to: %s", logging.getLevelName(log_level))
 
-    if log_level == logging.DEBUG:
+    if log_level <= logging.DEBUG:
         globals.debug = True
 
     if noop:

{python_semantic_release-9.15.0 → python_semantic_release-9.15.2}/src/semantic_release/cli/commands/version.py

@@ -653,6 +653,7 @@ def version(  # noqa: C901
         project.git_tag(
             tag_name=new_version.as_tag(),
             message=new_version.as_tag(),
+            isotimestamp=commit_date.isoformat(),
             noop=opts.noop,
         )
 

{python_semantic_release-9.15.0 → python_semantic_release-9.15.2}/src/semantic_release/cli/config.py

@@ -360,9 +360,12 @@ class RawConfig(BaseModel):
         try:
             # Check for repository & walk up parent directories
             with Repo(str(dir_path), search_parent_directories=True) as git_repo:
-                found_path = Path(
-                    git_repo.working_tree_dir or git_repo.working_dir
-                ).absolute()
+                found_path = (
+                    Path(git_repo.working_tree_dir or git_repo.working_dir)
+                    .expanduser()
+                    .absolute()
+                )
+
         except InvalidGitRepositoryError as err:
             raise InvalidGitRepositoryError("No valid git repository found!") from err
 
@@ -370,7 +373,8 @@ class RawConfig(BaseModel):
             logging.warning(
                 "Found .git/ in higher parent directory rather than provided in configuration."
             )
-        return found_path
+
+        return found_path.resolve()
 
     @field_validator("commit_parser", mode="after")
     @classmethod

{python_semantic_release-9.15.0 → python_semantic_release-9.15.2}/src/semantic_release/commit_parser/angular.py

@@ -21,7 +21,11 @@ from semantic_release.commit_parser.token import (
     ParseError,
     ParseResult,
 )
-from semantic_release.commit_parser.util import breaking_re, parse_paragraphs
+from semantic_release.commit_parser.util import (
+    breaking_re,
+    parse_paragraphs,
+    sort_numerically,
+)
 from semantic_release.enums import LevelBump
 from semantic_release.errors import InvalidParserOptions
 
@@ -195,7 +199,7 @@ class AngularCommitParser(CommitParser[ParseResult, AngularParserOptions]):
                     predicate.split(","),
                 )
             )
-            accumulator["linked_issues"] = sorted(
+            accumulator["linked_issues"] = sort_numerically(
                 set(accumulator["linked_issues"]).union(new_issue_refs)
             )
             # TODO: breaking change v10, removes resolution footers from descriptions

{python_semantic_release-9.15.0 → python_semantic_release-9.15.2}/src/semantic_release/commit_parser/emoji.py

@@ -18,7 +18,7 @@ from semantic_release.commit_parser.token import (
     ParsedMessageResult,
     ParseResult,
 )
-from semantic_release.commit_parser.util import parse_paragraphs
+from semantic_release.commit_parser.util import parse_paragraphs, sort_numerically
 from semantic_release.enums import LevelBump
 from semantic_release.errors import InvalidParserOptions
 
@@ -186,7 +186,7 @@ class EmojiCommitParser(CommitParser[ParseResult, EmojiParserOptions]):
                     predicate.split(","),
                 )
             )
-            accumulator["linked_issues"] = sorted(
+            accumulator["linked_issues"] = sort_numerically(
                 set(accumulator["linked_issues"]).union(new_issue_refs)
             )
             # TODO: breaking change v10, removes resolution footers from descriptions

{python_semantic_release-9.15.0 → python_semantic_release-9.15.2}/src/semantic_release/commit_parser/util.py

@@ -6,28 +6,34 @@ from typing import TYPE_CHECKING
 
 if TYPE_CHECKING:  # pragma: no cover
     from re import Pattern
-    from typing import TypedDict
+    from typing import Sequence, TypedDict
 
     class RegexReplaceDef(TypedDict):
         pattern: Pattern
         repl: str
 
 
+number_pattern = regexp(r"(\d+)")
+
 breaking_re = regexp(r"BREAKING[ -]CHANGE:\s?(.*)")
+
 un_word_wrap: RegexReplaceDef = {
     # Match a line ending where the next line is not indented, or a bullet
     "pattern": regexp(r"((?<!-)\n(?![\s*-]))"),
     "repl": r" ",  # Replace with a space
 }
+
 un_word_wrap_hyphen: RegexReplaceDef = {
     "pattern": regexp(r"((?<=\w)-\n(?=\w))"),
     "repl": r"-",  # Replace with single hyphen
 }
+
 trim_line_endings: RegexReplaceDef = {
     # Match line endings with optional whitespace
     "pattern": regexp(r"[\r\t\f\v ]*\r?\n"),
     "repl": "\n",  # remove the optional whitespace & remove windows newlines
 }
+
 spread_out_git_footers: RegexReplaceDef = {
     # Match a git footer line, and add an extra newline after it
     # only be flexible enough for a double space indent (otherwise its probably on purpose)
@@ -65,3 +71,7 @@ def parse_paragraphs(text: str) -> list[str]:
             ],
         )
     )
+
+
+def sort_numerically(iterable: Sequence[str] | set[str]) -> list[str]:
+    return sorted(iterable, key=lambda x: int((number_pattern.search(x) or [-1])[0]))

{python_semantic_release-9.15.0 → python_semantic_release-9.15.2}/src/semantic_release/data/templates/angular/md/.components/changes.md.j2

@@ -69,7 +69,7 @@ EXAMPLE:
 #}{%  if breaking_commits | length > 0
 %}{#    PREPROCESS COMMITS
 #}{%    set brk_ns = namespace(commits=breaking_commits)
-%}{{    apply_alphabetical_ordering_by_descriptions(brk_ns) | default("", true)
+%}{{    apply_alphabetical_ordering_by_brk_descriptions(brk_ns) | default("", true)
 }}{#
 #}{%    set brking_descriptions = []
 %}{#

{python_semantic_release-9.15.0 → python_semantic_release-9.15.2}/src/semantic_release/enums.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import logging
 from enum import IntEnum, unique
 
 
@@ -37,3 +38,32 @@ class LevelBump(IntEnum):
         >>> LevelBump.from_string("minor") == LevelBump.MINOR
         """
         return cls[val.upper().replace("-", "_")]
+
+
+class SemanticReleaseLogLevels(IntEnum):
+    """IntEnum representing the log levels used by semantic-release."""
+
+    FATAL = logging.FATAL
+    CRITICAL = logging.CRITICAL
+    ERROR = logging.ERROR
+    WARNING = logging.WARNING
+    INFO = logging.INFO
+    DEBUG = logging.DEBUG
+    SILLY = 5
+
+    def __str__(self) -> str:
+        """
+        Return the level name rather than 'SemanticReleaseLogLevels.<level>'
+        E.g.
+        >>> str(SemanticReleaseLogLevels.DEBUG)
+        'DEBUG'
+        >>> str(SemanticReleaseLogLevels.CRITICAL)
+        'CRITICAL'
+        """
+        return self.name.upper()
+
+
+logging.addLevelName(
+    SemanticReleaseLogLevels.SILLY,
+    str(SemanticReleaseLogLevels.SILLY),
+)

{python_semantic_release-9.15.0 → python_semantic_release-9.15.2}/src/semantic_release/gitproject.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 from contextlib import nullcontext
+from datetime import datetime
 from logging import getLogger
 from pathlib import Path
 from typing import TYPE_CHECKING
@@ -48,7 +49,9 @@ class GitProject:
         return self._logger
 
     def _get_custom_environment(
-        self, repo: Repo
+        self,
+        repo: Repo,
+        custom_vars: dict[str, str] | None = None,
     ) -> nullcontext[None] | _GeneratorContextManager[None]:
         """
         git.custom_environment is a context manager but
@@ -56,15 +59,26 @@ class GitProject:
         we need to throw it away and re-create it in
         order to use it again
         """
+        author_vars = (
+            {
+                "GIT_AUTHOR_NAME": self._commit_author.name,
+                "GIT_AUTHOR_EMAIL": self._commit_author.email,
+                "GIT_COMMITTER_NAME": self._commit_author.name,
+                "GIT_COMMITTER_EMAIL": self._commit_author.email,
+            }
+            if self._commit_author
+            else {}
+        )
+
+        custom_env_vars = {
+            **author_vars,
+            **(custom_vars or {}),
+        }
+
         return (
             nullcontext()
-            if not self._commit_author
-            else repo.git.custom_environment(
-                GIT_AUTHOR_NAME=self._commit_author.name,
-                GIT_AUTHOR_EMAIL=self._commit_author.email,
-                GIT_COMMITTER_NAME=self._commit_author.name,
-                GIT_COMMITTER_EMAIL=self._commit_author.email,
-            )
+            if not custom_env_vars
+            else repo.git.custom_environment(**custom_env_vars)
         )
 
     def is_dirty(self) -> bool:
@@ -182,19 +196,32 @@ class GitProject:
                     self.logger.exception(str(err))
                     raise GitCommitError("Failed to commit changes") from err
 
-    def git_tag(self, tag_name: str, message: str, noop: bool = False) -> None:
+    def git_tag(
+        self, tag_name: str, message: str, isotimestamp: str, noop: bool = False
+    ) -> None:
+        try:
+            datetime.fromisoformat(isotimestamp)
+        except ValueError as err:
+            raise ValueError("Invalid timestamp format") from err
+
         if noop:
-            command = (
-                f"""\
-                GIT_AUTHOR_NAME={self._commit_author.name} \\
-                GIT_AUTHOR_EMAIL={self._commit_author.email} \\
-                GIT_COMMITTER_NAME={self._commit_author.name} \\
-                GIT_COMMITTER_EMAIL={self._commit_author.email} \\
-                """
-                if self._commit_author
-                else ""
+            command = str.join(
+                " ",
+                [
+                    f"GIT_COMMITTER_DATE={isotimestamp}",
+                    *(
+                        [
+                            f"GIT_AUTHOR_NAME={self._commit_author.name}",
+                            f"GIT_AUTHOR_EMAIL={self._commit_author.email}",
+                            f"GIT_COMMITTER_NAME={self._commit_author.name}",
+                            f"GIT_COMMITTER_EMAIL={self._commit_author.email}",
+                        ]
+                        if self._commit_author
+                        else [""]
+                    ),
+                    f"git tag -a {tag_name} -m '{message}'",
+                ],
             )
-            command += f"git tag -a {tag_name} -m '{message}'"
 
             noop_report(
                 indented(
@@ -206,7 +233,10 @@ class GitProject:
             )
             return
 
-        with Repo(str(self.project_root)) as repo, self._get_custom_environment(repo):
+        with Repo(str(self.project_root)) as repo, self._get_custom_environment(
+            repo,
+            {"GIT_COMMITTER_DATE": isotimestamp},
+        ):
             try:
                 repo.git.tag("-a", tag_name, m=message)
             except GitCommandError as err: