Print aqt version at first line (#104)

* Use importlib_metadata instead of pkg_resources

Signed-off-by: Hiroshi Miura <miurahr@linux.com>
This commit is contained in:
Hiroshi Miura
2020-03-04 16:42:18 +09:00
committed by GitHub
parent 79b5a297b5
commit 8e7b720838
4 changed files with 17 additions and 6 deletions

View File

@@ -25,6 +25,7 @@ import logging
import logging.config
import os
import subprocess
import sys
import time
from packaging.version import Version, parse
@@ -33,6 +34,11 @@ from aqt.archives import QtArchives, ToolArchives
from aqt.installer import QtInstaller
from aqt.settings import Settings
try:
from importlib import metadata as importlib_metadata # noqa
except ImportError:
import importlib_metadata
class Cli():
"""CLI main class to parse command line argument and launch proper functions."""
@@ -118,6 +124,7 @@ class Cli():
modules = args.modules
sevenzip = self._set_sevenzip(args)
mirror = args.base
self.show_aqt_version()
if not self._check_mirror(mirror):
self.parser.print_help()
exit(1)
@@ -143,6 +150,7 @@ class Cli():
sevenzip = self._set_sevenzip(args)
version = args.version
mirror = args.base
self.show_aqt_version()
self._check_mirror(mirror)
if not self._check_tools_arg_combination(os_name, tool_name, arch):
self.logger.warning("Specified target combination is not valid: {} {} {}".format(os_name, tool_name, arch))
@@ -151,11 +159,18 @@ class Cli():
self.logger.info("Time elasped: {time:.8f} second".format(time=time.perf_counter() - start_time))
def run_list(self, args):
self.show_aqt_version()
print('List Qt packages for %s' % args.qt_version)
def show_help(self, args):
self.parser.print_help()
def show_aqt_version(self):
dist = importlib_metadata.distribution('aqtinstall')
module_name = dist.entry_points[0].name
python_version = sys.version
print("aqtinstall({}) {} on Python {}".format(module_name, dist.version, python_version))
def _create_parser(self):
parser = argparse.ArgumentParser(prog='aqt', description='Installer for Qt SDK.',
formatter_class=argparse.RawTextHelpFormatter, add_help=True)