Skip to content

Commit ed25634

Browse files
tdrueztdruez
authored
Dependencies upgrade (#246)
Signed-off-by: tdruez <[email protected]>
1 parent b446d3e commit ed25634

File tree

290 files changed

+1946
-2132
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

290 files changed

+1946
-2132
lines changed

‎component_catalog/admin.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -574,7 +574,7 @@ def changeform_view(self, request, object_id=None, form_url="", extra_context=No
574574
return super().changeform_view(request, object_id, form_url, extra_context)
575575
except FormDataOutdated:
576576
messages.error(
577-
request, "Form data outdated or inconsistent. " "The form data has been refreshed."
577+
request, "Form data outdated or inconsistent. The form data has been refreshed."
578578
)
579579
return redirect(request.path)
580580

@@ -1019,7 +1019,7 @@ def collect_data_action(self, request, queryset):
10191019
if update_fields:
10201020
package.last_modified_by = request.user
10211021
package.save()
1022-
message = f'Data collected for: {", ".join(update_fields)}.'
1022+
message = f"Data collected for: {', '.join(update_fields)}."
10231023
History.log_change(request.user, package, message, serialized_data)
10241024
update_count += 1
10251025

‎component_catalog/management/commands/setpurls.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,7 @@ def handle(self, *args, **options):
8888
)
8989
except Exception:
9090
self.stderr.write(
91-
f"Error encountered when processing Package:"
92-
f" {str(package)} ({package.uuid})"
91+
f"Error encountered when processing Package: {str(package)} ({package.uuid})"
9392
)
9493
self.stderr.write(traceback.format_exc())
9594
error_count += 1
@@ -108,4 +107,4 @@ def handle(self, *args, **options):
108107
self.stdout.write(self.style.SUCCESS(msg))
109108
self.stdout.write("Pre-update: " + pre_update_summary)
110109
self.stdout.write("Post-update: " + self.get_purl_summary(packages))
111-
self.stdout.write(f"Number of errors encountered when updating Packages: " f"{error_count}")
110+
self.stdout.write(f"Number of errors encountered when updating Packages: {error_count}")

‎component_catalog/models.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -2054,7 +2054,7 @@ def collect_data(self, force_update=False, save=True):
20542054

20552055
if save:
20562056
self.save(update_fields=update_fields)
2057-
tasks_logger.info(f'Package field(s) updated: {", ".join(update_fields)}')
2057+
tasks_logger.info(f"Package field(s) updated: {', '.join(update_fields)}")
20582058

20592059
return update_fields
20602060

‎component_catalog/tests/test_admin.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -1471,7 +1471,7 @@ def test_subcomponent_admin_license_expression_validation(self):
14711471
response = self.client.post(url, data)
14721472
expected = {
14731473
"license_expression": [
1474-
"Unknown license key(s): license2<br>" "Available licenses: license1"
1474+
"Unknown license key(s): license2<br>Available licenses: license1"
14751475
]
14761476
}
14771477
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):
24852485

24862486
response = self.client.post(add_url, data, follow=True)
24872487
expected = (
2488-
f'The SHA1, MD5, and Size fields collection from {data["download_url"]} is in progress.'
2488+
f"The SHA1, MD5, and Size fields collection from {data['download_url']} is in progress."
24892489
)
24902490
self.assertEqual(expected, list(response.context["messages"])[0].message)
24912491

