Mirrors/aqtinstall
1
0
Fork 0
mirror of https://github.com/miurahr/aqtinstall.git synced 2025-12-17 20:54:38 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,332 Commits 15 Branches 137 Tags
7ebd6aa34e4701bd231ec67508cc9f57a2948f12
Commit Graph

137 Commits

Author SHA1 Message Date
Hiroshi Miura
fbdcb0cf7c PEP8/Black 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2021-06-22 16:37:58 +09:00
Hiroshi Miura
580143352a Fix version comparison (#275) 
Fix function error when migrating semantic_version package

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2021-06-22 16:35:04 +09:00
Hiroshi Miura
f35edf398a Fix logging in installer sub-process when multiprocessing context with spawn method (#273) 
* Simplify logging

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

* Update logging

- keep logging file path in Settings
- introduce installer logger

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

* PEP8/Black

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

* Logging: add queue handler

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

* Logging: introduce logutils module

- Add QueueListenerHandler
- Add queue listener handler config
- qualname to aqt.installer

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

* Logging: introduce aqt.updater logger

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

* Logging: introduce aqt.main and aqt.archives logger

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

* PEP8/Black

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

* Logging: simplify config file

- use propergate for last output handler
- change formatter
  * console: brief
  * file: verbose
- Use multiprocessing.Queue() instead of queue.Queue()
- Remember logging config file customization in Settings
- QueueListener use handler as of getLogger("aqt").handlers

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

* change log level of redirection

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

* Logging: Single global LoggingQueueListener

- Global instance of LoggingQueueListener
- Drop queue_listener from logging.ini
- Generate QueueHandler from LoggingQueueLisnter.get_queue_handler
- Explicitly close QueueListenerHandler and Queue object.

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

* CI: use verbose console logging for ci

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

* CLI: drop options to specify logger and logger configuration file

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

* Make Instance of LoggingQueueListener in Cli class

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

* Handle QueueListener in Cli.call_installer

- Use mp.Manager().Queue()
- start(), stop() in caller
- Gracefully close QueueHandler in installer

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

* PEP8

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

* Drop berkeley.edu from fallbacks of mirror site

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

* Fix log format of time digits

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

* Update settings load

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

* CI: catch custom settings from change in master branch

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

* Show log when loading custom settings

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

* Improve subprocess logging that use root logger

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

* fix logging.ini settings

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

* Fix against tests

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

* Introduce MyQueueListener

- Inherit System QueueListner to override logger name

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

* PEP8/Black

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2021-06-21 15:25:00 +09:00
Hiroshi Miura
fac014216f Use global instance to hold Settings instead of Borg (#272) 
* Use global variable to hold Settings

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

* Settings global instance to hold configurations

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

* Revert to Settings class to helper module

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

* Revert Settings class variables

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

* PEP8

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

* CI: change actions to use macos-11

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

* Revert "CI: change actions to use macos-11"

CI: macos-11 is just for private preview

This reverts commit f1d576f4bf.
 2021-06-19 10:43:19 +09:00
Hiroshi Miura
fe38fb0e62 Version comparison by semantic_version (#263) 
* Version comparison by packaging.version

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

* Use semantic_version instead of packaging.version

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

* Use more semantic_version

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

* Fix typo and imports

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

* Fix missing imports

and fix typo, reduce redundancies.

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

* PEP8

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

* Add 5.12.11 to known version

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2021-06-12 10:46:45 +09:00
Hiroshi Miura
8cca49bb8b Fix changes for test hook 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2021-05-22 17:33:06 +09:00
Hiroshi Miura
43cb99bc9c Refactoring network code 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2021-05-22 17:26:16 +09:00
Hiroshi Miura
7debc508f4 Check blacklist when downloading Update.xml 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2021-05-22 16:42:42 +09:00
Hiroshi Miura
57cec9e2e0 Integrate cuteci installer into aqtinstall (#239) 
* Add cuteci intaller

* Check qtaccount.ini existence

* Fix subprocess call

* sub command show elapsed time

* test: cli: update help message exception

* Update URL base handling

* old version installer accept environment variable

- qtaccount: QTLOGIN and QTPASSWORD variable

* Change cuteci sub command to 'offline_installer'

* Update qscript to deselect QtCreator from installation

* Reuse downloaded installer file

* Update test and fix MANIFEST

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2021-05-20 14:43:02 +09:00
Hiroshi Miura
2bb8d68d6c PEP8 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2021-05-11 16:20:08 +09:00
Hiroshi Miura
c313b13c2a Check sha1 checksum of archive if possible 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2021-05-11 16:03:49 +09:00
Hiroshi Miura
d841741641 Reformat by black 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2021-04-02 12:20:10 +09:00
Hiroshi Miura
30bbff97c0 Catch both ReadTimeout and ConnectionTimeout and redirect to mirror 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2021-02-13 12:52:33 +09:00
Hiroshi Miura
c4b488bd22 Catch timeout connection then fallback 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2021-02-13 11:29:57 +09:00
Hiroshi Miura
d48ad94854 Suppress debug log of XML file 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2021-02-04 21:50:02 +09:00
Hiroshi Miura
c2750e34f1 Update documents and copyrights 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2021-01-30 00:28:44 +09:00
Hiroshi Miura
eddd4d5685 Fix installing android packages 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2021-01-27 15:16:20 +09:00
Hiroshi Miura
009e5e4069 Fix for taking substring 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2021-01-27 14:52:30 +09:00
Hiroshi Miura
fcccdd09da Update list command to work for Qt6 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2021-01-26 22:35:40 +09:00
Hiroshi Miura
01ed433429 Fix timeout option for SrcDocExample 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2021-01-21 21:32:28 +09:00
Hiroshi Miura
a43a26b7c6 Introduce timeout option 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2021-01-21 21:06:44 +09:00
Hiroshi Miura
4450242e2c Set timeout for requests connections 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2021-01-21 20:54:39 +09:00
Hiroshi Miura
7fd019e83b Fix for checks and tests 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2021-01-21 10:09:44 +09:00
Hiroshi Miura
c6f95a7d58 Select fallbacks from known list 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2021-01-21 10:04:14 +09:00
Hiroshi Miura
88b6cc6c81 Support --fallback mirror option 2021-01-21 08:21:19 +09:00
Hiroshi Miura
d21a098a96 Tools: Check name for archive seletion 
Related: #187 @stemoretti proposed
 2020-12-12 10:33:54 +09:00
Hiroshi Miura
37226ceda6 Tool: Compare version string by startswith 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2020-12-11 16:03:55 +09:00
Gamso
e99cb752eb fix syntax 2020-11-24 20:05:44 +01:00
Gamso
ef12e34f85 Add filter on doc and example packages when option "all_extra" is enabled. 
Add test.
 2020-11-24 19:48:03 +01:00
Hiroshi Miura
51fe856d1c Refactor: drop settings.py 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2020-11-22 15:25:22 +09:00
Hiroshi Miura
59a07f02e7 PEP8 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2020-09-16 11:05:10 +09:00
Hiroshi Miura
943f2dcf05 Add list command 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2020-09-16 09:58:16 +09:00
Gamso
91b78c24f2 Add check on packages name to download (#159) 
* Add check on packages name to download only packages for platforms specified.

* More stronger check with using platforms from combinations.json.

* Add test

Co-authored-by: Gamso <gamso@live.fr>
 2020-09-11 14:41:53 +09:00
Hiroshi Miura
d807f80b67 Fix to if .. is not None 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2020-08-18 18:08:57 +09:00
Hiroshi Miura
6032d67965 Check whether download archives is None 2020-08-18 17:34:58 +09:00
Hiroshi Miura
b5a84acfad Can use qt6_ as an archive base name 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2020-06-19 00:55:19 +09:00
Hiroshi Miura
5cf0fa2ae0 Do not raise exception for unknown option combinations 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2020-06-13 19:42:07 +09:00
Hiroshi Miura
cab78ff8fb Refactoring 
- Refactoring archives classes to use inhert functions
- define installer.finalize() and call it explicit from cli.py

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2020-05-31 14:24:53 +09:00
Hiroshi Miura
358819e6b4 Add subcommand to intall doc/src/examples 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2020-05-31 12:56:32 +09:00
Hiroshi Miura
72c4589e7d Patch qmake as finalize process (#130) 
* Patch qmake hard coded path with installed prefix(#100)
* AP: Update tests
 - Test android target with 5.14.x
 - Test ios target on mac
* Does not patch mac framework when android, ios and wasm
* Update changelog
* GHA: Update to run qmake to check patch
  - Check qmake works well if patched.

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2020-05-21 21:56:04 +09:00
Hiroshi Miura
fcb5b45631 CLI: Add --archives option 
when specify '--archive qtbase qttools' then
aqt installs these subset of installation.

There is no gurantee it works, and it is an advanced
option.

Implemented #126

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2020-05-19 12:14:25 +09:00
Hiroshi Miura
32d4cb7e6e Tool: fix download url construction with full_version 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2020-05-03 15:39:30 +09:00
Hiroshi Miura
10aa3c230b Fix Tools intallation 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2020-05-02 12:38:30 +09:00
Hiroshi Miura
6bf28e5afb Update Error Handling 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2020-05-02 12:19:40 +09:00
Hiroshi Miura
048d129768 Fix handling of QtArchive variables 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2020-05-02 12:19:40 +09:00
Hiroshi Miura
a097878bc0 test: Add unit test for archives.py 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2020-05-02 08:40:41 +09:00
Hiroshi Miura
f662ed11d0 Add debug message when failing parse package information 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2020-05-02 07:55:37 +09:00
Hiroshi Miura
79b5a297b5 Check version number and improve error messages (#102) 
* Check Qt versions and report 404 error

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2020-03-01 11:35:39 +09:00
Hiroshi Miura
996537a0bd Fix #81: support extra modules in Qt5.9 
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2020-01-13 23:32:40 +09:00
Hiroshi Miura
7148599017 Default to use internal extraction (#80) 
* Default to use py7zr
* Bamp up required py7zr >=0.5b5
* Drop --internal cli option

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
 2020-01-11 00:51:25 +09:00