Merge remote-tracking branch 'origin/master'

miurahr · Nov 23, 2019 · 1fe4f1e · 1fe4f1e
2 parents 71675ea + ec2a4a7
commit 1fe4f1e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/aqt/cli.py b/aqt/cli.py
@@ -111,8 +111,7 @@ def run_install(self, args):
         sevenzip = self._set_sevenzip(args)
         mirror = self._check_mirror(args)
         if not self._check_qt_arg_combination(qt_version, os_name, target, arch):
-            self.logger.error("Specified target combination is not valid: {} {} {}".format(os_name, target, arch))
-            exit(1)
+            self.logger.warning("Specified target combination is not valid: {} {} {}".format(os_name, target, arch))
         QtInstaller(QtArchives(os_name, target, qt_version, arch, modules=modules, mirror=mirror, logging=self.logger),
                     logging=self.logger).install(command=sevenzip, target_dir=output_dir)
         sys.stdout.write("\033[K")
@@ -127,10 +126,11 @@ def run_tool(self, args):
         version = args.version
         mirror = self._check_mirror(args)
         if not self._check_tools_arg_combination(os_name, tool_name, arch):
-            self.logger.error("Specified target combination is not valid: {} {} {}".format(os_name, tool_name, arch))
-            exit(1)
+            self.logger.warning("Specified target combination is not valid: {} {} {}".format(os_name, tool_name, arch))
         QtInstaller(ToolArchives(os_name, tool_name, version, arch, mirror=mirror, logging=self.logger),
                     logging=self.logger).install(command=sevenzip, target_dir=output_dir)
+    sys.stdout.write("\033[K")
+    print("Finished installation")
 
     def run_list(self, args):
         print('List Qt packages for %s' % args.qt_version)

diff --git a/requirements.txt b/requirements.txt
@@ -2,7 +2,6 @@ six
 requests
 pytest
 pytest-pep8
-pytest-cov
 flake8
 wheel
 twine