‎component_catalog/tests/test_api.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -273,7 +273,7 @@ def test_api_component_list_endpoint_uuid_filter(self):
273273
expected = {
274274
"uuid": [
275275
ErrorDetail(
276-
string="Select a valid choice. invalid is not one of " "the available choices.",
276+
string="Select a valid choice. invalid is not one of the available choices.",
277277
code="invalid_choice",
278278
)
279279
]

‎component_catalog/tests/test_command.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -112,9 +112,7 @@ def test_collectcpes_management_command(self):
112112
with self.assertRaises(CommandError) as error:
113113
management.call_command("collectcpes", stdout=output)
114114

115-
expected = (
116-
"Error: the following arguments are required: dataspace, " "cpe_dictionary_location"
117-
)
115+
expected = "Error: the following arguments are required: dataspace, cpe_dictionary_location"
118116
self.assertEqual(expected, str(error.exception))
119117

120118
def test_componentfrompackage_management_command(self):

‎component_catalog/tests/test_importers.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -795,7 +795,7 @@ def test_component_import_clean_primary_language(self):
795795
self.assertTrue(importer.formset.is_valid())
796796
expected = {
797797
"primary_language": [
798-
'"What" is not in standard languages list.' "\nSuggestion(s): WebDNA, Whitespace."
798+
'"What" is not in standard languages list.\nSuggestion(s): WebDNA, Whitespace.'
799799
]
800800
}
801801
self.assertEqual(expected, importer.formset.forms[0].warnings)

‎component_catalog/tests/test_models.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1897,7 +1897,7 @@ def test_package_model_set_package_url(self):
18971897
self.assertEqual("", package.subpath)
18981898
package.save()
18991899

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

‎component_catalog/tests/test_views.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1723,7 +1723,7 @@ def test_package_create_ajax_view(self):
17231723
response = self.client.get("/packages/")
17241724
messages = list(response.context["messages"])
17251725
msg = (
1726-
f'{collected_data["download_url"]} already exists in your Dataspace as '
1726+
f"{collected_data['download_url']} already exists in your Dataspace as "
17271727
f'<a href="{new_package.get_absolute_url()}">{new_package}</a>'
17281728
)
17291729
self.assertEqual(str(messages[0]), msg)

‎component_catalog/views.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -810,7 +810,7 @@ def dispatch(self, request, *args, **kwargs):
810810
if obj.dataspace != request.user.dataspace:
811811
messages.error(
812812
request,
813-
("The dataspace of the selected objects did " "not match your dataspace."),
813+
("The dataspace of the selected objects did not match your dataspace."),
814814
)
815815
return redirect(self.success_url)
816816
return super().dispatch(request, *args, **kwargs)
@@ -1392,7 +1392,7 @@ def post_scan_to_package(self, form_class):
13921392
if form.is_valid():
13931393
if form.changed_data:
13941394
form.save()
1395-
msg = f'Values for {", ".join(form.changed_data)} assigned to the package.'
1395+
msg = f"Values for {', '.join(form.changed_data)} assigned to the package."
13961396
messages.success(request, msg)
13971397
else:
13981398
messages.warning(request, "No new values to assign.")
@@ -1711,7 +1711,7 @@ def send_scan_notification(request, key):
17111711
updated_fields = scancodeio.update_from_scan(package, user)
17121712
if updated_fields:
17131713
description = (
1714-
f'Automatically updated {", ".join(updated_fields)} from scan results\n'
1714+
f"Automatically updated {', '.join(updated_fields)} from scan results\n"
17151715
+ description
17161716
)
17171717

@@ -2286,7 +2286,7 @@ def scan_summary_fields(self, scan_summary):
22862286
(
22872287
f'<input type="{input_type}" name="{model_field_name}"'
22882288
f' value="{escape(entry.get("value"))}">'
2289-
f' {escape(entry.get("value"))}'
2289+
f" {escape(entry.get('value'))}"
22902290
f' <span class="badge text-bg-secondary rounded-pill">{entry.get("count")}'
22912291
f"</span>"
22922292
)

‎dejacode_toolkit/__init__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ def __init__(self, dataspace):
7171
self.basic_auth_user = get_settings(f"{self.settings_prefix}_USER")
7272
self.basic_auth_password = get_settings(f"{self.settings_prefix}_PASSWORD")
7373

74-
self.api_url = f'{self.service_url.rstrip("/")}/api/'
74+
self.api_url = f"{self.service_url.rstrip('/')}/api/"
7575

7676
def get_session(self):
7777
session = requests.Session()

‎dejacode_toolkit/scancodeio.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ def update_from_scan(self, package, user):
223223
override_unknown=True,
224224
)
225225
if updated_fields:
226-
msg = f'Automatically updated {", ".join(updated_fields)} from scan results'
226+
msg = f"Automatically updated {', '.join(updated_fields)} from scan results"
227227
logger.debug(f"{self.label}: {msg}")
228228
History.log_change(user, package, message=msg)
229229

