Jun 18, 2024 · Jun 17, 2024 · Jun 17, 2024 · Jun 18, 2024 · Jun 18, 2024 · Jun 18, 2024
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
        run: |
          python -m ruff check . \
            --config pyproject.toml \
            --diff \
            --output-format=full \
            --exit-non-zero-on-fix

diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml
      - name: ruff
        run: |
          python -m ruff check . \
            --diff \
            --output-format=full \
            --exit-non-zero-on-fix

diff --git a/pyproject.toml b/pyproject.toml
  "DTZ",
  # flake8-errmsg
  "EM",
  # Some todos and some examples; leave this disabled for now
  "ERA001",
  # don't compare types, use isinstance()
  # sometimes using type(x) == y is deliberately chosen to exclude
  # subclasses
diff --git a/semantic_release/cli/commands/cli_context.py b/semantic_release/cli/commands/cli_context.py

        try:
            if was_conf_file_user_provided and not conf_file_exists:
                raise FileNotFoundError(
                raise FileNotFoundError(  # noqa: TRY301
                    f"File {self.global_opts.config_file} does not exist"
                )

diff --git a/semantic_release/cli/commands/version.py b/semantic_release/cli/commands/version.py
 check=True,
 env=dict(
 filter(
 lambdak_v:k_v[1]isnotNone,# type: ignore
 lambdak_v:k_v[1]isnotNone,# type: ignore # noqa: PGH003
                        {
 # Common values
 "PATH":os.getenv("PATH",""),
diff --git a/semantic_release/cli/config.py b/semantic_release/cli/config.py
    @model_validator(mode="after")
    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:
            if env_token := self._get_default_token():
                self.token = env_token
        if self.token:
            return self
        if self.type not in _known_hvcs:
            return self
        if env_token := self._get_default_token():
            self.token = env_token
        return self

    def _get_default_token(self) -> str | None:
        return masker

    @classmethod
    def from_raw_config(
    def from_raw_config(  # noqa: C901
        cls, raw: RawConfig, global_cli_options: GlobalCommandLineOptions
    ) -> RuntimeContext:
        ##
diff --git a/semantic_release/commit_parser/_base.py b/semantic_release/commit_parser/_base.py
 # @staticmethod
 # @abstractmethod
 defget_default_options(self)->_OPTS:
 returnself.parser_options()# type: ignore
 returnself.parser_options()# type: ignore # noqa: PGH003

 @abstractmethod
 defparse(self,commit:Commit)->_TT: ...
diff --git a/semantic_release/hvcs/bitbucket.py b/semantic_release/hvcs/bitbucket.py
 hvcs_api_domain:str|None=None,
 token:str|None=None,
 allow_insecure:bool=False,
 **kwargs:Any,
 **kwargs:Any,# noqa: ARG002
    )->None:
 super().__init__(remote_url)
 self.token=token
diff --git a/semantic_release/hvcs/gitea.py b/semantic_release/hvcs/gitea.py
 hvcs_domain:str|None=None,
 token:str|None=None,
 allow_insecure:bool=False,
 **kwargs:Any,
 **_kwargs:Any,
    )->None:
 super().__init__(remote_url)
 self.token=token
diff --git a/semantic_release/hvcs/github.py b/semantic_release/hvcs/github.py
 hvcs_api_domain:str|None=None,
 token:str|None=None,
 allow_insecure:bool=False,
 **kwargs:Any,
 **_kwargs:Any,
    )->None:
 super().__init__(remote_url)
 self.token=token
diff --git a/semantic_release/hvcs/gitlab.py b/semantic_release/hvcs/gitlab.py
 hvcs_domain:str|None=None,
 token:str|None=None,
 allow_insecure:bool=False,
 **kwargs:Any,
 **_kwargs:Any,
    )->None:
 super().__init__(remote_url)
 self.token=token
diff --git a/semantic_release/hvcs/remote_hvcs_base.py b/semantic_release/hvcs/remote_hvcs_base.py

 DEFAULT_ENV_TOKEN_NAME="HVCS_TOKEN"# noqa: S105

 def__init__(self,remote_url:str,*args:Any,**kwargs:Any)->None:
 def__init__(self,remote_url:str,*_args:Any,**_kwargs:Any)->None:
 super().__init__(remote_url)
 self._hvcs_domain:Url|None=None
 self._api_url:Url|None=None
diff --git a/semantic_release/version/algorithm.py b/semantic_release/version/algorithm.py
    )
 level_bump=max(parsed_levels,default=LevelBump.NO_RELEASE)
 log.info("The type of the next release release is: %s",level_bump)
 iflevel_bumpisLevelBump.NO_RELEASE:
 iflevel_bumpisLevelBump.NO_RELEASE:# noqa: SIM102
 iflatest_version.major!=0orallow_zero_version:
 log.info("No release will be made")
 returnlatest_version
