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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-semantic-release
-Version: 9.15.0
+Version: 9.15.1
 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.1}/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.1
       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.1
             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.1
     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.1
      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.1
      with:
        directory: ./project2
        github_token: ${{ secrets.GITHUB_TOKEN }}

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

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-semantic-release"
-version = "9.15.0"
+version = "9.15.1"
 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.1/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.1
 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.1}/src/semantic_release/__init__.py

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

{python_semantic_release-9.15.0 → python_semantic_release-9.15.1}/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.1}/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.1}/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.1}/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.1}/tests/unit/semantic_release/commit_parser/test_angular.py

@@ -267,7 +267,12 @@ def test_parser_return_linked_merge_request_from_commit_message(
                 (
                     f"{footer_prefix}: #555, #444, #333",
                     ["#333", "#444", "#555"],
-                ),  # TODO: force ordering?
+                ),
+                # More than 2 issues (force numerical sort)
+                (
+                    f"{footer_prefix}: #555, #3333, #444",
+                    ["#444", "#555", "#3333"],
+                ),
                 # Single issue listed multiple times
                 (f"{footer_prefix}: #555, #555", ["#555"]),
                 # Multiple footers with the same issue
@@ -388,7 +393,12 @@ def test_parser_return_linked_merge_request_from_commit_message(
                 (
                     f"{footer_prefix}: ABC-555, ABC-444, ABC-333",
                     ["ABC-333", "ABC-444", "ABC-555"],
-                ),  # TODO: force ordering?
+                ),
+                # More than 2 issues (force numerical sort)
+                (
+                    f"{footer_prefix}: ABC-555, ABC-3333, ABC-444",
+                    ["ABC-444", "ABC-555", "ABC-3333"],
+                ),
                 # Single issue listed multiple times
                 (f"{footer_prefix}: ABC-555, ABC-555", ["ABC-555"]),
                 # Multiple footers with the same issue

{python_semantic_release-9.15.0 → python_semantic_release-9.15.1}/tests/unit/semantic_release/commit_parser/test_emoji.py

@@ -210,7 +210,12 @@ def test_parser_return_linked_merge_request_from_commit_message(
                 (
                     f"{footer_prefix}: #555, #444, #333",
                     ["#333", "#444", "#555"],
-                ),  # TODO: force ordering?
+                ),
+                # More than 2 issues (force numerical sort)
+                (
+                    f"{footer_prefix}: #555, #3333, #444",
+                    ["#444", "#555", "#3333"],
+                ),
                 # Single issue listed multiple times
                 (f"{footer_prefix}: #555, #555", ["#555"]),
                 # Multiple footers with the same issue
@@ -331,7 +336,12 @@ def test_parser_return_linked_merge_request_from_commit_message(
                 (
                     f"{footer_prefix}: ABC-555, ABC-444, ABC-333",
                     ["ABC-333", "ABC-444", "ABC-555"],
-                ),  # TODO: force ordering?
+                ),
+                # More than 2 issues (force numerical sort)
+                (
+                    f"{footer_prefix}: ABC-555, ABC-3333, ABC-444",
+                    ["ABC-444", "ABC-555", "ABC-3333"],
+                ),
                 # Single issue listed multiple times
                 (f"{footer_prefix}: ABC-555, ABC-555", ["ABC-555"]),
                 # Multiple footers with the same issue

{python_semantic_release-9.15.0 → python_semantic_release-9.15.1}/tests/unit/semantic_release/commit_parser/test_scipy.py

@@ -266,7 +266,12 @@ def test_parser_return_linked_merge_request_from_commit_message(
                 (
                     f"{footer_prefix}: #555, #444, #333",
                     ["#333", "#444", "#555"],
-                ),  # TODO: force ordering?
+                ),
+                # More than 2 issues (force numerical sort)
+                (
+                    f"{footer_prefix}: #555, #3333, #444",
+                    ["#444", "#555", "#3333"],
+                ),
                 # Single issue listed multiple times
                 (f"{footer_prefix}: #555, #555", ["#555"]),
                 # Multiple footers with the same issue
@@ -387,7 +392,12 @@ def test_parser_return_linked_merge_request_from_commit_message(
                 (
                     f"{footer_prefix}: ABC-555, ABC-444, ABC-333",
                     ["ABC-333", "ABC-444", "ABC-555"],
-                ),  # TODO: force ordering?
+                ),
+                # More than 2 issues (force numerical sort)
+                (
+                    f"{footer_prefix}: ABC-555, ABC-3333, ABC-444",
+                    ["ABC-444", "ABC-555", "ABC-3333"],
+                ),
                 # Single issue listed multiple times
                 (f"{footer_prefix}: ABC-555, ABC-555", ["ABC-555"]),
                 # Multiple footers with the same issue