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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-semantic-release
-Version: 9.15.2
+Version: 9.16.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.13.0; extra == "mypy"
+Requires-Dist: mypy==1.14.1; extra == "mypy"
 Requires-Dist: types-requests~=2.32.0; extra == "mypy"
 Requires-Dist: types-pyyaml~=6.0; extra == "mypy"
 

{python_semantic_release-9.15.2 → python_semantic_release-9.16.0}/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.2
+    - uses: python-semantic-release/python-semantic-release@v9.16.0
       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.2
+            uses: python-semantic-release/python-semantic-release@v9.16.0
             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.2
+    uses: python-semantic-release/python-semantic-release@v9.16.0
     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.2
+     uses: python-semantic-release/python-semantic-release@v9.16.0
      with:
        directory: ./project1
        github_token: ${{ secrets.GITHUB_TOKEN }}
 
    - name: Release Project 2
-     uses: python-semantic-release/python-semantic-release@v9.15.2
+     uses: python-semantic-release/python-semantic-release@v9.16.0
      with:
        directory: ./project2
        github_token: ${{ secrets.GITHUB_TOKEN }}

{python_semantic_release-9.15.2 → python_semantic_release-9.16.0}/docs/commit_parsing.rst

@@ -334,19 +334,40 @@ where appropriate to assist with static type-checking.
 
 The :ref:`commit_parser <config-commit_parser>` option, if set to a string which
 does not match one of Python Semantic Release's built-in commit parsers, will be
-used to attempt to dynamically import a custom commit parser class. As such you will
-need to ensure that your custom commit parser is import-able from the environment in
-which you are running Python Semantic Release. The string should be structured in the
-standard ``module:attr`` format; for example, to import the class ``MyCommitParser``
-from the file ``custom_parser.py`` at the root of your repository, you should specify
-``"commit_parser=custom_parser:MyCommitParser"`` in your configuration, and run the
-``semantic-release`` command line interface from the root of your repository. Equally
-you can ensure that the module containing your parser class is installed in the same
-virtual environment as semantic-release. If you can run
-``python -c "from $MODULE import $CLASS"`` successfully, specifying
-``commit_parser="$MODULE:$CLASS"`` is sufficient. You may need to set the
-``PYTHONPATH`` environment variable to the directory containing the module with
-your commit parser.
+used to attempt to dynamically import a custom commit parser class.
+
+In order to use your custom parser, you must provide how to import the module and class
+via the configuration option. There are two ways to provide the import string:
+
+1.  **File Path & Class**: The format is ``"path/to/module_file.py:ClassName"``. This
+    is the easiest way to provide a custom parser. This method allows you to store your
+    custom parser directly in the repository with no additional installation steps. PSR
+    will locate the file, load the module, and instantiate the class. Relative paths are
+    recommended and it should be provided relative to the current working directory. This
+    import variant is available in v9.16.0 and later.
+
+2.  **Module Path & Class**: The format is ``"package.module_name:ClassName"``. This
+    method allows you to store your custom parser in a package that is installed in the
+    same environment as PSR. This method is useful if you want to share your custom parser
+    across multiple repositories. To share it across multiple repositories generally you will
+    need to publish the parser as its own separate package and then ``pip install`` it into
+    the current virtual environment. You can also keep it in the same repository as your
+    project as long as it is in the current directory of the virtual environment and is
+    locatable by the Python import system. You may need to set the ``PYTHONPATH`` environment
+    variable if you have a more complex directory structure.  This import variant is available
+    in v8.0.0 and later.
+
+    To test that your custom parser is importable, you can run the following command in the
+    directory where PSR will be executed:
+
+    .. code-block:: bash
+
+        python -c "from package.module_name import ClassName"
+
+    .. note::
+      Remember this is basic python import rules so the package name is optional and generally
+      packages are defined by a directory with ``__init__.py`` files.
+
 
 .. _commit_parser-tokens:
 

