Mirrors/aqtinstall
1
0
Fork 0
mirror of https://github.com/miurahr/aqtinstall.git synced 2025-12-18 05:04:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: remove logic to check combination

Browse Source 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
This commit is contained in:
Hiroshi Miura
2024-08-05 07:42:02 +09:00
parent 74963f9d87
commit 307d856f0c
2 changed files with 0 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
aqt/installer.py
View File

@@ -212,12 +212,6 @@ class Cli:
return True return True
return False return False
def _check_qt_arg_versions(self, version):
return version in Settings.available_versions
def _check_qt_arg_version_offline(self, version):
return version in Settings.available_offline_installer_version
def _warning_unknown_qt_version(self, qt_version: str) -> str: def _warning_unknown_qt_version(self, qt_version: str) -> str:
return self._warning_on_bad_combination(f'Qt version "{qt_version}"') return self._warning_on_bad_combination(f'Qt version "{qt_version}"')
@@ -412,10 +406,6 @@ class Cli:
auto_desktop_archives: List[QtPackage] = get_auto_desktop_archives() auto_desktop_archives: List[QtPackage] = get_auto_desktop_archives()
if not self._check_qt_arg_versions(qt_version):
self.logger.warning(self._warning_unknown_qt_version(qt_version))
if not self._check_qt_arg_combination(qt_version, os_name, target, arch):
self.logger.warning(self._warning_unknown_target_arch_combo([os_name, target, arch]))
all_extra = True if modules is not None and "all" in modules else False all_extra = True if modules is not None and "all" in modules else False
qt_archives: QtArchives = retry_on_bad_connection( qt_archives: QtArchives = retry_on_bad_connection(
@@ -486,8 +476,6 @@ class Cli:
modules = getattr(args, "modules", None) # `--modules` is invalid for `install-src` modules = getattr(args, "modules", None) # `--modules` is invalid for `install-src`
archives = args.archives archives = args.archives
all_extra = True if modules is not None and "all" in modules else False all_extra = True if modules is not None and "all" in modules else False
if not self._check_qt_arg_versions(qt_version):
self.logger.warning(self._warning_unknown_qt_version(qt_version))
srcdocexamples_archives: SrcDocExamplesArchives = retry_on_bad_connection( srcdocexamples_archives: SrcDocExamplesArchives = retry_on_bad_connection(
lambda base_url: SrcDocExamplesArchives( lambda base_url: SrcDocExamplesArchives(
@@ -580,9 +568,6 @@ class Cli:
archs = [args.tool_variant] archs = [args.tool_variant]
for arch in archs: for arch in archs:
if not self._check_tools_arg_combination(os_name, tool_name, arch):
self.logger.warning(self._warning_unknown_target_arch_combo([os_name, tool_name, arch]))
tool_archives: ToolArchives = retry_on_bad_connection( tool_archives: ToolArchives = retry_on_bad_connection(
lambda base_url: ToolArchives( lambda base_url: ToolArchives(
os_name=os_name, os_name=os_name,

14
tests/test_cli.py
View File

@@ -73,20 +73,6 @@ def test_cli_select_unexpected_modules(qt_version: str, modules: Optional[List[s
assert cli._select_unexpected_modules(nonexistent_qt, modules) == sorted(modules or []) assert cli._select_unexpected_modules(nonexistent_qt, modules) == sorted(modules or [])
def test_cli_check_combination():
cli = Cli()
cli._setup_settings()
assert cli._check_qt_arg_combination("5.11.3", "linux", "desktop", "gcc_64")
assert cli._check_qt_arg_combination("5.11.3", "mac", "desktop", "clang_64")
assert not cli._check_qt_arg_combination("5.14.0", "android", "desktop", "clang_64")
def test_cli_check_version():
cli = Cli()
cli._setup_settings()
assert cli._check_qt_arg_versions("5.12.0")
assert not cli._check_qt_arg_versions("5.12")
@pytest.mark.parametrize( @pytest.mark.parametrize(
"host, target, arch, version_or_spec, expected_version, is_bad_spec", "host, target, arch, version_or_spec, expected_version, is_bad_spec",