python-semantic-release 9.2.1__py3-none-any.whl → 9.2.2__py3-none-any.whl

{python_semantic_release-9.2.1.dist-info → python_semantic_release-9.2.2.dist-info}/METADATA

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

{python_semantic_release-9.2.1.dist-info → python_semantic_release-9.2.2.dist-info}/RECORD

@@ -1,4 +1,4 @@
-semantic_release/__init__.py,sha256=bJVwtLvzG4msFOn0HdwAXWwB5EwPQ3I39rraXXrlhw0,870
+semantic_release/__init__.py,sha256=UY60uqsKwT97THCS1FDDtGpgKytMBM6Hi3uMAfzJrLI,870
 semantic_release/__main__.py,sha256=vXOARLV7KHeVXgpOMU0Q-8wovpdsOrtTsycxulI5xIE,106
 semantic_release/const.py,sha256=Z1o2QNh60wSLeF-_1TemMBjU3ZXbV0XghnUFsbTVfOs,831
 semantic_release/enums.py,sha256=D5B_reQGGKQQT22HO5PUtvn2Bok3fkht6TfJtXkmAUg,1020
@@ -10,17 +10,18 @@ semantic_release/changelog/release_history.py,sha256=ShzZpxTjhxka6TMbzOzYzG3EuCH
 semantic_release/changelog/template.py,sha256=JqZcjdozM9-059Sa8PfiHxYNeyZFa0jxk_beyRLv5sU,4640
 semantic_release/cli/__init__.py,sha256=gwAYhZO-4TR0tKCkQ4GqutWsL--0CII2_dcbrElI4M4,419
 semantic_release/cli/common.py,sha256=cVQUI7Uaac_nJ7VEXuJ7Q9pVJpuMVRvE7bBl_i96g20,1439
-semantic_release/cli/config.py,sha256=eSNqPv5G-ta3OkD0Wd9p5s2_XbwGTI50YhpWElcahHs,15854
+semantic_release/cli/config.py,sha256=lBkTlc2x4PkCj7aGJn6DahsF_LH7Fsy-5OiTW61wRzA,16070
 semantic_release/cli/const.py,sha256=S8oNNpSaKdZxcAs7PAKEjQHic0czoJBGd7XHo57FOzw,39
 semantic_release/cli/github_actions_output.py,sha256=stGWcuMtelY0qM2E_-IfofP6UvsQ6czsO7qpMfnRJI4,2102
 semantic_release/cli/masking_filter.py,sha256=DxqjiJyABlzwwwZ1r8JGQpb6QrF00StJFm0-2-s5Fv0,3071
 semantic_release/cli/util.py,sha256=FyXaBkeL7nXKjy3X9rQLEwvn7p46xPekp2V8Z-5MVrk,3755
 semantic_release/cli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-semantic_release/cli/commands/changelog.py,sha256=vIJKTy8vPh7xGzJ3jEz-1z9evuJrHVg-Wqmms-c6G_k,4040
-semantic_release/cli/commands/generate_config.py,sha256=BwtwFhh80bkOUUNnR2ArC51YfPKI_y4HMD7C1oAFREA,1695
-semantic_release/cli/commands/main.py,sha256=LBbHbDNIctb35bUQsklefXVPN9bhY-LlrQFF1nNTMLg,5049
-semantic_release/cli/commands/publish.py,sha256=CvhZ4Z8CTPS-4f7kWH-xJ5JTk3jlJ-p8Mg7y2KC4SnY,1492
-semantic_release/cli/commands/version.py,sha256=lFXRUPM-amJaRNSaneV5olrf6UEYN_mCeBN_y7jGssk,22416
+semantic_release/cli/commands/changelog.py,sha256=Tk9DprnY9mDQXSE1krQd8oILn3W6dKN_stWx9EbLjhU,4087
+semantic_release/cli/commands/cli_context.py,sha256=fOLTUKb4UnZGQ6zVhftuvdfZ7fK7bDDIvj7Ud5yU98c,3443
+semantic_release/cli/commands/generate_config.py,sha256=2xZOu3NpyhBp0pWr7d8ugKl_kjqQgpSsSMHq5wHTfrE,1699
+semantic_release/cli/commands/main.py,sha256=LuL-O0LGonI5fQTZn0AUtYv2Ei_CYyNqYHMF_wN4InI,2900
+semantic_release/cli/commands/publish.py,sha256=_pz7rKx65tCH7J2uyWiBghQ61MmmIbxhF9bE4AkE0N8,1703
+semantic_release/cli/commands/version.py,sha256=1YfdvAkaammmgVRCFcGPujM2fNUvl5DN8xL3utGOzKE,22461
 semantic_release/commit_parser/__init__.py,sha256=cv5HFBdw7OJd4Laj4Ex8ZZ5Tml8GwXgQcXW6Pasr2Ao,615
 semantic_release/commit_parser/_base.py,sha256=aDS0dhFosT5i11tA5Ez8BTeikk6jwXjSEpJnJC5D2cs,2609
 semantic_release/commit_parser/angular.py,sha256=bS7Wrzpg_6zFil5Y4GIZkeGDPhvWQdTlFdWTtGVcpp0,4393
