Skip to content

Commit

Permalink
fix: delete combination check
Browse files Browse the repository at this point in the history
Signed-off-by: Hiroshi Miura <[email protected]>
  • Loading branch information
miurahr committed Aug 4, 2024
1 parent cc13229 commit d0260e0
Show file tree
Hide file tree
Showing 5 changed files with 1 addition and 290 deletions.
59 changes: 0 additions & 59 deletions .github/workflows/check-combinations.yml

This file was deleted.

5 changes: 0 additions & 5 deletions aqt/helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -359,11 +359,6 @@ def __init__(self):
self.loggingconf = os.path.join(os.path.dirname(__file__), "logging.ini")

def load_settings(self, file: Optional[Union[str, TextIO]] = None) -> None:
with open(
os.path.join(os.path.dirname(__file__), "combinations.json"),
"r",
) as j:
self._combinations = json.load(j)[0]
if file is not None:
if isinstance(file, str):
result = self.config.read(file)
Expand Down
9 changes: 0 additions & 9 deletions aqt/installer.py
Original file line number Diff line number Diff line change
Expand Up @@ -293,11 +293,6 @@ def _check_mirror(self, mirror):
return False
return True

def _select_unexpected_modules(self, qt_version: str, modules: Optional[List[str]]) -> List[str]:
"""Returns a sorted list of all the requested modules that do not exist in the combinations.json file."""
available = Settings.available_modules(qt_version)
return sorted(set(modules or []) - set(available or []))

@staticmethod
def _determine_qt_version(
qt_version_or_spec: str, host: str, target: str, arch: str, base_url: str = Settings.baseurl
Expand Down Expand Up @@ -422,10 +417,6 @@ def to_archives(baseurl: str) -> QtArchives:
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
if not all_extra:
unexpected_modules = self._select_unexpected_modules(qt_version, modules)
if unexpected_modules:
self.logger.warning(self._warning_unexpected_modules(unexpected_modules))

qt_archives: QtArchives = retry_on_bad_connection(
lambda base_url: QtArchives(
Expand Down
216 changes: 0 additions & 216 deletions ci/generate_combinations.py

This file was deleted.

2 changes: 1 addition & 1 deletion tools/build_standalone.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
adddata_arg = "{src:s};aqt"
else:
adddata_arg = "{src:s}:aqt"
for data in ["aqt/logging.ini", "aqt/settings.ini", "aqt/combinations.json"]:
for data in ["aqt/logging.ini", "aqt/settings.ini"]:
args.append('--add-data')
args.append(adddata_arg.format(src=data))
args.append(os.path.join(tools_dir, "launch_aqt.py"))
Expand Down

0 comments on commit d0260e0

Please sign in to comment.