{python_semantic_release-9.15.2 → python_semantic_release-9.16.0}/docs/configuration.rst

@@ -796,7 +796,7 @@ Built-in parsers:
     * ``tag`` - :ref:`TagCommitParser <commit_parser-builtin-tag>` *(deprecated in v9.12.0)*
 
 You can set any of the built-in parsers by their keyword but you can also specify
-your own commit parser in ``module:attr`` form.
+your own commit parser in ``path/to/module_file.py:Class`` or ``module:Class`` form.
 
 For more information see :ref:`commit-parsing`.
 

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

@@ -6,7 +6,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "python-semantic-release"
-version = "9.15.2"
+version = "9.16.0"
 description = "Automatic Semantic Versioning for Python projects"
 requires-python = ">=3.8"
 license = { text = "MIT" }
@@ -82,7 +82,7 @@ dev = [
   "ruff == 0.6.1"
 ]
 mypy = [
-  "mypy == 1.13.0",
+  "mypy == 1.14.1",
   "types-requests ~= 2.32.0",
   "types-pyyaml ~= 6.0",
 ]

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: python-semantic-release
-Version: 9.15.2
+Version: 9.16.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.13.0; extra == "mypy"
+Requires-Dist: mypy==1.14.1; extra == "mypy"
 Requires-Dist: types-requests~=2.32.0; extra == "mypy"
 Requires-Dist: types-pyyaml~=6.0; extra == "mypy"
 

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

@@ -116,6 +116,7 @@ tests/e2e/cmd_version/test_version.py
 tests/e2e/cmd_version/test_version_build.py
 tests/e2e/cmd_version/test_version_bump.py
 tests/e2e/cmd_version/test_version_changelog.py
+tests/e2e/cmd_version/test_version_changelog_custom_commit_msg.py
 tests/e2e/cmd_version/test_version_github_actions.py
 tests/e2e/cmd_version/test_version_print.py
 tests/e2e/cmd_version/test_version_release_notes.py

{python_semantic_release-9.15.2 → python_semantic_release-9.16.0}/src/python_semantic_release.egg-info/requires.txt

@@ -26,7 +26,7 @@ sphinx-autobuild==2024.2.4
 furo~=2024.1
 
 [mypy]
-mypy==1.13.0
+mypy==1.14.1
 types-requests~=2.32.0
 types-pyyaml~=6.0
 

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

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

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

@@ -26,6 +26,7 @@ from semantic_release.enums import LevelBump
 from semantic_release.errors import (
     BuildDistributionsError,
     GitCommitEmptyIndexError,
+    InternalError,
     UnexpectedResponse,
 )
 from semantic_release.gitproject import GitProject
@@ -35,7 +36,6 @@ from semantic_release.version.algorithm import (
     tags_and_versions,
 )
 from semantic_release.version.translator import VersionTranslator
-from semantic_release.version.version import Version
 
 if TYPE_CHECKING:  # pragma: no cover
     from pathlib import Path
@@ -45,6 +45,7 @@ if TYPE_CHECKING:  # pragma: no cover
 
     from semantic_release.cli.cli_context import CliContextObj
     from semantic_release.version.declaration import VersionDeclarationABC
+    from semantic_release.version.version import Version
 
 
 log = logging.getLogger(__name__)