@@ -44,10 +45,10 @@ semantic_release/version/algorithm.py,sha256=K9WkPRur0x5baXsqEi8kvaDfxduG4WNUiAL
 semantic_release/version/declaration.py,sha256=f6Ld7hIhrqvDrRBapJHr-KDimuyo-4IG8009Zu9BIgU,7357
 semantic_release/version/translator.py,sha256=P1noIsVBn8u6zNOFjG0xKYOWapxqf_PHSMvMeLJ9kXg,3050
 semantic_release/version/version.py,sha256=6PCtSbLP88U1daoxnCwHc--YguZo4waGNLqJ5JfeczE,14175
-python_semantic_release-9.2.1.dist-info/AUTHORS.rst,sha256=XOReVvpymEFUPsS2QPH97jlfJBVrxwS2eu8-jVAe4gk,230
-python_semantic_release-9.2.1.dist-info/LICENSE,sha256=NE85nszX252sdQdu0xgS9qwfYES0k8qS6gW3uO4jRGE,1083
-python_semantic_release-9.2.1.dist-info/METADATA,sha256=thUtW1xFlJYtbob07qyQU4AIoWpAyyrDdCMYTHP80_k,5365
-python_semantic_release-9.2.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-python_semantic_release-9.2.1.dist-info/entry_points.txt,sha256=qojUBx_Ywf4u7KgP6NWlDaBDymZVUGQ7m5wF2duC2F0,95
-python_semantic_release-9.2.1.dist-info/top_level.txt,sha256=qYA24nyg3eP-ti5UW7Vuj2aXVmM0wqVHx4mREdRZNAA,17
-python_semantic_release-9.2.1.dist-info/RECORD,,
+python_semantic_release-9.2.2.dist-info/AUTHORS.rst,sha256=XOReVvpymEFUPsS2QPH97jlfJBVrxwS2eu8-jVAe4gk,230
+python_semantic_release-9.2.2.dist-info/LICENSE,sha256=NE85nszX252sdQdu0xgS9qwfYES0k8qS6gW3uO4jRGE,1083
+python_semantic_release-9.2.2.dist-info/METADATA,sha256=b41gxhINO5-3krE8YC0-_sQSa8G4L5zFuOlMd9Rsd0A,5365
+python_semantic_release-9.2.2.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+python_semantic_release-9.2.2.dist-info/entry_points.txt,sha256=qojUBx_Ywf4u7KgP6NWlDaBDymZVUGQ7m5wF2duC2F0,95
+python_semantic_release-9.2.2.dist-info/top_level.txt,sha256=qYA24nyg3eP-ti5UW7Vuj2aXVmM0wqVHx4mREdRZNAA,17
+python_semantic_release-9.2.2.dist-info/RECORD,,

semantic_release/__init__.py

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

semantic_release/cli/commands/changelog.py

@@ -16,7 +16,7 @@ from semantic_release.cli.common import (
 from semantic_release.cli.util import noop_report
 
 if TYPE_CHECKING:
-    from semantic_release.cli.config import RuntimeContext
+    from semantic_release.cli.commands.cli_context import CliContextObj
     from semantic_release.version import Version
 
 log = logging.getLogger(__name__)
@@ -34,10 +34,11 @@ log = logging.getLogger(__name__)
     default=None,
     help="Post the generated release notes to the remote VCS's release for this tag",
 )
-@click.pass_context
-def changelog(ctx: click.Context, release_tag: str | None = None) -> None:
+@click.pass_obj
+def changelog(cli_ctx: CliContextObj, release_tag: str | None = None) -> None:
     """Generate and optionally publish a changelog for your project"""
-    runtime: RuntimeContext = ctx.obj
+    ctx = click.get_current_context()
+    runtime = cli_ctx.runtime_ctx
     repo = runtime.repo
     parser = runtime.commit_parser
     translator = runtime.version_translator

semantic_release/cli/commands/cli_context.py