‎dje/admin.py

+1-3
Original file line numberDiff line numberDiff line change
@@ -1426,9 +1426,7 @@ def get_form(self, request, obj=None, **kwargs):
14261426

14271427
permission_details_url = reverse("admin:auth_group_permission_details")
14281428
label_template = (
1429-
'{} <a href="{}" target="_blank" class="group-details-link">'
1430-
" (permission details)"
1431-
"</a>"
1429+
'{} <a href="{}" target="_blank" class="group-details-link"> (permission details)</a>'
14321430
)
14331431
groups_field.label = format_html(label_template, groups_field.label, permission_details_url)
14341432

‎dje/importers.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -613,7 +613,7 @@ def save_form(self, form):
613613
)
614614
if updated_fields:
615615
self.results["modified"].append(instance)
616-
msg = f'Updated {", ".join(updated_fields)} from import'
616+
msg = f"Updated {', '.join(updated_fields)} from import"
617617
History.log_change(self.user, instance, message=msg)
618618
return
619619

‎dje/management/commands/checkdata.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ def handle(self, *args, **options):
5252
special_tags = ["reporting"], ["expression"]
5353
if options["all_dataspaces"] and tags not in special_tags:
5454
raise CommandError(
55-
"--all-dataspaces only usable with `--tag reporting` or " "`--tag expression`"
55+
"--all-dataspaces only usable with `--tag reporting` or `--tag expression`"
5656
)
5757

5858
app_configs = {}

‎dje/management/commands/checkmigrations.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def add_arguments(self, parser):
3838
parser.add_argument(
3939
"--database",
4040
default=DEFAULT_DB_ALIAS,
41-
help='Nominates a database to synchronize. Defaults to the "default" ' "database.",
41+
help='Nominates a database to synchronize. Defaults to the "default" database.',
4242
)
4343

4444
def handle(self, *args, **options):

‎dje/management/commands/dumpdataset.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ def handle_field(self, obj, field):
5555

5656

5757
class Command(BaseCommand):
58-
help = "Output the contents of the all DejaCode data for the " "given Dataspace as a fixture."
58+
help = "Output the contents of the all DejaCode data for the given Dataspace as a fixture."
5959

6060
def add_arguments(self, parser):
6161
parser.add_argument("dataspace_name", help="Name of the Dataspace.")

‎dje/mass_update.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ def mass_update_action(modeladmin, request, queryset):
220220
messages.info(request, _(f"Updated {updated} records"))
221221

222222
if errors:
223-
messages.error(request, _(f'{len(errors)} error(s): {", ".join(errors)}'))
223+
messages.error(request, _(f"{len(errors)} error(s): {', '.join(errors)}"))
224224

225225
action_end.send(
226226
sender=modeladmin.model,

‎dje/models.py

+4-5
Original file line numberDiff line numberDiff line change
@@ -1460,7 +1460,7 @@ class ColoredIconMixin(models.Model):
14601460
blank=True,
14611461
max_length=7,
14621462
help_text=_(
1463-
"You can specify a valid HTML color code (e.g. #FFFFFF) to apply " "to your icon."
1463+
"You can specify a valid HTML color code (e.g. #FFFFFF) to apply to your icon."
14641464
),
14651465
)
14661466

