python-semantic-release 10.3.1__tar.gz → 10.3.2__tar.gz

{python_semantic_release-10.3.1 → python_semantic_release-10.3.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: python-semantic-release
-Version: 10.3.1
+Version: 10.3.2
 Summary: Automatic Semantic Versioning for Python projects
 Author-email: Rolf Erik Lekang <me@rolflekang.com>
 License: MIT
@@ -17,7 +17,7 @@ Classifier: Programming Language :: Python :: 3.10
 Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
-Requires-Python: >=3.8
+Requires-Python: ~=3.8
 Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: click~=8.1.0

{python_semantic_release-10.3.1 → python_semantic_release-10.3.2}/docs/configuration/automatic-releases/github-actions.rst

@@ -933,14 +933,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.3.1
+            uses: python-semantic-release/python-semantic-release@v10.3.2
             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.3.1
+            uses: python-semantic-release/publish-action@v10.3.2
             if: steps.release.outputs.released == 'true'
             with:
               github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -1039,7 +1039,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.3.1
+    uses: python-semantic-release/python-semantic-release@v10.3.2
     with:
       github_token: ${{ secrets.GITHUB_TOKEN }}
       force: patch
@@ -1098,14 +1098,14 @@ Publish Action.
 
         - name: Release submodule 1
           id: release-submod-1
-          uses: python-semantic-release/python-semantic-release@v10.3.1
+          uses: python-semantic-release/python-semantic-release@v10.3.2
           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.3.1
+          uses: python-semantic-release/python-semantic-release@v10.3.2
           with:
             directory: ${{ env.SUBMODULE_2_DIR }}
             github_token: ${{ secrets.GITHUB_TOKEN }}
@@ -1117,7 +1117,7 @@ Publish Action.
         # ------------------------------------------------------------------- #
 
         - name: Publish | Upload package 1 to GitHub Release Assets
-          uses: python-semantic-release/publish-action@v10.3.1
+          uses: python-semantic-release/publish-action@v10.3.2
           if: steps.release-submod-1.outputs.released == 'true'
           with:
             directory: ${{ env.SUBMODULE_1_DIR }}
@@ -1125,7 +1125,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.3.1
+          uses: python-semantic-release/publish-action@v10.3.2
           if: steps.release-submod-2.outputs.released == 'true'
           with:
             directory: ${{ env.SUBMODULE_2_DIR }}

{python_semantic_release-10.3.1 → python_semantic_release-10.3.2}/docs/configuration/configuration-guides/uv_integration.rst

@@ -176,7 +176,7 @@ look like this:
           id: version
           env:
             GH_TOKEN: "none"
-          run: uv run semantic-release -v version --no-commit --no-tag
+          run: uv run semantic-release -v version --no-changelog --no-commit --no-tag
 
         - name: Upload | Distribution Artifacts
           if: ${{ steps.version.outputs.released == 'true' }}

{python_semantic_release-10.3.1 → python_semantic_release-10.3.2}/pyproject.toml

@@ -6,9 +6,9 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-semantic-release"
-version = "10.3.1"
+version = "10.3.2"
 description = "Automatic Semantic Versioning for Python projects"
-requires-python = ">=3.8"
+requires-python = "~= 3.8"
 license = { text = "MIT" }
 classifiers = [
   "Programming Language :: Python",

{python_semantic_release-10.3.1 → python_semantic_release-10.3.2}/src/semantic_release/cli/commands/version.py

@@ -471,11 +471,7 @@ def version(  # noqa: C901
     no_verify = runtime.no_git_verify
     opts = runtime.global_cli_options
     gha_output = VersionGitHubActionsOutput(
-        gh_client=(
-            hvcs_client
-            if isinstance(hvcs_client, Github)
-            else Github(hvcs_client.remote_url(use_token=False))
-        ),
+        gh_client=hvcs_client if isinstance(hvcs_client, Github) else None,
         mode=(
             PersistenceMode.TEMPORARY
             if opts.noop or (not commit_changes and not create_tag)
@@ -553,7 +549,8 @@ def version(  # noqa: C901
 
     # Update GitHub Actions output value with new version & set delayed write
     gha_output.version = new_version
-    ctx.call_on_close(gha_output.write_if_possible)
+    if isinstance(hvcs_client, Github):
+        ctx.call_on_close(gha_output.write_if_possible)
 
     # Make string variant of version or appropriate tag as necessary
     version_to_print = str(new_version) if not print_only_tag else new_version.as_tag()

{python_semantic_release-10.3.1 → python_semantic_release-10.3.2}/src/semantic_release/cli/github_actions_output.py

@@ -24,7 +24,7 @@ class VersionGitHubActionsOutput:
 
     def __init__(
         self,
-        gh_client: Github,
+        gh_client: Github | None = None,
         mode: PersistenceMode = PersistenceMode.PERMANENT,
         released: bool | None = None,
         version: Version | None = None,
@@ -106,6 +106,12 @@ class VersionGitHubActionsOutput:
             raise TypeError("output 'prev_version' should be a Version")
         self._prev_version = value
 
+    @property
+    def gh_client(self) -> Github:
+        if not self._gh_client:
+            raise ValueError("GitHub client not set, cannot create links")
+        return self._gh_client
+
     def to_output_text(self) -> str:
         missing: set[str] = set()
         if self.version is None:
@@ -128,7 +134,7 @@ class VersionGitHubActionsOutput:
             "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 "",
+            "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 "",
         }

{python_semantic_release-10.3.1 → python_semantic_release-10.3.2}/src/semantic_release/version/algorithm.py

@@ -346,24 +346,7 @@ def next_version(
     # Step 5. apply the parser to each commit in the history (could return multiple results per commit)
     parsed_results = list(map(commit_parser.parse, commits_since_last_release))
 
-    # Step 5A. Validation type check for the parser results (important because of possible custom parsers)
-    for parsed_result in parsed_results:
-        if not any(
-            (
-                isinstance(parsed_result, (ParseError, ParsedCommit)),
-                type(parsed_result) == list
-                and validate_types_in_sequence(
-                    parsed_result, (ParseError, ParsedCommit)
-                ),
-                type(parsed_result) == tuple
-                and validate_types_in_sequence(
-                    parsed_result, (ParseError, ParsedCommit)
-                ),
-            )
-        ):
-            raise TypeError("Unexpected type returned from commit_parser.parse")
-
-    # Step 5B. Accumulate all parsed results into a single list accounting for possible multiple results per commit
+    # Step 5A. Accumulate all parsed results into a single list accounting for possible multiple results per commit
     consolidated_results: list[ParseResult] = reduce(
         lambda accumulated_results, p_results: [
             *accumulated_results,
@@ -378,6 +361,10 @@ def next_version(
         [],
     )
 
+    # Step 5B. Validation type check for the parser results (important because of possible custom parsers)
+    if not validate_types_in_sequence(consolidated_results, (ParseError, ParsedCommit)):
+        raise TypeError("Unexpected type returned from commit_parser.parse")
+
     # Step 5C. Parse the commits to determine the bump level that should be applied
     parsed_levels: set[LevelBump] = {
         parsed_result.bump  # type: ignore[union-attr] # too complex for type checkers

{python_semantic_release-10.3.1 → python_semantic_release-10.3.2}/tests/conftest.py

@@ -1,4 +1,4 @@
-"""Note: fixtures are stored in the tests/fixtures directory for better organisation"""
+"""Note: fixtures are stored in the tests/fixtures directory for better organization"""
 
 from __future__ import annotations
 
@@ -9,7 +9,7 @@ from datetime import datetime, timedelta, timezone
 from hashlib import md5
 from pathlib import Path
 from tempfile import NamedTemporaryFile
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, cast
 from unittest import mock
 
 import pytest
@@ -17,13 +17,15 @@ from click.testing import CliRunner
 from filelock import FileLock
 from git import Commit, Repo
 
+from semantic_release.version.version import Version
+
 from tests.const import PROJ_DIR
 from tests.fixtures import *
 from tests.util import copy_dir_tree, remove_dir_tree
 
 if TYPE_CHECKING:
     from tempfile import _TemporaryFileWrapper
-    from typing import Any, Callable, Generator, Protocol, Sequence, TypedDict
+    from typing import Any, Callable, Generator, Optional, Protocol, Sequence, TypedDict
 
     from click.testing import Result
     from filelock import AcquireReturnProxy
@@ -325,7 +327,7 @@ def get_authorization_to_build_repo_cache(
 def get_cached_repo_data(request: pytest.FixtureRequest) -> GetCachedRepoDataFn:
     def _get_cached_repo_data(proj_dirname: str) -> RepoData | None:
         cache_key = f"psr/repos/{proj_dirname}"
-        return request.config.cache.get(cache_key, None)
+        return cast("Optional[RepoData]", request.config.cache.get(cache_key, None))
 
     return _get_cached_repo_data
 
@@ -335,6 +337,10 @@ def set_cached_repo_data(request: pytest.FixtureRequest) -> SetCachedRepoDataFn:
     def magic_serializer(obj: Any) -> Any:
         if isinstance(obj, Path):
             return obj.__fspath__()
+
+        if isinstance(obj, Version):
+            return obj.__dict__
+
         return obj
 
     def _set_cached_repo_data(proj_dirname: str, data: RepoData) -> None:
@@ -386,13 +392,30 @@ def build_repo_or_copy_cache(
             with log_file_lock, log_file.open(mode="a") as afd:
                 afd.write(f"{stable_now_date().isoformat()}: {build_msg}...\n")
 
+            try:
+                # Try to build repository but catch any errors so that it doesn't cascade through all tests
+                # do to an unreleased lock
+                build_definition = build_repo_func(cached_repo_path)
+            except Exception:
+                remove_dir_tree(cached_repo_path, force=True)
+
+                if filelock:
+                    filelock.lock.release()
+
+                with log_file_lock, log_file.open(mode="a") as afd:
+                    afd.write(
+                        f"{stable_now_date().isoformat()}: {build_msg}...FAILED\n"
+                    )
+
+                raise
+
             # Marks the date when the cached repo was created
             set_cached_repo_data(
                 repo_name,
                 {
                     "build_date": today_date_str,
                     "build_spec_hash": build_spec_hash,
-                    "build_definition": build_repo_func(cached_repo_path),
+                    "build_definition": build_definition,
                 },
             )
 

{python_semantic_release-10.3.1 → python_semantic_release-10.3.2}/tests/e2e/cmd_changelog/test_changelog.py

@@ -14,7 +14,6 @@ import semantic_release.hvcs.github
 from semantic_release.changelog.context import ChangelogMode
 from semantic_release.cli.config import ChangelogOutputFormat
 from semantic_release.hvcs.github import Github
-from semantic_release.version.version import Version
 
 from tests.const import (
     CHANGELOG_SUBCMD,
@@ -77,6 +76,12 @@ if TYPE_CHECKING:
 
     from requests_mock import Mocker
 
+    from semantic_release.commit_parser.conventional import (
+        ConventionalCommitParser,
+    )
+    from semantic_release.commit_parser.emoji import EmojiCommitParser
+    from semantic_release.commit_parser.scipy import ScipyCommitParser
+
     from tests.conftest import RunCliFn
     from tests.e2e.conftest import RetrieveRuntimeContextFn
     from tests.fixtures.example_project import (
@@ -867,9 +872,12 @@ def test_changelog_update_mode_unreleased_n_released(
     commit_n_rtn_changelog_entry: CommitNReturnChangelogEntryFn,
     changelog_file: Path,
     insertion_flag: str,
-    get_commit_def_of_conventional_commit: GetCommitDefFn,
-    get_commit_def_of_emoji_commit: GetCommitDefFn,
-    get_commit_def_of_scipy_commit: GetCommitDefFn,
+    get_commit_def_of_conventional_commit: GetCommitDefFn[ConventionalCommitParser],
+    get_commit_def_of_emoji_commit: GetCommitDefFn[EmojiCommitParser],
+    get_commit_def_of_scipy_commit: GetCommitDefFn[ScipyCommitParser],
+    default_conventional_parser: ConventionalCommitParser,
+    default_emoji_parser: EmojiCommitParser,
+    default_scipy_parser: ScipyCommitParser,
 ):
     """
     Given there are unreleased changes and a previous release in the changelog,
@@ -890,18 +898,23 @@ def test_changelog_update_mode_unreleased_n_released(
     commit_n_section: Commit2Section = {
         "conventional": {
             "commit": get_commit_def_of_conventional_commit(
-                "perf: improve the performance of the application"
+                "perf: improve the performance of the application",
+                parser=default_conventional_parser,
             ),
             "section": "Performance Improvements",
         },
         "emoji": {
             "commit": get_commit_def_of_emoji_commit(
-                ":zap: improve the performance of the application"
+                ":zap: improve the performance of the application",
+                parser=default_emoji_parser,
             ),
             "section": ":zap:",
         },
         "scipy": {
-            "commit": get_commit_def_of_scipy_commit("MAINT: fix an issue"),
+            "commit": get_commit_def_of_scipy_commit(
+                "MAINT: fix an issue",
+                parser=default_scipy_parser,
+            ),
             "section": "Fix",
         },
     }
@@ -1095,9 +1108,7 @@ def test_custom_release_notes_template(
 ) -> None:
     """Verify the template `.release_notes.md.j2` from `template_dir` is used."""
     expected_call_count = 1
-    version = Version.parse(
-        get_versions_from_repo_build_def(repo_result["definition"])[-1]
-    )
+    version = get_versions_from_repo_build_def(repo_result["definition"])[-1]
 
     # Setup
     use_release_notes_template()

{python_semantic_release-10.3.1 → python_semantic_release-10.3.2}/tests/e2e/cmd_changelog/test_changelog_custom_parser.py

@@ -18,6 +18,10 @@ from tests.util import (
 if TYPE_CHECKING:
     from pathlib import Path
 
+    from semantic_release.commit_parser.conventional import (
+        ConventionalCommitParser,
+    )
+
     from tests.conftest import RunCliFn
     from tests.fixtures.example_project import UpdatePyprojectTomlFn, UseCustomParserFn
     from tests.fixtures.git_repo import BuiltRepoResult, GetCommitDefFn
@@ -31,9 +35,10 @@ def test_changelog_custom_parser_remove_from_changelog(
     run_cli: RunCliFn,
     update_pyproject_toml: UpdatePyprojectTomlFn,
     use_custom_parser: UseCustomParserFn,
-    get_commit_def_of_conventional_commit: GetCommitDefFn,
+    get_commit_def_of_conventional_commit: GetCommitDefFn[ConventionalCommitParser],
     changelog_md_file: Path,
     default_md_changelog_insertion_flag: str,
+    default_conventional_parser: ConventionalCommitParser,
 ):
     """
     Given when a changelog filtering custom parser is configured
@@ -41,7 +46,8 @@ def test_changelog_custom_parser_remove_from_changelog(
     Then the commit message is not included in the resulting changelog
     """
     ignored_commit_def = get_commit_def_of_conventional_commit(
-        "chore: do not include me in the changelog"
+        "chore: do not include me in the changelog",
+        parser=default_conventional_parser,
     )
 
     # Because we are in init mode, the insertion flag is not present in the changelog

{python_semantic_release-10.3.1 → python_semantic_release-10.3.2}/tests/e2e/cmd_changelog/test_changelog_release_notes.py

@@ -6,8 +6,6 @@ from typing import TYPE_CHECKING
 import pytest
 from pytest_lazy_fixtures import lf as lazy_fixture
 
-from semantic_release.version.version import Version
-
 from tests.const import CHANGELOG_SUBCMD, EXAMPLE_PROJECT_LICENSE, MAIN_PROG_NAME
 from tests.fixtures.repos import (
     repo_w_github_flow_w_default_release_channel_conventional_commits,
@@ -21,7 +19,7 @@ from tests.util import assert_successful_exit_code
 if TYPE_CHECKING:
     from requests_mock import Mocker
 
-    from tests.conftest import GetStableDateNowFn, RunCliFn
+    from tests.conftest import GetCachedRepoDataFn, GetStableDateNowFn, RunCliFn
     from tests.fixtures.example_project import UpdatePyprojectTomlFn
     from tests.fixtures.git_repo import (
         BuiltRepoResult,
@@ -56,19 +54,16 @@ def test_changelog_latest_release_notes(
     repo_def = repo_result["definition"]
     tag_format_str: str = get_cfg_value_from_def(repo_def, "tag_format_str")  # type: ignore[assignment]
     repo_actions_per_version = split_repo_actions_by_release_tags(
-        repo_definition=repo_def,
-        tag_format_str=tag_format_str,
+        repo_definition=repo_def
     )
     all_versions = get_versions_from_repo_build_def(repo_def)
     latest_release_version = all_versions[-1]
     release_tag = tag_format_str.format(version=latest_release_version)
 
     expected_release_notes = generate_default_release_notes_from_def(
-        version_actions=repo_actions_per_version[release_tag],
+        version_actions=repo_actions_per_version[latest_release_version],
         hvcs=get_hvcs_client_from_repo_def(repo_def),
-        previous_version=(
-            Version.parse(all_versions[-2]) if len(all_versions) > 1 else None
-        ),
+        previous_version=(all_versions[-2] if len(all_versions) > 1 else None),
         license_name=EXAMPLE_PROJECT_LICENSE,
         mask_initial_release=get_cfg_value_from_def(repo_def, "mask_initial_release"),
     )
@@ -130,8 +125,7 @@ def test_changelog_previous_release_notes(
     repo_def = repo_result["definition"]
     tag_format_str: str = get_cfg_value_from_def(repo_def, "tag_format_str")  # type: ignore[assignment]
     repo_actions_per_version = split_repo_actions_by_release_tags(
-        repo_definition=repo_def,
-        tag_format_str=tag_format_str,
+        repo_definition=repo_def
     )
     # Extract all versions except for the latest one
     all_prev_versions = get_versions_from_repo_build_def(repo_def)[:-1]
@@ -139,10 +133,10 @@ def test_changelog_previous_release_notes(
     release_tag = tag_format_str.format(version=latest_release_version)
 
     expected_release_notes = generate_default_release_notes_from_def(
-        version_actions=repo_actions_per_version[release_tag],
+        version_actions=repo_actions_per_version[latest_release_version],
         hvcs=get_hvcs_client_from_repo_def(repo_def),
         previous_version=(
-            Version.parse(all_prev_versions[-2]) if len(all_prev_versions) > 1 else None
+            all_prev_versions[-2] if len(all_prev_versions) > 1 else None
         ),
         license_name=EXAMPLE_PROJECT_LICENSE,
         mask_initial_release=mask_initial_release,
@@ -170,17 +164,17 @@ def test_changelog_previous_release_notes(
 
 
 @pytest.mark.parametrize(
-    "repo_result, cache_key, mask_initial_release, license_name",
+    "repo_result, repo_fixture_name, mask_initial_release, license_name",
     [
         (
             lazy_fixture(repo_w_trunk_only_conventional_commits.__name__),
-            f"psr/repos/{repo_w_trunk_only_conventional_commits.__name__}",
+            repo_w_trunk_only_conventional_commits.__name__,
             True,
             "BSD-3-Clause",
         ),
         pytest.param(
             lazy_fixture(repo_w_trunk_only_conventional_commits.__name__),
-            f"psr/repos/{repo_w_trunk_only_conventional_commits.__name__}",
+            repo_w_trunk_only_conventional_commits.__name__,
             False,
             "BSD-3-Clause",
             marks=pytest.mark.comprehensive,
@@ -188,7 +182,7 @@ def test_changelog_previous_release_notes(
         *[
             pytest.param(
                 lazy_fixture(repo_fixture_name),
-                f"psr/repos/{repo_fixture_name}",
+                repo_fixture_name,
                 mask_initial_release,
                 "BSD-3-Clause",
                 marks=pytest.mark.comprehensive,
@@ -216,15 +210,15 @@ def test_changelog_release_notes_license_change(
     split_repo_actions_by_release_tags: SplitRepoActionsByReleaseTagsFn,
     generate_default_release_notes_from_def: GenerateDefaultReleaseNotesFromDefFn,
     update_pyproject_toml: UpdatePyprojectTomlFn,
-    cache: pytest.Cache,
-    cache_key: str,
+    repo_fixture_name: str,
     stable_now_date: GetStableDateNowFn,
+    get_cached_repo_data: GetCachedRepoDataFn,
 ):
     # Setup
     repo_def = repo_result["definition"]
     tag_format_str: str = get_cfg_value_from_def(repo_def, "tag_format_str")  # type: ignore[assignment]
 
-    if not (repo_build_data := cache.get(cache_key, None)):
+    if not (repo_build_data := get_cached_repo_data(repo_fixture_name)):
         pytest.fail("Repo build date not found in cache")
 
     repo_build_datetime = datetime.strptime(repo_build_data["build_date"], "%Y-%m-%d")
@@ -236,7 +230,6 @@ def test_changelog_release_notes_license_change(
 
     repo_actions_per_version = split_repo_actions_by_release_tags(
         repo_definition=repo_def,
-        tag_format_str=tag_format_str,
     )
     # Extract all versions
     all_versions = get_versions_from_repo_build_def(repo_def)
@@ -247,21 +240,17 @@ def test_changelog_release_notes_license_change(
     prev_release_tag = tag_format_str.format(version=previous_release_version)
 
     expected_release_notes = generate_default_release_notes_from_def(
-        version_actions=repo_actions_per_version[latest_release_tag],
+        version_actions=repo_actions_per_version[latest_release_version],
         hvcs=get_hvcs_client_from_repo_def(repo_def),
-        previous_version=(
-            Version.parse(previous_release_version) if len(all_versions) > 1 else None
-        ),
+        previous_version=(previous_release_version if len(all_versions) > 1 else None),
         license_name=license_name,
         mask_initial_release=mask_initial_release,
     )
 
     expected_prev_release_notes = generate_default_release_notes_from_def(
-        version_actions=repo_actions_per_version[prev_release_tag],
+        version_actions=repo_actions_per_version[previous_release_version],
         hvcs=get_hvcs_client_from_repo_def(repo_def),
-        previous_version=(
-            Version.parse(all_versions[-3]) if len(all_versions) > 2 else None
-        ),
+        previous_version=(all_versions[-3] if len(all_versions) > 2 else None),
         license_name=EXAMPLE_PROJECT_LICENSE,
         mask_initial_release=mask_initial_release,
     )

{python_semantic_release-10.3.1 → python_semantic_release-10.3.2}/tests/e2e/cmd_version/bump_version/conftest.py

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+from pathlib import Path
 from typing import TYPE_CHECKING
 
 import pytest
@@ -11,8 +12,7 @@ from tests.const import MAIN_PROG_NAME, VERSION_SUBCMD
 from tests.util import assert_successful_exit_code
 
 if TYPE_CHECKING:
-    from pathlib import Path
-    from typing import Protocol
+    from typing import Protocol, Sequence
 
     from click.testing import Result
 
@@ -24,7 +24,8 @@ if TYPE_CHECKING:
         def __call__(
             self,
             mirror_repo_dir: Path,
-            configuration_step: RepoActionConfigure,
+            configuration_steps: Sequence[RepoActionConfigure],
+            files_to_remove: Sequence[Path],
         ) -> Path: ...
 
     class RunPSReleaseFn(Protocol):
@@ -32,18 +33,18 @@ if TYPE_CHECKING:
             self,
             next_version_str: str,
             git_repo: Repo,
+            config_toml_path: Path = ...,
         ) -> Result: ...
 
 
 @pytest.fixture(scope="session")
 def init_mirror_repo_for_rebuild(
     build_repo_from_definition: BuildRepoFromDefinitionFn,
-    changelog_md_file: Path,
-    changelog_rst_file: Path,
 ) -> InitMirrorRepo4RebuildFn:
     def _init_mirror_repo_for_rebuild(
         mirror_repo_dir: Path,
-        configuration_step: RepoActionConfigure,
+        configuration_steps: Sequence[RepoActionConfigure],
+        files_to_remove: Sequence[Path],
     ) -> Path:
         # Create the mirror repo directory
         mirror_repo_dir.mkdir(exist_ok=True, parents=True)
@@ -51,13 +52,23 @@ def init_mirror_repo_for_rebuild(
         # Initialize mirror repository
         build_repo_from_definition(
             dest_dir=mirror_repo_dir,
-            repo_construction_steps=[configuration_step],
+            repo_construction_steps=configuration_steps,
         )
 
         with Repo(mirror_repo_dir) as mirror_git_repo:
-            # remove the default changelog files to enable Update Mode (new default of v10)
-            mirror_git_repo.git.rm(str(changelog_md_file), force=True)
-            mirror_git_repo.git.rm(str(changelog_rst_file), force=True)
+            for filepath in files_to_remove:
+                file = (
+                    (mirror_git_repo.working_dir / filepath).resolve().absolute()
+                    if not filepath.is_absolute()
+                    else filepath
+                )
+                if (
+                    Path(mirror_git_repo.working_dir) not in file.parents
+                    or not file.exists()
+                ):
+                    continue
+
+                mirror_git_repo.git.rm(str(file), force=True)
 
         return mirror_repo_dir
 
@@ -69,6 +80,7 @@ def run_psr_release(
     run_cli: RunCliFn,
     changelog_rst_file: Path,
     update_pyproject_toml: UpdatePyprojectTomlFn,
+    pyproject_toml_file: Path,
 ) -> RunPSReleaseFn:
     base_version_cmd = [MAIN_PROG_NAME, "--strict", VERSION_SUBCMD]
     write_changelog_only_cmd = [
@@ -82,6 +94,7 @@ def run_psr_release(
     def _run_psr_release(
         next_version_str: str,
         git_repo: Repo,
+        config_toml_path: Path = pyproject_toml_file,
     ) -> Result:
         version_n_buildmeta = next_version_str.split("+", maxsplit=1)
         version_n_prerelease = version_n_buildmeta[0].split("-", maxsplit=1)
@@ -107,6 +120,7 @@ def run_psr_release(
         update_pyproject_toml(
             "tool.semantic_release.changelog.default_templates.changelog_file",
             str(changelog_rst_file),
+            toml_file=config_toml_path,
         )
         cli_cmd = [*write_changelog_only_cmd, *prerelease_args, *build_metadata_args]
         result = run_cli(cli_cmd[1:], env={Github.DEFAULT_ENV_TOKEN_NAME: "1234"})
@@ -116,7 +130,7 @@ def run_psr_release(
         git_repo.git.reset("--mixed", "HEAD")
 
         # Add the changelog file to the git index but reset the working directory
-        git_repo.git.add(str(changelog_rst_file))
+        git_repo.git.add(str(changelog_rst_file.resolve()))
         git_repo.git.checkout("--", ".")
 
         # Actual run to release & write the MD changelog