@@ -0,0 +1,100 @@
+from __future__ import annotations
+
+import logging
+from pathlib import Path
+from typing import TYPE_CHECKING
+
+import click
+from click.core import ParameterSource
+from git import InvalidGitRepositoryError
+from pydantic import ValidationError
+
+from semantic_release.cli.config import (
+    RawConfig,
+    RuntimeContext,
+)
+from semantic_release.cli.util import load_raw_config_file, rprint
+from semantic_release.errors import InvalidConfiguration, NotAReleaseBranch
+
+if TYPE_CHECKING:
+    from semantic_release.cli.config import GlobalCommandLineOptions
+
+    class CliContext(click.Context):
+        obj: CliContextObj
+
+
+class CliContextObj:
+    def __init__(
+        self,
+        ctx: click.Context,
+        logger: logging.Logger,
+        global_opts: GlobalCommandLineOptions,
+    ) -> None:
+        self._runtime_ctx: RuntimeContext | None = None
+        self.ctx = ctx
+        self.logger = logger
+        self.global_opts = global_opts
+
+    @property
+    def runtime_ctx(self) -> RuntimeContext:
+        """
+        Lazy load the runtime context. This is done to avoid configuration loading when
+        the command is not run. This is useful for commands like `--help` and `--version`
+        """
+        if self._runtime_ctx is None:
+            self._runtime_ctx = self._init_runtime_ctx()
+        return self._runtime_ctx
+
+    def _init_runtime_ctx(self) -> RuntimeContext:
+        config_path = Path(self.global_opts.config_file)
+        conf_file_exists = config_path.exists()
+        was_conf_file_user_provided = bool(
+            self.ctx.get_parameter_source("config_file")
+            not in (
+                ParameterSource.DEFAULT,
+                ParameterSource.DEFAULT_MAP,
+            )
+        )
+
+        try:
+            if was_conf_file_user_provided and not conf_file_exists:
+                raise FileNotFoundError(
+                    f"File {self.global_opts.config_file} does not exist"
+                )
+
+            config_obj = (
+                {} if not conf_file_exists else load_raw_config_file(config_path)
+            )
+            if not config_obj:
+                self.logger.info(
+                    "configuration empty, falling back to default configuration"
+                )
+
+            raw_config = RawConfig.model_validate(config_obj)
+            runtime = RuntimeContext.from_raw_config(
+                raw_config,
+                global_cli_options=self.global_opts,
+            )
+        except NotAReleaseBranch as exc:
+            rprint(f"[bold {'red' if self.global_opts.strict else 'orange1'}]{exc!s}")
+            # If not strict, exit 0 so other processes can continue. For example, in
+            # multibranch CI it might be desirable to run a non-release branch's pipeline
+            # without specifying conditional execution of PSR based on branch name
+            self.ctx.exit(2 if self.global_opts.strict else 0)
+        except FileNotFoundError as exc:
+            click.echo(str(exc), err=True)
+            self.ctx.exit(2)
+        except (
+            ValidationError,
+            InvalidConfiguration,
+            InvalidGitRepositoryError,
+        ) as exc:
+            click.echo(str(exc), err=True)
+            self.ctx.exit(1)
+
+        # This allows us to mask secrets in the logging
+        # by applying it to all the configured handlers
+        for handler in logging.getLogger().handlers:
+            handler.addFilter(runtime.masker)
+
+        return runtime

semantic_release/cli/commands/generate_config.py

@@ -38,7 +38,7 @@ def generate_config(fmt: str = "toml", is_pyproject_toml: bool = False) -> None:
     your needs. For example, to append the default configuration to your pyproject.toml
     file, you can use the following command:
 
