Dependencies upgrade (#246)

Signed-off-by: tdruez <tdruez@nexb.com>

Author: tdruez

component_catalog/admin.py

@@ -574,7 +574,7 @@ def changeform_view(self, request, object_id=None, form_url="", extra_context=No
             return super().changeform_view(request, object_id, form_url, extra_context)
         except FormDataOutdated:
             messages.error(
-                request, "Form data outdated or inconsistent. " "The form data has been refreshed."
+                request, "Form data outdated or inconsistent. The form data has been refreshed."
             )
             return redirect(request.path)
 
@@ -1019,7 +1019,7 @@ def collect_data_action(self, request, queryset):
             if update_fields:
                 package.last_modified_by = request.user
                 package.save()
-                message = f'Data collected for: {", ".join(update_fields)}.'
+                message = f"Data collected for: {', '.join(update_fields)}."
                 History.log_change(request.user, package, message, serialized_data)
                 update_count += 1
 

component_catalog/management/commands/setpurls.py

@@ -88,8 +88,7 @@ def handle(self, *args, **options):
                 )
             except Exception:
                 self.stderr.write(
-                    f"Error encountered when processing Package:"
-                    f" {str(package)} ({package.uuid})"
+                    f"Error encountered when processing Package: {str(package)} ({package.uuid})"
                 )
                 self.stderr.write(traceback.format_exc())
                 error_count += 1
@@ -108,4 +107,4 @@ def handle(self, *args, **options):
         self.stdout.write(self.style.SUCCESS(msg))
         self.stdout.write("Pre-update: " + pre_update_summary)
         self.stdout.write("Post-update: " + self.get_purl_summary(packages))
-        self.stdout.write(f"Number of errors encountered when updating Packages: " f"{error_count}")
+        self.stdout.write(f"Number of errors encountered when updating Packages: {error_count}")

component_catalog/models.py

@@ -2054,7 +2054,7 @@ def collect_data(self, force_update=False, save=True):
 
         if save:
             self.save(update_fields=update_fields)
-            tasks_logger.info(f'Package field(s) updated: {", ".join(update_fields)}')
+            tasks_logger.info(f"Package field(s) updated: {', '.join(update_fields)}")
 
         return update_fields
 

component_catalog/tests/test_admin.py

@@ -1471,7 +1471,7 @@ def test_subcomponent_admin_license_expression_validation(self):
         response = self.client.post(url, data)
         expected = {
             "license_expression": [
-                "Unknown license key(s): license2<br>" "Available licenses: license1"
+                "Unknown license key(s): license2<br>Available licenses: license1"
             ]
         }
         self.assertEqual(expected, response.context_data["adminform"].form.errors)
@@ -2485,7 +2485,7 @@ def test_package_changeform_save_and_collect_data_on_addition(self, mock_get):
 
         response = self.client.post(add_url, data, follow=True)
         expected = (
-            f'The SHA1, MD5, and Size fields collection from {data["download_url"]} is in progress.'
+            f"The SHA1, MD5, and Size fields collection from {data['download_url']} is in progress."
         )
         self.assertEqual(expected, list(response.context["messages"])[0].message)
 

component_catalog/tests/test_api.py

@@ -273,7 +273,7 @@ def test_api_component_list_endpoint_uuid_filter(self):
         expected = {
             "uuid": [
                 ErrorDetail(
-                    string="Select a valid choice. invalid is not one of " "the available choices.",
+                    string="Select a valid choice. invalid is not one of the available choices.",
                     code="invalid_choice",
                 )
             ]

component_catalog/tests/test_command.py

@@ -112,9 +112,7 @@ def test_collectcpes_management_command(self):
         with self.assertRaises(CommandError) as error:
             management.call_command("collectcpes", stdout=output)
 
-        expected = (
-            "Error: the following arguments are required: dataspace, " "cpe_dictionary_location"
-        )
+        expected = "Error: the following arguments are required: dataspace, cpe_dictionary_location"
         self.assertEqual(expected, str(error.exception))
 
     def test_componentfrompackage_management_command(self):

component_catalog/tests/test_importers.py

@@ -795,7 +795,7 @@ def test_component_import_clean_primary_language(self):
         self.assertTrue(importer.formset.is_valid())
         expected = {
             "primary_language": [
-                '"What" is not in standard languages list.' "\nSuggestion(s): WebDNA, Whitespace."
+                '"What" is not in standard languages list.\nSuggestion(s): WebDNA, Whitespace.'
             ]
         }
         self.assertEqual(expected, importer.formset.forms[0].warnings)

component_catalog/tests/test_models.py

@@ -1897,7 +1897,7 @@ def test_package_model_set_package_url(self):
         self.assertEqual("", package.subpath)
         package.save()
 
-        package_url = f'pkg:maven/mysql/mysql-connector-java@%40MYSQL_CJ_.{"version"*100}'
+        package_url = f"pkg:maven/mysql/mysql-connector-java@%40MYSQL_CJ_.{'version' * 100}"
         with self.assertRaises(ValidationError) as e:
             package.set_package_url(package_url)
         self.assertEqual('Value too long for field "version".', e.exception.message)

component_catalog/tests/test_views.py

@@ -1723,7 +1723,7 @@ def test_package_create_ajax_view(self):
         response = self.client.get("/packages/")
         messages = list(response.context["messages"])
         msg = (
-            f'{collected_data["download_url"]} already exists in your Dataspace as '
+            f"{collected_data['download_url']} already exists in your Dataspace as "
             f'<a href="{new_package.get_absolute_url()}">{new_package}</a>'
         )
         self.assertEqual(str(messages[0]), msg)

component_catalog/views.py

@@ -810,7 +810,7 @@ def dispatch(self, request, *args, **kwargs):
                 if obj.dataspace != request.user.dataspace:
                     messages.error(
                         request,
-                        ("The dataspace of the selected objects did " "not match your dataspace."),
+                        ("The dataspace of the selected objects did not match your dataspace."),
                     )
                     return redirect(self.success_url)
         return super().dispatch(request, *args, **kwargs)
@@ -1392,7 +1392,7 @@ def post_scan_to_package(self, form_class):
         if form.is_valid():
             if form.changed_data:
                 form.save()
-                msg = f'Values for {", ".join(form.changed_data)} assigned to the package.'
+                msg = f"Values for {', '.join(form.changed_data)} assigned to the package."
                 messages.success(request, msg)
             else:
                 messages.warning(request, "No new values to assign.")
@@ -1711,7 +1711,7 @@ def send_scan_notification(request, key):
         updated_fields = scancodeio.update_from_scan(package, user)
         if updated_fields:
             description = (
-                f'Automatically updated {", ".join(updated_fields)} from scan results\n'
+                f"Automatically updated {', '.join(updated_fields)} from scan results\n"
                 + description
             )
 
@@ -2286,7 +2286,7 @@ def scan_summary_fields(self, scan_summary):
                     (
                         f'<input type="{input_type}" name="{model_field_name}"'
                         f' value="{escape(entry.get("value"))}">'
-                        f' {escape(entry.get("value"))}'
+                        f" {escape(entry.get('value'))}"
                         f' <span class="badge text-bg-secondary rounded-pill">{entry.get("count")}'
                         f"</span>"
                     )