test: fixes after bumping deps

Author: efa2d19

mac_cleanup/__main__.py

@@ -1,4 +1,5 @@
 """Mocking HomeBrew entrypoint."""
+
 # -*- coding: utf-8 -*-
 import re
 import sys

mac_cleanup/__version__.py

@@ -1,6 +1,6 @@
 try:  # For gh-actions
     from importlib.metadata import version
 
-    __version__ = version(__package__)
+    __version__ = version(__package__)  # pyright: ignore [reportArgumentType]
 except ModuleNotFoundError:  # pragma: no cover
     __version__ = "source"

mac_cleanup/config.py

@@ -1,4 +1,5 @@
 """Config handler."""
+
 from inspect import getmembers, isfunction
 from pathlib import Path
 from typing import Callable, Final, Optional, TypedDict, final
@@ -34,8 +35,10 @@ def __init__(self, config_path_: Path):
         self.__load_default()
 
         # Load config
+        self.__config_data: Final[ConfigFile]
+
         try:
-            self.__config_data: Final[ConfigFile] = self.__read()
+            self.__config_data = self.__read()
         except FileNotFoundError:
             console.print("[danger]Modules not configured, opening configuration screen...[/danger]")
 
@@ -175,12 +178,12 @@ def __configure(self, *, all_modules: list[str], enabled_modules: list[str]) ->
             title="[info]Controls",
         )
 
