refactor(pikatypes): move aur_types to this new module

pikaur/aur.py

@@ -5,9 +5,9 @@
 from urllib import parse
 from urllib.parse import quote
 
-from .aur_types import AurBaseUrl, AURPackageInfo
 from .exceptions import AURError
 from .logging_extras import create_logger
+from .pikatypes import AurBaseUrl, AURPackageInfo
 from .progressbar import ThreadSafeProgressBar
 from .provider import Provider
 from .urllib_helper import get_gzip_from_url, get_json_from_url

pikaur/aur_deps.py

@@ -17,7 +17,7 @@
 from .version import VersionMatcher
 
 if TYPE_CHECKING:
-    from .aur_types import AURPackageInfo
+    from .pikatypes import AURPackageInfo
 
 
 logger = create_logger("aur_deps")

pikaur/conflicts.py

@@ -10,8 +10,8 @@
 if TYPE_CHECKING:
     from collections.abc import Sequence
 
-    from .aur_types import AURPackageInfo
     from .core import AURInstallInfo
+    from .pikatypes import AURPackageInfo
 
 
 def get_new_repo_pkgs_conflicts(repo_packages: list[str]) -> dict[str, list[str]]:

pikaur/core.py

@@ -25,7 +25,7 @@
 
     from typing_extensions import TypedDict
 
-    from .aur_types import AURPackageInfo
+    from .pikatypes import AURPackageInfo
 
     IOStream = IO[bytes] | int | None
 

pikaur/getpkgbuild_cli.py

@@ -5,12 +5,12 @@
 from .args import parse_args
 from .aur import find_aur_packages, get_repo_url
 from .aur_deps import get_aur_deps_list
-from .aur_types import AURPackageInfo
 from .core import check_executables, interactive_spawn
 from .exceptions import PackagesNotFoundInRepoError
 from .i18n import translate
 from .pacman import PackageDB
 from .pikaprint import print_stdout
+from .pikatypes import AURPackageInfo
 from .print_department import print_not_found_packages
 from .urllib_helper import wrap_proxy_env
 

pikaur/install_cli.py

@@ -10,7 +10,6 @@
 from typing import TYPE_CHECKING
 
 from .args import parse_args, reconstruct_args
-from .aur_types import AURPackageInfo
 from .build import PackageBuild, PkgbuildChanged, clone_aur_repos
 from .config import DiffPagerValues, PikaurConfig, UsingDynamicUsers
 from .conflicts import find_aur_conflicts
@@ -52,6 +51,7 @@
     print_stdout,
     print_warning,
 )
+from .pikatypes import AURPackageInfo
 from .print_department import (
     pretty_format_sysupgrade,
     print_not_found_packages,

pikaur/install_info_fetcher.py

@@ -9,7 +9,6 @@
 from .args import parse_args, reconstruct_args
 from .aur import find_aur_packages, find_aur_provided_deps, strip_aur_repo_name
 from .aur_deps import find_aur_deps, find_repo_deps_of_aur_pkgs
-from .aur_types import AURPackageInfo
 from .core import AURInstallInfo, ComparableType, PackageSource, RepoInstallInfo
 from .exceptions import DependencyError, DependencyVersionMismatchError, SysExit
 from .i18n import translate
@@ -22,6 +21,7 @@
     strip_repo_name,
 )
 from .pikaprint import print_error, print_stderr, print_stdout
+from .pikatypes import AURPackageInfo
 from .print_department import print_ignored_package, print_not_found_packages
 from .prompt import ask_to_continue
 from .replacements import find_replacements

pikaur/main.py

@@ -17,7 +17,6 @@
 import pyalpm
 
 from .args import parse_args
-from .aur_types import AURPackageInfo
 from .config import (
     AurReposCachePath,
     CacheRoot,
@@ -44,6 +43,7 @@
 from .logging_extras import create_logger
 from .pacman import PackageDB
 from .pikaprint import TTYRestore, bold_line, print_error, print_stderr, print_warning
+from .pikatypes import AURPackageInfo
 from .pikspect import PikspectSignalHandler
 from .pkg_cache_cli import cli_clean_packages_cache
 from .print_department import print_version

pikaur/pacman.py

@@ -28,7 +28,7 @@
     from re import Pattern
     from typing import Final
 
-    from .aur_types import AURPackageInfo
+    from .pikatypes import AURPackageInfo
 
 
 REPO_NAME_DELIMITER: "Final" = "/"

pikaur/print_department.py

@@ -10,7 +10,6 @@
 
 from .alpm import OFFICIAL_REPOS, PyAlpmWrapper
 from .args import parse_args
-from .aur_types import AURPackageInfo
 from .config import VERSION, AurSearchSortingValues, PikaurConfig, UpgradeSortingValues
 from .core import DEFAULT_TIMEZONE, InstallInfo
 from .i18n import translate, translate_many
@@ -26,6 +25,7 @@
     print_warning,
     printable_length,
 )
+from .pikatypes import AURPackageInfo
 from .version import get_common_version, get_version_diff
 
 if TYPE_CHECKING:

pikaur/provider.py

@@ -4,9 +4,9 @@
 
 import pyalpm
 
-from .aur_types import AURPackageInfo
 from .i18n import translate
 from .pikaprint import Colors, bold_line, color_line, print_error, print_stdout
+from .pikatypes import AURPackageInfo
 from .print_department import print_package_search_results
 from .prompt import NotANumberInputError, get_multiple_numbers_input
 from .version import VersionMatcher

pikaur/search_cli.py

@@ -11,11 +11,11 @@
     get_all_aur_names,
     get_all_aur_packages,
 )
-from .aur_types import AURPackageInfo
 from .exceptions import AURError, SysExit
 from .i18n import translate
 from .pacman import PackageDB, get_pkg_id, refresh_pkg_db_if_needed
 from .pikaprint import print_error, print_stderr
+from .pikatypes import AURPackageInfo
 from .print_department import print_package_search_results
 
 if TYPE_CHECKING:

pikaur/updates.py

@@ -30,8 +30,8 @@
 
     import pyalpm
 
-    from .aur_types import AURPackageInfo
     from .core import InstallInfo
+    from .pikatypes import AURPackageInfo
 
 
 DEVEL_PKGS_POSTFIXES: "Final" = (

pikaur_meta_helpers/find_aur_pkgs_with_aur_deps.py

@@ -5,7 +5,7 @@
 
 import tqdm  # type: ignore[import-untyped]
 
-from pikaur.aur_types import AURPackageInfo
+from pikaur.pikatypes import AURPackageInfo
 from pikaur.version import VersionMatcher
 from pikaur_meta_helpers.util import load_aur_dump
 

pikaur_meta_helpers/find_aur_pkgs_with_double_requirements.py

@@ -5,7 +5,7 @@
 
 import tqdm  # type: ignore[import-untyped]
 
-from pikaur.aur_types import AURPackageInfo
+from pikaur.pikatypes import AURPackageInfo
 from pikaur.version import VersionMatcher
 from pikaur_meta_helpers.util import load_aur_dump
 

pikaur_meta_helpers/util.py

@@ -3,7 +3,7 @@
 from typing import Final
 
 from pikaur.aur import get_all_aur_packages
-from pikaur.aur_types import AURPackageInfo
+from pikaur.pikatypes import AURPackageInfo
 
 PICKLE_FILE: Final = Path("aur_db.dump")