-        semantic-release generate-config -f toml >> pyproject.toml
+        semantic-release generate-config --pyproject >> pyproject.toml
     """
     # due to possible IntEnum values (which are not supported by tomlkit.dumps, see sdispater/tomlkit#237),
     # we must ensure the transformation of the model to a dict uses json serializable values

semantic_release/cli/commands/main.py

@@ -1,26 +1,21 @@
 from __future__ import annotations
 
 import logging
-from pathlib import Path
 
+# from typing import TYPE_CHECKING
 import click
-from click.core import ParameterSource
-from git import InvalidGitRepositoryError
-from git.repo.base import Repo
-from pydantic import ValidationError
 from rich.console import Console
 from rich.logging import RichHandler
 
 import semantic_release
-from semantic_release.cli.commands.generate_config import generate_config
-from semantic_release.cli.config import (
-    GlobalCommandLineOptions,
-    RawConfig,
-    RuntimeContext,
-)
+from semantic_release.cli.commands.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 load_raw_config_file, rprint
-from semantic_release.errors import InvalidConfiguration, NotAReleaseBranch
+from semantic_release.cli.util import rprint
+
+# if TYPE_CHECKING:
+#     pass
+
 
 FORMAT = "[%(name)s] %(levelname)s %(module)s.%(funcName)s: %(message)s"
 
@@ -94,19 +89,8 @@ def main(
         ],
     )
 
-    log = logging.getLogger(__name__)
-
-    if ctx.invoked_subcommand == generate_config.name:
-        # generate-config doesn't require any of the usual setup,
-        # so exit out early and delegate to it
-        log.debug("Forwarding to %s", generate_config.name)
-        return
-
-    log.debug("logging level set to: %s", logging.getLevelName(log_level))
-    try:
-        repo = Repo(".", search_parent_directories=True)
-    except InvalidGitRepositoryError:
-        ctx.fail("Not in a valid Git repository")
+    logger = logging.getLogger(__name__)
+    logger.debug("logging level set to: %s", logging.getLevelName(log_level))
 
     if noop:
         rprint(
@@ -115,51 +99,9 @@ def main(
         )
 
     cli_options = GlobalCommandLineOptions(
-        noop=noop,
-        verbosity=verbosity,
-        config_file=config_file,
-        strict=strict,
+        noop=noop, verbosity=verbosity, config_file=config_file, strict=strict
     )
-    log.debug("global cli options: %s", cli_options)
-
-    config_path = Path(config_file)
-    # default no config loaded
-    config_text = {}
-    if not config_path.exists():
-        if ctx.get_parameter_source("config_file") not in (
-            ParameterSource.DEFAULT,
-            ParameterSource.DEFAULT_MAP,
-        ):
-            ctx.fail(f"File {config_file} does not exist")
-
-        log.info(
-            "configuration file %s not found, using default configuration",
-            config_file,
-        )
 
-    else:
-        try:
-            config_text = load_raw_config_file(config_path)
-        except InvalidConfiguration as exc:
-            ctx.fail(str(exc))
+    logger.debug("global cli options: %s", cli_options)
 
-    try:
-        raw_config = RawConfig.model_validate(config_text)
-        runtime = RuntimeContext.from_raw_config(
-            raw_config, repo=repo, global_cli_options=cli_options
-        )
-    except NotAReleaseBranch as exc:
-        rprint(f"[bold {'red' if strict else 'orange1'}]{exc!s}")
-        # If not strict, exit 0 so other processes can continue. For example, in
-        # multibranch CI it might be desirable to run a non-release branch's pipeline
-        # without specifying conditional execution of PSR based on branch name
-        ctx.exit(2 if strict else 0)
-    except (ValidationError, InvalidConfiguration) as exc:
-        click.echo(str(exc), err=True)
-        ctx.exit(1)
-    ctx.obj = runtime
-
-    # This allows us to mask secrets in the logging
-    # by applying it to all the configured handlers
-    for handler in logging.getLogger().handlers:
-        handler.addFilter(runtime.masker)
+    ctx.obj = CliContextObj(ctx, logger, cli_options)

semantic_release/cli/commands/publish.py

@@ -1,10 +1,17 @@
+from __future__ import annotations
+
 import logging
+from typing import TYPE_CHECKING
 
 import click
 
 from semantic_release.cli.util import noop_report
 from semantic_release.version import tags_and_versions
 
+if TYPE_CHECKING:
+    from semantic_release.cli.commands.cli_context import CliContextObj
+
+
 log = logging.getLogger(__name__)
 
 
@@ -20,10 +27,11 @@ log = logging.getLogger(__name__)
     help="The tag associated with the release to publish to",
     default="latest",
 )
-@click.pass_context
-def publish(ctx: click.Context, tag: str = "latest") -> None:
+@click.pass_obj
+def publish(cli_ctx: CliContextObj, tag: str = "latest") -> None:
     """Build and publish a distribution to a VCS release."""
-    runtime = ctx.obj
+    ctx = click.get_current_context()
+    runtime = cli_ctx.runtime_ctx
     repo = runtime.repo
     hvcs_client = runtime.hvcs_client
     translator = runtime.version_translator

semantic_release/cli/commands/version.py

@@ -5,7 +5,7 @@ import os
 import subprocess
 from contextlib import nullcontext
 from datetime import datetime
-from typing import TYPE_CHECKING, ContextManager, Iterable
+from typing import TYPE_CHECKING
 
 import click
 import shellingham  # type: ignore[import]
@@ -28,10 +28,12 @@ from semantic_release.version import Version, next_version, tags_and_versions
 log = logging.getLogger(__name__)
 
 if TYPE_CHECKING:  # pragma: no cover
+    from typing import ContextManager, Iterable
+
     from git import Repo
     from git.refs.tag import Tag
 
-    from semantic_release.cli.config import RuntimeContext
+    from semantic_release.cli.commands.cli_context import CliContextObj
     from semantic_release.version import VersionTranslator
     from semantic_release.version.declaration import VersionDeclarationABC
 
@@ -213,9 +215,9 @@ def shell(cmd: str, *, check: bool = True) -> subprocess.CompletedProcess:
     is_flag=True,
     help="Skip building the current project",
 )
-@click.pass_context
+@click.pass_obj
 def version(  # noqa: C901
-    ctx: click.Context,
+    cli_ctx: CliContextObj,
     print_only: bool = False,
     print_only_tag: bool = False,
     print_last_released: bool = False,
@@ -231,22 +233,27 @@ def version(  # noqa: C901
     build_metadata: str | None = None,
     skip_build: bool = False,
 ) -> str:
-    r"""
+    """
     Detect the semantically correct next version that should be applied to your
     project.
 
-    \b
     By default:
-      * Write this new version to the project metadata locations
-        specified in the configuration file
-      * Create a new commit with these locations and any other assets configured
-        to be included in a release
-      * Tag this commit according the configured format, with a tag that uniquely
-        identifies the version being released.
-      * Push the new tag and commit to the remote for the repository
-      * Create a release (if supported) in the remote VCS for this tag
+
+    * Write this new version to the project metadata locations specified
+    in the configuration file
+
+    * Create a new commit with these locations and any other assets configured
+    to be included in a release
+
+    * Tag this commit according the configured format, with a tag that uniquely
+    identifies the version being released.
+
+    * Push the new tag and commit to the remote for the repository
+
+    * Create a release (if supported) in the remote VCS for this tag
     """
