Commit Graph

113 Commits

Author SHA1 Message Date
Hiroshi Miura
5572fc9127 style: Improve readability by reformatting long lines
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2025-12-14 11:20:06 +09:00
Hiroshi Miura
9475986b31 Merge pull request #927 from Kidev/fix_926
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 package (push) Has been cancelled
Test on GH actions environment / test (binary, windows-latest, 3.13, 6.6.3) (push) Has been cancelled
Test on GH actions environment / test (standard, ubuntu-latest, 3.13, 6.5.3) (push) Has been cancelled
Test on GH actions environment / test (standard, ubuntu-latest, 3.13, 6.6.3) (push) Has been cancelled
Test on GH actions environment / test (standard, ubuntu-latest, 3.13, 6.8.0) (push) Has been cancelled
Test on GH actions environment / test (standard, ubuntu-latest, 3.13, 6.8.1) (push) Has been cancelled
Test on GH actions environment / test (standard, windows-latest, 3.13, 6.5.3) (push) Has been cancelled
Test on GH actions environment / test (standard, windows-latest, 3.13, 6.6.3) (push) Has been cancelled
Test on GH actions environment / test (standard, windows-latest, 3.13, 6.7.3) (push) Has been cancelled
Publish Python 🐍 distributions 📦 to PyPI / publish Python 🐍 distributions 📦 to PyPI (push) Has been cancelled
Fix spec version input for `all_os` `wasm` not detecting `wasm_*` architectures for Qt >= 6.8.0
2025-11-06 18:19:28 +09:00
Hiroshi Miura
08d83d503b Merge pull request #947 from tsteven4/issue946
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 package (push) Has been cancelled
Test on GH actions environment / test (binary, windows-latest, 3.13, 6.6.3) (push) Has been cancelled
Test on GH actions environment / test (standard, ubuntu-latest, 3.13, 6.5.3) (push) Has been cancelled
Test on GH actions environment / test (standard, ubuntu-latest, 3.13, 6.6.3) (push) Has been cancelled
Test on GH actions environment / test (standard, ubuntu-latest, 3.13, 6.8.0) (push) Has been cancelled
Test on GH actions environment / test (standard, ubuntu-latest, 3.13, 6.8.1) (push) Has been cancelled
Test on GH actions environment / test (standard, windows-latest, 3.13, 6.5.3) (push) Has been cancelled
Test on GH actions environment / test (standard, windows-latest, 3.13, 6.6.3) (push) Has been cancelled
Test on GH actions environment / test (standard, windows-latest, 3.13, 6.7.3) (push) Has been cancelled
Publish Python 🐍 distributions 📦 to PyPI / publish Python 🐍 distributions 📦 to PyPI (push) Has been cancelled
fix extensions for list-qt, install-qt commands and android >= 6.7.0
2025-10-14 12:01:56 +09:00
tsteven4
56d94cfd79 fix list-qt, install-qt for android >= 6.7.0
This resolves #946
2025-10-06 19:22:43 -06:00
tsteven4
4a53344c99 fail correctly for windows_arm64 paired with win64_msvc2022_arm64_cross_compiled. 2025-09-16 14:54:19 -06:00
tsteven4
ce91d93eee fix installation of extensions for windows arm64.
The qtwebengine extension for WoA appeared in 6.10.0.
The qtpdf extension for WoA appeared in 6.9.2.
Support for both the cross compiled and native versions is included
and tested.
2025-09-16 11:32:28 -06:00
Alexandre 'Kidev' Poumaroux
b44a7fa5de Fix #926 2025-06-12 18:12:48 +02:00
Alexandre 'Kidev' Poumaroux
3efa01906c Make match_any_ext use TARGETS_FOR_HOST const array for values 2025-04-24 10:00:56 +02:00
J.D. Purcell
a039f9ff9e Fix list-qt for all_os 6.7.* by updating fetch_versions
Signed-off-by: Alexandre 'Kidev' Poumaroux <1204936+Kidev@users.noreply.github.com>
2025-04-24 09:57:33 +02:00
Alexandre 'Kidev' Poumaroux
5d74ad44c9 Fix issue with list android 6.7 2025-04-19 00:50:57 +02:00
Alexandre 'Kidev' Poumaroux
c63fb870e6 Add --UNSAFE-ignore-hash option 2025-04-17 23:03:59 +02: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
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
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
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
tsteven4
cdabdefe0c incorporate improvement from review
Co-authored-by: Hiroshi Miura <miurahr@linux.com>
2024-12-03 05:48:24 -07:00
tsteven4
a1ffb938a8 fix regression "check packaging" 2024-11-28 11:43:16 -07:00
tsteven4
8301064868 get --modules and --long-modules working with 6.8.0+ extensions 2024-11-28 10:22:56 -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
J.D. Purcell
44ee2e8a8c fix: installation of 6.8 win64_msvc2022_arm64_cross_compiled 2024-10-10 08:49:25 -04: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
7ad738b3a0 style: apply black
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2024-06-21 03:16:59 +09:00
Hiroshi Miura
b8f7ed69c1 feat: support list Qt 6.8.0 windows_arm64
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2024-06-20 21:15:13 +09:00
Hiroshi Miura
6f2f085fdb feat: support list Qt 6.8.0
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2024-06-20 20:11:13 +09:00
Andrew Wason
f049a82d9d Override host/target for src/docs if Qt >= 6.7.0 (#776)
* Override host/target for src/docs if Qt >= 6.7.0

Fixes https://github.com/miurahr/aqtinstall/issues/775
2024-05-05 09:28:02 +09:00
Hiroshi Miura
799fcfb026 fix: type error on type definition
commit d0603a25 has error in type definition for mypy.
It causes ‘type’ object is not subscriptable error.

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2024-04-13 17:40:25 +09:00
Andrew Wason
1615782c25 Fixes and tests. Untested Azure pipeline support. 2024-03-05 18:37:15 -05:00
Andrew Wason
d0603a2555 Handle linux desktop arm64 arch with Qt 6.7.0 via new linux_arm64 host.
Top level directories are `qtsdkrepository/linux_x64` or `qtsdkrepository/linux_arm64`
qtsdkrepository files are suffixed with `.linux_gcc_64` or `.linux_gcc_arm64`
Installation directory is `gcc_64` or `gcc_arm64`
2024-03-05 09:55:10 -05:00
David Dalcino
4994594112 fix generate_combinations issue with Linux Qt 6.7 (#756)
* fix generate_combinations issue with Linux Qt 6.7

Qt 6.7.0 changes the default arch for Linux from gcc_64 to linux_gcc_64.
This allows the generate_combinations.py script to account for that.

Also, Qt 6.7.0 is missing a few architectures that were present in
earlier versions of Qt6. This makes sure that the script can pick those
up.

* black (v 24.1.1)

New version of black formats metadata.py differently than before
2024-02-10 12:24:00 +09:00
Cyril Margorin
5229003ec8 Fix issue #731
Make base_url argument optional with default to None and replace it with
Settings.baseurl if it is None (standard optional argument procedure)
2023-11-10 10:33:51 +03:00
lebarsfa
612dc7ba91 Add ignore_hash option in settings.ini (#684)
* Settings: add an option to skip checksum verification on Updates.xml

This allows aqt to work even when the server download.qt.io is
unreachable.

Signed-off-by: Alberto Mardegan <mardy@users.sourceforge.net>

* Update settings.ini

* Correct option to skip checksum verification

* Rename ignore_hash option to INSECURE_NOT_FOR_PRODUCTION_ignore_hash

* Update doc about INSECURE_NOT_FOR_PRODUCTION_ignore_hash

* Add hash_algorithm option

* Unofficial mirrors might not provide any hash for Updates.xml

* docs: update configuration.rst

express default value of hash_algorithm

Signed-off-by: Hiroshi Miura <miurahr@linux.com>

* fix: hashlib constructor with usedforsecurity=False

- Python 3.9 and later introduce a keyword argument ``usedforsecurity``
- Set to False because we use hash to check file integrity not for password hash.

Signed-off-by: Hiroshi Miura <miurahr@linux.com>

* Attempt to fix parameter type inconsistency in downloadBinaryFile

---------

Signed-off-by: Alberto Mardegan <mardy@users.sourceforge.net>
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
Co-authored-by: Alberto Mardegan <mardy@users.sourceforge.net>
Co-authored-by: Hiroshi Miura <miurahr@linux.com>
2023-11-06 07:29:03 +09:00
Dave Dalcino
5c2c18d96b Fix installation of win64_msvc2019_arm64 arch
This fixes the behavior of the `--autodesktop` flag and the updater,
when installing win64_msvc2019_arm64 for desktop targets.
2023-09-06 18:09:02 -07:00
LuK1337
27fb2b3339 Add support for standalone sdktool installation
This allows us to install sdktool using the following command:
aqt install-tool windows desktop sdktool
2023-05-16 20:55:48 +02:00
Dave Dalcino
d47d99d14b Impl resilience to missing wasm Updates.xml files
Allows MetadataFactory to produce a list of architectures when the
standard Updates.xml file is present, but the expected wasm Updates.xml
file is not.
2023-02-11 14:08:36 -08:00
Dave Dalcino
dc9c1e6798 Add support for qt 6.5.0 wasm 2023-02-06 16:51:16 -08:00
Dave Dalcino
dfa6733a0b Make MetadataFactory.fetch_versions more readable 2022-11-21 07:34:46 +09:00
Hiroshi Miura
1dbd73450a Adjust code scanner warnings
- Replace map+filter and list+filter with list comprehension expression
- Use try/except for next(Iterator)
- Add test case for altlink that cause exception on next() in get_altlink
- Avoid exit but use sys.exit

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2022-11-21 07:34:45 +09:00
Dave Dalcino
452f8d74b2 Fix mypy type errors
- Introduce classes inherit argparse.ArgumentParser to suppress mypy
  errors in Cli class.
- `requests.session.Session.get()` expects that `timeout` is `float | tuple[float, float] | tuple[float, None] | None`
  so use `Tuple[float, float]` for timeout
- Use named tuple for modules_query
- Update test_list.py
2022-11-21 07:34:45 +09:00
Dave Dalcino
81eebde168 Adjust against mypy type errors 2022-11-20 15:20:27 +09:00
Dave Dalcino
c90b262984 remove extensions from ArchiveId 2022-11-16 16:14:55 -08:00
Dave Dalcino
caee04bcb3 Remove extensions 2022-11-16 16:14:54 -08:00
Dave Dalcino
cdf45d4810 Remove NotImplementedError footgun 2022-10-10 22:57:21 -07:00
Dave Dalcino
703f2d2fe3 rework logic for readability 2022-08-20 09:09:23 -07:00
Dave Dalcino
85eee1a938 Refactor: move Qt repo properties to QtRepoProperty
Move default_desktop_arch_dir & dir_for_version to QtRepoProperty
2022-08-20 09:04:52 -07:00