diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 9126b43a..3dbb5e3c 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -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" diff --git a/dejacode_toolkit/scancodeio.py b/dejacode_toolkit/scancodeio.py index a2e1d17d..8b5f1152 100644 --- a/dejacode_toolkit/scancodeio.py +++ b/dejacode_toolkit/scancodeio.py @@ -21,6 +21,7 @@ from dejacode_toolkit import logger from dejacode_toolkit.utils import md5 + class ScanCodeIO(BaseService): label = "ScanCode.io" settings_prefix = "SCANCODEIO" diff --git a/dje/importers.py b/dje/importers.py index 927651f0..082a02b2 100644 --- a/dje/importers.py +++ b/dje/importers.py @@ -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 diff --git a/dje/registration.py b/dje/registration.py index d4ff9188..57286bf0 100644 --- a/dje/registration.py +++ b/dje/registration.py @@ -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 diff --git a/product_portfolio/tests/test_importers.py b/product_portfolio/tests/test_importers.py index b72fc99b..689920a6 100644 --- a/product_portfolio/tests/test_importers.py +++ b/product_portfolio/tests/test_importers.py @@ -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()) @@ -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()) diff --git a/product_portfolio/views.py b/product_portfolio/views.py index 46a1d406..ef024480 100644 --- a/product_portfolio/views.py +++ b/product_portfolio/views.py @@ -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_ = "" diff --git a/setup.cfg b/setup.cfg index 5fe3eb7f..dde420d1 100644 --- a/setup.cfg +++ b/setup.cfg @@ -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 @@ -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 @@ -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 diff --git a/thirdparty/dist/black-23.11.0-py3-none-any.whl b/thirdparty/dist/black-23.11.0-py3-none-any.whl deleted file mode 100644 index d8b0521e..00000000 Binary files a/thirdparty/dist/black-23.11.0-py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/black-23.11.0-py3-none-any.whl.ABOUT b/thirdparty/dist/black-23.11.0-py3-none-any.whl.ABOUT deleted file mode 100644 index ed3df9aa..00000000 --- a/thirdparty/dist/black-23.11.0-py3-none-any.whl.ABOUT +++ /dev/null @@ -1,14 +0,0 @@ -about_resource: black-23.11.0-py3-none-any.whl -name: black -version: 23.11.0 -download_url: https://files.pythonhosted.org/packages/be/fb/8a670d2a246a351d7662e785d85a636c1c60b5800d175421cdfcb2a59b1d/black-23.11.0-py3-none-any.whl -package_url: pkg:pypi/black@23.11.0 -license_expression: mit -copyright: Copyright black project contributors -attribute: yes -checksum_md5: 126986c3cc5e12ddd88a487f0eef3a42 -checksum_sha1: 23abe9997f3ddefa60b7ad485bf6544c426fb97a -licenses: - - key: mit - name: MIT License - file: mit.LICENSE diff --git a/thirdparty/dist/black-24.2.0-py3-none-any.whl b/thirdparty/dist/black-24.2.0-py3-none-any.whl new file mode 100644 index 00000000..78cad1d5 Binary files /dev/null and b/thirdparty/dist/black-24.2.0-py3-none-any.whl differ diff --git a/thirdparty/dist/pip-23.3.1-py3-none-any.whl.ABOUT b/thirdparty/dist/pip-23.3.1-py3-none-any.whl.ABOUT deleted file mode 100644 index 3ba1cf70..00000000 --- a/thirdparty/dist/pip-23.3.1-py3-none-any.whl.ABOUT +++ /dev/null @@ -1,14 +0,0 @@ -about_resource: pip-23.3.1-py3-none-any.whl -name: pip -version: 23.3.1 -download_url: https://files.pythonhosted.org/packages/47/6a/453160888fab7c6a432a6e25f8afe6256d0d9f2cbd25971021da6491d899/pip-23.3.1-py3-none-any.whl -package_url: pkg:pypi/pip@23.3.1 -license_expression: mit -copyright: Copyright pip project contributors -attribute: yes -checksum_md5: 5d2d058044a3ae2800d18e358ddc72ca -checksum_sha1: 4b2baddc0673f73017e531648a9ee27e47925e7a -licenses: - - key: mit - name: MIT License - file: mit.LICENSE diff --git a/thirdparty/dist/pip-23.3.1-py3-none-any.whl b/thirdparty/dist/pip-24.0-py3-none-any.whl similarity index 83% rename from thirdparty/dist/pip-23.3.1-py3-none-any.whl rename to thirdparty/dist/pip-24.0-py3-none-any.whl index a4faf716..2e6aa9d2 100644 Binary files a/thirdparty/dist/pip-23.3.1-py3-none-any.whl and b/thirdparty/dist/pip-24.0-py3-none-any.whl differ diff --git a/thirdparty/dist/rq-1.15.1-py2.py3-none-any.whl b/thirdparty/dist/rq-1.15.1-py2.py3-none-any.whl deleted file mode 100644 index 64de2825..00000000 Binary files a/thirdparty/dist/rq-1.15.1-py2.py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/rq-1.15.1-py2.py3-none-any.whl.ABOUT b/thirdparty/dist/rq-1.15.1-py2.py3-none-any.whl.ABOUT deleted file mode 100644 index c7507778..00000000 --- a/thirdparty/dist/rq-1.15.1-py2.py3-none-any.whl.ABOUT +++ /dev/null @@ -1,14 +0,0 @@ -about_resource: rq-1.15.1-py2.py3-none-any.whl -name: rq -version: 1.15.1 -download_url: https://files.pythonhosted.org/packages/e1/24/5ae8bfcea4f24b32e079da421015ad380eadfc8250892a2470b6f19df0d8/rq-1.15.1-py2.py3-none-any.whl -package_url: pkg:pypi/rq@1.15.1 -license_expression: bsd-new -copyright: Copyright rq project contributors -attribute: yes -checksum_md5: 891b5f300363084fdf750306362559a4 -checksum_sha1: 312e40cc54c789fbccd46c172603af670cd3008a -licenses: - - key: bsd-new - name: BSD-3-Clause - file: bsd-new.LICENSE diff --git a/thirdparty/dist/rq-1.16.0-py3-none-any.whl b/thirdparty/dist/rq-1.16.0-py3-none-any.whl new file mode 100644 index 00000000..5993cccf Binary files /dev/null and b/thirdparty/dist/rq-1.16.0-py3-none-any.whl differ