Skip to content

Commit

Permalink
Upgrade rq, pip, and black #50
Browse files Browse the repository at this point in the history
Signed-off-by: tdruez <[email protected]>
  • Loading branch information
tdruez committed Feb 26, 2024
1 parent 4161933 commit 7b0d57b
Show file tree
Hide file tree
Showing 15 changed files with 20 additions and 61 deletions.
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
uses: actions/checkout@v4

- name: Set up Python
uses: actions/setup-python@v4
uses: actions/setup-python@v5
with:
python-version: "3.12"

Expand Down
1 change: 1 addition & 0 deletions dejacode_toolkit/scancodeio.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
from dejacode_toolkit import logger
from dejacode_toolkit.utils import md5


class ScanCodeIO(BaseService):
label = "ScanCode.io"
settings_prefix = "SCANCODEIO"
Expand Down
6 changes: 3 additions & 3 deletions dje/importers.py
Original file line number Diff line number Diff line change
Expand Up @@ -203,9 +203,9 @@ def post_process_form(self):
continue

choices = [str(getattr(choice, identifier_field, "")) for choice in form_field.queryset]
form_field.error_messages[
"invalid_choice"
] = 'That choice is not one of the available choices: "{}"'.format(", ".join(choices))
form_field.error_messages["invalid_choice"] = (
'That choice is not one of the available choices: "{}"'.format(", ".join(choices))
)

for field_name, field in self.fields.items():
# Using `type()` comparison in place if `isinstance` since we do not want
Expand Down
6 changes: 3 additions & 3 deletions dje/registration.py
Original file line number Diff line number Diff line change
Expand Up @@ -126,9 +126,9 @@ def __init__(self, *args, **kwargs):

self.fields["hcaptcha"].label = ""

self.fields[
"updates_email_notification"
].label = "Receive updates on DejaCode features and news"
self.fields["updates_email_notification"].label = (
"Receive updates on DejaCode features and news"
)

for field in self.fields.values():
field.help_text = None
Expand Down
12 changes: 6 additions & 6 deletions product_portfolio/tests/test_importers.py
Original file line number Diff line number Diff line change
Expand Up @@ -563,9 +563,9 @@ def test_codebaseresource_import_custom_product_component(self):
product=self.product1,
dataspace=self.dataspace,
)
formset_data[
"form-0-product_component"
] = f"{product_component.name}:{product_component.version}"
formset_data["form-0-product_component"] = (
f"{product_component.name}:{product_component.version}"
)
importer = CodebaseResourceImporter(self.super_user, formset_data=formset_data)
importer.save_all()
self.assertTrue(importer.formset.is_valid())
Expand All @@ -575,9 +575,9 @@ def test_codebaseresource_import_custom_product_component(self):
product_component.name = self.c1.name
product_component.version = self.c1.version
product_component.save()
formset_data[
"form-0-product_component"
] = f"{product_component.name}:{product_component.version}"
formset_data["form-0-product_component"] = (
f"{product_component.name}:{product_component.version}"
)
importer = CodebaseResourceImporter(self.super_user, formset_data=formset_data)
importer.save_all()
self.assertTrue(importer.formset.is_valid())
Expand Down
6 changes: 3 additions & 3 deletions product_portfolio/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -1244,9 +1244,9 @@ def as_attribution_node(self, relationship):
notice_text=None,
is_displayed=True,
homepage_url=relationship.homepage_url if self.include_homepage_url else "",
standard_notice=relationship.standard_notice
if self.include_standard_notice
else "",
standard_notice=(
relationship.standard_notice if self.include_standard_notice else ""
),
)

copyright_ = ""
Expand Down
6 changes: 3 additions & 3 deletions setup.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ install_requires =
# Base configuration tools
setuptools==69.0.2
wheel==0.42.0
pip==23.3.1
pip==24.0
# Django
Django==5.0.2
asgiref==3.7.2
Expand Down Expand Up @@ -98,7 +98,7 @@ install_requires =
# Testing
model_bakery==1.10.1
# Task queue
rq==1.15.1
rq==1.16.0
django-rq==2.10.1
fakeredis==2.21.1
# Libs
Expand Down Expand Up @@ -182,7 +182,7 @@ dev =
# Imports
isort==5.12.0
# Black
black==23.11.0
black==24.2.0
mypy-extensions==0.4.3
pathspec==0.10.1
tomli==2.0.1
Expand Down
Binary file removed thirdparty/dist/black-23.11.0-py3-none-any.whl
Binary file not shown.
14 changes: 0 additions & 14 deletions thirdparty/dist/black-23.11.0-py3-none-any.whl.ABOUT

This file was deleted.

Binary file added thirdparty/dist/black-24.2.0-py3-none-any.whl
Binary file not shown.
14 changes: 0 additions & 14 deletions thirdparty/dist/pip-23.3.1-py3-none-any.whl.ABOUT

This file was deleted.

Binary file not shown.
Binary file removed thirdparty/dist/rq-1.15.1-py2.py3-none-any.whl
Binary file not shown.
14 changes: 0 additions & 14 deletions thirdparty/dist/rq-1.15.1-py2.py3-none-any.whl.ABOUT

This file was deleted.

Binary file added thirdparty/dist/rq-1.16.0-py3-none-any.whl
Binary file not shown.

0 comments on commit 7b0d57b

Please sign in to comment.