Commit Graph

639 Commits

Author SHA1 Message Date
Hiroshi Miura
82d051a04d Fix: variable become undefined when extension not exist or connection error (#868)
- Fixed the issue #867

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2025-03-16 17:56:53 +09:00
J.D. Purcell
7f5d0ed242 Fix missing log statement for target_qt.conf 2025-03-11 20:38:32 -04:00
J.D. Purcell
a19e36e80d Fix error running official installer on macOS 2025-03-11 09:46:33 -04:00
Alex Spataru
bb20a686cf Fix download URL for official installer on macOS 2025-03-11 09:43:41 -04:00
Hiroshi Miura
83cbd6c4e1 Update aqt/installer.py
Co-authored-by: J.D. Purcell <jdpurcell@gmail.com>
2025-03-11 14:19:21 +09:00
Hiroshi Miura
3b9a1a98ae style: apply black
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2025-03-04 16:20:24 +09:00
Hiroshi Miura
4a2f739647 Fix: run_list_qt_commercial: call of download_installer
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2025-03-04 16:20:11 +09:00
Hiroshi Miura
122377cb8a refactor: removal of duplicated download_installer functionality
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2025-03-04 11:43:53 +09:00
Hiroshi Miura
edc423a239 feat: install-qt-official checks hash for downloaded binary
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2025-03-04 09:00:58 +09:00
Alexandre Poumaroux
5d699b9ebf Commercial fixes, CI tests, more tests, coverage (#883)
* Add authentication flags for list-qt-commercial, add tests for coverage

* Add dry run

* Make tests really use auth since secrets have been added, fix some indents

* Fix auth issue, rename user 'email, and password 'pw'

* Fix modules param type

* Update commands names
2025-02-22 09:56:56 +09:00
tsteven4
06b821965d fix list-src,doc,examples for >= 6.8.0 (#880)
Some checks are pending
Test on GH actions environment / test (standard, ubuntu-latest, 3.12, 6.6.3) (push) Waiting to run
Test on GH actions environment / test (standard, ubuntu-latest, 3.12, 6.8.0) (push) Waiting to run
Test on GH actions environment / test (standard, ubuntu-latest, 3.12, 6.8.1) (push) Waiting to run
Check tox tests / Check packaging 📦 (push) Waiting to run
CodeQL / Analyze (python) (push) Waiting to run
Publish Python 🐍 distributions 📦 to PyPI / Build and publish Python 🐍 distributions 📦 to PyPI (push) Waiting to run
Test on GH actions environment / test (binary, windows-latest, 3.12, 6.6.3) (push) Waiting to run
Test on GH actions environment / test (standard, ubuntu-latest, 3.12, 6.5.3) (push) Waiting to run
Test on GH actions environment / test (standard, windows-latest, 3.12, 6.5.3) (push) Waiting to run
Test on GH actions environment / test (standard, windows-latest, 3.12, 6.6.3) (push) Waiting to run
Test on GH actions environment / test (standard, windows-latest, 3.12, 6.7.3) (push) Waiting to run
* fix list-src,doc,examples for >= 6.8.0

* generalize test_list_src_doc_examples_cli for version

* tweak expected url patterns.
2025-01-28 20:55:01 +09:00
Alexandre Poumaroux
cbe159f38a Add support for commercial versions of Qt (#878)
* Add install-qt-commercial feature and tests

* Make the auto-answers parameters, fix linter issues

* Fork and execv instead of using subprocess

* Return to simpler process execution method version

* Fix test

* Move commercial installer into its own file

* Fix shadowing of symbol platform causing errors

* Adapt test_cli for argparse format changes on py 3.13+

* Fix some errors, monkeypatch install test

* Add --override super command

* Properly handle --override and grab all the remaining commands when no quotes are given

* Fix tests

* Add base for modules, some niche features are not yet entirely implemented, and there are no updates to the testsuite

* Fix some mistakes

* Fix errors made with the monkeypatch, update Settings to make sure its init

* Tests commercial (#20)

* Full support of installation of all modules and addons
* Add auto setup of cache folder for each OS, add unattended parameter
* Fix settings folders
* Add graceful error message for overwrite case

* Fix windows issue

* Hidden summon works

* Remove both subprocess direct calls

* Dipose of temp folder

* Fix path issue

* Add list-qt-commercial command

* Fix help info

* Make no params valid for list-qt-commercial

* Fix lint errors, and param overflow when no args are passed to list

* Fix search

* Add tests for coverage, fix lint

* Test for overwriting, and for cache usage coverage

* Return to clean exec, ignoring CI fail to preserve code clarity

* Fix parsing of subprocess.run output for some python versions

* Make output more readable in console for list-qt-commercial

* Forward email and password to list request for users without a qtaccount.ini

* Change default settings

* Fix lint errors

* Fix check error
2025-01-28 20:51:53 +09:00
Hiroshi Miura
7917b2d725 Merge pull request #875 from miurahr/topic/miurahr/migrate-to-patch-ng
Some checks failed
Check tox tests / Check packaging 📦 (push) Has been cancelled
CodeQL / Analyze (python) (push) Has been cancelled
Publish Python 🐍 distributions 📦 to PyPI / Build and publish Python 🐍 distributions 📦 to PyPI (push) Has been cancelled
Test on GH actions environment / test (binary, windows-latest, 3.12, 6.6.3) (push) Has been cancelled
Test on GH actions environment / test (standard, ubuntu-latest, 3.12, 6.5.3) (push) Has been cancelled
Test on GH actions environment / test (standard, ubuntu-latest, 3.12, 6.6.3) (push) Has been cancelled
Test on GH actions environment / test (standard, ubuntu-latest, 3.12, 6.8.0) (push) Has been cancelled
Test on GH actions environment / test (standard, ubuntu-latest, 3.12, 6.8.1) (push) Has been cancelled
Test on GH actions environment / test (standard, windows-latest, 3.12, 6.5.3) (push) Has been cancelled
Test on GH actions environment / test (standard, windows-latest, 3.12, 6.6.3) (push) Has been cancelled
Test on GH actions environment / test (standard, windows-latest, 3.12, 6.7.3) (push) Has been cancelled
chore: migrate to patch_ng
2025-01-06 16:06:50 +09:00
Alexandre Poumaroux
a09b5cee28 Fix WASM (#846)
* Rewrite WASM support

* Add WASM tests to CI, update CI to test more the latest versions, add auto EMSDK version detection function

* Fix some mistakes, typos, moved emsdk version function into BuildJob

* Fix issue related to extensions interfering with wasm on 6.8+

* Fix tests

* Remove dep on Version in CI

* Remove safety before patch

* handle cases where extensions don't exist.

for example with windows desktop 6.8.1 win64_msvc2022_arm64_cross_compiled
both qtwebengine and qtpdf don't exist.

Signed-off-by: Alexandre 'Kidev' Poumaroux <1204936+Kidev@users.noreply.github.com>

* for --long-modules assume extension doesn't exist on download error.

Signed-off-by: Alexandre 'Kidev' Poumaroux <1204936+Kidev@users.noreply.github.com>

* for --modules assume extension doesn't exist for download failures.

Signed-off-by: Alexandre 'Kidev' Poumaroux <1204936+Kidev@users.noreply.github.com>

* reformat with black

Signed-off-by: Alexandre 'Kidev' Poumaroux <1204936+Kidev@users.noreply.github.com>

* fix flake8 regression that doesn't occur locally.

Signed-off-by: Alexandre 'Kidev' Poumaroux <1204936+Kidev@users.noreply.github.com>

* Fix autodesktop by also updating the OS when searching for a valid desktop version to download

* Fix extension issue, reduce the possible retry for getting extensions to prevent server spam

* Fix CI asking for msvc2019 on 6.8+ but its no longer supported

* Make CI use C++20 and MSVC2022

* Fix linux build

* Update runners to windows-2022

Signed-off-by: Alexandre 'Kidev' Poumaroux <1204936+Kidev@users.noreply.github.com>

* Fix patching

Signed-off-by: Alexandre 'Kidev' Poumaroux <1204936+Kidev@users.noreply.github.com>

* Add back the semantic version changes to prevent crashes, add tests for it

* Update checks

* Cast 'https://mirrors.ustc.edu.cn' to the shadow realm

* Again

* Update settings.ini

* Update settings.ini

* Update settings.ini

* Remove one_rep on silent

* Update settings.ini

* Restore master settings, remove hash check

* ci: Use specific mirror

Attempt to work around download errors in Azure due to Qt's official download site often redirecting to mirrors to which the network connection is unstable

Signed-off-by: Alexandre 'Kidev' Poumaroux <1204936+Kidev@users.noreply.github.com>

* Re enable hash checking

* Treat read timeout error during download as connection error

Signed-off-by: Alexandre 'Kidev' Poumaroux <1204936+Kidev@users.noreply.github.com>

* Add test for modules in WASM with autodesktop

* Fix format

* Fix test

* Make '--autodesktop' trigger its own install process, and test it

* Fix older autodesktop tests

* Add mock update files for 680 wasm, add test for wasm 680 autodesktop

* Passes the additional tests

* Fix format

* Improve coverage, fix format

* Fix tests and improve logging or install

* Fix format

* Fix regression in other tests

* Use flavor

* Fix line len

* Fix codeql

* Fix list-qt for WASM arch on 6.5.x and 6.6.x, restore to original download URL

* Fix test error

* Revert ci settings URL as it is never used by clients, only in CI

* Add comment for clarity in ci/settings.ini

---------

Signed-off-by: Alexandre 'Kidev' Poumaroux <1204936+Kidev@users.noreply.github.com>
Co-authored-by: tsteven4 <13596209+tsteven4@users.noreply.github.com>
Co-authored-by: J.D. Purcell <jdpurcell@gmail.com>
2025-01-06 15:35:40 +09:00
Hiroshi Miura
02e8c0d08a chore: migrate to patch_ng
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2025-01-04 23:36:43 +09:00
Hiroshi Miura
f81078f0ad style: isort
Some checks failed
Test on GH actions environment / test (standard, windows-latest, 3.12, 6.5.3) (push) Has been cancelled
Test on GH actions environment / test (standard, windows-latest, 3.12, 6.6.3) (push) Has been cancelled
Test on GH actions environment / test (standard, windows-latest, 3.12, 6.7.3) (push) Has been cancelled
Check tox tests / Check packaging 📦 (push) Has been cancelled
CodeQL / Analyze (python) (push) Has been cancelled
Publish Python 🐍 distributions 📦 to PyPI / Build and publish Python 🐍 distributions 📦 to PyPI (push) Has been cancelled
Test on GH actions environment / test (binary, windows-latest, 3.12, 6.6.3) (push) Has been cancelled
Test on GH actions environment / test (standard, ubuntu-latest, 3.12, 6.5.3) (push) Has been cancelled
Test on GH actions environment / test (standard, ubuntu-latest, 3.12, 6.6.3) (push) Has been cancelled
Test on GH actions environment / test (standard, ubuntu-latest, 3.12, 6.8.0) (push) Has been cancelled
Test on GH actions environment / test (standard, ubuntu-latest, 3.12, 6.8.1) (push) Has been cancelled
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2024-12-24 16:05:44 +09:00
Hiroshi Miura
eb164e552b Improve type definitions and styles (#869)
- exclude .reviewdog.yml from source distribution
- Add more type hints
- protective check for self.config in SettingsClass

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2024-12-24 14:45:04 +09:00
tsteven4
f914397685 fix source/doc/examples with qstkdrepo changes. (#857)
Some checks failed
Check tox tests / Check packaging 📦 (push) Waiting to run
CodeQL / Analyze (python) (push) Waiting to run
Publish Python 🐍 distributions 📦 to PyPI / Build and publish Python 🐍 distributions 📦 to PyPI (push) Waiting to run
Test on GH actions environment / test (binary, windows-latest, 3.12, 6.6.3) (push) Has been cancelled
Test on GH actions environment / test (standard, ubuntu-latest, 3.12, 6.5.3) (push) Has been cancelled
Test on GH actions environment / test (standard, ubuntu-latest, 3.12, 6.6.3) (push) Has been cancelled
Test on GH actions environment / test (standard, ubuntu-latest, 3.12, 6.8.0) (push) Has been cancelled
Test on GH actions environment / test (standard, ubuntu-latest, 3.12, 6.8.1) (push) Has been cancelled
Test on GH actions environment / test (standard, windows-latest, 3.12, 6.5.3) (push) Has been cancelled
Test on GH actions environment / test (standard, windows-latest, 3.12, 6.6.3) (push) Has been cancelled
Test on GH actions environment / test (standard, windows-latest, 3.12, 6.7.3) (push) Has been cancelled
* fix source/doc/examples with qstkdrepo changes.

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.

* configure pylint max-line-length to match others.

* Revert "configure pylint max-line-length to match others."

This reverts commit 8ebba90c36.
2024-12-21 10:03:13 +09:00
tsteven4
3f2f59d488 appease mypy Version no-untyped-call (#864)
* appease mypy Version no-untyped-call

Without the type hint we get:
error: Call to untyped function "Version" in typed
context  [no-untyped-call]

Note that our Version is derived from semantic_version, which
doesn't have type hints.

* mark class definition __init__ functions -> None.

This prevents reviewdog from generating an no-untyped-call warning
when a new instance of the class is created.  This behavior is
a time bomb.  reviewdog flags the warning at the line the new instance
was added, which is within the scope of the diffs, but the problem lies
elsewhere, in the class definition.

* fix mypy import-untyped error.
2024-12-21 10:02:21 +09:00
Hiroshi Miura
5ee98eff82 Merge pull request #854 from tsteven4/androidinstall
Some checks are pending
Check tox tests, lint and types / Check packaging 📦 (push) Waiting to run
CodeQL / Analyze (python) (push) Waiting to run
Publish Python 🐍 distributions 📦 to PyPI / Build and publish Python 🐍 distributions 📦 to PyPI (push) Waiting to run
Test on GH actions environment / test (binary, windows-latest, 3.12, 6.6.3) (push) Waiting to run
Test on GH actions environment / test (standard, ubuntu-latest, 3.12, 6.5.3) (push) Waiting to run
Test on GH actions environment / test (standard, ubuntu-latest, 3.12, 6.6.3) (push) Waiting to run
Test on GH actions environment / test (standard, ubuntu-latest, 3.12, 6.8.0) (push) Waiting to run
Test on GH actions environment / test (standard, ubuntu-latest, 3.12, 6.8.1) (push) Waiting to run
Test on GH actions environment / test (standard, windows-latest, 3.12, 6.5.3) (push) Waiting to run
Test on GH actions environment / test (standard, windows-latest, 3.12, 6.6.3) (push) Waiting to run
Test on GH actions environment / test (standard, windows-latest, 3.12, 6.7.3) (push) Waiting to run
fix computation of archive location for android install.
2024-12-16 23:11:53 +09:00
Hiroshi Miura
b8683afb0c Merge pull request #852 from tsteven4/extensionsmaynotexist
handle cases where extensions don't exist.
2024-12-16 23:11:21 +09:00
tsteven4
9ae5295ae4 fix computation of archive location for android install. 2024-12-15 14:32:36 -07:00
tsteven4
7d50defe7e fix flake8 regression that doesn't occur locally. 2024-12-14 19:01:04 -07:00
tsteven4
a49ca11548 reformat with black 2024-12-14 18:48:06 -07:00
tsteven4
6d944b4b80 for --modules assume extension doesn't exist for download failures. 2024-12-14 18:43:31 -07:00
tsteven4
f70e5b8d6b for --long-modules assume extension doesn't exist on download error. 2024-12-14 18:34:04 -07:00
J.D. Purcell
00e95c9129 Patch additional Qt scripts
Patches qtpath (introduced by QTBUG-97821) and the versioned variant of the tool wrapper scripts (introduced by QTBUG-109024)
2024-12-14 16:36:13 -05:00
tsteven4
c8793b3f06 handle cases where extensions don't exist.
for example with windows desktop 6.8.1 win64_msvc2022_arm64_cross_compiled
both qtwebengine and qtpdf don't exist.
2024-12-14 09:16:52 -07:00
tsteven4
cdabdefe0c incorporate improvement from review
Co-authored-by: Hiroshi Miura <miurahr@linux.com>
2024-12-03 05:48:24 -07:00
tsteven4
8a117b7081 Merge branch 'master' into qtextensions 2024-12-02 07:04:43 -07:00
tsteven4
1b2a9b2715 try to fix type test again, add 6.8.1 test 2024-11-30 16:33:46 -07:00
tsteven4
a4cf04e972 handle Updates.xml Operation extract elements. 2024-11-30 16:11:22 -07:00
tsteven4
a1ffb938a8 fix regression "check packaging" 2024-11-28 11:43:16 -07:00
tsteven4
ee40b25e84 fix regression failures. 2024-11-28 11:28:56 -07:00
tsteven4
8301064868 get --modules and --long-modules working with 6.8.0+ extensions 2024-11-28 10:22:56 -07:00
tsteven4
5a13230a3b fix pre 6.8.0 installs 2024-11-28 10:17:27 -07:00
tsteven4
aa222a59db search a list of possible extensions.
currently qtwebengine, qtpdf.
2024-11-27 15:12:29 -07:00
tsteven4
1d528c205f look for modules in extensions directory. 2024-11-27 12:00:03 -07:00
Hiroshi Miura
039209530d Merge pull request #826 from miurahr/topic/miurahr/fix-win64-llvm-mingw
Some checks failed
Test on GH actions environment / test (standard, windows-latest, 3.12, 6.5.3) (push) Has been cancelled
Test on GH actions environment / test (standard, windows-latest, 3.12, 6.6.3) (push) Has been cancelled
Test on GH actions environment / test (standard, windows-latest, 3.12, 6.7.3) (push) Has been cancelled
Check tox tests, lint and types / Check packaging 📦 (push) Has been cancelled
CodeQL / Analyze (python) (push) Has been cancelled
Publish Python 🐍 distributions 📦 to PyPI / Build and publish Python 🐍 distributions 📦 to PyPI (push) Has been cancelled
Test on GH actions environment / test (binary, windows-latest, 3.12, 6.6.3) (push) Has been cancelled
Test on GH actions environment / test (standard, ubuntu-latest, 3.12, 6.5.3) (push) Has been cancelled
Test on GH actions environment / test (standard, ubuntu-latest, 3.12, 6.6.3) (push) Has been cancelled
Test on GH actions environment / test (standard, ubuntu-latest, 3.12, 6.8.0) (push) Has been cancelled
bug: fix error when instaling win64_llvm_mingw / Qt 6.7 and 6.8
2024-10-12 19:11:19 +09:00
Hiroshi Miura
46d334a123 Merge pull request #823 from miurahr/topic/miurahr/drop-old-syntax
Some checks failed
Check tox tests, lint and types / Check packaging 📦 (push) Has been cancelled
CodeQL / Analyze (python) (push) Has been cancelled
Publish Python 🐍 distributions 📦 to PyPI / Build and publish Python 🐍 distributions 📦 to PyPI (push) Has been cancelled
Test on GH actions environment / test (binary, windows-latest, 3.12, 6.6.3) (push) Has been cancelled
Test on GH actions environment / test (standard, ubuntu-latest, 3.12, 6.5.3) (push) Has been cancelled
Test on GH actions environment / test (standard, ubuntu-latest, 3.12, 6.6.3) (push) Has been cancelled
Test on GH actions environment / test (standard, ubuntu-latest, 3.12, 6.8.0) (push) Has been cancelled
Test on GH actions environment / test (standard, windows-latest, 3.12, 6.5.3) (push) Has been cancelled
Test on GH actions environment / test (standard, windows-latest, 3.12, 6.6.3) (push) Has been cancelled
Test on GH actions environment / test (standard, windows-latest, 3.12, 6.7.3) (push) Has been cancelled
refactor: remove legacy subcommand syntax
2024-10-11 09:38:44 +09:00
J.D. Purcell
44ee2e8a8c fix: installation of 6.8 win64_msvc2022_arm64_cross_compiled 2024-10-10 08:49:25 -04:00
Hiroshi Miura
5a2074b4f2 Update copyright year of aqt/installer.py 2024-10-08 10:45:50 +09:00
Dave Dalcino
ff4fef3d1c black 2024-10-06 14:17:43 -07:00
Hiroshi Miura
7371504db1 Update aqt/metadata.py 2024-10-06 10:33:08 +09:00
Hiroshi Miura
7cfd15a585 fix: arch_dir of win64_llvm_mingw
- set arch_dir to be llvm_mingw_64

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2024-10-06 09:52:09 +09:00
Hiroshi Miura
fddd634b6d style: remove unused field and apply black
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2024-09-29 12:30:16 +09:00
Hiroshi Miura
81c983990a refactor: remove legacy commands
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2024-09-29 12:17:54 +09:00
Hiroshi Miura
2a8eb72c0b refactor: test: update cases and expectations
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2024-09-29 12:17:44 +09:00
Mozi
7a0120ff45 fix: remove logic to check or warn about unknown combinations 2024-08-16 03:01:24 +00:00
Hiroshi Miura
65e760383f fix: remove logic to check combination
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2024-08-05 08:00:32 +09:00