python-semantic-release 9.8.1__tar.gz → 9.8.3__tar.gz

{python_semantic_release-9.8.1/python_semantic_release.egg-info → python_semantic_release-9.8.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-semantic-release
-Version: 9.8.1
+Version: 9.8.3
 Summary: Automatic Semantic Versioning for Python projects
 Author-email: Rolf Erik Lekang <me@rolflekang.com>
 License: MIT
@@ -55,7 +55,7 @@ Requires-Dist: types-pytest-lazy-fixture~=0.6.3; extra == "test"
 Provides-Extra: dev
 Requires-Dist: pre-commit~=3.5; extra == "dev"
 Requires-Dist: tox~=4.11; extra == "dev"
-Requires-Dist: ruff==0.4.4; extra == "dev"
+Requires-Dist: ruff==0.4.9; extra == "dev"
 Provides-Extra: mypy
 Requires-Dist: mypy==1.10.0; extra == "mypy"
 Requires-Dist: types-requests~=2.31.0; extra == "mypy"

{python_semantic_release-9.8.1 → python_semantic_release-9.8.3}/docs/changelog_templates.rst

@@ -339,8 +339,7 @@ Below is an example template that can be used to render a Changelog:
 .. code-block::
 
     # CHANGELOG
-    {% if context.history.unreleased | length > 0 %}
-
+    {% if context.history.unreleased | length > 0 -%}
     {# UNRELEASED #}
     ## Unreleased
     {% for type_, commits in context.history.unreleased | dictsort %}
@@ -349,12 +348,9 @@ Below is an example template that can be used to render a Changelog:
     * {{ commit.commit.message.rstrip() }} ([`{{ commit.commit.hexsha[:7] }}`]({{ commit.commit.hexsha | commit_hash_url }}))
     {% else %}
     * {{ commit.commit.message.rstrip() }} ([`{{ commit.commit.hexsha[:7] }}`]({{ commit.commit.hexsha | commit_hash_url }}))
-    {% endif %}{% endfor %}{% endfor %}
-
-    {% endif %}
-
+    {% endif %}{% endfor %}{% endfor %}{% endif -%}
     {# RELEASED #}
-    {% for version, release in context.history.released.items() %}
+    {% for version, release in context.history.released.items() -%}
     ## {{ version.as_tag() }} ({{ release.tagged_date.strftime("%Y-%m-%d") }})
     {% for type_, commits in release["elements"] | dictsort %}
     ### {{ type_ | capitalize }}

{python_semantic_release-9.8.1 → python_semantic_release-9.8.3}/pyproject.toml

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-semantic-release"
-version = "9.8.1"
+version = "9.8.3"
 description = "Automatic Semantic Versioning for Python projects"
 requires-python = ">=3.8"
 license = { text = "MIT" }
@@ -74,7 +74,7 @@ test = [
 dev = [
   "pre-commit ~= 3.5",
   "tox ~= 4.11",
-  "ruff == 0.4.4"
+  "ruff == 0.4.9"
 ]
 mypy = [
   "mypy == 1.10.0",

{python_semantic_release-9.8.1 → python_semantic_release-9.8.3/python_semantic_release.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-semantic-release
-Version: 9.8.1
+Version: 9.8.3
 Summary: Automatic Semantic Versioning for Python projects
 Author-email: Rolf Erik Lekang <me@rolflekang.com>
 License: MIT
@@ -55,7 +55,7 @@ Requires-Dist: types-pytest-lazy-fixture~=0.6.3; extra == "test"
 Provides-Extra: dev
 Requires-Dist: pre-commit~=3.5; extra == "dev"
 Requires-Dist: tox~=4.11; extra == "dev"
-Requires-Dist: ruff==0.4.4; extra == "dev"
+Requires-Dist: ruff==0.4.9; extra == "dev"
 Provides-Extra: mypy
 Requires-Dist: mypy==1.10.0; extra == "mypy"
 Requires-Dist: types-requests~=2.31.0; extra == "mypy"

{python_semantic_release-9.8.1 → python_semantic_release-9.8.3}/python_semantic_release.egg-info/requires.txt

@@ -17,7 +17,7 @@ build~=1.2
 [dev]
 pre-commit~=3.5
 tox~=4.11
-ruff==0.4.4
+ruff==0.4.9
 
 [docs]
 Sphinx~=6.0

{python_semantic_release-9.8.1 → python_semantic_release-9.8.3}/semantic_release/__init__.py

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

{python_semantic_release-9.8.1 → python_semantic_release-9.8.3}/semantic_release/commit_parser/token.py

@@ -21,7 +21,8 @@ class ParsedCommit(NamedTuple):
     @property
     def message(self) -> str:
         m = self.commit.message
-        return m.decode("utf-8") if isinstance(m, bytes) else m
+        message_str = m.decode("utf-8") if isinstance(m, bytes) else m
+        return message_str.replace("\r", "")
 
     @property
     def hexsha(self) -> str:
@@ -39,7 +40,8 @@ class ParseError(NamedTuple):
     @property
     def message(self) -> str:
         m = self.commit.message
-        return m.decode("utf-8") if isinstance(m, bytes) else m
+        message_str = m.decode("utf-8") if isinstance(m, bytes) else m
+        return message_str.replace("\r", "")
 
     @property
     def hexsha(self) -> str:

{python_semantic_release-9.8.1 → python_semantic_release-9.8.3}/semantic_release/data/templates/CHANGELOG.md.j2

@@ -1,5 +1,5 @@
 # CHANGELOG
-{% if context.history.unreleased | length > 0 %}
+{% if context.history.unreleased | length > 0 -%}
 {# UNRELEASED #}
 ## Unreleased
 {% for type_, commits in context.history.unreleased | dictsort %}
@@ -8,8 +8,8 @@
 * {{ commit.message.rstrip() }} ([`{{ commit.short_hash }}`]({{ commit.hexsha | commit_hash_url }}))
 {% else %}
 * {{ commit.message.rstrip() }} ([`{{ commit.short_hash }}`]({{ commit.hexsha | commit_hash_url }}))
-{% endif %}{% endfor %}{% endfor %}{% endif %}
-{% for version, release in context.history.released.items() %}
+{% endif %}{% endfor %}{% endfor %}{% endif -%}
+{% for version, release in context.history.released.items() -%}
 {# RELEASED #}
 ## {{ version.as_semver_tag() }} ({{ release.tagged_date.strftime("%Y-%m-%d") }})
 {% for type_, commits in release["elements"] | dictsort %}

{python_semantic_release-9.8.1 → python_semantic_release-9.8.3}/tests/fixtures/git_repo.py

@@ -21,7 +21,7 @@ from tests.util import (
 )
 
 if TYPE_CHECKING:
-    from typing import Generator, Literal, Protocol, TypedDict, Union
+    from typing import Generator, Protocol, TypedDict, Union
 
     from semantic_release.hvcs import HvcsBase
 
@@ -34,7 +34,7 @@ if TYPE_CHECKING:
         UseParserFn,
     )
 
-    CommitConvention = Literal["angular", "emoji", "scipy", "tag"] | str
+    CommitConvention = str
     VersionStr = str
     CommitMsg = str
     ChangelogTypeHeading = str
@@ -331,15 +331,13 @@ def simulate_default_changelog_creation() -> SimulateDefaultChangelogCreationFn:
         if version == "Unreleased":
             version_entry.append(f"## {version}\n")
         else:
-            version_entry.append(
-                # TODO: artificial newline in front due to template when no Unreleased changes exist
-                f"\n## v{version} ({TODAY_DATE_STR})\n"
-            )
+            version_entry.append(f"## v{version} ({TODAY_DATE_STR})\n")
 
         for section_def in version_def["changelog_sections"]:
             version_entry.append(f"### {section_def['section']}\n")
-            for i in section_def["i_commits"]:
-                version_entry.append(f"* {version_def['commits'][i]}\n")
+            version_entry.extend(
+                [f"* {version_def['commits'][i]}\n" for i in section_def["i_commits"]]
+            )
 
         return str.join("\n", version_entry)
 
@@ -355,7 +353,7 @@ def simulate_default_changelog_creation() -> SimulateDefaultChangelogCreationFn:
             version_entries.insert(0, build_version_entry(version, version_def))
 
         changelog_content = (
-            str.join("\n" * 3, [header, str.join("\n", list(version_entries))]).rstrip()
+            str.join("\n" * 2, [header, str.join("\n", list(version_entries))]).rstrip()
             + "\n"
         )
 

{python_semantic_release-9.8.1 → python_semantic_release-9.8.3}/tests/fixtures/scipy.py

@@ -394,44 +394,3 @@ def scipy_major_mixed_commits(
             ),
         )
     )
-
-
-# @pytest.fixture(
-#     params=xdist_sort_hack(
-#         [
-#             k
-#             for k, v in ScipyParserOptions().tag_to_level.items()
-#             if v is LevelBump.MAJOR
-#         ]
-#     )
-# )
-# def scipy_major_commits(request, subject, default_scipy_parser_options):
-#     patch_tags = [
-#         k
-#         for k, v in default_scipy_parser_options.tag_to_level.items()
-#         if v is LevelBump.PATCH
-#     ]
-#     minor_tags = [
-#         k
-#         for k, v in default_scipy_parser_options.tag_to_level.items()
-#         if v is LevelBump.MINOR
-#     ]
-#     patch_commits = [
-#         _make_scipy_commit(random.choice(patch_tags), subject, body_parts)
-#         for body_parts in SCIPY_FORMATTED_COMMIT_BODY_PARTS
-#     ]
-#     minor_commits = [
-#         _make_scipy_commit(random.choice(minor_tags), subject, body_parts)
-#         for body_parts in SCIPY_FORMATTED_COMMIT_BODY_PARTS
-#     ]
-#     major_commits = [
-#         _make_scipy_commit(request.param, subject, body_parts)
-#         for body_parts in SCIPY_FORMATTED_COMMIT_BODY_PARTS
-#     ]
-#     return list(
-#         chain.from_iterable(
-#             zip_longest(
-#                 major_commits, minor_commits, patch_commits, fillvalue="uninteresting"
-#             )
-#         )
-#     )

{python_semantic_release-9.8.1 → python_semantic_release-9.8.3}/tests/scenario/test_next_version.py

@@ -802,10 +802,9 @@ def test_algorithm_no_zero_dot_versions_tag(
                         )
                     ),
                     *(
-                        # when allow_zero_version is True,
-                        # prerelease is True, & major_on_zero is False, the version should be
-                        # minor bumped, when given commits of a minor or major level because
-                        # major_on_zero = False
+                        # when allow_zero_version is True, prerelease is True, & major_on_zero
+                        # is False, the version should be minor bumped, when given commits of a
+                        # minor or major level because major_on_zero = False
                         (commits, False, False, True, "0.3.0")
                         for commits in (
                             lazy_fixture(angular_minor_commits.__name__),
@@ -1212,10 +1211,9 @@ def test_algorithm_with_zero_dot_versions_angular(
                         )
                     ),
                     *(
-                        # when allow_zero_version is True,
-                        # prerelease is True, & major_on_zero is False, the version should be
-                        # minor bumped, when given commits of a minor or major level because
-                        # major_on_zero = False
+                        # when allow_zero_version is True, prerelease is True, & major_on_zero
+                        # is False, the version should be minor bumped, when given commits of a
+                        # minor or major level because major_on_zero = False
                         (commits, False, False, True, "0.3.0")
                         for commits in (
                             lazy_fixture(emoji_minor_commits.__name__),
@@ -1622,10 +1620,9 @@ def test_algorithm_with_zero_dot_versions_emoji(
                         )
                     ),
                     *(
-                        # when allow_zero_version is True,
-                        # prerelease is True, & major_on_zero is False, the version should be
-                        # minor bumped, when given commits of a minor or major level because
-                        # major_on_zero = False
+                        # when allow_zero_version is True, prerelease is True, & major_on_zero
+                        # is False, the version should be minor bumped, when given commits of a
+                        # minor or major level because major_on_zero = False
                         (commits, False, False, True, "0.3.0")
                         for commits in (
                             lazy_fixture(scipy_minor_commits.__name__),
@@ -2026,10 +2023,10 @@ def test_algorithm_with_zero_dot_versions_scipy(
                         )
                     ),
                     *(
-                        # when allow_zero_version is True,
-                        # prerelease is True, & major_on_zero is False, the version should be
-                        # minor bumped, when given commits of a minor or major level because
-                        # major_on_zero = False
+                        # when allow_zero_version is True, prerelease is True,
+                        # & major_on_zero is False, the version should be minor
+                        # bumped, when given commits of a minor or major level
+                        # because major_on_zero = False
                         (commits, False, False, True, "0.3.0")
                         for commits in (
                             lazy_fixture(tag_minor_commits.__name__),