Commit Graph

121 Commits

Author SHA1 Message Date
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
49fc8ec6b1 Version subcommand
- Set aqt version by version.py generation
- Drop importlib and pkg_resources chunks of code

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-06-11 08:34:43 +09:00
Hiroshi Miura
b066a8654c Drop feature to install old versions
The feature is infeasible to maintain, so drop the feature from release.

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-05-24 11:27:34 +09:00
Hiroshi Miura
741eb4989e PEP8/Black
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-05-24 08:27:07 +09:00
Hiroshi Miura
fb088cac05 settings.ini: fix -c option handling
when argparse.FileType("r") used, variable passed is a open-ed file.

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-05-23 15:16:38 +09:00
Hiroshi Miura
827d8d53e1 Introduce -c / --config command line option
option to specify settings.ini

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-05-23 14:35:05 +09:00
Hiroshi Miura
4c0638250c Move constants into settings.ini configuration
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-05-23 13:00:31 +09:00
Hiroshi Miura
ca72e070c7 test: Early load custom configuration
hack for borg class

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-05-23 12:12:04 +09:00
Hiroshi Miura
dd74254ea0 Check config file existence and handle parsing error
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-05-23 11:30:30 +09:00
Hiroshi Miura
6b12ce9e9d Merge pull request #244 from miurahr/patch-add-blacklist
Refactoring network code
2021-05-22 21:25:52 +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
53c71ff664 refactor Cli class (#243)
* refactor Cli class

- check version combination
- remove dead code

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

* fix typo in json

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

* Update version combinations

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-05-22 14:25:17 +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
David Dalcino
451bbb46ef Add RawTextHelpFormatter to install_parser
The `aqt install -h` command prints the help text for the `arch`
argument all together on one line. I noticed that the help text
is formatted very carefully in code, with lots of meaningful
whitespace, but on my computer, all that whitespace is being ignored.

With `formatter_class=argparse.RawTextHelpFormatter` added to
the `subparsers.add_parser()` function call, all of the whitespace
in the help text is preserved.

It looks like `formatter_class=argparse.RawTextHelpFormatter`
already exists in the call that creates the root parser, but it
appears that this property does not extend to all subparsers
automatically.
2021-05-10 15:33:33 -07:00
Hiroshi Miura
10dcbf6c5e Fix doc argument parse(#234)
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-05-02 11:48:15 +09:00
Hiroshi Miura
e5a062a150 Allow non-existence of py7zr dependency
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-04-08 11:35:37 +09:00
Hiroshi Miura
a697aeb88a PEP8
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-04-04 01:29:24 +09:00
Hiroshi Miura
33a5968d82 Merge branch 'master' into topic-keep-archive 2021-04-02 16:55:06 +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
249108384a Drop importing inspect
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-03-31 22:48:09 +09:00
Hiroshi Miura
b20e9dcc44 Add --keep option to keep downloaded archives
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-03-15 14:41:55 +09:00
Hiroshi Miura
575613cec4 fix cli version error
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-02-25 20:58:18 +09:00
Hiroshi Miura
7ad2038711 Fix getting module version
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-02-25 20:49:53 +09:00
Hiroshi Miura
740ebbb741 Fix getting module_name
fixed #221

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-02-25 20:41:12 +09:00
Hiroshi Miura
9e8da5c87e Fix resource leak
- Close multiprocessing.pool to release resource

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-02-20 09:47:51 +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
060a1125f3 Handle Qt6/non-desktop installation patching (#210)
* Do not check qmake for android

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

* Refactoring patching

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

* CI: test android_armv7 in 6.0.1

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

* Patching qt6 android qmake script

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

* Patching qt6 android qmake script(wip)

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

* CI: test android/qt6 on github actions

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

* Add combination for Qt6 and update README

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

* CI: Azure: Fix test cases

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

* CI: Azure: Fix Qt6 test case

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

* CI: Fix windows case

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

* CI: Fix windows case

Add debug print

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

* Fix prefix path for patching

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

* Improvve log messages for patching

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

* CI: Check android installation

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

* CI: Check android installation

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

* CI: Check android installation

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

* Updater: update logging message

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

* Updater: Fix qmake detection on windows

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

* CI: run qmake.bat on windows

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

* CI: run Qt6 qmake.bat on windows

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

* CI: run Qt6 qmake.bat on windows

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

* CI: Azure: fix mirror test

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

* CI: Azure: test Qt6 with Ubuntu 20.04

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-02-11 10:05:13 +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
c73ea45a28 Change no patching condition
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-01-30 17:49:43 +09:00
Hiroshi Miura
69586a94f9 Change no patching condition
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-01-30 17:42:10 +09:00
Hiroshi Miura
ba71ecf888 Support Adding modules to existing install
- Implement #174
- Introduce --noarchives option

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-01-30 17:11:53 +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
c8bb556e0a Merge pull request #201 from miurahr/topic-filepatch-pkgconfig
Improve patching
2021-01-28 23:37:11 +09:00
Hiroshi Miura
e502b259e2 Fix crash when no arch specified on windows
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-01-28 08:14:07 +09:00
Hiroshi Miura
655e6e2b66 Improve patching
- Patch pkgconfig configurations
- Patch libQt5Core and libQt6Core for linux
- Catch exception on qmake -query execution

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-01-27 14:46:06 +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
a43a26b7c6 Introduce timeout option
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-01-21 21:06:44 +09:00
Hiroshi Miura
3582152996 Merge pull request #196 from miurahr/topic-fallback
Select fallback mirror site when main site connection failed
2021-01-21 12:11:29 +09:00
Hiroshi Miura
5d71cf4a38 Fix tools installation to use fallback url
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2021-01-21 11:15:51 +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
Vadim Peretokin
864481aa0d Fix up grammar 2020-12-14 08:34:22 +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
df8c4a17ae Support partial source installation
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2020-11-22 09:52:58 +09:00
Hiroshi Miura
d8b0ae647c Refactoring
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2020-11-21 22:35:37 +09:00
Hiroshi Miura
8bb70f6f37 Refactoring modules
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2020-11-21 21:17:24 +09:00
Hiroshi Miura
780d9f2ede PEP8
Signed-off-by: Hiroshi Miura <miurahr@linux.com>
2020-11-21 18:13:50 +09:00