build: update build dependencies, fix minor lint and test issues, update qpc version to 1.8.2

Makefile

@@ -45,7 +45,7 @@ install:
 lint: lint-ruff lint-docs
 
 lint-ruff:
-	poetry run ruff .
+	poetry run ruff check .
 	poetry run ruff format --check .
 
 lint-docs:

docs/_build/qpc.1

@@ -27,7 +27,7 @@ level margin: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .\" new: \\n[rst2man-indent\\n[rst2man-indent-level]]
 .in \\n[rst2man-indent\\n[rst2man-indent-level]]u
 ..
-.TH "qpc" "1" "May 06, 2024" "" "qpc"
+.TH "qpc" "1" "July 15, 2024" "" "qpc"
 .SH NAME
 .sp
 qpc \- Inspect and report on product entitlement metadata from various sources, including networks and systems management solutions.

pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "qpc"
-version = "1.8.1"
+version = "1.8.2"
 license = {file = "LICENSE"}
 requires-python = ">=3.11,<3.13"
 dynamic = ["scripts"]
 
 [tool.poetry]
 name = "qpc"
-version = "1.8.1"
+version = "1.8.2"
 description = ""
 classifiers=[
     "License :: OSI Approved :: GNU General Public License v3 (GPLv3)",

qpc.spec

@@ -3,7 +3,7 @@
 Name:           qpc
 Summary:        command-line client interface for quipucords
 
-Version:        1.8.1
+Version:        1.8.2
 Release:        1%{?dist}
 Epoch:          0
 
@@ -49,6 +49,10 @@ sed \
 %{python3_sitelib}/qpc-*.egg-info/
 
 %changelog
+* Mon Jul 15 2024 Brad Smith <[email protected]> - 0:1.8.2-1
+- Better output and exit code from incomplete commands.
+- Minor performance updates and cleanup.
+
 * Tue Jun 11 2024 Bruno Ciconelle <[email protected]> - 0:1.8.1-1
 - Add support for aggregate report (Brad Smith)
 - Upgrade python version to 3.12

qpc/insights/login.py

@@ -48,4 +48,4 @@ def _do_command(self):
             write_insights_auth_token(auth_token)
         except InsightsAuthError as err:
             logger.error(_(err.message))
-            SystemExit(1)
+            raise SystemExit(1)

qpc/insights/publish.py

@@ -240,4 +240,4 @@ def _do_command(self):
             self._publish_to_ingress()
         except QPCError as err:
             logger.error(_(err.message))
-            SystemExit(1)
+            raise SystemExit(1)

qpc/scan/add.py

@@ -118,13 +118,13 @@ def _build_data(self):
             False,
         )
         if disabled_optional_products is not None:
-            self.req_payload["options"][
-                "disabled_optional_products"
-            ] = disabled_optional_products
+            self.req_payload["options"]["disabled_optional_products"] = (
+                disabled_optional_products
+            )
         if enabled_ext_product_search is not None:
-            self.req_payload["options"][
-                "enabled_extended_product_search"
-            ] = enabled_ext_product_search
+            self.req_payload["options"]["enabled_extended_product_search"] = (
+                enabled_ext_product_search
+            )
 
     def _handle_response_success(self):
         json_data = self.response.json()

qpc/tests/cred/conftest.py

@@ -4,8 +4,7 @@
 
 
 @pytest.fixture(autouse=True)
-def _setup_server_config_file(server_config):
-    ...
+def _setup_server_config_file(server_config): ...
 
 
 @pytest.fixture

qpc/tests/insights/test_insights_login.py

@@ -56,14 +56,14 @@ def test_insights_login_normal_behavior(self, faker, mocker, capsys):
         assert "Waiting for login authorization ..." in stdout_lines[3]
         assert "Login authorization successful." in stdout_lines[4]
 
-    def test_insights_login_auth_error(self, faker, mocker, capsys):
+    def test_insights_login_auth_error(self, mocker, capsys):
         """Testing that insights login catches auth errors."""
         err_message = messages.INSIGHTS_LOGIN_REQUEST_FAILED % "Network Error"
         mocker.patch.object(
             InsightsAuth, "request_auth", side_effect=InsightsAuthError(err_message)
         )
         test_argv = ["/bin/qpc", "insights", "login"]
-        with mock.patch.object(sys, "argv", test_argv):
+        with mock.patch.object(sys, "argv", test_argv), pytest.raises(SystemExit):
             CLI().main()
         out, err = capsys.readouterr()
         assert err_message in err

qpc/tests/insights/test_insights_publish.py

@@ -127,8 +127,9 @@ def test_insights_publish_args_are_mutually_exclusive(self, mocker):
             "--report",
             "1",
         ]
-        with pytest.raises(SystemExit) as exc_info, mock.patch.object(
-            sys, "argv", test_argv
+        with (
+            pytest.raises(SystemExit) as exc_info,
+            mock.patch.object(sys, "argv", test_argv),
         ):
             CLI().main()
         # argparse will always exit with value 2