@@ -90,7 +91,18 @@ def version_from_forced_level(
 
     # If we have no tags, return the default version
     if not ts_and_vs:
-        return Version.parse(DEFAULT_VERSION).bump(forced_level_bump)
+        # Since the translator is configured by the user, we can't guarantee that it will
+        # be able to parse the default version. So we first cast it to a tag using the default
+        # value and the users configured tag format, then parse it back to a version object
+        default_initial_version = translator.from_tag(
+            translator.str_to_tag(DEFAULT_VERSION)
+        )
+        if default_initial_version is None:
+            # This should never happen, but if it does, it's a bug
+            raise InternalError(
+                "Translator was unable to parse the embedded default version"
+            )
+        return default_initial_version.bump(forced_level_bump)
 
     _, latest_version = ts_and_vs[0]
     if forced_level_bump is not LevelBump.PRERELEASE_REVISION:
@@ -516,12 +528,8 @@ def version(  # noqa: C901
     gha_output.version = new_version
     ctx.call_on_close(gha_output.write_if_possible)
 
-    # Make string variant of version && Translate to tag if necessary
-    version_to_print = (
-        str(new_version)
-        if not print_only_tag
-        else translator.str_to_tag(str(new_version))
-    )
+    # 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()
 
     # Print the new version so that command-line output capture will work
     click.echo(version_to_print)

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

@@ -2,11 +2,17 @@ from __future__ import annotations
 
 import logging
 import os
-import re
 from collections.abc import Mapping
 from dataclasses import dataclass, is_dataclass
 from enum import Enum
+from functools import reduce
 from pathlib import Path
+from re import (
+    Pattern,
+    compile as regexp,
+    error as RegExpError,  # noqa: N812
+    escape as regex_escape,
+)
 from typing import Any, ClassVar, Dict, List, Literal, Optional, Tuple, Type, Union
 
 from git import Actor, InvalidGitRepositoryError
@@ -157,6 +163,20 @@ class ChangelogConfig(BaseModel):
     insertion_flag: str = ""
     template_dir: str = "templates"
 
+    @field_validator("exclude_commit_patterns", mode="after")
+    @classmethod
+    def validate_match(cls, patterns: Tuple[str, ...]) -> Tuple[str, ...]:
+        curr_index = 0
+        try:
+            for i, pattern in enumerate(patterns):
+                curr_index = i
+                regexp(pattern)
+        except RegExpError as err:
+            raise ValueError(
+                f"exclude_commit_patterns[{curr_index}]: Invalid regular expression"
+            ) from err
+        return patterns
+
     @field_validator("changelog_file", mode="after")
     @classmethod
     def changelog_file_deprecation_warning(cls, val: str) -> str:
@@ -228,8 +248,8 @@ class BranchConfig(BaseModel):
             return ".*"
 
         try:
-            re.compile(match)
-        except re.error as err:
+            regexp(match)
+        except RegExpError as err:
             raise ValueError(f"Invalid regex {match!r}") from err
         return match
 
@@ -513,7 +533,7 @@ class RuntimeContext:
     assets: List[str]
     commit_author: Actor
     commit_message: str
-    changelog_excluded_commit_patterns: Tuple[re.Pattern[str], ...]
+    changelog_excluded_commit_patterns: Tuple[Pattern[str], ...]
     version_declarations: Tuple[VersionDeclarationABC, ...]
     hvcs_client: hvcs.HvcsBase
     changelog_insertion_flag: str
@@ -545,7 +565,7 @@ class RuntimeContext:
         choices: Dict[str, BranchConfig], active_branch: str
     ) -> BranchConfig:
         for group, options in choices.items():
-            if re.match(options.match, active_branch):
+            if regexp(options.match).match(active_branch):
                 log.info(
                     "Using group %r options, as %r matches %r",
                     group,
@@ -639,12 +659,21 @@ class RuntimeContext:
 
         # We always exclude PSR's own release commits from the Changelog
         # when parsing commits
-        _psr_release_commit_re = re.compile(
-            raw.commit_message.replace(r"{version}", r"(?P<version>.*)")
+        psr_release_commit_regex = regexp(
+            reduce(
+                lambda regex_str, pattern: str(regex_str).replace(*pattern),
+                (
+                    # replace the version holder with a regex pattern to match various versions
+                    (regex_escape("{version}"), r"(?P<version>\d+\.\d+\.\d+\S*)"),
+                    # TODO: add any other placeholders here
+                ),
+                # We use re.escape to ensure that the commit message is treated as a literal
+                regex_escape(raw.commit_message),
+            )
         )
         changelog_excluded_commit_patterns = (
-            _psr_release_commit_re,
-            *(re.compile(pattern) for pattern in raw.changelog.exclude_commit_patterns),
+            psr_release_commit_regex,
+            *(regexp(pattern) for pattern in raw.changelog.exclude_commit_patterns),
         )
 
         _commit_author_str = cls.resolve_from_env(raw.commit_author) or ""

{python_semantic_release-9.15.2 → python_semantic_release-9.16.0}/src/semantic_release/helpers.py

@@ -1,9 +1,11 @@
-import importlib
+import importlib.util
 import logging
+import os
 import re
 import string
+import sys
 from functools import lru_cache, wraps
-from pathlib import PurePosixPath
+from pathlib import Path, PurePosixPath
 from typing import Any, Callable, NamedTuple, TypeVar
 from urllib.parse import urlsplit
 
@@ -69,8 +71,43 @@ def dynamic_import(import_path: str) -> Any:
     """
     log.debug("Trying to import %s", import_path)
     module_name, attr = import_path.split(":", maxsplit=1)
-    module = importlib.import_module(module_name)
-    return getattr(module, attr)
+
+    # Check if the module is a file path, if it can be resolved and exists on disk then import as a file
+    module_filepath = Path(module_name).resolve()
+    if module_filepath.exists():
+        module_path = (
+            module_filepath.stem
+            if Path(module_name).is_absolute()
+            else str(Path(module_name).with_suffix("")).replace(os.sep, ".")
+        )
+
+        if module_path not in sys.modules:
+            spec = importlib.util.spec_from_file_location(
+                module_path, str(module_filepath)
+            )
+            if spec is None:
+                raise ImportError(f"Could not import {module_filepath}")
+
+            module = importlib.util.module_from_spec(spec)  # type: ignore[arg-type]
+            sys.modules.update({spec.name: module})
+            spec.loader.exec_module(module)  # type: ignore[union-attr]
+
+        return getattr(sys.modules[module_path], attr)
+
+    # Otherwise, import as a module
+    try:
+        module = importlib.import_module(module_name)
+        return getattr(module, attr)
+    except TypeError as err:
+        raise ImportError(
+            str.join(
+                "\n",
+                [
+                    str(err.args[0]),
+                    "Verify the import format matches 'module:attribute' or 'path/to/module:attribute'",
+                ],
+            )
+        ) from err
 
 
 class ParsedGitUrl(NamedTuple):

{python_semantic_release-9.15.2 → python_semantic_release-9.16.0}/src/semantic_release/version/algorithm.py

@@ -270,6 +270,7 @@ def next_version(
         translator.str_to_tag(DEFAULT_VERSION)
     )
     if default_initial_version is None:
+        # This should never happen, but if it does, it's a bug
         raise InternalError(
             "Translator was unable to parse the embedded default version"
         )

python_semantic_release-9.16.0/tests/e2e/cmd_version/bump_version/conftest.py

@@ -0,0 +1,60 @@
+from __future__ import annotations
+
+import shutil
+from typing import TYPE_CHECKING
+
+import pytest
+from git import Repo
+
+if TYPE_CHECKING:
+    from pathlib import Path
+    from typing import Protocol
+
+    from tests.fixtures.git_repo import BuildRepoFromDefinitionFn, RepoActionConfigure
+
+    class InitMirrorRepo4RebuildFn(Protocol):
+        def __call__(
+            self,
+            mirror_repo_dir: Path,
+            configuration_step: RepoActionConfigure,
+        ) -> Path: ...
+
+
+@pytest.fixture(scope="session")
+def init_mirror_repo_for_rebuild(
+    default_changelog_md_template: Path,
+    default_changelog_rst_template: Path,
+    changelog_template_dir: Path,
+    build_repo_from_definition: BuildRepoFromDefinitionFn,
+) -> InitMirrorRepo4RebuildFn:
+    def _init_mirror_repo_for_rebuild(
+        mirror_repo_dir: Path,
+        configuration_step: RepoActionConfigure,
+    ) -> Path:
+        # Create the mirror repo directory
+        mirror_repo_dir.mkdir(exist_ok=True, parents=True)
+
+        # Initialize mirror repository
+        build_repo_from_definition(
+            dest_dir=mirror_repo_dir,
+            repo_construction_steps=[configuration_step],
+        )
+
+        # Force custom changelog to be a copy of the default changelog (md and rst)
+        shutil.copytree(
+            src=default_changelog_md_template.parent,
+            dst=mirror_repo_dir / changelog_template_dir,
+            dirs_exist_ok=True,
+        )
+        shutil.copytree(
+            src=default_changelog_rst_template.parent,
+            dst=mirror_repo_dir / changelog_template_dir,
+            dirs_exist_ok=True,
+        )
+
+        with Repo(mirror_repo_dir) as mirror_git_repo:
+            mirror_git_repo.git.add(str(changelog_template_dir))
+
+        return mirror_repo_dir
+
+    return _init_mirror_repo_for_rebuild

{python_semantic_release-9.15.2 → python_semantic_release-9.16.0}/tests/e2e/cmd_version/bump_version/git_flow/test_repo_1_channel.py

@@ -27,11 +27,8 @@ if TYPE_CHECKING:
     from click.testing import CliRunner
     from requests_mock import Mocker
 
-    from tests.e2e.cmd_version.bump_version.conftest import (
-        GetSanitizedMdChangelogContentFn,
-        GetSanitizedRstChangelogContentFn,
-        InitMirrorRepo4RebuildFn,
-    )
+    from tests.e2e.cmd_version.bump_version.conftest import InitMirrorRepo4RebuildFn
+    from tests.e2e.conftest import GetSanitizedChangelogContentFn
     from tests.fixtures.example_project import ExProjectDir
     from tests.fixtures.git_repo import (
         BuildRepoFromDefinitionFn,
@@ -71,8 +68,8 @@ def test_gitflow_repo_rebuild_1_channel(
     post_mocker: Mocker,
     default_tag_format_str: str,
     version_py_file: Path,
-    get_sanitized_md_changelog_content: GetSanitizedMdChangelogContentFn,
-    get_sanitized_rst_changelog_content: GetSanitizedRstChangelogContentFn,
+    get_sanitized_md_changelog_content: GetSanitizedChangelogContentFn,
+    get_sanitized_rst_changelog_content: GetSanitizedChangelogContentFn,
 ):
     # build target repo into a temporary directory
     target_repo_dir = example_project_dir / repo_fixture_name

{python_semantic_release-9.15.2 → python_semantic_release-9.16.0}/tests/e2e/cmd_version/bump_version/git_flow/test_repo_2_channels.py

@@ -27,11 +27,8 @@ if TYPE_CHECKING:
     from click.testing import CliRunner
     from requests_mock import Mocker
 
-    from tests.e2e.cmd_version.bump_version.conftest import (
-        GetSanitizedMdChangelogContentFn,
-        GetSanitizedRstChangelogContentFn,
-        InitMirrorRepo4RebuildFn,
-    )
+    from tests.e2e.cmd_version.bump_version.conftest import InitMirrorRepo4RebuildFn
+    from tests.e2e.conftest import GetSanitizedChangelogContentFn
     from tests.fixtures.example_project import ExProjectDir
     from tests.fixtures.git_repo import (
         BuildRepoFromDefinitionFn,
@@ -71,8 +68,8 @@ def test_gitflow_repo_rebuild_2_channels(
     post_mocker: Mocker,
     default_tag_format_str: str,
     version_py_file: Path,
-    get_sanitized_md_changelog_content: GetSanitizedMdChangelogContentFn,
-    get_sanitized_rst_changelog_content: GetSanitizedRstChangelogContentFn,
+    get_sanitized_md_changelog_content: GetSanitizedChangelogContentFn,
+    get_sanitized_rst_changelog_content: GetSanitizedChangelogContentFn,
 ):
     # build target repo into a temporary directory
     target_repo_dir = example_project_dir / repo_fixture_name

{python_semantic_release-9.15.2 → python_semantic_release-9.16.0}/tests/e2e/cmd_version/bump_version/git_flow/test_repo_3_channels.py

@@ -28,11 +28,8 @@ if TYPE_CHECKING:
     from click.testing import CliRunner
     from requests_mock import Mocker
 
-    from tests.e2e.cmd_version.bump_version.conftest import (
-        GetSanitizedMdChangelogContentFn,
-        GetSanitizedRstChangelogContentFn,
-        InitMirrorRepo4RebuildFn,
-    )
+    from tests.e2e.cmd_version.bump_version.conftest import InitMirrorRepo4RebuildFn
+    from tests.e2e.conftest import GetSanitizedChangelogContentFn
     from tests.fixtures.example_project import ExProjectDir
     from tests.fixtures.git_repo import (
         BuildRepoFromDefinitionFn,
@@ -73,8 +70,8 @@ def test_gitflow_repo_rebuild_3_channels(
     post_mocker: Mocker,
     default_tag_format_str: str,
     version_py_file: Path,
-    get_sanitized_md_changelog_content: GetSanitizedMdChangelogContentFn,
-    get_sanitized_rst_changelog_content: GetSanitizedRstChangelogContentFn,
+    get_sanitized_md_changelog_content: GetSanitizedChangelogContentFn,
+    get_sanitized_rst_changelog_content: GetSanitizedChangelogContentFn,
 ):
     # build target repo into a temporary directory
     target_repo_dir = example_project_dir / repo_fixture_name

{python_semantic_release-9.15.2 → python_semantic_release-9.16.0}/tests/e2e/cmd_version/bump_version/git_flow/test_repo_4_channels.py

@@ -27,11 +27,8 @@ if TYPE_CHECKING:
     from click.testing import CliRunner
     from requests_mock import Mocker
 
-    from tests.e2e.cmd_version.bump_version.conftest import (
-        GetSanitizedMdChangelogContentFn,
-        GetSanitizedRstChangelogContentFn,
-        InitMirrorRepo4RebuildFn,
-    )
+    from tests.e2e.cmd_version.bump_version.conftest import InitMirrorRepo4RebuildFn
+    from tests.e2e.conftest import GetSanitizedChangelogContentFn
     from tests.fixtures.example_project import ExProjectDir
     from tests.fixtures.git_repo import (
         BuildRepoFromDefinitionFn,
@@ -71,8 +68,8 @@ def test_gitflow_repo_rebuild_4_channels(
     post_mocker: Mocker,
     default_tag_format_str: str,
     version_py_file: Path,
-    get_sanitized_md_changelog_content: GetSanitizedMdChangelogContentFn,
-    get_sanitized_rst_changelog_content: GetSanitizedRstChangelogContentFn,
+    get_sanitized_md_changelog_content: GetSanitizedChangelogContentFn,
+    get_sanitized_rst_changelog_content: GetSanitizedChangelogContentFn,
 ):
     # build target repo into a temporary directory
     target_repo_dir = example_project_dir / repo_fixture_name

{python_semantic_release-9.15.2 → python_semantic_release-9.16.0}/tests/e2e/cmd_version/bump_version/github_flow/test_repo_1_channel.py

@@ -27,11 +27,8 @@ if TYPE_CHECKING:
     from click.testing import CliRunner
     from requests_mock import Mocker
 
-    from tests.e2e.cmd_version.bump_version.conftest import (
-        GetSanitizedMdChangelogContentFn,
-        GetSanitizedRstChangelogContentFn,
-        InitMirrorRepo4RebuildFn,
-    )
+    from tests.e2e.cmd_version.bump_version.conftest import InitMirrorRepo4RebuildFn
+    from tests.e2e.conftest import GetSanitizedChangelogContentFn
     from tests.fixtures.example_project import ExProjectDir
     from tests.fixtures.git_repo import (
         BuildRepoFromDefinitionFn,
@@ -71,8 +68,8 @@ def test_githubflow_repo_rebuild_1_channel(
     post_mocker: Mocker,
     default_tag_format_str: str,
     version_py_file: Path,
-    get_sanitized_md_changelog_content: GetSanitizedMdChangelogContentFn,
-    get_sanitized_rst_changelog_content: GetSanitizedRstChangelogContentFn,
+    get_sanitized_md_changelog_content: GetSanitizedChangelogContentFn,
+    get_sanitized_rst_changelog_content: GetSanitizedChangelogContentFn,
 ):
     # build target repo into a temporary directory
     target_repo_dir = example_project_dir / repo_fixture_name

{python_semantic_release-9.15.2 → python_semantic_release-9.16.0}/tests/e2e/cmd_version/bump_version/github_flow/test_repo_2_channels.py

@@ -27,11 +27,8 @@ if TYPE_CHECKING:
     from click.testing import CliRunner
     from requests_mock import Mocker
 
-    from tests.e2e.cmd_version.bump_version.conftest import (
-        GetSanitizedMdChangelogContentFn,
-        GetSanitizedRstChangelogContentFn,
-        InitMirrorRepo4RebuildFn,
-    )
+    from tests.e2e.cmd_version.bump_version.conftest import InitMirrorRepo4RebuildFn
+    from tests.e2e.conftest import GetSanitizedChangelogContentFn
     from tests.fixtures.example_project import ExProjectDir
     from tests.fixtures.git_repo import (
         BuildRepoFromDefinitionFn,
@@ -71,8 +68,8 @@ def test_githubflow_repo_rebuild_2_channels(
     post_mocker: Mocker,
     default_tag_format_str: str,
     version_py_file: Path,
-    get_sanitized_md_changelog_content: GetSanitizedMdChangelogContentFn,
-    get_sanitized_rst_changelog_content: GetSanitizedRstChangelogContentFn,
+    get_sanitized_md_changelog_content: GetSanitizedChangelogContentFn,
+    get_sanitized_rst_changelog_content: GetSanitizedChangelogContentFn,
 ):
     # build target repo into a temporary directory
     target_repo_dir = example_project_dir / repo_fixture_name

{python_semantic_release-9.15.2 → python_semantic_release-9.16.0}/tests/e2e/cmd_version/bump_version/trunk_based_dev/test_repo_trunk.py

@@ -27,11 +27,8 @@ if TYPE_CHECKING:
     from click.testing import CliRunner
     from requests_mock import Mocker
 
-    from tests.e2e.cmd_version.bump_version.conftest import (
-        GetSanitizedMdChangelogContentFn,
-        GetSanitizedRstChangelogContentFn,
-        InitMirrorRepo4RebuildFn,
-    )
+    from tests.e2e.cmd_version.bump_version.conftest import InitMirrorRepo4RebuildFn
+    from tests.e2e.conftest import GetSanitizedChangelogContentFn
     from tests.fixtures.example_project import ExProjectDir
     from tests.fixtures.git_repo import (
         BuildRepoFromDefinitionFn,
@@ -71,8 +68,8 @@ def test_trunk_repo_rebuild_only_official_releases(
     post_mocker: Mocker,
     default_tag_format_str: str,
     version_py_file: Path,
-    get_sanitized_md_changelog_content: GetSanitizedMdChangelogContentFn,
-    get_sanitized_rst_changelog_content: GetSanitizedRstChangelogContentFn,
+    get_sanitized_md_changelog_content: GetSanitizedChangelogContentFn,
+    get_sanitized_rst_changelog_content: GetSanitizedChangelogContentFn,
 ):
     # build target repo into a temporary directory
     target_repo_dir = example_project_dir / repo_fixture_name