refactor: leverage ty 0.0.33 declared-type preference to remove casts

ty 0.0.33 prefers the declared type on annotated assignments when the
RHS returns Any/Unknown, removing the need for cast() workarounds.

- Bump ty minimum to >=0.0.33
- Replace cast() with type annotations where applicable

Co-authored-by: Copilot <[email protected]>

Author: bearomorphism

commitizen/commands/bump.py

@@ -263,7 +263,7 @@ def __call__(self) -> None:
             )
         )
 
-        rules = TagRules.from_settings(cast("Settings", self.bump_settings))
+        rules = TagRules.from_settings(self.bump_settings)
         current_tag = rules.find_tag_for(git.get_tags(), current_version)
         current_tag_version = (
             current_tag.name if current_tag else rules.normalize_tag(current_version)
@@ -323,16 +323,14 @@ def __call__(self) -> None:
                 try:
                     Changelog(
                         self.config,
-                        cast(
-                            "ChangelogArgs",
-                            {**changelog_args, "dry_run": True},
-                        ),
+                        {**changelog_args, "dry_run": True},
                     )()
                 except DryRunExit:
                     pass
 
             changelog_cmd = Changelog(
                 self.config,
+                # TODO: remove cast once self.file_name is narrowed to str
                 cast(
                     "ChangelogArgs",
                     {

commitizen/commands/changelog.py

@@ -3,7 +3,7 @@
 from difflib import SequenceMatcher
 from operator import itemgetter
 from pathlib import Path
-from typing import TYPE_CHECKING, Any, TypedDict, cast
+from typing import TYPE_CHECKING, Any, TypedDict
 
 from commitizen import changelog, defaults, factory, git, out
 from commitizen.changelog_formats import get_changelog_format
@@ -99,11 +99,10 @@ def __init__(self, config: BaseConfig, arguments: ChangelogArgs) -> None:
         self.change_type_map = (
             self.config.settings.get("change_type_map") or self.cz.change_type_map
         )
-        self.change_type_order = cast(
-            "list[str]",
+        self.change_type_order: list[str] = (
             self.config.settings.get("change_type_order")
             or self.cz.change_type_order
-            or defaults.CHANGE_TYPE_ORDER,
+            or defaults.CHANGE_TYPE_ORDER
         )
         self.rev_range = arguments.get("rev_range")
         self.tag_rules = TagRules(

commitizen/version_schemes.py

@@ -421,7 +421,7 @@ def get_version_scheme(settings: Settings, name: str | None = None) -> VersionSc
         (ep,) = metadata.entry_points(name=name, group=SCHEMES_ENTRYPOINT)
     except ValueError:
         raise VersionSchemeUnknown(f'Version scheme "{name}" unknown.')
-    scheme = cast("VersionScheme", ep.load())
+    scheme: VersionScheme = ep.load()
 
     # `VersionProtocol` is a `@runtime_checkable` Protocol, but `issubclass()` is not
     # supported for Protocols with non-method members. We check an instance instead by

pyproject.toml

@@ -118,7 +118,7 @@ linters = [
     "types-termcolor>=0.1.1",
     "types-colorama>=0.4.15.20240311",
     "prek>=0.2.28",
-    "ty>=0.0.29",
+    "ty>=0.0.33",
 ]
 
 documentation = [

scripts/gen_cli_help_screenshots.py

@@ -2,7 +2,7 @@
 import subprocess
 from itertools import chain
 from pathlib import Path
-from typing import Any, cast
+from typing import Any
 
 from rich.console import Console
 
@@ -14,8 +14,8 @@ def gen_cli_help_screenshots() -> None:
     images_root = Path(__file__).parent.parent / "docs" / "images" / "cli_help"
     images_root.mkdir(parents=True, exist_ok=True)
 
-    cli_data = cast("dict[str, Any]", data)
-    commands_cfg = cast("list[dict[str, Any]]", cli_data["subcommands"]["commands"])
+    cli_data: dict[str, Any] = data
+    commands_cfg: list[dict[str, Any]] = cli_data["subcommands"]["commands"]
     cz_commands = (
         command["name"] if isinstance(command["name"], str) else command["name"][0]
         for command in commands_cfg

tests/commands/test_version_command.py

@@ -8,9 +8,6 @@
 from commitizen.__version__ import __version__
 from commitizen.config.base_config import BaseConfig
 
-if TYPE_CHECKING:
-    from commitizen.commands.version import VersionArgs
-
 
 def test_version_for_showing_project_version_error(config, capsys):
     # No version specified in config
@@ -170,7 +167,7 @@ def test_version_just_minor(config, capsys, version: str, expected_version: str)
 )
 def test_version_invalid_combinations(config, capsys, args: dict, expected_error: str):
     """Test that certain flag combinations produce errors."""
-    commands.Version(config, args)()  # type: ignore[arg-type]
+    commands.Version(config, args)()  # type: ignore  # noqa: PGH003
     captured = capsys.readouterr()
     assert not captured.out
     assert expected_error in captured.err

tests/test_changelog.py

@@ -1171,11 +1171,13 @@ def test_generate_tree_from_commits(gitcommits, tags, merge_prereleases):
     for release, expected_release in zip(tree, expected):
         assert release["version"] == expected_release["version"]
         assert release["date"] == expected_release["date"]
-        assert release["changes"].keys() == expected_release["changes"].keys()
-        for change_type in release["changes"]:
-            changes = release["changes"][change_type]
-            expected_changes = expected_release["changes"][change_type]
-            for change, expected_change in zip(changes, expected_changes):
+        changes = cast("dict[str, Any]", release["changes"])
+        expected_changes_map = cast("dict[str, Any]", expected_release["changes"])
+        assert changes.keys() == expected_changes_map.keys()
+        for change_type in changes:
+            change_list = changes[change_type]
+            expected_list = expected_changes_map[change_type]
+            for change, expected_change in zip(change_list, expected_list):
                 assert change["scope"] == expected_change["scope"]
                 assert change["breaking"] == expected_change["breaking"]
                 assert change["message"] == expected_change["message"]