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

Fix incompatible type annotations

Browse Source
This commit is contained in:
David Dalcino
2022-03-10 18:02:05 -08:00
parent 49a6cf97b6
commit ec073a6272
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
ci/generate_combinations.py
View File

@@ -4,7 +4,7 @@ import argparse
import json import json
import logging import logging
from pathlib import Path from pathlib import Path
from typing import Dict, Generator, Iterator, List, Optional, Tuple, Union from typing import Dict, Generator, Iterable, List, Optional, Tuple, Union
from jsoncomparison import NO_DIFF, Compare from jsoncomparison import NO_DIFF, Compare
@@ -26,8 +26,8 @@ def is_blacklisted_tool(tool_name: str) -> bool:
def iter_archive_ids( def iter_archive_ids(
*, *,
category: str, category: str,
hosts: Iterator[str] = ArchiveId.HOSTS, hosts: Iterable[str] = ArchiveId.HOSTS,
targets: Optional[Iterator[str]] = None, targets: Optional[Iterable[str]] = None,
add_extensions: bool = False, add_extensions: bool = False,
) -> Generator[ArchiveId, None, None]: ) -> Generator[ArchiveId, None, None]:
def iter_extensions() -> Generator[str, None, None]: def iter_extensions() -> Generator[str, None, None]:
@@ -76,7 +76,7 @@ def iter_arches() -> Generator[dict, None, None]:
def iter_tool_variants() -> Generator[dict, None, None]: def iter_tool_variants() -> Generator[dict, None, None]:
for archive_id in iter_archive_ids(category="tools"): for archive_id in iter_archive_ids(category="tools"):
logger.info("Fetching tool variants for {}".format(archive_id)) logger.info("Fetching tool variants for {}".format(archive_id))
for tool_name in tqdm(sorted(MetadataFactory(archive_id).getList())): for tool_name in tqdm(sorted(MetadataFactory(archive_id).fetch_tools())):
if is_blacklisted_tool(tool_name): if is_blacklisted_tool(tool_name):
continue continue
for tool_variant in MetadataFactory( for tool_variant in MetadataFactory(
@@ -93,7 +93,7 @@ def iter_tool_variants() -> Generator[dict, None, None]:
def iter_qt_minor_groups( def iter_qt_minor_groups(
host: str = "linux", target: str = "desktop" host: str = "linux", target: str = "desktop"
) -> Generator[Tuple[int, int], None, None]: ) -> Generator[Tuple[int, int], None, None]:
versions: Versions = MetadataFactory(ArchiveId("qt", host, target)).getList() versions: Versions = MetadataFactory(ArchiveId("qt", host, target)).fetch_versions()
for minor_group in versions: for minor_group in versions:
v = minor_group[0] v = minor_group[0]
yield v.major, v.minor yield v.major, v.minor