@@ -1617,8 +1617,7 @@ class DejacodeUser(AbstractUser):
16171617
updates_email_notification = models.BooleanField(
16181618
default=False,
16191619
help_text=_(
1620-
"Check this to receive email notifications with updates on DejaCode "
1621-
"features and news."
1620+
"Check this to receive email notifications with updates on DejaCode features and news."
16221621
),
16231622
)
16241623

@@ -1932,13 +1931,13 @@ def log_deletion(cls, user, obj):
19321931
class ExternalSource(DataspacedModel):
19331932
label = models.CharField(
19341933
max_length=50,
1935-
help_text=_("A Label is a concise name of the external source as it " "is commonly known."),
1934+
help_text=_("A Label is a concise name of the external source as it is commonly known."),
19361935
)
19371936

19381937
notes = models.TextField(
19391938
blank=True,
19401939
help_text=_(
1941-
"Notes describe the purpose and special characteristics " "of the external source."
1940+
"Notes describe the purpose and special characteristics of the external source."
19421941
),
19431942
)
19441943

‎dje/tasks.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -222,7 +222,7 @@ def pull_project_data_from_scancodeio(scancodeproject_uuid):
222222
scancode_project.append_to_log(msg)
223223

224224
for object_type, values in errors.items():
225-
msg = f"- {len(values)} {object_type} error{pluralize(values)} " f"occurred during import."
225+
msg = f"- {len(values)} {object_type} error{pluralize(values)} occurred during import."
226226
scancode_project.append_to_log(msg)
227227

228228
scancode_project.save()

‎dje/tests/__init__.py

