-
-
Notifications
You must be signed in to change notification settings - Fork 92
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.
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 source/doc/examples with qstkdrepo changes. #857
Conversation
This handles all_os/qt/qt6_xyz_src_doc_examples changing to all_os/qt/qt6/xyz/[unix|windows]_line_endings_src for both list and install commands.
This will clash massively with #846 Edit: maybe not since its for install-src... Scared to find out though, or even check, as the missing doubling folder was one of the issue |
It fixes issues with: install-src, install-example, install-doc, list-src, list-example, list-doc |
@tsteven4 Changes to This is my version, does it fix your issue already? It may def to_folder(self, version: Version, qt_version_no_dots: str, extension: Optional[str] = None) -> str:
if version >= Version("6.8.0"):
if self.target == "wasm":
# Qt 6.8+ WASM uses a split folder structure
folder = f"qt{version.major}_{qt_version_no_dots}"
if extension:
folder = f"{folder}/{folder}_{extension}"
return folder
else:
base = f"qt{version.major}_{qt_version_no_dots}"
return f"{base}/{base}" # HERE
elif version >= Version("6.5.0") and self.target == "wasm":
# Qt 6.5-6.7 WASM uses direct wasm_[single|multi]thread folder
if extension:
return f"qt{version.major}_{qt_version_no_dots}_{extension}"
return f"qt{version.major}_{qt_version_no_dots}"
# Pre-6.8 structure for non-WASM or pre-6.5 structure
return "{category}{major}_{ver}{ext}".format(
category=self.category,
major=qt_version_no_dots[0],
ver=qt_version_no_dots,
ext="_" + extension if extension else "",
) |
@Kidev Your change to to_folder breaks my fix for source/doc/examples. When we get src/doc/example listings from all_os/qt (>= 6.7.0) we need to use the old style path WITH the extension. Your change works for 6.7.*, but not >=6.8.0. A merge of to_folder will be required.
I tested this PR with this your change to to_folder:
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
There are several linter warnings reported. Could you improve the code style and a usage of Version
?
locally pylint 3.3.2 comes up with 168 issues in metadata.py. Perhaps reviewdog is only showing ones that overlap changes in the file. 55 of these are "line to long". .flake8 sets the max line length to 125, but pylint seems to use 100. |
OK, I see. I do check the configuration of pylint and the PR looks good. |
At least until the fix for #843 is released (presumably in aqtinstall 3.1.22). See miurahr/aqtinstall#843 and miurahr/aqtinstall#857.
Squashed commit of the following: commit 693f19c Author: Paul Colby <git@colby.id.au> Date: Mon Jan 1 18:13:46 2024 +1100 Continue to exclude Qt 6.x with GCC on macOS commit a6c3a5c Author: Paul Colby <git@colby.id.au> Date: Mon Jan 1 18:09:15 2024 +1100 Include the required QRegularExpression header commit 6f078e5 Author: Paul Colby <git@colby.id.au> Date: Mon Jan 1 18:08:54 2024 +1100 Some fixes / tweaks for Qt 6.8.1 and 6.9.0 commit 49be473 Author: Paul Colby <git@colby.id.au> Date: Mon Jan 1 18:04:45 2024 +1100 Correct the referenced Qt version commit eef0aaa Author: Paul Colby <git@colby.id.au> Date: Mon Jan 1 18:04:40 2024 +1100 Use aqtinstall HEAD for Qt 6.8.1 and 6.8.0 support At least until the fix for #843 is released (presumably in aqtinstall 3.1.22). See miurahr/aqtinstall#843 and miurahr/aqtinstall#857. commit fe107e7 Merge: 24016a1 4507ccc Author: Paul Colby <git@colby.id.au> Date: Mon Jan 1 18:00:00 2024 +1100 Merge branch 'main' into qt-6.8.1 commit 24016a1 Merge: 8571331 968e509 Author: Paul Colby <git@colby.id.au> Date: Sun Dec 29 11:25:00 2024 +1100 Merge branch 'main' into qt-6.8.1 commit 8571331 Author: Paul Colby <git@colby.id.au> Date: Thu Dec 26 18:32:54 2024 +1100 Try Qt 6.9.0 (currently beta) commit 9e2a846 Merge: 551ee79 c3e649c Author: Paul Colby <git@colby.id.au> Date: Thu Dec 26 18:30:08 2024 +1100 Merge branch 'main' into qt-6.8.1 commit 551ee79 Merge: f261069 5c65691 Author: Paul Colby <git@colby.id.au> Date: Sun Dec 22 23:01:23 2024 +1100 Merge branch 'more-tee' into qt-6.8.1 commit f261069 Author: Paul Colby <git@colby.id.au> Date: Tue Dec 3 19:18:01 2024 +1100 Upgrade to Qt 6.8.1
This handles all_os/qt/qt6_xyz_src_doc_examples changing to all_os/qt/qt6/xyz/[unix|windows]_line_endings_src for both list and install commands.
This resolves #843