diff --git a/tests/command_line/conftest.py b/tests/command_line/conftest.py
 from click.testing import CliRunner
 from requests_mock import ANY

 from semantic_release.cli import config asCliConfigModule
 from semantic_release.cli import config ascli_config_module
 from semantic_release.cli.config import (
    GlobalCommandLineOptions,
    RawConfig,
    """Mock the `Repo.git.push()` method in `semantic_release.cli.main`."""
    mocked_push = MagicMock()
    cls = prepare_mocked_git_command_wrapper_type(push=mocked_push)
    monkeypatch.setattr(CliConfigModule.Repo, "GitCommandWrapperType", cls)
    monkeypatch.setattr(cli_config_module.Repo, "GitCommandWrapperType", cls)
    return mocked_push


diff --git a/tests/command_line/test_changelog.py b/tests/command_line/test_changelog.py
 fromtests.fixtures.example_projectimportExProjectDir,UseReleaseNotesTemplateFn


 changelog_subcmd=changelog.nameorchangelog.__name__# type: ignore
 changelog_subcmd=changelog.nameorchangelog.__name__# type: ignore # noqa: PGH003


 @pytest.mark.parametrize(
diff --git a/tests/conftest.py b/tests/conftest.py
 fromtypingimportTYPE_CHECKING

 importpytest
 fromgitimportCommit
 fromgitimportCommit,Repo

 fromtests.fixturesimport*
 fromtests.utilimportremove_dir_tree
 exception=None
 try:
 yield_netrc_file
 exceptExceptionaserr:
 exceptExceptionaserr:# noqa: BLE001
 exception=err
 finally:
 forcontext_managerinentered_context_managers:
diff --git a/tests/unit/semantic_release/hvcs/test_gitlab.py b/tests/unit/semantic_release/hvcs/test_gitlab.py
    )

 # Execute in mocked environment expecting a GitlabUpdateError to be raised
 withcreate_release_patch,edit_release_notes_patch,get_release_by_id_patch:
 withcreate_release_patch,edit_release_notes_patch,get_release_by_id_patch:# noqa: SIM117
 withpytest.raises(gitlab.GitlabUpdateError):
 default_gl_client.create_or_update_release(
 A_GOOD_TAG,RELEASE_NOTES,prerelease
diff --git a/tests/util.py b/tests/util.py

 from semantic_release.changelog.context import make_changelog_context
 from semantic_release.changelog.release_history import ReleaseHistory
 from semantic_release.cli import config ascliConfigModule
 from semantic_release.cli import config ascli_config_module
 from semantic_release.commit_parser._base import CommitParser, ParserOptions
 from semantic_release.commit_parser.token import ParsedCommit, ParseResult
 from semantic_release.enums import LevelBump

    _R = TypeVar("_R")

    GitCommandWrapperType: TypeAlias =cliConfigModule.Repo.GitCommandWrapperType
    GitCommandWrapperType: TypeAlias =cli_config_module.Repo.GitCommandWrapperType


 def copy_dir_tree(src_dir: Path | str, dst_dir: Path | str) -> None:
    >>> mocked_push.assert_called_once()
    """

    class MockGitCommandWrapperType(cliConfigModule.Repo.GitCommandWrapperType):
    class MockGitCommandWrapperType(cli_config_module.Repo.GitCommandWrapperType):
        def __getattr__(self, name: str) -> Any:
            try:
                return object.__getattribute__(self, f"mocked_{name}")
Original file line number	Diff line number	Diff line change
Expand Up		@@ -77,7 +77,6 @@ jobs:
		run: \|
		python -m ruff check . \
		--config pyproject.toml \
		--diff \
		--output-format=full \
		--exit-non-zero-on-fix

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -73,7 +73,6 @@ jobs:
		- name: ruff
		run: \|
		python -m ruff check . \
		--diff \
		--output-format=full \
		--exit-non-zero-on-fix

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -222,6 +222,8 @@ ignore = [
		"DTZ",
		# flake8-errmsg
		"EM",
		# Some todos and some examples; leave this disabled for now
		"ERA001",
codejedi365 marked this conversation as resolved. Show resolvedHide resolved
		# don't compare types, use isinstance()
		# sometimes using type(x) == y is deliberately chosen to exclude
		# subclasses
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -58,7 +58,7 @@ def _init_runtime_ctx(self) -> RuntimeContext:

		try:
		if was_conf_file_user_provided and not conf_file_exists:
		raise FileNotFoundError(
		raise FileNotFoundError( # noqa: TRY301
wyardley marked this conversation as resolved. Show resolvedHide resolved
		f"File {self.global_opts.config_file} does not exist"
		)

Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -551,7 +551,7 @@ def version( # noqa: C901
		check=True,
		env=dict(
		filter(
		lambdak_v:k_v[1]isnotNone,# type: ignore
		lambdak_v:k_v[1]isnotNone,# type: ignore # noqa: PGH003
		{
		# Common values
		"PATH":os.getenv("PATH",""),
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -145,9 +145,12 @@ def resolve_env_vars(cls, val: Any) -> str \| None:
		@model_validator(mode="after")
		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:
		if env_token := self._get_default_token():
		self.token = env_token
		if self.token:
		return self
		if self.type not in _known_hvcs:
		return self
		if env_token := self._get_default_token():
		self.token = env_token
		return self

		def _get_default_token(self) -> str \| None:
Expand DownExpand Up		@@ -406,7 +409,7 @@ def apply_log_masking(self, masker: MaskingFilter) -> MaskingFilter:
		return masker

		@classmethod
		def from_raw_config(
		def from_raw_config( # noqa: C901
		cls, raw: RawConfig, global_cli_options: GlobalCommandLineOptions
		) -> RuntimeContext:
		##
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -77,7 +77,7 @@ def __init__(self, options: _OPTS \| None = None) -> None:
		# @staticmethod
		# @abstractmethod
		defget_default_options(self)->_OPTS:
		returnself.parser_options()# type: ignore
		returnself.parser_options()# type: ignore # noqa: PGH003

		@abstractmethod
		defparse(self,commit:Commit)->_TT: ...
Original file line number	Diff line number	Diff line change
Expand Up		@@ -59,7 +59,7 @@ def __init__(
		hvcs_api_domain:str\|None=None,
		token:str\|None=None,
		allow_insecure:bool=False,
		**kwargs:Any,
		**kwargs:Any,# noqa: ARG002
wyardley marked this conversation as resolved. Show resolvedHide resolved
		)->None:
		super().__init__(remote_url)
		self.token=token
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -43,7 +43,7 @@ def __init__(
		hvcs_domain:str\|None=None,
		token:str\|None=None,
		allow_insecure:bool=False,
		**kwargs:Any,
		**_kwargs:Any,
		)->None:
		super().__init__(remote_url)
		self.token=token
Expand Down
Original file line number	Diff line number	Diff line change
Expand Up		@@ -89,7 +89,7 @@ def __init__(
		hvcs_api_domain:str\|None=None,
		token:str\|None=None,
		allow_insecure:bool=False,
		**kwargs:Any,
		**_kwargs:Any,
		)->None:
		super().__init__(remote_url)
		self.token=token
Expand Down