-    runtime: RuntimeContext = ctx.obj
+    ctx = click.get_current_context()
+    runtime = cli_ctx.runtime_ctx
     repo = runtime.repo
     translator = runtime.version_translator
 

semantic_release/cli/config.py

@@ -9,13 +9,13 @@ from enum import Enum
 from pathlib import Path
 from typing import Any, ClassVar, Dict, List, Literal, Optional, Tuple, Type, Union
 
-from git import Actor
+from git import Actor, InvalidGitRepositoryError
 from git.repo.base import Repo
 from jinja2 import Environment
 from pydantic import BaseModel, Field, RootModel, ValidationError, model_validator
 
-# For Python 3.8 compatibility
-from typing_extensions import Annotated
+# For Python 3.8, 3.9, 3.10 compatibility
+from typing_extensions import Annotated, Self
 
 from semantic_release import hvcs
 from semantic_release.changelog import environment
@@ -119,7 +119,7 @@ class RemoteConfig(BaseModel):
     ignore_token_for_push: bool = False
 
     @model_validator(mode="after")
-    def set_default_token(self) -> RemoteConfig:
+    def set_default_token(self) -> Self:
         # Set the default token name for the given VCS when no user input is given
         if not self.token and self.type in _known_hvcs:
             default_token_name = _known_hvcs[self.type].DEFAULT_ENV_TOKEN_NAME
@@ -155,7 +155,7 @@ class RawConfig(BaseModel):
     version_variables: Optional[Tuple[str, ...]] = None
 
     @model_validator(mode="after")
-    def set_default_opts(self) -> RawConfig:
+    def set_default_opts(self) -> Self:
         # Set the default parser options for the given commit parser when no user input is given
         if not self.commit_parser_options and self.commit_parser:
             parser_opts_type = None
@@ -291,14 +291,17 @@ class RuntimeContext:
 
     @classmethod
     def from_raw_config(
-        cls, raw: RawConfig, repo: Repo, global_cli_options: GlobalCommandLineOptions
+        cls, raw: RawConfig, global_cli_options: GlobalCommandLineOptions
     ) -> RuntimeContext:
         ##
         # credentials masking for logging
         masker = MaskingFilter(_use_named_masks=raw.logging_use_named_masks)
 
         try:
+            repo = Repo(".", search_parent_directories=True)
             active_branch = repo.active_branch.name
+        except InvalidGitRepositoryError as err:
+            raise InvalidGitRepositoryError("No valid git repository found!") from err
         except TypeError as err:
             raise NotAReleaseBranch(
                 "Detached HEAD state cannot match any release groups; "