From 0a1d036750d39382bc149818397eb965180a230b Mon Sep 17 00:00:00 2001 From: correctmost <134317971+correctmost@users.noreply.github.com> Date: Sat, 30 Nov 2024 16:40:38 -0500 Subject: [PATCH] Remove unused VersionDef class (#2972) This allows the comparison-with-callable pylint rule to be enabled. --- archinstall/lib/models/__init__.py | 2 +- archinstall/lib/models/gen.py | 56 ------------------------------ pyproject.toml | 1 - 3 files changed, 1 insertion(+), 58 deletions(-) diff --git a/archinstall/lib/models/__init__.py b/archinstall/lib/models/__init__.py index 4763a983..209a0d49 100644 --- a/archinstall/lib/models/__init__.py +++ b/archinstall/lib/models/__init__.py @@ -1,5 +1,5 @@ from .audio_configuration import Audio, AudioConfiguration from .bootloader import Bootloader -from .gen import LocalPackage, PackageSearch, PackageSearchResult, VersionDef +from .gen import LocalPackage, PackageSearch, PackageSearchResult from .network_configuration import NetworkConfiguration, Nic, NicType from .users import PasswordStrength, User diff --git a/archinstall/lib/models/gen.py b/archinstall/lib/models/gen.py index 3dd47725..86f8f78c 100644 --- a/archinstall/lib/models/gen.py +++ b/archinstall/lib/models/gen.py @@ -2,62 +2,6 @@ from dataclasses import dataclass from typing import Any -@dataclass -class VersionDef: - version_string: str - - @classmethod - def parse_version(cls) -> list[str]: - if '.' in cls.version_string: - versions = cls.version_string.split('.') - else: - versions = [cls.version_string] - - return versions - - @classmethod - def major(self) -> str: - return self.parse_version()[0] - - @classmethod - def minor(cls) -> str | None: - versions = cls.parse_version() - if len(versions) >= 2: - return versions[1] - - return None - - @classmethod - def patch(cls) -> str | None: - versions = cls.parse_version() - if '-' in versions[-1]: - _, patch_version = versions[-1].split('-', 1) - return patch_version - - return None - - def __eq__(self, other) -> bool: - if other.major == self.major and \ - other.minor == self.minor and \ - other.patch == self.patch: - - return True - return False - - def __lt__(self, other) -> bool: - if self.major() > other.major(): - return False - elif self.minor() and other.minor() and self.minor() > other.minor(): - return False - elif self.patch() and other.patch() and self.patch() > other.patch(): - return False - - return True - - def __str__(self) -> str: - return self.version_string - - @dataclass class PackageSearchResult: pkgname: str diff --git a/pyproject.toml b/pyproject.toml index 60e4af67..089b429e 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -160,7 +160,6 @@ disable = [ "bare-except", "broad-exception-caught", "cell-var-from-loop", - "comparison-with-callable", "dangerous-default-value", "fixme", "protected-access",