+2-3
Original file line numberDiff line numberDiff line change
@@ -101,12 +101,11 @@ def __exit__(self, exc_type, exc_value, traceback):
101101
self.test_case.assertLessEqual(
102102
executed,
103103
self.num,
104-
"%d queries executed, %d max expected\nCaptured queries were:\n%s"
105-
% (
104+
"{} queries executed, {} max expected\nCaptured queries were:\n{}".format(
106105
executed,
107106
self.num,
108107
"\n".join(
109-
"%d. %s" % (i, query["sql"])
108+
"{}. {}".format(i, query["sql"])
110109
for i, query in enumerate(self.captured_queries, start=1)
111110
),
112111
),

‎license_library/models.py

+5-8
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ class LicenseTag(DataspacedModel):
106106
label = models.CharField(
107107
max_length=50,
108108
help_text=_(
109-
"Organization-defined Label to identify a Tag that can be applied to a " "Tag Group."
109+
"Organization-defined Label to identify a Tag that can be applied to a Tag Group."
110110
),
111111
)
112112

@@ -311,13 +311,13 @@ class LicenseStatus(DataspacedModel):
311311
code = models.CharField(
312312
max_length=50,
313313
help_text=_(
314-
"Organization-defined Code to identify a Status that can be applied to a " "License."
314+
"Organization-defined Code to identify a Status that can be applied to a License."
315315
),
316316
)
317317

318318
text = models.TextField(
319319
help_text=_(
320-
"Text to describe a Status that can be applied to a License by an " "Organization."
320+
"Text to describe a Status that can be applied to a License by an Organization."
321321
),
322322
)
323323

@@ -456,9 +456,7 @@ def render(self, template, as_link=False, show_policy=False, **kwargs):
456456

457457
if show_policy and self.usage_policy_id:
458458
rendered = (
459-
f'<span class="text-nowrap">'
460-
f"{rendered}{self.get_usage_policy_icon_tooltip()}"
461-
f"</span>"
459+
f'<span class="text-nowrap">{rendered}{self.get_usage_policy_icon_tooltip()}</span>'
462460
)
463461

464462
return rendered
@@ -572,8 +570,7 @@ class License(
572570
_("Text URLs"),
573571
blank=True,
574572
help_text=_(
575-
"URLs to the text of the license (plain text or HTML) on the main site of "
576-
"this license."
573+
"URLs to the text of the license (plain text or HTML) on the main site of this license."
577574
),
578575
)
579576

‎license_library/tests/test_search_quality.py

+4-4
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@ def search_test_func(self):
196196

197197
# build a reasonably unique and valid function name
198198
# based on the up to 50 chars from the query and a row number
199-
test_func_name = "test_search_%04d_" % rownum + python_safe(
200-
query[:50] + str(notes) if notes else ""
199+
test_func_name = "test_search_{}_".format(
200+
rownum + python_safe(query[:50] + str(notes) if notes else "")
201201
)
202202
# these are needed to ensure we can use the tests name for selection in discovery
203203
search_test_func.__name__ = str(test_func_name)
@@ -225,7 +225,7 @@ def build_tsts_from_csv(csv_path, test_class):
225225
- 7 and other columns: Expected results: Each column contains a license: use * if this
226226
can be any license.
227227
"""
228-
with open(csv_path, "rU") as fin:
228+
with open(csv_path) as fin:
229229
import csv
230230

231231
reader = csv.reader(fin)
@@ -239,7 +239,7 @@ def build_tsts_from_csv(csv_path, test_class):
239239
query = row[0]
240240
if not query:
241241
raise RuntimeError(
242-
"Missing test query for row: %d of CSV file:%r" % (i + 1, csv_path)
242+
"Missing test query for row: {} of CSV file:{}".format(i + 1, csv_path)
243243
)
244244
notes = row[1] if len(row) >= 2 else False
245245
ordered = row[2] if len(row) >= 3 else False

‎organization/api.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ class OwnerFilterSet(DataspacedAPIFilterSet):
9595
type = django_filters.ChoiceFilter(
9696
choices=Owner.OWNER_TYPE_CHOICES,
9797
help_text=f"Exact owner type. Supported values: "
98-
f'{", ".join(type[0] for type in Owner.OWNER_TYPE_CHOICES)}',
98+
f"{', '.join(type[0] for type in Owner.OWNER_TYPE_CHOICES)}",
9999
)
100100
last_modified_date = LastModifiedDateFilter()
101101

‎product_portfolio/forms.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -672,7 +672,7 @@ def render(self, name, value, attrs=None, renderer=None):
672672
if value:
673673
return (
674674
f'<div class="object_display">'
675-
f'<strong>{value.get_absolute_link(target="_blank")}</strong>'
675+
f"<strong>{value.get_absolute_link(target='_blank')}</strong>"
676676
f"</div>"
677677
)
678678

‎product_portfolio/tests/test_api.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -839,7 +839,7 @@ def test_api_productcomponent_endpoint_create_license_expression_from_choice(sel
839839
data["license_expression"] = self.license2.key
840840
expected = {
841841
"license_expression": [
842-
"Unknown license key(s): license2<br>" "Available licenses: license1"
842+
"Unknown license key(s): license2<br>Available licenses: license1"
843843
]
844844
}
845845
response = self.client.post(self.productcomponent_list_url, data)

‎product_portfolio/tests/test_models.py

+1-4
Original file line numberDiff line numberDiff line change
@@ -180,10 +180,7 @@ def test_product_model_get_feature_values_and_get_feature_datalist(self):
180180
self.assertEqual(expected, list(self.product1.get_feature_values(pc_queryset)))
181181

182182
expected = (
183-
'<datalist id="feature_datalist">'
184-
"<option>f1</option>"
185-
"<option>f2</option>"
186-
"</datalist>"
183+
'<datalist id="feature_datalist"><option>f1</option><option>f2</option></datalist>'
187184
)
188185
self.assertEqual(expected, self.product1.get_feature_datalist())
189186

‎pyproject.toml

+1
Original file line numberDiff line numberDiff line change
@@ -46,3 +46,4 @@ max-complexity = 17
4646
# Do not run bandit on test files.
4747
"**/tests/*" = ["S"]
4848
"dejacode_toolkit/csaf/*" = ["D", "UP", "E501", "F401"]
49+
"dejacode_toolkit/spdx.py" = ["UP"]

0 commit comments

Comments
 (0)