-        questions = inquirer.Checkbox(  # pyright: ignore [reportUnknownVariableType, reportUnknownMemberType]
+        questions = inquirer.Checkbox(  # pyright: ignore [reportUnknownMemberType]
             "modules", message="Active modules", choices=all_modules, default=enabled_modules, carousel=True
         )
 
         # Get user answers
-        answers = inquirer.prompt(  # pyright: ignore [reportUnknownMemberType]
+        answers = inquirer.prompt(  # pyright: ignore [reportUnknownVariableType, reportUnknownMemberType]
             questions=[questions], raise_keyboard_interrupt=True
         )
 

mac_cleanup/console.py

@@ -1,4 +1,5 @@
 """Configuration of Rich console."""
+
 from typing import Optional
 
 from rich.console import Console

mac_cleanup/core.py

@@ -1,4 +1,5 @@
 """Core for collecting all unit modules."""
+
 from functools import partial
 from itertools import chain
 from pathlib import Path as Path_

mac_cleanup/core_modules.py

@@ -1,4 +1,5 @@
 """All core modules."""
+
 from abc import ABC, abstractmethod
 from pathlib import Path as Path_
 from typing import Final, Optional, TypeVar, final
@@ -32,11 +33,11 @@ def with_prompt(self: T, message_: Optional[str] = None) -> T:
             return self
 
         # Can't be solved without typing.Self
-        self.__prompt = True  # pyright: ignore [reportGeneralTypeIssues]
+        self.__prompt = True  # pyright: ignore [reportAttributeAccessIssue]
 
         if message_:
             # Can't be solved without typing.Self
-            self.__prompt_message = message_  # pyright: ignore [reportGeneralTypeIssues]
+            self.__prompt_message = message_  # pyright: ignore [reportAttributeAccessIssue]
 
         return self
 

mac_cleanup/default_modules.py

@@ -337,6 +337,7 @@ def yarn():
             unit.add(Command("yarn cache clean --force"))
             unit.add(Path("~/Library/Caches/yarn").dry_run_only())
 
+
 def bun():
     from mac_cleanup.utils import cmd
 
@@ -346,6 +347,7 @@ def bun():
             unit.add(Command("bun pm cache rm"))
             unit.add(Path("~/.bun/install/cache").dry_run_only())
 
+
 def pod():
     from mac_cleanup.utils import cmd
 
@@ -449,12 +451,13 @@ def telegram():
         if reopen_telegram:
             unit.add(Command("open /Applications/Telegram.app"))
 
-def conan():  
+
+def conan():
     with clc as unit:
         unit.message("Clearing conan cache")
         unit.add(Command("""conan remove "*" -c"""))
         unit.add(Path("~/.conan2/p/"))
-    
+
 
 def nuget_cache():
     with clc as unit:

mac_cleanup/error_handling.py

@@ -1,4 +1,5 @@
 """Wrapper for handling all errors in entry point."""
+
 from functools import wraps
 from typing import Any, Callable, Iterable, Optional, Type, TypeVar, overload
 
@@ -76,15 +77,15 @@ def wrapper(*args: Any, **kwargs: Any) -> Optional[T]:
 
 
 @overload
-def catch_exception(func: T, exception: Optional[_exception] = ..., exit_on_exception: bool = ...) -> T:
-    ...  # pragma: no cover (coverage marks line as untested)
+def catch_exception(
+    func: T, exception: Optional[_exception] = ..., exit_on_exception: bool = ...
+) -> T: ...  # pragma: no cover (coverage marks line as untested)
 
 
 @overload
 def catch_exception(
     func: None = ..., exception: Optional[_exception] = ..., exit_on_exception: bool = ...
-) -> ErrorHandler:
-    ...  # pragma: no cover (coverage marks line as untested)
+) -> ErrorHandler: ...  # pragma: no cover (coverage marks line as untested)
 
 
 def catch_exception(

mac_cleanup/main.py

@@ -1,5 +1,4 @@
-from os import environ
-from os import statvfs
+from os import environ, statvfs
 from pathlib import Path
 
 from mac_cleanup.config import Config
@@ -12,7 +11,7 @@
 
 class EntryPoint:
     if (config_home := environ.get("XDG_CONFIG_HOME")) is not None:
-        config_path = Path(config_home).expanduser().joinpath("mac_cleanup_py").joinpath("config.toml")            
+        config_path = Path(config_home).expanduser().joinpath("mac_cleanup_py").joinpath("config.toml")
     else:
         config_path = Path.home().joinpath(".mac_cleanup_py")
 
@@ -43,8 +42,7 @@ def cleanup(self) -> None:
 
         # Print results
         print_panel(
-            text=f"Removed - [success]{bytes_to_human(free_space_after - free_space_before)}",
-            title="[info]Success",
+            text=f"Removed - [success]{bytes_to_human(free_space_after - free_space_before)}", title="[info]Success"
         )
 
     @catch_exception

mac_cleanup/parser.py

@@ -1,4 +1,5 @@
 """Console argument parser configuration."""
+
 from argparse import ArgumentParser, RawTextHelpFormatter
 from typing import final
 

mac_cleanup/progress.py

@@ -1,4 +1,5 @@
 """Modified rich progress bar."""
+
 from typing import Iterable, Optional, Sequence
 
 from rich.progress import (

mac_cleanup/utils.py

@@ -97,7 +97,7 @@ def check_deletable(path: Path | str) -> bool:
     if any(path_posix.startswith(protected_path) for protected_path in list(map(expanduser, sip_list + user_list))):
         return False
 
-    return "com.apple.rootless" not in xattr(path_posix).keys()
+    return "com.apple.rootless" not in xattr(path_posix)
 
 
 @beartype

module_template.py

@@ -1,4 +1,5 @@
 """Custom module template example."""
+
 from mac_cleanup import *
 
 # Do not import any functions at the top level

tests/test_config.py

@@ -1,4 +1,5 @@
 """All tests for mac_cleanup_py.config."""
+
 import tempfile
 from pathlib import Path
 from typing import IO, Callable, Optional

tests/test_core.py

@@ -1,4 +1,5 @@
 """All tests for mac_cleanup_py.core."""
+
 import os
 import tempfile
 from pathlib import Path as Pathlib
@@ -33,10 +34,10 @@ def test_create_unit(self):
 
         # Check errors
         with pytest.raises(TypeError):
-            Unit(message=message, modules=[123])  # pyright: ignore [reportGeneralTypeIssues] # noqa
+            Unit(message=message, modules=[123])  # pyright: ignore [reportArgumentType] # noqa
 
         with pytest.raises(TypeError):
-            Unit(message=message, modules=123)  # pyright: ignore [reportGeneralTypeIssues] # noqa
+            Unit(message=message, modules=123)  # pyright: ignore [reportArgumentType] # noqa
 
 
 class TestCollector:
@@ -56,7 +57,7 @@ def test_errors_on_exit(self, raised_error: Type[BaseException]):
             raise raised_error
 
     @staticmethod
-    @pytest.fixture()
+    @pytest.fixture
     def base_collector() -> _Collector:
         """Get main collector instance - :class:`mac_cleanup.core._Collector`"""
 
@@ -121,9 +122,10 @@ def test_get_size(self, size_multiplier: int, base_collector: _Collector):
         # Get size in bytes
         size = 1024 * size_multiplier
 
-        with tempfile.TemporaryDirectory() as dir_name, tempfile.NamedTemporaryFile(
-            mode="w+b", dir=dir_name, prefix="test_get_size", suffix=".test"
-        ) as f:
+        with (
+            tempfile.TemporaryDirectory() as dir_name,
+            tempfile.NamedTemporaryFile(mode="w+b", dir=dir_name, prefix="test_get_size", suffix=".test") as f,
+        ):
             # Write random bytes with specified size
             f.write(os.urandom(size))
 

tests/test_core_modules.py

@@ -1,4 +1,5 @@
 """All tests for mac_cleanup_py.config."""
+
 import tempfile
 from pathlib import Path as Pathlib
 from typing import IO, Callable, Optional, cast

tests/test_error_handling.py

@@ -1,4 +1,5 @@
 """Test global error handler."""
+
 from typing import Iterable, Type
 
 import pytest

tests/test_main.py

@@ -1,4 +1,5 @@
 """Test main script in mac_cleanup_py.main."""
+
 from pathlib import Path as Pathlib
 from typing import Any, Callable
 
@@ -59,9 +60,9 @@ def dummy_count_free_space(entry_self: EntryPoint) -> float:  # noqa
             if not hasattr(dummy_count_free_space, "called"):
                 dummy_count_free_space.called = True  # pyright: ignore [reportFunctionMemberAccess]
 
-                return 1024**2 * size_multiplier / 2
+                return 1024**3 * size_multiplier / 2
             else:
-                return 1024**2 * size_multiplier
+                return 1024**3 * size_multiplier
 
         # Dummy module execution (empty one)
         dummy_module_execute: Callable[[BaseModule], None] = lambda md_self: None
@@ -150,7 +151,7 @@ def dummy_config_call(config_path_: Pathlib, configuration_prompted: bool) -> No
         if not cleanup_prompted:
             assert "Exiting..." in captured_stdout
 
-    def test_test_dry_run_prompt_error(self, capsys: CaptureFixture[str], monkeypatch: MonkeyPatch):
+    def test_dry_run_prompt_error(self, capsys: CaptureFixture[str], monkeypatch: MonkeyPatch):
         """Test errors in dry_run in :class:`mac_cleanup.main.EntryPoint`"""
 
         # Dummy count_dry returning 1 GB

tests/test_parser.py

@@ -1,12 +1,13 @@
 """All tests for mac_cleanup_py.parser."""
+
 from argparse import Action
 
 import pytest
 
 from mac_cleanup.parser import Args, parser
 
 
-@pytest.fixture()
+@pytest.fixture
 def get_namespace() -> Args:
     """Get empty args."""
 

tests/test_progress.py

@@ -1,4 +1,5 @@
 """All tests for mac_cleanup_py.progress."""
+
 from typing import Callable
 
 import pytest

tests/test_utils.py

@@ -1,4 +1,5 @@
 """All tests for mac_cleanup_py.utils."""
+
 from pathlib import Path
 from typing import Optional
 
@@ -28,7 +29,7 @@ def test_cmd(command: str | int, ignore_errors: bool, output: str):
 
     if isinstance(command, int):
         with pytest.raises(BeartypeCallHintParamViolation):
-            cmd(command=command, ignore_errors=ignore_errors)  # pyright: ignore [reportGeneralTypeIssues] # noqa
+            cmd(command=command, ignore_errors=ignore_errors)  # pyright: ignore [reportArgumentType] # noqa
         return
 
     assert cmd(command=command, ignore_errors=ignore_errors) == output
@@ -52,7 +53,7 @@ def test_expanduser(str_path: str | int, output: Optional[str]):
 
     if isinstance(str_path, int):
         with pytest.raises(BeartypeCallHintParamViolation):
-            expanduser(str_path=str_path)  # pyright: ignore [reportGeneralTypeIssues] # noqa
+            expanduser(str_path=str_path)  # pyright: ignore [reportArgumentType] # noqa
         return
 
     if output is None:
@@ -94,7 +95,7 @@ def test_check_exists(path: Path | str | int, output: bool, expand_path: bool):
 
     if isinstance(path, int):
         with pytest.raises(BeartypeCallHintParamViolation):
-            check_exists(path=path, expand_user=expand_path)  # pyright: ignore [reportGeneralTypeIssues] # noqa
+            check_exists(path=path, expand_user=expand_path)  # pyright: ignore [reportArgumentType] # noqa
         return
 
     assert check_exists(path=path, expand_user=expand_path) is output
@@ -134,7 +135,7 @@ def test_check_deletable(path: Path | str | int, output: bool):
 
     if isinstance(path, int):
         with pytest.raises(BeartypeCallHintParamViolation):
-            check_deletable(path=path)  # pyright: ignore [reportGeneralTypeIssues] # noqa
+            check_deletable(path=path)  # pyright: ignore [reportArgumentType] # noqa
         return
 
     assert check_deletable(path=path) is output
@@ -166,7 +167,7 @@ def test_bytes_to_human(byte: int | str, in_power: int, output: str):
 
     if isinstance(byte, str):
         with pytest.raises(BeartypeCallHintParamViolation):
-            bytes_to_human(size_bytes=byte)  # pyright: ignore [reportGeneralTypeIssues] # noqa
+            bytes_to_human(size_bytes=byte)  # pyright: ignore [reportArgumentType] # noqa
         return
 
     assert bytes_to_human(size_bytes=byte**in_power) == output