Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix generate_combinations issue with Linux Qt 6.7 #756

Merged
merged 2 commits into from
Feb 10, 2024
Merged

fix generate_combinations issue with Linux Qt 6.7 #756

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
45f3535
fix generate_combinations issue with Linux Qt 6.7
ddalcino Feb 10, 2024
d54ba7b
black (v 24.1.1)
ddalcino Feb 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 3 additions & 6 deletions aqt/metadata.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,18 +286,15 @@ def map_key_to_heading(cls, key: str) -> str:

@property
@abstractmethod
def short_heading_keys(self) -> Iterable[str]:
...
def short_heading_keys(self) -> Iterable[str]: ...

@property
@abstractmethod
def long_heading_keys(self) -> Iterable[str]:
...
def long_heading_keys(self) -> Iterable[str]: ...

@property
@abstractmethod
def name_heading(self) -> str:
...
def name_heading(self) -> str: ...

def __format__(self, format_spec: str) -> str:
short = False
Expand Down
6 changes: 4 additions & 2 deletions ci/generate_combinations.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ def iter_arches() -> Generator[dict, None, None]:
logger.info("Fetching arches")
archive_ids = list(iter_archive_ids(category="qt"))
for archive_id in tqdm(archive_ids):
for version in ("latest", "5.15.2", "5.13.2", "5.9.9"):
for version in ("latest", "6.5", "6.2", "5.15.2", "5.13.2", "5.9.9"):
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oops; this doesn't actually work because 6.5 and 6.2 are not valid versions. I was counting on CI to fail if the script doesn't work; I didn't realize it wasn't going to run.

for arch_name in MetadataFactory(archive_id, architectures_ver=version).getList():
yield {
"os_name": archive_id.host,
Expand Down Expand Up @@ -82,10 +82,12 @@ def iter_modules_for_qt_minor_groups(
) -> Generator[Dict, None, None]:
logger.info("Fetching qt modules for {}/{}".format(host, target))
for major, minor in tqdm(list(iter_qt_minor_groups(host, target))):
use_linux_gcc = (host == "linux" and arch == "gcc_64" and major == 6 and minor >= 7)
use_arch = "linux_gcc_64" if use_linux_gcc else arch
yield {
"qt_version": f"{major}.{minor}",
"modules": MetadataFactory(
ArchiveId("qt", host, target), modules_query=MetadataFactory.ModulesQuery(f"{major}.{minor}.0", arch)
ArchiveId("qt", host, target), modules_query=MetadataFactory.ModulesQuery(f"{major}.{minor}.0", use_arch)
).getList(),
}

Expand Down
Loading