diff --git a/.VERSION b/.VERSION new file mode 100644 index 0000000..be0bb0a --- /dev/null +++ b/.VERSION @@ -0,0 +1 @@ +$Format:%(describe:tags)$ \ No newline at end of file diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..7c5b460 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,2 @@ +# Save the version details for git tarballs in .VERSION file +.VERSION export-subst diff --git a/.github/ISSUE_TEMPLATE/bug_report.md b/.github/ISSUE_TEMPLATE/bug_report.md new file mode 100644 index 0000000..7631400 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/bug_report.md @@ -0,0 +1,26 @@ +--- +name: Bug report +about: Create a report to help us improve +title: 'BUG: ' +labels: bug, design needed, enhancement +assignees: '' + +--- + +**Describe the bug** +A clear and concise description of what the bug is. + +**To Reproduce** +Steps to reproduce the behavior: +1. Go to '...' +2. Click on '....' +3. Scroll down to '....' +4. See error + +**Expected behavior** +A clear and concise description of what you expected to happen. + +**Screenshots** +If applicable, add screenshots to help explain your problem. + +**Context (OS, Browser, Device, etc.):** diff --git a/.github/ISSUE_TEMPLATE/dejacode-documentation.md b/.github/ISSUE_TEMPLATE/dejacode-documentation.md new file mode 100644 index 0000000..7e169cf --- /dev/null +++ b/.github/ISSUE_TEMPLATE/dejacode-documentation.md @@ -0,0 +1,14 @@ +--- +name: DejaCode documentation +about: Request a DejaCode documentation improvement +title: 'DOC: ' +labels: documentation +assignees: '' + +--- + +**What type of documentation would you like?** +How-to, Reference, Tutorial, on-screen prompt + +**Documentation topic** +Describe the features of DejaCode that would benefit from more explanation. diff --git a/.github/ISSUE_TEMPLATE/dejacode-enhancement-request.md b/.github/ISSUE_TEMPLATE/dejacode-enhancement-request.md new file mode 100644 index 0000000..93f2d33 --- /dev/null +++ b/.github/ISSUE_TEMPLATE/dejacode-enhancement-request.md @@ -0,0 +1,20 @@ +--- +name: DejaCode enhancement request +about: Suggest an enhancement for DejaCode +title: 'Enhancement request: ' +labels: design needed, enhancement +assignees: '' + +--- + +**Is your enhancement request related to a problem? Please describe.** +Describe the problem that you would like to address. + +**What are the benefits of the requested enhancement?** +How will the new functionality benefit DejaCode users? + +**Describe the solution you would like** +Provide a concise scenario or use case that needs to be supported in DejaCode. + +**Additional notes** +Add any other context or screenshots about the feature request here. diff --git a/.github/ISSUE_TEMPLATE/roadmap-item-template.md b/.github/ISSUE_TEMPLATE/roadmap-item-template.md new file mode 100644 index 0000000..aacc4dc --- /dev/null +++ b/.github/ISSUE_TEMPLATE/roadmap-item-template.md @@ -0,0 +1,17 @@ +--- +name: Roadmap item template +about: Structure for roadmap items +title: 'RFC: ' +labels: design needed, enhancement +assignees: '' + +--- + +**Summary** +A clear and concise description of the Roadmap requirements and objectives. + +**Intended Outcome** +A clear and concise description of the impact on the AboutCode stack. + +**How will it work?** +Details to explain what needs to be done. diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index 31f65a4..3dbb5e3 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -33,9 +33,9 @@ jobs: uses: actions/checkout@v4 - name: Set up Python - uses: actions/setup-python@v4 + uses: actions/setup-python@v5 with: - python-version: "3.10" + python-version: "3.12" - name: Install python-ldap OS dependencies run: sudo apt-get install -y libsasl2-dev libldap2-dev libssl-dev diff --git a/.github/workflows/gh-release.yml b/.github/workflows/gh-release.yml new file mode 100644 index 0000000..c23b238 --- /dev/null +++ b/.github/workflows/gh-release.yml @@ -0,0 +1,17 @@ +name: Create a GitHub release + +on: + workflow_dispatch: + push: + tags: + - "v*.*.*" + +jobs: + create-github-release: + runs-on: ubuntu-22.04 + + steps: + - name: Create a GitHub release + uses: softprops/action-gh-release@v1 + with: + draft: false diff --git a/.gitignore b/.gitignore index 23cd2bd..e2a18e1 100644 --- a/.gitignore +++ b/.gitignore @@ -1,5 +1,6 @@ *.pyc *.db +*.rdb .installed.cfg parts develop-eggs diff --git a/.readthedocs.yaml b/.readthedocs.yaml index 5399ec0..19c4747 100644 --- a/.readthedocs.yaml +++ b/.readthedocs.yaml @@ -8,7 +8,7 @@ version: 2 build: os: ubuntu-22.04 tools: - python: "3.10" + python: "3.12" # Optionally declare the Python requirements required to build your docs python: diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 053b324..173519d 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -1,11 +1,101 @@ Release notes ============= -### Version 5.0.1-dev +### Version 5.1.1-dev + +- Add visual indicator in hierarchy views, when an object on the far left or far right + also belong or have a hierarchy (relathionship tree). + https://github.com/nexB/dejacode/issues/70 + +### Version 5.1.0 + +- Upgrade Python version to 3.12 and Django to 5.0.x + https://github.com/nexB/dejacode/issues/50 + +- Replace Celery by RQ for async job queue and worker. + https://github.com/nexB/dejacode/issues/6 + +- Add support for CycloneDX spec version "1.6". + In the UI and API, older spe version such as "1.4" and "1.5" are also available as + download. + https://github.com/nexB/dejacode/pull/79 + +- Lookup in PurlDB by purl in Add Package form. + When a Package URL is available in the context of the "Add Package" form, + for example when using a link from the Vulnerabilities tab, + data is fetched from the PurlDB to initialize the form. + https://github.com/nexB/dejacode/issues/47 + +- If you select two versions of the same Product in the Product list, or two different + Products, and click the Compare button, you can now download the results of the + comparison to a .xlsx file, making it easy to share the information with your + colleagues. + https://github.com/nexB/dejacode/issues/7 + +- Add dark theme support in UI. + https://github.com/nexB/dejacode/issues/25 + +- Add "Load Packages from SBOMs", "Import scan results", and + "Pull ScanCode.io project data" feature as Product action in the REST API. + https://github.com/nexB/dejacode/issues/59 + +- Add REST API endpoints to download SBOMs as CycloneDX and SPDX. + https://github.com/nexB/dejacode/issues/60 + +- Refactor the "Import manifest" feature as "Load SBOMs". + https://github.com/nexB/dejacode/issues/61 + +- Add support to import packages from manifest. + https://github.com/nexB/dejacode/issues/65 + +- Add a vulnerability link to the VulnerableCode app in the Vulnerability tab. + https://github.com/nexB/dejacode/issues/4 + +- Add a DEJACODE_SUPPORT_EMAIL setting for support email address customization. + https://github.com/nexB/dejacode/issues/76 + +- Show the individual PURL fields in the Package details view. + https://github.com/nexB/dejacode/issues/83 + +- Fix the logout link of the admin app. + https://github.com/nexB/dejacode/issues/89 + +- Display full commit in the version displayed in the UI + https://github.com/nexB/dejacode/issues/88 + +- Refine the Product comparison logic for Packages. + The type and namespace fields are now used along the name field to match similar + Packages (excluding the version). + https://github.com/nexB/dejacode/issues/113 + +- Refactor the implementation of Keywords on forms to allow more flexibilty. + Existing Keywords are suggested for consistency but any values is now allowed. + https://github.com/nexB/dejacode/issues/48 + +- Display Product inventory count on the Product list view. + https://github.com/nexB/dejacode/issues/81 + +- Always display the full Package URL in the UI view including the "pkg:" prefix. + https://github.com/nexB/dejacode/issues/115 + +- Add a new AboutCode tab in Package details view. + https://github.com/nexB/dejacode/issues/42 + +- Enhance Package Import to support modifications. + https://github.com/nexB/dejacode/issues/84 + +- Add an option on the "Add to Product" form to to replace any existing relationships + with a different version of the same object by the selected object. + https://github.com/nexB/dejacode/issues/12 + +### Version 5.0.1 - Improve the stability of the "Check for new Package versions" feature. https://github.com/nexB/dejacode/issues/17 +- Improve the support for SourgeForge download URLs. + https://github.com/nexB/dejacode/issues/26 + ### Version 5.0.0 Initial release. diff --git a/Dockerfile b/Dockerfile index b550c72..1cad2a3 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,7 +6,7 @@ # See https://aboutcode.org for more information about AboutCode FOSS projects. # -FROM python:3.10-slim +FROM python:3.12-slim LABEL org.opencontainers.image.source="https://github.com/nexB/dejacode" LABEL org.opencontainers.image.description="DejaCode" @@ -31,6 +31,7 @@ RUN apt-get update \ libldap2-dev \ libsasl2-dev \ libpq5 \ + git \ wait-for-it \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* diff --git a/Makefile b/Makefile index 7e69bde..f914f48 100644 --- a/Makefile +++ b/Makefile @@ -6,7 +6,7 @@ # See https://aboutcode.org for more information about AboutCode FOSS projects. # -PYTHON_EXE=python3.10 +PYTHON_EXE=python3.12 MANAGE=bin/python manage.py ACTIVATE?=. bin/activate; PIP_ARGS=--find-links=./thirdparty/dist/ --no-index --no-cache-dir @@ -129,7 +129,10 @@ postgresdb: @gunzip < ${DB_INIT_FILE} | psql --username=${DB_USERNAME} ${DB_NAME} run: - ${MANAGE} runserver 8000 + ${MANAGE} runserver 8000 --insecure + +worker: + ${MANAGE} rqworker test: @echo "-> Run the test suite" @@ -162,4 +165,4 @@ log: createsuperuser: ${DOCKER_EXEC} web ./manage.py createsuperuser -.PHONY: virtualenv conf dev envfile check bandit isort black doc8 valid check-docstrings check-deploy clean initdb postgresdb migrate run test docs build psql bash shell log createsuperuse +.PHONY: virtualenv conf dev envfile check bandit isort black doc8 valid check-docstrings check-deploy clean initdb postgresdb migrate run test docs build psql bash shell log createsuperuser diff --git a/component_catalog/api.py b/component_catalog/api.py index 33c2bd9..e9ad4fb 100644 --- a/component_catalog/api.py +++ b/component_catalog/api.py @@ -35,13 +35,16 @@ from dejacode_toolkit.download import collect_package_data from dejacode_toolkit.scancodeio import ScanCodeIO from dje import tasks +from dje.api import AboutCodeFilesActionMixin from dje.api import CreateRetrieveUpdateListViewSet +from dje.api import CycloneDXSOMActionMixin from dje.api import DataspacedAPIFilterSet from dje.api import DataspacedHyperlinkedRelatedField from dje.api import DataspacedSerializer from dje.api import DataspacedSlugRelatedField from dje.api import ExternalReferenceSerializer from dje.api import NameVersionHyperlinkedRelatedField +from dje.api import SPDXDocumentActionMixin from dje.filters import LastModifiedDateFilter from dje.filters import MultipleCharFilter from dje.filters import MultipleUUIDFilter @@ -447,7 +450,9 @@ class Meta: ) -class ComponentViewSet(CreateRetrieveUpdateListViewSet): +class ComponentViewSet( + SPDXDocumentActionMixin, CycloneDXSOMActionMixin, CreateRetrieveUpdateListViewSet +): queryset = Component.objects.all() serializer_class = ComponentSerializer filterset_class = ComponentFilterSet @@ -820,7 +825,13 @@ def collect_create_scan(download_url, user): return package -class PackageViewSet(SendAboutFilesMixin, CreateRetrieveUpdateListViewSet): +class PackageViewSet( + SendAboutFilesMixin, + AboutCodeFilesActionMixin, + SPDXDocumentActionMixin, + CycloneDXSOMActionMixin, + CreateRetrieveUpdateListViewSet, +): queryset = Package.objects.all() serializer_class = PackageSerializer filterset_class = PackageAPIFilterSet @@ -868,13 +879,6 @@ def about(self, request, uuid): package = self.get_object() return Response({"about_data": package.as_about_yaml()}) - @action(detail=True) - def about_files(self, request, uuid): - package = self.get_object() - about_files = package.get_about_files() - filename = self.get_filename(package) - return self.get_zipped_response(about_files, filename) - download_url_description = ( "A single, or list of, Download URL(s).

" 'cURL style: -d "download_url=url1&download_url=url2"

' @@ -1025,3 +1029,37 @@ def get_queryset(self): "child", ) ) + + +class KeywordSerializer(DataspacedSerializer): + class Meta: + model = ComponentKeyword + fields = ( + "api_url", + "uuid", + "label", + "description", + ) + extra_kwargs = { + "api_url": { + "view_name": "api_v2:componentkeyword-detail", + "lookup_field": "uuid", + }, + } + + +class KeywordViewSet(CreateRetrieveUpdateListViewSet): + queryset = ComponentKeyword.objects.all() + serializer_class = KeywordSerializer + lookup_field = "uuid" + search_fields = ( + "label", + "description", + ) + search_fields_autocomplete = ("label",) + ordering_fields = ( + "label", + "created_date", + "last_modified_date", + ) + allow_reference_access = True diff --git a/component_catalog/filters.py b/component_catalog/filters.py index f8eb067..353df10 100644 --- a/component_catalog/filters.py +++ b/component_catalog/filters.py @@ -71,7 +71,7 @@ class ComponentFilterSet(DataspacedFilterSet): label=_("License"), field_name="licenses__key", to_field_name="key", - queryset=License.objects.all().only("key", "short_name", "dataspace"), + queryset=License.objects.only("key", "short_name", "dataspace__id"), widget=BootstrapSelectMultipleWidget( search_placeholder="Search licenses", ), @@ -80,7 +80,7 @@ class ComponentFilterSet(DataspacedFilterSet): label=_("Keyword"), to_field_name="label", lookup_expr="contains", - queryset=ComponentKeyword.objects.all().only("label", "dataspace"), + queryset=ComponentKeyword.objects.only("label", "dataspace__id"), widget=BootstrapSelectMultipleWidget( search_placeholder="Search keywords", ), @@ -183,7 +183,7 @@ class PackageFilterSet(DataspacedFilterSet): label=_("License"), field_name="licenses__key", to_field_name="key", - queryset=License.objects.all().only("key", "short_name", "dataspace"), + queryset=License.objects.only("key", "short_name", "dataspace__id"), widget=BootstrapSelectMultipleWidget( search_placeholder="Search licenses", ), diff --git a/component_catalog/forms.py b/component_catalog/forms.py index f5304fc..e6c3ddf 100644 --- a/component_catalog/forms.py +++ b/component_catalog/forms.py @@ -39,7 +39,7 @@ from dje.forms import DataspacedModelForm from dje.forms import DefaultOnAdditionLabelMixin from dje.forms import Group -from dje.forms import JSONListChoiceField +from dje.forms import JSONListField from dje.forms import OwnerChoiceField from dje.forms import autocomplete_placeholder from dje.mass_update import DejacodeMassUpdateForm @@ -56,23 +56,29 @@ class SetKeywordsChoicesFormMixin: def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) - - keywords_field = self.fields.get("keywords") - if keywords_field: + if keywords_field := self.fields.get("keywords"): keywords_qs = ComponentKeyword.objects.scope(self.dataspace) labels = keywords_qs.values_list("label", flat=True) - keywords_field.choices = [(label, label) for label in labels] - keywords_field.widget.attrs.update( - { - "data-list": ", ".join(labels), - } - ) + keywords_field.widget.attrs.update({"data-list": ", ".join(labels)}) + + +class KeywordsField(JSONListField): + def __init__(self, **kwargs): + widget = AutocompleteInput( + attrs={ + "data-api_url": reverse_lazy("api_v2:componentkeyword-list"), + }, + display_link=False, + display_attribute="label", + ) + kwargs.setdefault("widget", widget) + kwargs.setdefault("required", False) + super().__init__(**kwargs) class ComponentForm( LicenseExpressionFormMixin, DefaultOnAdditionLabelMixin, - SetKeywordsChoicesFormMixin, DataspacedModelForm, ): default_on_addition_fields = ["configuration_status"] @@ -83,10 +89,7 @@ class ComponentForm( ] color_initial = True - keywords = JSONListChoiceField( - required=False, - widget=AwesompleteInputWidget(attrs=autocomplete_placeholder), - ) + keywords = KeywordsField() packages_ids = forms.CharField( widget=forms.HiddenInput, @@ -262,16 +265,12 @@ def clean(self): class PackageForm( LicenseExpressionFormMixin, PackageFieldsValidationMixin, - SetKeywordsChoicesFormMixin, DataspacedModelForm, ): save_as = True color_initial = True - keywords = JSONListChoiceField( - required=False, - widget=AwesompleteInputWidget(attrs=autocomplete_placeholder), - ) + keywords = KeywordsField() collect_data = forms.BooleanField( required=False, @@ -647,6 +646,17 @@ class AddToProductAdminForm(forms.Form): queryset=Product.objects.none(), ) ids = forms.CharField(widget=forms.widgets.HiddenInput) + replace_existing_version = forms.BooleanField( + required=False, + initial=False, + label="Replace existing relationships by newer version.", + help_text=( + "Select this option to replace any existing relationships with a different version " + "of the same object. " + "If more than one version of the object is already assigned, no replacements will be " + "made, and the new version will be added instead." + ), + ) def __init__(self, request, model, relation_model, *args, **kwargs): super().__init__(*args, **kwargs) @@ -664,9 +674,11 @@ def get_selected_objects(self): def save(self): product = self.cleaned_data["product"] + return product.assign_objects( related_objects=self.get_selected_objects(), user=self.request.user, + replace_version=self.cleaned_data["replace_existing_version"], ) @@ -720,15 +732,15 @@ def new_component_from_package_link(self): href = f"{component_add_url}?package_ids={package.id}" return HTML( + f"
" f'
' f' ' f" Add Component from Package data" f" " f"
" - f"
" ) def clean_component(self): @@ -750,9 +762,9 @@ def helper(self): helper.layout = Layout( Fieldset( None, - self.new_component_from_package_link(), "object_id", "component", + self.new_component_from_package_link(), ), ) return helper @@ -910,7 +922,7 @@ class ComponentAdminForm( SetKeywordsChoicesFormMixin, DataspacedAdminForm, ): - keywords = JSONListChoiceField( + keywords = JSONListField( required=False, widget=AdminAwesompleteInputWidget(attrs=autocomplete_placeholder), ) @@ -944,7 +956,7 @@ class PackageAdminForm( SetKeywordsChoicesFormMixin, DataspacedAdminForm, ): - keywords = JSONListChoiceField( + keywords = JSONListField( required=False, widget=AdminAwesompleteInputWidget(attrs=autocomplete_placeholder), ) @@ -990,7 +1002,7 @@ class ComponentMassUpdateForm( DejacodeMassUpdateForm, ): raw_id_fields = ["owner"] - keywords = JSONListChoiceField( + keywords = JSONListField( required=False, widget=AwesompleteInputWidget(attrs=autocomplete_placeholder), ) @@ -1063,7 +1075,7 @@ class Meta: class PackageMassUpdateForm( LicenseExpressionFormMixin, SetKeywordsChoicesFormMixin, DejacodeMassUpdateForm ): - keywords = JSONListChoiceField( + keywords = JSONListField( required=False, widget=AwesompleteInputWidget(attrs=autocomplete_placeholder), ) diff --git a/component_catalog/importers.py b/component_catalog/importers.py index 70153e7..f60467e 100644 --- a/component_catalog/importers.py +++ b/component_catalog/importers.py @@ -5,6 +5,7 @@ # See https://github.com/nexB/dejacode for support or download. # See https://aboutcode.org for more information about AboutCode FOSS projects. # + import json import os from urllib.parse import urlparse @@ -29,7 +30,8 @@ from component_catalog.models import Package from component_catalog.models import Subcomponent from component_catalog.programming_languages import PROGRAMMING_LANGUAGES -from dje.forms import JSONListChoiceField +from dje.fields import SmartFileField +from dje.forms import JSONListField from dje.importers import BaseImporter from dje.importers import BaseImportModelForm from dje.importers import ComponentRelatedFieldImportMixin @@ -40,6 +42,12 @@ from product_portfolio.models import ProductComponent from product_portfolio.models import ProductPackage +keywords_help = ( + get_help_text(Component, "keywords") + + " You can add multiple keywords by separating them with commas, like this: " + "keyword1, keyword2." +) + class OwnerChoiceField(ModelChoiceFieldForImport): def get_suggestions(self, value, limit=5): @@ -157,8 +165,9 @@ class ComponentImportForm( identifier_field="label", ) - keywords = JSONListChoiceField( + keywords = JSONListField( required=False, + help_text=keywords_help, ) acceptable_linkages = ImportMultipleChoiceField( @@ -172,6 +181,7 @@ class Meta: "children", "packages", "completion_level", + "request_count", # JSONField not supported "dependencies", ) @@ -237,8 +247,9 @@ class PackageImportForm( identifier_field="label", ) - keywords = JSONListChoiceField( + keywords = JSONListField( required=False, + help_text=keywords_help, ) class Meta: @@ -248,6 +259,7 @@ class Meta: # JSONField not supported "dependencies", "file_references", + "request_count", "parties", ] @@ -294,10 +306,20 @@ def save(self, commit=True): return package +class PackageImportableUploadFileForm(forms.Form): + file = SmartFileField(extensions=["csv", "json"]) + + @property + def header(self): + return "Select a CSV (.csv) or JSON (.json) file" + + class PackageImporter(BaseImporter): model_form = PackageImportForm + upload_form_class = PackageImportableUploadFileForm add_to_product_perm = "product_portfolio.add_productpackage" relation_model = ProductPackage + update_existing = True def prepare_data_json(self, data): """ diff --git a/component_catalog/models.py b/component_catalog/models.py index 9ae9e40..e4917f4 100644 --- a/component_catalog/models.py +++ b/component_catalog/models.py @@ -34,6 +34,8 @@ from attributecode.model import About from cyclonedx import model as cyclonedx_model from cyclonedx.model import component as cyclonedx_component +from cyclonedx.model import contact as cyclonedx_contact +from cyclonedx.model import license as cyclonedx_license from packageurl import PackageURL from packageurl.contrib import purl2url from packageurl.contrib import url2purl @@ -62,7 +64,7 @@ from dje.models import ParentChildModelMixin from dje.models import ParentChildRelationshipModel from dje.models import ReferenceNotesMixin -from dje.tasks import tasks_logger +from dje.tasks import logger as tasks_logger from dje.utils import set_fields_from_object from dje.validators import generic_uri_validator from dje.validators import validate_url_segment @@ -758,7 +760,7 @@ def as_cyclonedx(self, license_expression_spdx=None): """Return this Component/Product as an CycloneDX Component entry.""" supplier = None if self.owner: - supplier = cyclonedx_model.OrganizationalEntity( + supplier = cyclonedx_contact.OrganizationalEntity( name=self.owner.name, urls=[self.owner.homepage_url], ) @@ -766,9 +768,9 @@ def as_cyclonedx(self, license_expression_spdx=None): expression_spdx = license_expression_spdx or self.get_license_expression_spdx_id() licenses = [] if expression_spdx: - licenses = [ - cyclonedx_model.LicenseChoice(license_expression=expression_spdx), - ] + # Using the LicenseExpression directly as the make_with_expression method + # does not support the "LicenseRef-" keys. + licenses = [cyclonedx_license.LicenseExpression(value=expression_spdx)] if self.__class__.__name__ == "Product": component_type = cyclonedx_component.ComponentType.APPLICATION @@ -777,12 +779,12 @@ def as_cyclonedx(self, license_expression_spdx=None): return cyclonedx_component.Component( name=self.name, - component_type=component_type, + type=component_type, version=self.version, bom_ref=str(self.uuid), supplier=supplier, licenses=licenses, - copyright_=self.copyright, + copyright=self.copyright, description=self.description, cpe=getattr(self, "cpe", None), properties=get_cyclonedx_properties(self), @@ -1839,10 +1841,9 @@ def enforce_identifier(self): def identifier(self): """ Provide a unique value to identify each Package. - It is the Package URL (minus the 'pkg:' prefix) if one exists; - otherwise it is the Package Filename. + It is the Package URL if one exists; otherwise it is the Package Filename. """ - return self.short_package_url or self.filename + return self.package_url or self.filename @classmethod def identifier_help(cls): @@ -1873,8 +1874,8 @@ def package_url_filename(self): Return the Package URL string as a valid filename. Useful when `Package.filename` is not available. """ - cleaned_package_url = self.short_package_url - for char in "/@?=#": + cleaned_package_url = self.plain_package_url + for char in "/@?=#:": cleaned_package_url = cleaned_package_url.replace(char, "_") return get_valid_filename(cleaned_package_url) @@ -1887,7 +1888,8 @@ def get_url(self, name, params=None, include_identifier=False): if not params: params = [self.dataspace.name, quote_plus(str(self.uuid))] if include_identifier: - params.insert(1, self.identifier) + # For the URL, using plain_package_url for simplification + params.insert(1, self.plain_package_url or self.filename) return super().get_url(name, params) def get_absolute_url(self): @@ -1913,12 +1915,16 @@ def get_export_cyclonedx_url(self): return self.get_url("export_cyclonedx") @classmethod - def get_identifier_fields(cls): + def get_identifier_fields(cls, *args, purl_fields_only=False, **kwargs): """ Explicit list of identifier fields as we do not enforce a unique together on this model. This is used in the Importer, to catch duplicate entries. + The purl_fields_only option can be use to limit the results. """ + if purl_fields_only: + return PACKAGE_URL_FIELDS + return ["filename", "download_url", *PACKAGE_URL_FIELDS] @property @@ -2015,9 +2021,15 @@ def size_formatted(self): @cached_property def component(self): - """Return the Component instance if 1 and only 1 Component is assigned to this Package.""" - with suppress(ObjectDoesNotExist, MultipleObjectsReturned): - return self.component_set.get() + """ + Return the Component instance if 1 and only 1 Component is assigned to this + Package. + Using ``component_set.all()`` to benefit from prefetch_related when it was + applied to the Package QuerySet. + """ + component_set = self.component_set.all() + if len(component_set) == 1: + return component_set[0] def set_values_from_component(self, component, user): changed_fields = set_fields_from_object( @@ -2222,9 +2234,9 @@ def as_cyclonedx(self, license_expression_spdx=None): licenses = [] if expression_spdx: - licenses = [ - cyclonedx_model.LicenseChoice(license_expression=expression_spdx), - ] + # Using the LicenseExpression directly as the make_with_expression method + # does not support the "LicenseRef-" keys. + licenses = [cyclonedx_license.LicenseExpression(value=expression_spdx)] hash_fields = { "md5": cyclonedx_model.HashAlgorithm.MD5, @@ -2233,19 +2245,19 @@ def as_cyclonedx(self, license_expression_spdx=None): "sha512": cyclonedx_model.HashAlgorithm.SHA_512, } hashes = [ - cyclonedx_model.HashType(algorithm=algorithm, hash_value=hash_value) + cyclonedx_model.HashType(alg=algorithm, content=hash_value) for field_name, algorithm in hash_fields.items() if (hash_value := getattr(self, field_name)) ] - purl = self.package_url + package_url = self.get_package_url() return cyclonedx_component.Component( name=self.name, version=self.version, - bom_ref=purl or str(self.uuid), - purl=purl, + bom_ref=str(package_url) or str(self.uuid), + purl=package_url, licenses=licenses, - copyright_=self.copyright, + copyright=self.copyright, description=self.description, cpe=self.cpe, author=self.author, diff --git a/component_catalog/templates/admin/component_catalog/add_to_product.html b/component_catalog/templates/admin/component_catalog/add_to_product.html index 854add4..a162143 100644 --- a/component_catalog/templates/admin/component_catalog/add_to_product.html +++ b/component_catalog/templates/admin/component_catalog/add_to_product.html @@ -19,17 +19,22 @@

Add {% trans opts.verbose_name %} to a product

The Product provides you with a group of {% trans opts.verbose_name_plural|title %} that are used together, so that you can generate Attribution documentation for all of the {% trans opts.verbose_name_plural|title %} in that Product.

-

+

{{ form.non_field_errors }} {{ form.product.errors }} {{ form.product }} +
+ {{ form.replace_existing_version }} + {{ form.replace_existing_version.label }} +

{{ form.replace_existing_version.help_text }}

+
{% if perms.product_portfolio.add_product %} {% endif %} {{ form.ct }} {{ form.ids }} -

+

diff --git a/component_catalog/templates/component_catalog/base_component_package_details.html b/component_catalog/templates/component_catalog/base_component_package_details.html index 1cbc1e8..8cc12c8 100644 --- a/component_catalog/templates/component_catalog/base_component_package_details.html +++ b/component_catalog/templates/component_catalog/base_component_package_details.html @@ -20,7 +20,7 @@ {% block javascripts %} {{ block.super }} - + {% include 'includes/dependencies-json-viewer.js.html' %} {% if open_add_to_package_modal %} diff --git a/component_catalog/templates/component_catalog/base_component_package_list.html b/component_catalog/templates/component_catalog/base_component_package_list.html index d90a75c..8d1617d 100644 --- a/component_catalog/templates/component_catalog/base_component_package_list.html +++ b/component_catalog/templates/component_catalog/base_component_package_list.html @@ -2,9 +2,11 @@ {% load i18n %} {% block top-right-buttons %} - + + + {% if form or add_to_component_form %}
@@ -47,16 +49,17 @@ + {% include 'component_catalog/includes/component_hierarchy.js.html' with related_parents=tabsets.Hierarchy.fields.0.1.related_parents related_children=tabsets.Hierarchy.fields.0.1.related_children productcomponents=tabsets.Hierarchy.fields.0.1.productcomponents %} {% if tabsets.Owner.extra %} {% include 'organization/includes/owner_hierarchy.js.html' with current_owner=object.owner parents=tabsets.Owner.extra.context.owner_parents children=tabsets.Owner.extra.context.owner_children tab_name="tab_owner" %} diff --git a/component_catalog/templates/component_catalog/includes/add_package_modal.html b/component_catalog/templates/component_catalog/includes/add_package_modal.html index 75ac559..194816d 100644 --- a/component_catalog/templates/component_catalog/includes/add_package_modal.html +++ b/component_catalog/templates/component_catalog/includes/add_package_modal.html @@ -8,7 +8,7 @@
Add Package
{% csrf_token %} -
+
diff --git a/component_catalog/templates/component_catalog/includes/add_to.js.html b/component_catalog/templates/component_catalog/includes/add_to.js.html index 08b5d02..a024fe6 100644 --- a/component_catalog/templates/component_catalog/includes/add_to.js.html +++ b/component_catalog/templates/component_catalog/includes/add_to.js.html @@ -1,28 +1,35 @@ \ No newline at end of file + \ No newline at end of file diff --git a/component_catalog/templates/component_catalog/includes/add_to_modal.html b/component_catalog/templates/component_catalog/includes/add_to_modal.html index 7b17e89..847f175 100644 --- a/component_catalog/templates/component_catalog/includes/add_to_modal.html +++ b/component_catalog/templates/component_catalog/includes/add_to_modal.html @@ -7,14 +7,14 @@
{{ form.helper.modal_title }}
-
+
+ {% crispy form %} {# Only displayed on list views #} {% if request.resolver_match.url_name|default:""|slice:"-4:" == "list" %} -
Selected objects:
-
    +
    Selected objects:
    +
      {% endif %} - {% crispy form %}
      diff --git a/component_catalog/templates/component_catalog/includes/component_hierarchy.js.html b/component_catalog/templates/component_catalog/includes/component_hierarchy.js.html index 4947825..c37e010 100644 --- a/component_catalog/templates/component_catalog/includes/component_hierarchy.js.html +++ b/component_catalog/templates/component_catalog/includes/component_hierarchy.js.html @@ -1,84 +1,66 @@ - \ No newline at end of file + {% if related_child.child_count > 0 %} + var linkUrl = '{{ related_child.child.get_absolute_url }}#hierarchy'; + addEndpointWithLink(jsPlumbHierarchy, source_id, 'RightMiddle', linkUrl); + {% endif %} + {% endfor %} +{% endblock %} \ No newline at end of file diff --git a/component_catalog/templates/component_catalog/includes/hierarchy_instance_box.html b/component_catalog/templates/component_catalog/includes/hierarchy_instance_box.html index 0c08374..1f1a973 100644 --- a/component_catalog/templates/component_catalog/includes/hierarchy_instance_box.html +++ b/component_catalog/templates/component_catalog/includes/hierarchy_instance_box.html @@ -1,5 +1,5 @@ {% load i18n %} -
      +
        {% if request.user.is_authenticated and is_user_dataspace and instance.request_count %} diff --git a/component_catalog/templates/component_catalog/includes/scan_delete_modal.html b/component_catalog/templates/component_catalog/includes/scan_delete_modal.html index 30f7d73..a2cc0d8 100644 --- a/component_catalog/templates/component_catalog/includes/scan_delete_modal.html +++ b/component_catalog/templates/component_catalog/includes/scan_delete_modal.html @@ -6,7 +6,7 @@
        Delete {% trans 'Scan' %}
      -
      +

      Are you sure you want to delete this Scan?

      All data and results related to the Scan will be deleted.
      diff --git a/component_catalog/templates/component_catalog/includes/scan_list_table.html b/component_catalog/templates/component_catalog/includes/scan_list_table.html index a9e997e..650e2b8 100644 --- a/component_catalog/templates/component_catalog/includes/scan_list_table.html +++ b/component_catalog/templates/component_catalog/includes/scan_list_table.html @@ -3,7 +3,7 @@ - - + - @@ -2823,7 +2836,11 @@ def test_scan_list_view(self, mock_fetch_scan_list): "input_sources": [ { "filename": self.package1.filename, - "source": self.package1.download_url, + "download_url": self.package1.download_url, + "is_uploaded": False, + "tag": "", + "exists": True, + "uuid": "8e454229-70f4-476f-a56f-2967eb2e8f4c", } ], "runs": [ @@ -3194,9 +3211,11 @@ def test_package_details_view_get_vulnerability_fields(self): fields = get_vulnerability_fields(vulnerability={}, dataspace=self.dataspace) self.assertEqual(fields[0], ("Summary", None, "Summary of the vulnerability")) + vulnerability_url = "http://public.vulnerablecode.io/vulnerabilities/VCID-pk3r-ga7k-aaap" vulnerability = { - "vulnerability_id": "42d0a7c4-99e9-4506-b0c6-338ec2993147", + "vulnerability_id": "VCID-pk3r-ga7k-aaap", "summary": "SQL Injection", + "resource_url": vulnerability_url, "references": [ { "reference_id": "", @@ -3219,19 +3238,22 @@ def test_package_details_view_get_vulnerability_fields(self): dataspace=self.dataspace, ) self.assertEqual(fields[0], ("Summary", "SQL Injection", "Summary of the vulnerability")) - self.assertEqual(fields[1][0], "Fixed packages") - fixed_package_values = fields[1][1] + self.assertEqual(fields[1][0], "VulnerableCode URL") + url_as_link = f'{vulnerability_url}' + self.assertEqual(fields[1][1], url_as_link) + self.assertEqual(fields[2][0], "Fixed packages") + fixed_package_values = fields[2][1] self.assertIn("nginx/nginx@1.10.1", fixed_package_values) self.assertIn( 'nginx/nginx@1.11.1', + f'pkg:nginx/nginx@1.11.1', fixed_package_values, ) self.assertEqual( - fields[2][0:2], + fields[3][0:2], ( "Reference IDs", '' @@ -3240,7 +3262,7 @@ def test_package_details_view_get_vulnerability_fields(self): ), ) self.assertEqual( - fields[3][0:2], + fields[4][0:2], ( "Reference URLs", '') + self.assertContains(response, '
      ')
 
         response = self.client.get(self.package1.get_url("tab_purldb"))
         self.assertContains(
             response,
-            '
      '
+            '
      '
             "a2363646a9dd05955633b450010b59a21af8a423"
             "
      ",
         )
         self.assertContains(
-            response, '
      2015-09-22
      '
+            response, '
      2015-09-22
      '
         )
         self.assertContains(
-            response, '
      Java
      '
+            response, '
      Java
      '
         )
-        self.assertContains(response, '
      ')
+        self.assertContains(response, '
      ')
 
     def test_component_catalog_package_add_view_permission_access(self):
         add_url = reverse("component_catalog:package_add")
@@ -3632,6 +3672,53 @@ def test_component_catalog_package_add_view_create_proper(self):
         expected = "Package "name.zip" was successfully created."
         self.assertContains(response, expected)
 
+    @mock.patch("dejacode_toolkit.purldb.PurlDB.request_get")
+    @mock.patch("dejacode_toolkit.purldb.PurlDB.is_configured")
+    def test_component_catalog_package_add_view_initial_data(
+        self, mock_is_configured, mock_request_get
+    ):
+        self.client.login(username=self.super_user.username, password="secret")
+        add_url = reverse("component_catalog:package_add")
+
+        mock_is_configured.return_value = True
+        self.dataspace.enable_purldb_access = True
+        self.dataspace.save()
+
+        puyrldb_entry = {
+            "filename": "abbot-1.4.0.jar",
+            "release_date": "2015-09-22",
+            "type": "maven",
+            "namespace": "abbot",
+            "name": "abbot",
+            "version": "1.4.0",
+            "qualifiers": "",
+            "subpath": "",
+            "primary_language": "Java",
+            "description": "Abbot Java GUI Test Library",
+            "declared_license_expression": "bsd-new OR eps-1.0 OR apache-2.0 OR mit",
+        }
+        mock_request_get.return_value = {
+            "count": 1,
+            "results": [puyrldb_entry],
+        }
+
+        response = self.client.get(add_url)
+        self.assertEqual({}, response.context["form"].initial)
+
+        response = self.client.get(add_url + "?package_url=pkg:maven/abbot/abbot@1.4.0")
+        expected = {
+            "filename": "abbot-1.4.0.jar",
+            "release_date": "2015-09-22",
+            "type": "maven",
+            "namespace": "abbot",
+            "name": "abbot",
+            "version": "1.4.0",
+            "primary_language": "Java",
+            "description": "Abbot Java GUI Test Library",
+            "license_expression": "bsd-new OR eps-1.0 OR apache-2.0 OR mit",
+        }
+        self.assertEqual(expected, response.context["form"].initial)
+
     @mock.patch("dje.tasks.scancodeio_submit_scan.delay")
     @mock.patch("dejacode_toolkit.scancodeio.ScanCodeIO.is_configured")
     def test_component_catalog_package_add_view_create_with_submit_scan(
@@ -4563,8 +4650,6 @@ def test_component_catalog_component_form_add(self):
         self.assertIn(status, form.fields["configuration_status"].queryset)
         self.assertNotIn(alternate_status, form.fields["configuration_status"].queryset)
 
-        self.assertEqual([(keyword.label, keyword.label)], form.fields["keywords"].choices)
-
         # NameVersionValidationFormMixin
         data = {
             "name": self.component1.name,
@@ -4610,7 +4695,7 @@ def test_component_catalog_component_form_add(self):
             "copyright": "Copyright",
             "notice_text": "Notice",
             "description": "Description",
-            "keywords": [keyword.label],
+            "keywords": [keyword.label, "Another keyword"],
             "primary_language": "Python",
             "homepage_url": "https://nexb.com",
             "configuration_status": status.pk,
@@ -4623,6 +4708,7 @@ def test_component_catalog_component_form_add(self):
         self.assertEqual(owner, component.owner)
         self.assertEqual(status, component.configuration_status)
         self.assertEqual(license1.key, component.license_expression)
+        self.assertEqual(["Key1", "Another keyword"], component.keywords)
 
     def test_component_catalog_component_form_assigned_packages(self):
         data = {
diff --git a/component_catalog/tests/testfiles/search/component_dataset.json b/component_catalog/tests/testfiles/search/component_dataset.json
index 254ae7f..9cd869c 100644
--- a/component_catalog/tests/testfiles/search/component_dataset.json
+++ b/component_catalog/tests/testfiles/search/component_dataset.json
@@ -28,8 +28,8 @@
       "nexB"
     ],
     "uuid": "53fa7229-617b-4dfa-9eee-8c09e9380046",
-    "created_date": "2014-07-01T00:00:00",
-    "last_modified_date": "2017-05-19T16:09:49.020",
+    "created_date": "2014-07-01T00:00:00Z",
+    "last_modified_date": "2017-05-19T16:09:49.020Z",
     "reference_notes": "",
     "usage_policy": null,
     "name": "logback",
@@ -68,8 +68,8 @@
       "nexB"
     ],
     "uuid": "03df48a9-60df-43b6-9c04-4a4c9015f309",
-    "created_date": "2014-07-01T00:00:00",
-    "last_modified_date": "2017-05-19T16:10:20.504",
+    "created_date": "2014-07-01T00:00:00Z",
+    "last_modified_date": "2017-05-19T16:10:20.504Z",
     "reference_notes": "",
     "usage_policy": null,
     "name": "logback",
@@ -108,8 +108,8 @@
       "nexB"
     ],
     "uuid": "fed79fab-5d00-4994-a2d1-ad35164b736a",
-    "created_date": "2014-07-01T00:00:00",
-    "last_modified_date": "2014-03-04T12:07:06.500",
+    "created_date": "2014-07-01T00:00:00Z",
+    "last_modified_date": "2014-03-04T12:07:06.500Z",
     "reference_notes": "",
     "usage_policy": null,
     "name": "logback eclipse",
@@ -148,8 +148,8 @@
       "nexB"
     ],
     "uuid": "4a037d63-f479-41f7-985e-436b8039160a",
-    "created_date": "2014-07-01T00:00:00",
-    "last_modified_date": "2016-11-10T03:56:18.135",
+    "created_date": "2014-07-01T00:00:00Z",
+    "last_modified_date": "2016-11-10T03:56:18.135Z",
     "reference_notes": "",
     "usage_policy": null,
     "name": "jblogbackup",
@@ -188,8 +188,8 @@
       "nexB"
     ],
     "uuid": "663fe571-6042-48cd-95ec-6cf57316a591",
-    "created_date": "2015-08-04T15:08:45.738",
-    "last_modified_date": "2015-08-21T12:16:25.333",
+    "created_date": "2015-08-04T15:08:45.738Z",
+    "last_modified_date": "2015-08-21T12:16:25.333Z",
     "reference_notes": "",
     "usage_policy": null,
     "name": "logback classic",
@@ -228,8 +228,8 @@
       "nexB"
     ],
     "uuid": "d47238fd-09aa-45e9-aafa-9d8c3fe10b93",
-    "created_date": "2014-07-01T00:00:00",
-    "last_modified_date": "2016-11-10T03:56:18.165",
+    "created_date": "2014-07-01T00:00:00Z",
+    "last_modified_date": "2016-11-10T03:56:18.165Z",
     "reference_notes": "",
     "usage_policy": null,
     "name": "jblogbackup",
@@ -268,8 +268,8 @@
       "nexB"
     ],
     "uuid": "31368d10-b832-4c77-87d3-2d300989d30e",
-    "created_date": "2014-07-01T00:00:00",
-    "last_modified_date": "2016-11-10T04:17:12.090",
+    "created_date": "2014-07-01T00:00:00Z",
+    "last_modified_date": "2016-11-10T04:17:12.090Z",
     "reference_notes": "",
     "usage_policy": null,
     "name": "nagios-logback-appender",
@@ -308,8 +308,8 @@
       "nexB"
     ],
     "uuid": "0a8bfdd1-7c48-4ac7-99f1-9e6c46e1bb81",
-    "created_date": "2014-07-01T00:00:00",
-    "last_modified_date": "2017-05-19T16:10:45.082",
+    "created_date": "2014-07-01T00:00:00Z",
+    "last_modified_date": "2017-05-19T16:10:45.082Z",
     "reference_notes": "",
     "usage_policy": null,
     "name": "logback",
@@ -348,8 +348,8 @@
       "nexB"
     ],
     "uuid": "9b1c732d-081b-44ae-a366-ac0182281422",
-    "created_date": "2017-06-13T10:05:03.727",
-    "last_modified_date": "2017-06-13T10:05:03.727",
+    "created_date": "2017-06-13T10:05:03.727Z",
+    "last_modified_date": "2017-06-13T10:05:03.727Z",
     "reference_notes": "",
     "usage_policy": null,
     "name": "zzz",
diff --git a/component_catalog/views.py b/component_catalog/views.py
index b2df46a..943eb8c 100644
--- a/component_catalog/views.py
+++ b/component_catalog/views.py
@@ -20,6 +20,8 @@
 from django.contrib.auth.decorators import login_required
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.core import signing
+from django.core.validators import EMPTY_VALUES
+from django.db.models import Count
 from django.db.models import Prefetch
 from django.http import FileResponse
 from django.http import Http404
@@ -33,6 +35,7 @@
 from django.utils.formats import date_format
 from django.utils.html import escape
 from django.utils.html import format_html
+from django.utils.text import normalize_newlines
 from django.utils.translation import gettext
 from django.utils.translation import gettext_lazy as _
 from django.views.decorators.csrf import csrf_exempt
@@ -45,6 +48,7 @@
 from natsort import natsorted
 from notifications.signals import notify
 from packageurl import PackageURL
+from packageurl.contrib import purl2url
 from packageurl.contrib import url2purl
 
 from component_catalog.filters import ComponentFilterSet
@@ -214,12 +218,17 @@ def get_form_kwargs(self):
         return kwargs
 
     def form_valid(self, form):
-        created_count, unchanged_count = form.save()
+        created_count, updated_count, unchanged_count = form.save()
         product = form.cleaned_data["product"]
         opts = self.model._meta
 
+        msg = ""
         if created_count:
-            msg = f'{created_count} {opts.model_name}(s) added to "{product}".'
+            msg = f'{created_count} {opts.model_name}(s) added to "{product}". '
+        if updated_count:
+            msg += f'{updated_count} {opts.model_name}(s) updated on "{product}".'
+
+        if msg:
             messages.success(self.request, msg)
         else:
             msg = f"No new {opts.model_name}(s) were assigned to this product."
@@ -310,6 +319,14 @@ def get_vulnerability_fields(vulnerability, dataspace):
             (_("Summary"), summary, "Summary of the vulnerability"),
         ]
 
+        if vulnerability_url := vulnerability.get("resource_url"):
+            vulnerability_url_help = "Link to the VulnerableCode app."
+            url_as_link = format_html(
+                '{vulnerability_url}',
+                vulnerability_url=vulnerability_url,
+            )
+            tab_fields.append((_("VulnerableCode URL"), url_as_link, vulnerability_url_help))
+
         if include_fixed_packages:
             fixed_packages = vulnerability.get("fixed_packages", [])
             fixed_packages_sorted = natsorted(fixed_packages, key=itemgetter("purl"))
@@ -614,18 +631,38 @@ def get_queryset(self):
             "licenses",
         )
 
-        related_children_qs = Subcomponent.objects.select_related(
-            "usage_policy",
-        ).prefetch_related(
-            "licenses",
-            Prefetch("child", queryset=component_prefetch_qs),
+        related_children_qs = (
+            Subcomponent.objects.select_related(
+                "usage_policy",
+            )
+            .prefetch_related(
+                "licenses",
+                Prefetch("child", queryset=component_prefetch_qs),
+            )
+            .annotate(
+                child_count=Count("child__children"),
+            )
+            .order_by(
+                "child__name",
+                "child__version",
+            )
         )
 
-        related_parents_qs = Subcomponent.objects.select_related(
-            "usage_policy",
-        ).prefetch_related(
-            "licenses",
-            Prefetch("parent", queryset=component_prefetch_qs),
+        related_parents_qs = (
+            Subcomponent.objects.select_related(
+                "usage_policy",
+            )
+            .prefetch_related(
+                "licenses",
+                Prefetch("parent", queryset=component_prefetch_qs),
+            )
+            .annotate(
+                parent_count=Count("parent__related_parents"),
+            )
+            .order_by(
+                "parent__name",
+                "parent__version",
+            )
         )
 
         return (
@@ -926,12 +963,16 @@ def get_form_kwargs(self):
         return kwargs
 
     def form_valid(self, form):
-        created_count, unchanged_count = form.save()
+        created_count, updated_count, unchanged_count = form.save()
         model_name = self.model._meta.model_name
         product_name = form.cleaned_data["product"].name
+
         msg = f"{created_count} {model_name}(s) added to {product_name}."
+        if updated_count:
+            msg += f" {updated_count} {model_name}(s) updated on {product_name}."
         if unchanged_count:
             msg += f" {unchanged_count} {model_name}(s) were already assigned."
+
         messages.success(self.request, msg)
         return super().form_valid(form)
 
@@ -1137,8 +1178,8 @@ class PackageDetailsView(
     AcceptAnonymousMixin,
     AddPackagePermissionMixin,
     TabVulnerabilityMixin,
-    ObjectDetailsView,
     AddToProductFormMixin,
+    ObjectDetailsView,
 ):
     model = Package
     slug_url_kwarg = "uuid"
@@ -1237,6 +1278,9 @@ class PackageDetailsView(
         "vulnerabilities": {
             "verbose_name": "Vulnerabilities",
         },
+        "aboutcode": {
+            "verbose_name": "AboutCode",
+        },
         "history": {
             "fields": [
                 "created_date",
@@ -1256,8 +1300,7 @@ def get_context_data(self, **kwargs):
         has_change_package_permission = user.has_perm("component_catalog.change_package")
         context_data["has_change_package_permission"] = has_change_package_permission
 
-        # License data is required for the Scan tab "scan to package"
-        # license expression fields
+        # License data is required for the Scan tab "scan to package" license expression fields
         client_data = getattr(self.request, "client_data", {})
         include_all_licenses = all(
             [
@@ -1270,9 +1313,9 @@ def get_context_data(self, **kwargs):
             all_licenses = License.objects.scope(user.dataspace).filter(is_active=True)
             add_client_data(self.request, license_data=all_licenses.data_for_expression_builder())
 
-        if self.request.user.has_perm("component_catalog.change_component"):
+        if user.has_perm("component_catalog.change_component"):
             context_data["add_to_component_form"] = AddToComponentForm(
-                self.request.user, initial={self.model._meta.model_name: self.object}
+                user, initial={self.model._meta.model_name: self.object}
             )
 
         return context_data
@@ -1437,6 +1480,15 @@ def tab_purldb(self):
         }
         return {"fields": [(None, tab_context, None, template)]}
 
+    def tab_aboutcode(self):
+        template = "component_catalog/tabs/tab_aboutcode.html"
+        context = {
+            "about_content": self.object.as_about_yaml(),
+            "notice_content": normalize_newlines(self.object.notice_text),
+        }
+
+        return {"fields": [(None, context, None, template)]}
+
     def get_vulnerabilities_tab_fields(self, vulnerabilities):
         dataspace = self.object.dataspace
         fields = []
@@ -1772,7 +1824,10 @@ def send_scan_notification(request, key):
 
     project = json_data.get("project")
     input_sources = project.get("input_sources")
-    download_url = list(input_sources.values())[0]
+    if not input_sources:
+        raise Http404("Missing `input_sources` entry in provided data.")
+    download_url = input_sources[0].get("download_url")
+
     package = get_object_or_404(Package, download_url=download_url, dataspace=user.dataspace)
     description = package.download_url
 
@@ -1893,26 +1948,52 @@ def get_initial(self):
         """Pre-fill the form with initial data from a PurlDB entry or a `package_url`."""
         initial = super().get_initial()
 
-        purldb_uuid = self.request.GET.get("purldb_uuid", None)
-        if purldb_uuid:
-            purldb_entry = PurlDB(self.request.user).get_package(purldb_uuid)
+        if purldb_entry := self.get_entry_from_purldb():
             purldb_entry["license_expression"] = purldb_entry.get("declared_license_expression")
-            model_fields = [field.name for field in Package._meta.get_fields()]
+            model_fields = [
+                field.name
+                for field in Package._meta.get_fields()
+                # Generic keywords are not supported because of validation
+                if field.name != "keywords"
+            ]
             initial_from_purldb_entry = {
                 field_name: value
                 for field_name, value in purldb_entry.items()
-                if value and field_name in model_fields
+                if value not in EMPTY_VALUES and field_name in model_fields
             }
             initial.update(initial_from_purldb_entry)
+            messages.info(self.request, "Initial data fetched from PurlDB.")
 
-        package_url = self.request.GET.get("package_url", None)
-        if package_url:
+        elif package_url := self.request.GET.get("package_url", None):
             purl = PackageURL.from_string(package_url)
             package_url_dict = purl.to_dict(encode=True, empty="")
             initial.update(package_url_dict)
+            if download_url := purl2url.get_download_url(package_url):
+                initial.update({"download_url": download_url})
 
         return initial
 
+    def get_entry_from_purldb(self):
+        user = self.request.user
+        purldb = PurlDB(user)
+        is_purldb_enabled = all(
+            [
+                purldb.is_configured(),
+                user.dataspace.enable_purldb_access,
+            ]
+        )
+
+        if not is_purldb_enabled:
+            return
+
+        purldb_uuid = self.request.GET.get("purldb_uuid", None)
+        package_url = self.request.GET.get("package_url", None)
+
+        if purldb_uuid:
+            return purldb.get_package(purldb_uuid)
+        elif package_url:
+            return purldb.get_package_by_purl(package_url)
+
     def get_success_message(self, cleaned_data):
         success_message = super().get_success_message(cleaned_data)
 
@@ -2108,8 +2189,8 @@ def license_clarity_fields(license_clarity_score):
                 value = f'{weight}'
 
             elif field == "score":
-                td_class += " bg-light"
-                th_class = "bg-light"
+                td_class += " bg-body-tertiary"
+                th_class = "bg-body-tertiary"
                 badge_color = "text-bg-primary"
                 value = f'{field_value}'
 
@@ -2132,7 +2213,7 @@ def license_clarity_fields(license_clarity_score):
     @staticmethod
     def get_key_file_summary(key_file_data):
         dt = '
      {}
      '
-        dd = '
      {}
      '
+        dd = '
      {}
      '
         summary = ""
 
         for label, field, value_key in ScanCodeIO.KEY_FILE_DETECTION_FIELDS:
diff --git a/dejacode/__init__.py b/dejacode/__init__.py
index b206456..b388da2 100644
--- a/dejacode/__init__.py
+++ b/dejacode/__init__.py
@@ -8,12 +8,68 @@
 
 import os
 import sys
+import warnings
+from contextlib import suppress
+from pathlib import Path
 
-from dejacode.celery import app as celery_app
+import git
 
-VERSION = "5.0.1-dev"
-__version__ = VERSION
-__all__ = ["celery_app"]
+VERSION = "5.1.1-dev"
+
+PROJECT_DIR = Path(__file__).resolve().parent
+ROOT_DIR = PROJECT_DIR.parent
+
+
+def get_version(version):
+    """Return the version including the git describe tag when available."""
+    # The codebase is a git clone
+    if git_describe := get_git_describe_from_local_checkout():
+        return git_describe
+
+    # The codebase is an extracted git archive
+    if git_describe := get_git_describe_from_version_file():
+        return git_describe
+
+    return version
+
+
+def get_git_describe_from_local_checkout():
+    """
+    Return the git describe tag from the local checkout.
+    This will only provide a result when the codebase is a git clone.
+    """
+    with suppress(git.GitError):
+        return git.Repo(".").git.describe(tags=True, always=True)
+
+
+def get_git_describe_from_version_file(version_file_location=ROOT_DIR / ".VERSION"):
+    """
+    Return the git describe tag from the ".VERSION" file.
+    This will only provide a result when the codebase is an extracted git archive
+    """
+    try:
+        version = version_file_location.read_text().strip()
+    except (FileNotFoundError, UnicodeDecodeError):
+        return
+
+    if version and version.startswith("v"):
+        return version
+
+
+def extract_short_commit(git_describe):
+    """
+    Extract the short commit hash from a Git describe string while removing
+    any leading "g" character if present.
+    """
+    short_commit = git_describe.split("-")[-1]
+    return short_commit.lstrip("g")
+
+
+__version__ = get_version(VERSION)
+
+
+# Turn off the warnings for the following modules.
+warnings.filterwarnings("ignore", module="cyclonedx")
 
 
 def command_line():
diff --git a/dejacode/celery.py b/dejacode/celery.py
deleted file mode 100644
index 7ef9e0a..0000000
--- a/dejacode/celery.py
+++ /dev/null
@@ -1,23 +0,0 @@
-#
-# Copyright (c) nexB Inc. and others. All rights reserved.
-# DejaCode is a trademark of nexB Inc.
-# SPDX-License-Identifier: AGPL-3.0-only
-# See https://github.com/nexB/dejacode for support or download.
-# See https://aboutcode.org for more information about AboutCode FOSS projects.
-#
-
-import os
-
-from celery import Celery
-
-# set the default Django settings module for the 'celery' program.
-os.environ.setdefault("DJANGO_SETTINGS_MODULE", "dejacode.settings")
-
-app = Celery("dejacode")
-
-# Using a string here means the worker doesn't have to serialize
-# the configuration object to child processes.
-# - namespace='CELERY' means all celery-related configuration keys
-#   should have a `CELERY_` prefix.
-app.config_from_object("django.conf:settings", namespace="CELERY")
-app.autodiscover_tasks()
diff --git a/dejacode/settings.py b/dejacode/settings.py
index 0c6a81e..77e5fef 100644
--- a/dejacode/settings.py
+++ b/dejacode/settings.py
@@ -9,6 +9,7 @@
 # Common Django settings for all deployments of DejaCode
 
 import sys
+import tempfile
 from pathlib import Path
 
 import environ
@@ -29,7 +30,7 @@
 SECRET_KEY = env.str("SECRET_KEY")
 ALLOWED_HOSTS = env.list(
     "ALLOWED_HOSTS",
-    default=[".localhost", "127.0.0.1", "[::1]", "host.docker.internal"],
+    default=[".localhost", "127.0.0.1", "[::1]", "host.docker.internal", "172.17.0.1"],
 )
 CSRF_TRUSTED_ORIGINS = env.list("CSRF_TRUSTED_ORIGINS", default=[])
 # SECURITY WARNING: don't run with debug turned on in production
@@ -87,7 +88,6 @@
 # timezone as the operating system.
 TIME_ZONE = env.str("TIME_ZONE", default="US/Pacific")
 
-SITE_ID = env.int("SITE_ID", default=1)
 SITE_URL = env.str("SITE_URL", default="")
 
 ENABLE_SELF_REGISTRATION = env.bool("ENABLE_SELF_REGISTRATION", default=False)
@@ -162,8 +162,7 @@ def gettext_noop(s):
 FILE_UPLOAD_PERMISSIONS = 0o644  # -rw-rw-r--
 
 # https://docs.djangoproject.com/en/dev/ref/settings/#data-upload-max-number-fields
-# Set to 10 times the default value (1,000)
-DATA_UPLOAD_MAX_NUMBER_FIELDS = 10000
+DATA_UPLOAD_MAX_NUMBER_FIELDS = env.int("DATA_UPLOAD_MAX_NUMBER_FIELDS", default=10000)
 
 # hCaptcha script location for registration form
 HCAPTCHA_JS_API_URL = env.str("HCAPTCHA_JS_API_URL", default="/static/js/hcaptcha.js")
@@ -209,7 +208,13 @@ def gettext_noop(s):
 # CSRF_COOKIE_HTTPONLY = True
 # Also, security.W004 SECURE_HSTS_SECONDS and security.W008 SECURE_SSL_REDIRECT
 # are handled at the web server level.
-SILENCED_SYSTEM_CHECKS = ["security.W004", "security.W008", "security.W017", "urls.W005"]
+SILENCED_SYSTEM_CHECKS = [
+    "security.W004",
+    "security.W008",
+    "security.W017",
+    "urls.W005",
+    "admin.E039",
+]
 
 # Set the following to True to enable ClamAV scan on uploaded files
 # This requires the installation of ClamAV
@@ -297,14 +302,15 @@ def gettext_noop(s):
 # On the other hand, the management commands will override each others if the
 # app is declared after another in the list.
 PREREQ_APPS = [
+    # Must come before Third-party apps for proper templates override
     "dje",
+    # Django built-in
     "django.contrib.auth",
     "django.contrib.contenttypes",
     "django.contrib.sessions",
     "django.contrib.messages",
     "django.contrib.staticfiles",
-    "django.contrib.sitemaps",
-    "django.contrib.sites",
+    # Third-party apps
     "django.contrib.humanize",
     "django.contrib.postgres",
     "grappelli.dashboard",
@@ -312,6 +318,7 @@ def gettext_noop(s):
     "django.contrib.admin",
     "rest_framework",
     "rest_framework.authtoken",
+    "django_rq",
     "crispy_forms",
     "crispy_bootstrap5",
     "guardian",
@@ -362,6 +369,9 @@ def gettext_noop(s):
 DEFAULT_FROM_EMAIL = env.str("DEFAULT_FROM_EMAIL", default="")
 EMAIL_USE_TLS = env.bool("EMAIL_USE_TLS", default=True)
 
+# An email address displayed in UI for users to reach the support team.
+DEJACODE_SUPPORT_EMAIL = env.str("DEJACODE_SUPPORT_EMAIL", default="")
+
 # Enable this setting to display a "Tools" section in the navbar including
 # links to the "Requests" and "Reporting" views.
 SHOW_TOOLS_IN_NAV = env.bool("SHOW_TOOLS_IN_NAV", default=True)
@@ -401,8 +411,7 @@ def gettext_noop(s):
 
 # Default setup for the cache
 # See https://docs.djangoproject.com/en/dev/topics/cache/
-# Set CACHE_BACKEND="django.core.cache.backends.locmem.LocMemCache" in dev mode
-CACHE_BACKEND = env.str("CACHE_BACKEND", default="django.core.cache.backends.redis.RedisCache")
+CACHE_BACKEND = env.str("CACHE_BACKEND", default="django.core.cache.backends.locmem.LocMemCache")
 CACHES = {
     "default": {
         "BACKEND": CACHE_BACKEND,
@@ -417,6 +426,44 @@ def gettext_noop(s):
     },
 }
 
+# Job Queue
+RQ_QUEUES = {
+    "default": {
+        "HOST": env.str("DEJACODE_REDIS_HOST", default="localhost"),
+        "PORT": env.str("DEJACODE_REDIS_PORT", default="6379"),
+        "PASSWORD": env.str("DEJACODE_REDIS_PASSWORD", default=""),
+        "DEFAULT_TIMEOUT": env.int("DEJACODE_REDIS_DEFAULT_TIMEOUT", default=360),
+    },
+}
+
+
+def enable_rq_eager_mode():
+    """
+    Enable the eager mode for the RQ tasks system.
+    Meaning the tasks will run directly sychroniously without the need of a worker.
+    Setting ASYNC to False in RQ_QUEUES will run jobs synchronously, but a running
+    Redis server is still needed to store job data.
+    This function patch the django_rq.get_redis_connection to always return a fake
+    redis connection using the `fakeredis` library.
+    """
+    import django_rq.queues
+    from fakeredis import FakeRedis
+    from fakeredis import FakeStrictRedis
+
+    for queue_config in RQ_QUEUES.values():
+        queue_config["ASYNC"] = False
+
+    def get_fake_redis_connection(config, use_strict_redis):
+        return FakeStrictRedis() if use_strict_redis else FakeRedis()
+
+    django_rq.queues.get_redis_connection = get_fake_redis_connection
+
+
+DEJACODE_ASYNC = env.bool("DEJACODE_ASYNC", default=False)
+if not DEJACODE_ASYNC or IS_TESTS:
+    enable_rq_eager_mode()
+
+
 # https://docs.djangoproject.com/en/dev/topics/logging/#configuring-logging
 LOGGING = {
     "version": 1,
@@ -490,7 +537,7 @@ def gettext_noop(s):
         "dejacode_toolkit": {
             "handlers": ["null"] if IS_TESTS else ["console"],
             "propagate": False,
-            "level": DEJACODE_LOG_LEVEL,
+            "level": "DEBUG" if DEBUG else DEJACODE_LOG_LEVEL,
         },
         "django_auth_ldap": {
             "handlers": ["null"] if IS_TESTS else ["console"],
@@ -598,10 +645,6 @@ def gettext_noop(s):
 # authentication.
 AXES_DISABLE_ACCESS_LOG = True
 
-# Celery
-CELERY_BROKER_URL = env.str("CELERY_BROKER_URL", default="redis://")
-CELERY_TASK_ALWAYS_EAGER = env.bool("CELERY_TASK_ALWAYS_EAGER", default=False)
-
 # 2FA with django-otp
 OTP_TOTP_ISSUER = "DejaCode"
 
@@ -619,10 +662,10 @@ def gettext_noop(s):
     INTERNAL_IPS = ["127.0.0.1"]
 
 if IS_TESTS:
-    CELERY_TASK_ALWAYS_EAGER = True
-    CELERY_EAGER_PROPAGATES_EXCEPTIONS = True
     # Silent the django-axes logging during tests
     LOGGING["loggers"].update({"axes": {"handlers": ["null"]}})
+    # Do not pollute the MEDIA_ROOT location while running the tests.
+    MEDIA_ROOT = tempfile.TemporaryDirectory().name
     # Set a faster hashing algorithm for running the tests
     # https://docs.djangoproject.com/en/dev/topics/testing/overview/#password-hashing
     PASSWORD_HASHERS = [
diff --git a/dejacode/static/css/dejacode_admin.css b/dejacode/static/css/dejacode_admin.css
index 35a8c40..42d313f 100644
--- a/dejacode/static/css/dejacode_admin.css
+++ b/dejacode/static/css/dejacode_admin.css
@@ -25,17 +25,6 @@ body.grp-popup #grp-content { padding-top: 0; top: 0; }
 header#grp-header li.nav-header { padding: 4px 10px; color: #808080; }
 .user-options-handler { text-align: end; }
 
-#logout-form {
-  display: inline;
-}
-#logout-form button {
-  background: none;
-  border: none;
-  cursor: pointer;
-  padding: 0;
-  text-decoration: underline;
-}
-
 #grp-user-tools>li button {
     display: block;
     padding: 10px 10px;
diff --git a/dejacode/static/css/dejacode_bootstrap.css b/dejacode/static/css/dejacode_bootstrap.css
index 9469041..0365875 100644
--- a/dejacode/static/css/dejacode_bootstrap.css
+++ b/dejacode/static/css/dejacode_bootstrap.css
@@ -8,42 +8,35 @@
 #
 */
 
-/* -- Main -- */
-main {
-  height: 100%;
-  min-height: 36em;
+/* -- Vars -- */
+:root,[data-bs-theme=light] {
+  --bs-body-font-size: .9375rem;
+  --bs-body-font-family: Cerebri Sans,sans-serif;
+  --bs-djc-blue-bg: #4b70aa;
+  --bs-djc-request-bg: #6b15a1;
+  --bs-djc-request-active-bg: #4d0f74;
+}
+[data-bs-theme=light] {
+  --bs-link-color: #2e73d0;
+  --bs-link-color-rgb: 46, 115, 208;
+  --bs-link-hover-color: #0056b3;
+  --bs-link-hover-color-rgb: 0, 86, 179;
 }
+
+/* -- Main -- */
 body {
   padding-top: 4rem;
-  font-family: Cerebri Sans,sans-serif;
-  font-size: .9375rem;
-  font-weight: 400;
-  line-height: 1.5;
-  color: #12263f;
-  background-color: #fff;
-}
-[data-bs-theme=dark] body {
-  color: var(--bs-body-color);
-  background-color: var(--bs-body-bg);
-}
-body.body-background, .bg-light {
-  background-color: var(--bs-tertiary-bg);
 }
 a {
-  color: #2e73d0;
   text-decoration: none;
 }
 a:hover {
-  color: #0056b3;
   text-decoration: underline;
 }
 a.btn:hover,
 a.dropdown-item:hover {
   text-decoration: none;
 }
-.badge-light {
-  background-color: #ddd;
-}
 .fs-85pct {
   font-size: 85%;
 }
@@ -58,16 +51,12 @@ a.dropdown-item:hover {
 .header-pretitle {
   letter-spacing: .08rem;
   text-transform: uppercase;
-  color: #4f5763;
+  color: var(--bs-light-text-emphasis);
   font-size: 0.625rem;
   margin-bottom: 0.5rem;
   font-weight: 500;
   line-height: 1.2;
 }
-.header-pretitle a {
-  text-decoration: none;
-  color: #22589f;
-}
 .header-title {
   margin-bottom: 0;
   font-size: 1.625rem;
@@ -85,10 +74,32 @@ code {
   height: 1rem;
   width: 1rem;
 }
-.text-break-initial {
+.btn.badge .fa, .btn.badge .fas, .btn.badge .far {
+  height: initial;
+  width: inherit;
+}
+.text-break-initial,
+table.text-break thead {
   word-wrap: initial!important;
   word-break: initial!important;
 }
+/* -- Dark there fixes -- */
+[data-bs-theme=dark] .btn-outline-dark {
+  --bs-btn-color: var(--bs-tertiary-color);
+  --bs-btn-border-color: var(--bs-tertiary-color);
+  --bs-btn-hover-color: #fff;
+  --bs-btn-hover-bg: var(--bs-tertiary-color);
+  --bs-btn-hover-border-color: var(--bs-tertiary-color);
+  --bs-btn-focus-shadow-rgb: 108, 117, 125;
+  --bs-btn-active-color: #fff;
+  --bs-btn-active-bg: var(--bs-tertiary-color);
+  --bs-btn-active-border-color: var(--bs-tertiary-color);
+  --bs-btn-active-shadow: inset 0 3px 5px rgba(0, 0, 0, 0.125);
+  --bs-btn-disabled-color: var(--bs-tertiary-color);
+  --bs-btn-disabled-bg: transparent;
+  --bs-btn-disabled-border-color: var(--bs-tertiary-color);
+  --bs-gradient: none;
+}
 
 /* -- Navbar -- */
 nav.navbar {
@@ -97,12 +108,17 @@ nav.navbar {
 }
 nav.navbar #search-input {
   width: 220px;
+  color: var(--bs-white);
+  background-color: rgba(0,0,0,0.25);
+}
+nav.navbar #search-input::placeholder {
+  color: var(--bs-gray-300);
 }
 nav.navbar.fixed-top {
-  background-color: #4b70aa;
+  background-color: var(--bs-djc-blue-bg);
 }
 .navbar-dark .navbar-nav .nav-link {
-  color: #fff;
+  color: var(--bs-white);
 }
 .navbar .notification-active {
   position: absolute;
@@ -117,7 +133,7 @@ nav.navbar.fixed-top {
 .navbar-dark .navbar-nav .nav-link.active,
 .navbar-dark .navbar-nav .nav-link.show,
 .navbar-dark .navbar-nav .show>.nav-link {
-    color: #fff;
+    color: var(--bs-white);
     text-decoration: underline;
     text-underline-position: under;
 }
@@ -127,7 +143,7 @@ nav.navbar.fixed-top {
 
 /* -- Pagination -- */
 nav ul.pagination .disabled {
-  --bs-pagination-disabled-bg: white;
+  --bs-pagination-disabled-bg: var(--bs-pagination-disabled-bg);
 }
 
 /* -- Back to Top link -- */
@@ -143,7 +159,7 @@ nav ul.pagination .disabled {
 }
 #back-to-top:hover i {
   position: relative;
-  color: #fff;
+  color: var(--bs-black);
   top: -.4375rem;
 }
 
@@ -158,14 +174,13 @@ nav ul.pagination .disabled {
   top: .375rem;
   right: 0;
   z-index: 10;
-  color: #818a91;
+  color: var(--bs-body-color);
   cursor: pointer;
   background-color: transparent;
   border: 0;
 }
-/* 
       has a 15px right-padding that need to be added */
 dd .btn-clipboard {
-  right: 1.7rem;
+  right: 1rem;
 }
 dd .btn-expend {
   right: 3.1rem;
@@ -178,7 +193,7 @@ dd .btn-expend {
 }
 .btn-clipboard:hover,
 .btn-expend:hover {
-  color: #4b70aa;
+  color: var(--bs-djc-blue-bg);
 }
 dd.reduced pre {
   max-height: 110px;
@@ -190,13 +205,14 @@ dd.reduced pre {
 }
 
 /* -- Footer -- */
-.footer {
-  border-top: 0.0625rem solid #dae1e9;
+.footer a {
+  color: var(--bs-body-color);
+  font-weight: 500;
 }
-.footer a, .footer a:hover,
+.footer a:hover,
 .footer a:focus {
-  font-weight: 500;
-  color: #4e5c6e;
+    color: var(--bs-link-hover-color);
+    text-decoration: underline;
 }
 .footer li {
   display: inline-block;
@@ -204,11 +220,6 @@ dd.reduced pre {
 .footer li + li {
   margin-left: 1rem;
 }
-@media (min-width: 576px) {
-  .footer {
-    text-align: left;
-  }
-}
 
 /* -- Homepage card layout -- */
 @media (min-width:576px) {
@@ -237,6 +248,10 @@ dd.reduced pre {
     z-index: 1;
     font-size: 0.875rem;
 }
+th.column-grouping {
+  width: 36px;
+  max-width: 36px;
+}
 th.column-selection {
   width: 27px;
   max-width: 27px;
@@ -308,7 +323,7 @@ table.products-table .column-name {
   min-width: 180px;
 }
 table.products-table .column-version {
-  min-width: 82px;
+  min-width: 90px;
 }
 table.products-table .column-primary_language {
   min-width: 130px;
@@ -325,6 +340,9 @@ table.products-table .column-license_expression {
 table.products-table .column-owner {
   min-width: 75px;
 }
+table.products-table .column-productinventoryitem_count {
+  width: 100px;
+}
 
 /* -- Package List -- */
 table.packages-table .column-usage_policy {
@@ -365,36 +383,36 @@ table.purldb-table .column-license_expression {
 
 /* -- Request button -- */
 .btn-request {
-  color: #fff;
-  background-color: #6b15a1;
-  border-color: #6b15a1;
+  color: var(--bs-white);
+  background-color: var(--bs-djc-request-bg);
+  border-color: var(--bs-djc-request-bg);
 }
 .btn-request:hover,
 .btn-request:active,
 .btn.show.btn-request {
-  color: #fff;
-  background-color: #4d0f74;
-  border-color: #4d0f74;
+  color: var(--bs-white);
+  background-color: var(--bs-djc-request-active-bg);
+  border-color: var(--bs-djc-request-active-bg);
 }
 .btn-request:focus {
   box-shadow: 0 0 0 0.2rem rgba(107,21,161,.25);
 }
 .btn-outline-request {
-    color: #6b15a1;
-    border-color: #6b15a1;
+    color: var(--bs-djc-request-bg);
+    border-color: var(--bs-djc-request-bg);
 }
 .btn-outline-request:hover {
     color: #fff;
-    background-color: #6b15a1;
-    border-color: #6b15a1;
+    background-color: var(--bs-djc-request-bg);
+    border-color: var(--bs-djc-request-bg);
 }
 .btn-outline-request:focus {
   box-shadow: 0 0 0 0.2rem rgba(107,21,161,.25);
 }
 .btn-outline-request:not(:disabled):not(.disabled):active {
     color: #fff;
-    background-color: #4d0f74;
-    border-color: #4d0f74;
+    background-color: var(--bs-djc-request-active-bg);
+    border-color: var(--bs-djc-request-active-bg);
 }
 
 /* -- Requests list -- */
@@ -409,20 +427,20 @@ table.purldb-table .column-license_expression {
   text-decoration: none;
 }
 .text-bg-request {
-  background-color: #6b15a1;
+  background-color: var(--bs-djc-request-bg);
   color: white;
   vertical-align: middle;
 }
 
 /* -- Requests form -- */
 #workflow-request-form fieldset.right-side label {
-  color: #495057;
+  color: var(--bs-card-color);
   font-size: 0.875rem;
   font-weight: 600;
   margin-bottom: .25rem;
 }
 #workflow-request-form fieldset.right-side .small-label {
-  color: #495057;
+  color: var(--bs-card-color);
   font-size: 0.875rem;
 }
 
@@ -476,6 +494,10 @@ div.awesomplete {
   max-height: 50vh;
   overflow-y: auto;
 }
+[data-bs-theme=dark] .awesomplete > ul {
+  background: var(--bs-black);
+}
+
 #div_id_component .awesomplete {
   display: inline-block !important;
 }
@@ -513,7 +535,7 @@ body.product-comparison #div_id_exclude {
 
 /* -- Tables -- */
 :not([data-bs-theme="dark"]) .table {
-  --bs-table-striped-bg: #f9fbfd;
+  --bs-table-striped-bg: var(--bs-tertiary-bg);
 }
 td.version_grouping {
   text-align: center;
@@ -528,11 +550,11 @@ tr.extra-details {
 }
 td.sub-header {
   color: #95aac9;
-  background-color: #f9fbfd;
+  background-color: var(--bs-tertiary-bg);
   text-align: center;
 }
 .table-hover tbody tr:hover {
-  background-color: #f9fbfd;
+  background-color: var(--bs-tertiary-bg);
 }
 .table-fixed-layout {
   table-layout: fixed;
@@ -540,9 +562,6 @@ td.sub-header {
 .table thead tr th {
   vertical-align: middle;
 }
-.table thead tr th a {
-  color: #000000;
-}
 .table thead tr th a.sort,
 .table thead tr th a.sort:hover {
   color: #ccc;
@@ -550,7 +569,7 @@ td.sub-header {
   margin-left: 0.0625rem;
 }
 .table thead tr th a.sort.active {
-  color: black;
+  color: var(--bs-body-color);
 }
 
 /* -- Better looks for the popover fake links -- */
@@ -573,7 +592,7 @@ a[data-category-pk]:focus,
 
 /* -- Sign Up/In Forms -- */
 body.signup-form {
-  background-color: #4b70aa;
+  background-color: var(--bs-djc-blue-bg);
 }
 body.signup-form label {
   display: none;
@@ -598,19 +617,13 @@ form[id^="2fa"] .alert ul {
   padding: 0;
   list-style: none;
 }
-body.signup-form form#registration p.eula {
-  margin-bottom: 0.3125rem;
-}
 body.signup-form h1 {
   text-align: center;
   margin: 25px 0;
-  color: white;
+  color: var(--bs-white);
   font-size: 30px;
   font-weight: normal;
 }
-body.signup-form p.eula {
-  font-weight: bold;
-}
 body.signup-form .asteriskField {
   display: none;
 }
@@ -664,7 +677,7 @@ pre.log {
 }
 .nav-pills .nav-link.active,
 .nav-pills .show>.nav-link {
-  background-color: #4b70aa;
+  background-color: var(--bs-djc-blue-bg);
 }
 .card,
 .table {
@@ -691,7 +704,7 @@ mark {
   background-color: rgba(255, 193, 7, 0.3);
   padding: .15em;
 }
-.bg-light {
+.bg-body-tertiary {
   background-color: var(--bs-tertiary-bg) !important;
 }
 .annotation_link,
@@ -713,15 +726,15 @@ a.no-style:hover {
 }
 code.key {
   background-color: transparent;
-  color: black;
+  color: var(--bs-body-color);
   padding: 0.125rem 0.25rem;
-  border: 0.0625rem solid #e1e1e8;
+  border: 0.0625rem solid var(--bs-gray-400);
   border-radius: 0.1875rem;
   white-space: nowrap;
 }
 .dropdown-item.active,
 .dropdown-item:active {
-  background-color: #4b70aa;
+  background-color: var(--bs-djc-blue-bg);
 }
 table thead .dropdown-toggle::after {
   margin-left: 0;
@@ -735,12 +748,9 @@ table thead .dropdown-toggle::after {
 .fa-stack.fa-small {
   font-size: 0.6em;
 }
-pre {
-  background-color: white;
-}
-pre.pre-bg-light,
+pre.pre-bg-body-tertiary,
 .requests-details #comments_section pre {
-  border: 0.0625rem solid #dee2e6;
+  border: 0.0625rem solid var(--bs-gray-300);
   border-radius: .25rem;
   padding: 0.5rem;
   background-color: var(--bs-tertiary-bg);
@@ -783,7 +793,9 @@ pre .clearfix {
 #key-files-modal dt {
   font-size: 0.85rem;
 }
-
+#key-file-source {
+  background-color: var(--bs-tertiary-bg);
+}
 /* -- bootstrap-select DejaCode compatibility -- */
 select.bootstrap-select-filter {
   display: none;
@@ -795,7 +807,6 @@ select.bootstrap-select-filter {
 }
 .bs-searchbox {
   padding: 0.5rem;
-  background-color: #f7f7f7;
   border-bottom: 0.0625rem solid #ebebeb;
 }
 .bs-searchbox input {
@@ -813,7 +824,6 @@ select.bootstrap-select-filter {
   padding: 0.5rem 0.75rem;
   margin-bottom: 0;
   font-size: 1rem;
-  background-color: #f7f7f7;
   border-bottom: 1px solid #ebebeb;
   border-top-left-radius: calc(0.3rem - 1px);
   border-top-right-radius: calc(0.3rem - 1px);
@@ -826,12 +836,11 @@ select.bootstrap-select-filter {
   font-size: 1.5rem;
   font-weight: 700;
   line-height: 1;
-  color: #000;
   text-shadow: 0 1px 0 #fff;
   opacity: .5;
 }
 .bootstrap-select li.selected a {
-  background-color: #4b70aa;
+  background-color: var(--bs-djc-blue-bg);
   color: #fff;
   text-decoration:none;
   outline:0;
@@ -851,6 +860,9 @@ select.bootstrap-select-filter {
   white-space: normal;
   font-size: 14px;
 }
+.bootstrap-select .no-results {
+    background: var(--bs-popover-header-bg);
+}
 /* Custom filters dropdown menu sizes */
 .column-license_expression .dropdown-menu {
   width: 350px;
@@ -877,7 +889,7 @@ select.bootstrap-select-filter {
     z-index: 1;
 }
 .timeline:before {
-    background: #dee2e6;
+    background: var(--bs-gray-300);
     left: 9px;
     width: 2px;
     height: 100%;
diff --git a/dejacode/static/js/bootstrap_theme_toggler.js b/dejacode/static/js/bootstrap_theme_toggler.js
new file mode 100644
index 0000000..0e02011
--- /dev/null
+++ b/dejacode/static/js/bootstrap_theme_toggler.js
@@ -0,0 +1,81 @@
+/*!
+* Color mode toggler for Bootstrap's docs (https://getbootstrap.com/)
+* Copyright 2011-2023 The Bootstrap Authors
+* Licensed under the Creative Commons Attribution 3.0 Unported License.
+* https://getbootstrap.com/docs/5.3/customize/color-modes/#javascript
+*/
+
+(() => {
+'use strict'
+
+const getStoredTheme = () => localStorage.getItem('theme')
+const setStoredTheme = theme => localStorage.setItem('theme', theme)
+
+const getPreferredTheme = () => {
+  const storedTheme = getStoredTheme()
+  if (storedTheme) {
+    return storedTheme
+  }
+
+  return window.matchMedia('(prefers-color-scheme: dark)').matches ? 'dark' : 'light'
+}
+
+const setTheme = theme => {
+  if (theme === 'auto' && window.matchMedia('(prefers-color-scheme: dark)').matches) {
+    document.documentElement.setAttribute('data-bs-theme', 'dark')
+  } else {
+    document.documentElement.setAttribute('data-bs-theme', theme)
+  }
+}
+
+setTheme(getPreferredTheme())
+
+const showActiveTheme = (theme, focus = false) => {
+  const themeSwitcher = document.querySelector('#bd-theme')
+
+  if (!themeSwitcher) {
+    return
+  }
+
+  const themeSwitcherText = document.querySelector('#bd-theme-text')
+  const activeThemeIcon = document.querySelector('.theme-icon-active use')
+  const btnToActive = document.querySelector(`[data-bs-theme-value="${theme}"]`)
+  const svgOfActiveBtn = btnToActive.querySelector('svg use').getAttribute('href')
+
+  document.querySelectorAll('[data-bs-theme-value]').forEach(element => {
+    element.classList.remove('active')
+    element.setAttribute('aria-pressed', 'false')
+  })
+
+  btnToActive.classList.add('active')
+  btnToActive.setAttribute('aria-pressed', 'true')
+  activeThemeIcon.setAttribute('href', svgOfActiveBtn)
+  const themeSwitcherLabel = `${themeSwitcherText.textContent} (${btnToActive.dataset.bsThemeValue})`
+  themeSwitcher.setAttribute('aria-label', themeSwitcherLabel)
+
+  if (focus) {
+    themeSwitcher.focus()
+  }
+}
+
+window.matchMedia('(prefers-color-scheme: dark)').addEventListener('change', () => {
+  const storedTheme = getStoredTheme()
+  if (storedTheme !== 'light' && storedTheme !== 'dark') {
+    setTheme(getPreferredTheme())
+  }
+})
+
+window.addEventListener('DOMContentLoaded', () => {
+  showActiveTheme(getPreferredTheme())
+
+  document.querySelectorAll('[data-bs-theme-value]')
+    .forEach(toggle => {
+      toggle.addEventListener('click', () => {
+        const theme = toggle.getAttribute('data-bs-theme-value')
+        setStoredTheme(theme)
+        setTheme(theme)
+        showActiveTheme(theme, true)
+      })
+    })
+})
+})()
diff --git a/dejacode/static/js/dejacode_main.js b/dejacode/static/js/dejacode_main.js
index 44db88c..1fbfd43 100644
--- a/dejacode/static/js/dejacode_main.js
+++ b/dejacode/static/js/dejacode_main.js
@@ -8,6 +8,92 @@
 #
 */
 
+function setupTooltips() {
+  // Enables all tooltips
+  const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]');
+  const tooltips = Array.from(tooltipTriggerList).map(element => {
+    return new bootstrap.Tooltip(element, {
+      container: 'body'
+    });
+  });
+}
+
+function setupPopovers() {
+  // Enables all popovers
+  const popoverTriggerList = document.querySelectorAll('[data-bs-toggle="popover"]');
+  const popovers = Array.from(popoverTriggerList).map(element => {
+    return new bootstrap.Popover(element, {
+      container: 'body',
+      html: true
+    });
+  });
+}
+
+function setupSelectionCheckboxes() {
+  const selectAllCheckbox = document.getElementById("checkbox-select-all");
+  const rowCheckboxes = document.querySelectorAll("table#object-list-table tbody input[type='checkbox']");
+  let lastChecked; // Store the last checked checkbox
+
+  if (!rowCheckboxes) return;
+
+  // Select-all checkboxes
+  if (selectAllCheckbox) {
+    selectAllCheckbox.addEventListener("click", function() {
+      rowCheckboxes.forEach(function(checkbox) {
+        checkbox.checked = selectAllCheckbox.checked;
+      });
+    });
+  }
+
+  // Add a click event listener to each row checkbox to handle individual selections
+  rowCheckboxes.forEach((checkbox) => {
+    checkbox.addEventListener("click", function (event) {
+      if (event.shiftKey && lastChecked) {
+        // Determine the index of the clicked checkbox
+        const currentCheckboxIndex = Array.from(rowCheckboxes).indexOf(checkbox);
+        const lastCheckedIndex = Array.from(rowCheckboxes).indexOf(lastChecked);
+
+        // Determine the range of checkboxes to check/uncheck
+        const startIndex = Math.min(currentCheckboxIndex, lastCheckedIndex);
+        const endIndex = Math.max(currentCheckboxIndex, lastCheckedIndex);
+
+        // Toggle the checkboxes within the range
+        for (let i = startIndex; i <= endIndex; i++) {
+          rowCheckboxes[i].checked = checkbox.checked;
+        }
+      }
+
+      // Update the last checked checkbox
+      lastChecked = checkbox;
+
+      // Check if all row checkboxes are checked and update the "Select All" checkbox accordingly
+      if (selectAllCheckbox) {
+        selectAllCheckbox.checked = Array.from(rowCheckboxes).every((cb) => cb.checked);
+      }
+
+    });
+  });
+}
+
+function setupBackToTop() {
+  // Get the back-to-top button element
+  const backToTopButton = document.getElementById('back-to-top');
+
+  // Add a scroll event listener
+  window.addEventListener('scroll', function () {
+    if (window.scrollY >= 250) { // Page is scrolled more than 250px
+      backToTopButton.style.display = 'block';
+    } else {
+      backToTopButton.style.display = 'none';
+    }
+  });
+
+  // Add a click event listener to scroll back to the top
+  backToTopButton.addEventListener('click', function () {
+    window.scrollTo(0, 0);
+  });
+}
+
 document.addEventListener('DOMContentLoaded', () => {
   NEXB = {};
   NEXB.client_data = JSON.parse(document.getElementById("client_data").textContent);
@@ -37,23 +123,6 @@ document.addEventListener('DOMContentLoaded', () => {
     document.body.appendChild(overlay);
   }
 
-  // Enables all tooltips
-  const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]');
-  const tooltips = Array.from(tooltipTriggerList).map(element => {
-    return new bootstrap.Tooltip(element, {
-      container: 'body'
-    });
-  });
-
-  // Enables all popovers
-  const popoverTriggerList = document.querySelectorAll('[data-bs-toggle="popover"]');
-  const popovers = Array.from(popoverTriggerList).map(element => {
-    return new bootstrap.Popover(element, {
-      container: 'body',
-      html: true
-    });
-  });
-
   // Search selection in the header
   $('#search-selector-list a').click(function(event) {
     event.preventDefault();
@@ -62,21 +131,9 @@ document.addEventListener('DOMContentLoaded', () => {
     $('#search-input').focus();
   });
 
-  // Get the back-to-top button element
-  const backToTopButton = document.getElementById('back-to-top');
-
-  // Add a scroll event listener
-  window.addEventListener('scroll', function () {
-    if (window.scrollY >= 250) { // Page is scrolled more than 250px
-      backToTopButton.style.display = 'block';
-    } else {
-      backToTopButton.style.display = 'none';
-    }
-  });
-
-  // Add a click event listener to scroll back to the top
-  backToTopButton.addEventListener('click', function () {
-    window.scrollTo(0, 0);
-  });
+  setupTooltips();
+  setupPopovers();
+  setupSelectionCheckboxes();
+  setupBackToTop();
 
 });
diff --git a/dejacode/static/js/license_expression_builder.js b/dejacode/static/js/license_expression_builder.js
index f85f9dd..6824665 100644
--- a/dejacode/static/js/license_expression_builder.js
+++ b/dejacode/static/js/license_expression_builder.js
@@ -76,7 +76,7 @@ if (typeof(grp) !== 'undefined') {
         }
     }
 
-    NEXB.setup_awesomplete_builder = function(element, related_field, max_items, license_data) {
+    setup_awesomplete_builder = function(element, related_field, max_items, license_data) {
         if (!element) return false;
         console.log('Setup license expression builder for #' + element.id);
 
@@ -144,7 +144,7 @@ if (typeof(grp) !== 'undefined') {
     function add_expression_builder(license_expression_field) {
         let fieldset = $(license_expression_field).parents('fieldset');
         let related_component_field = fieldset.find("input[name$='component'], input[name$='child'], input[name$='package']");
-        NEXB.setup_awesomplete_builder(license_expression_field, related_component_field);
+        setup_awesomplete_builder(license_expression_field, related_component_field);
     }
 
     function add_expression_builder_in_inlines_on_add_another(form) {
diff --git a/dejacode/urls.py b/dejacode/urls.py
index e81cf8d..a1de87e 100644
--- a/dejacode/urls.py
+++ b/dejacode/urls.py
@@ -22,6 +22,7 @@
 from rest_framework.routers import DefaultRouter
 
 from component_catalog.api import ComponentViewSet
+from component_catalog.api import KeywordViewSet
 from component_catalog.api import PackageViewSet
 from component_catalog.api import SubcomponentViewSet
 from component_catalog.views import send_scan_notification
@@ -64,6 +65,7 @@
 api_router.register("license_annotations", LicenseAnnotationViewSet)
 api_router.register("components", ComponentViewSet)
 api_router.register("subcomponents", SubcomponentViewSet)
+api_router.register("keywords", KeywordViewSet)
 api_router.register("packages", PackageViewSet)
 api_router.register("products", ProductViewSet)
 api_router.register("product_components", ProductComponentViewSet)
diff --git a/dejacode_toolkit/__init__.py b/dejacode_toolkit/__init__.py
index 20aa042..7b121f7 100644
--- a/dejacode_toolkit/__init__.py
+++ b/dejacode_toolkit/__init__.py
@@ -41,7 +41,7 @@ class BaseService:
     settings_prefix = None
     url_field_name = None
     api_key_field_name = None
-    default_timeout = 3
+    default_timeout = 5
 
     def __init__(self, user):
         if not user:
@@ -123,16 +123,14 @@ def request_get(self, url, **kwargs):
             logger.error(f"{self.label} [Exception] {exception}")
 
     def request_post(self, url, **kwargs):
-        """
-        Return the response from calling URL using current session.
-        Return `None` in case of Exception.
-        """
+        """Return the response from a HTTP POST request on the provided `url` ."""
         if "timeout" not in kwargs:
             kwargs["timeout"] = self.default_timeout
 
+        # Do not `raise_for_status` as the response may contain valuable data
+        # even on non 200 status code.
         try:
             response = self.session.post(url, **kwargs)
-            response.raise_for_status()
             return response.json()
         except (requests.RequestException, ValueError, TypeError) as exception:
             logger.error(f"{self.label} [Exception] {exception}")
diff --git a/dejacode_toolkit/download.py b/dejacode_toolkit/download.py
index ca2aba8..35331db 100644
--- a/dejacode_toolkit/download.py
+++ b/dejacode_toolkit/download.py
@@ -7,8 +7,9 @@
 #
 
 import cgi
-import os
 import socket
+from pathlib import Path
+from urllib.parse import unquote
 from urllib.parse import urlparse
 
 from django.template.defaultfilters import filesizeformat
@@ -29,7 +30,7 @@ class DataCollectionException(Exception):
 
 def collect_package_data(url):
     try:
-        response = requests.get(url, timeout=10, stream=True)
+        response = requests.get(url, timeout=5, stream=True)
     except (requests.RequestException, socket.timeout) as e:
         raise DataCollectionException(e)
 
@@ -54,8 +55,13 @@ def collect_package_data(url):
         )
 
     content_disposition = response.headers.get("content-disposition", "")
-    value, params = cgi.parse_header(content_disposition)
-    filename = params.get("filename") or os.path.basename(urlparse(url).path)
+    _, params = cgi.parse_header(content_disposition)
+
+    filename = params.get("filename")
+    if not filename:
+        # Using ``response.url`` in place of provided ``url`` arg since the former
+        # will be more accurate in case of HTTP redirect.
+        filename = unquote(Path(urlparse(response.url).path).name)
 
     package_data = {
         "download_url": url,
diff --git a/dejacode_toolkit/purldb.py b/dejacode_toolkit/purldb.py
index 55d0315..5ddb5f7 100644
--- a/dejacode_toolkit/purldb.py
+++ b/dejacode_toolkit/purldb.py
@@ -54,6 +54,11 @@ def get_package(self, uuid):
         """Get a Package details entry providing its `uuid`."""
         return self.request_get(url=f"{self.package_api_url}{uuid}/")
 
+    def get_package_by_purl(self, package_url):
+        """Get a Package details entry providing its `package_url`."""
+        if results := self.find_packages({"purl": package_url}):
+            return results[0]
+
     def find_packages(self, payload, timeout=None):
         """Get Packages details using provided `payload` filters on the PurlDB package list."""
         response = self.request_get(self.package_api_url, params=payload, timeout=timeout)
diff --git a/dejacode_toolkit/scancodeio.py b/dejacode_toolkit/scancodeio.py
index 0fcd6e7..332217a 100644
--- a/dejacode_toolkit/scancodeio.py
+++ b/dejacode_toolkit/scancodeio.py
@@ -7,13 +7,13 @@
 #
 
 import json
+from hashlib import md5
 from urllib.parse import quote_plus
 
 from django.apps import apps
 from django.conf import settings
 from django.core import signing
 from django.urls import reverse
-from django.utils.crypto import md5
 
 import requests
 from license_expression import Licensing
@@ -66,7 +66,7 @@ def submit_scan(self, uri, user_uuid, dataspace_uuid):
         data = {
             "name": get_project_name(uri, user_uuid, dataspace_uuid),
             "input_urls": uri,
-            "pipeline": "scan_package",
+            "pipeline": "scan_single_package",
             "execute_now": True,
         }
 
@@ -76,10 +76,12 @@ def submit_scan(self, uri, user_uuid, dataspace_uuid):
         logger.debug(f'{self.label}: submit scan uri="{uri}" webhook_url="{webhook_url}"')
         return self.request_post(url=self.project_api_url, json=data)
 
-    def submit_manifest_inspection(self, project_name, file_location, user_uuid, execute_now=False):
+    def submit_project(
+        self, project_name, pipeline_name, file_location, user_uuid, execute_now=False
+    ):
         data = {
             "name": project_name,
-            "pipeline": "inspect_manifest",
+            "pipeline": pipeline_name,
             "execute_now": execute_now,
         }
         files = {
@@ -92,7 +94,7 @@ def submit_manifest_inspection(self, project_name, file_location, user_uuid, exe
         data["webhook_url"] = webhook_url
 
         logger.debug(
-            f"{self.label}: submit manifest inspection "
+            f"{self.label}: submit pipeline={pipeline_name} "
             f'project_name="{project_name}" webhook_url="{webhook_url}"'
         )
         return self.request_post(url=self.project_api_url, data=data, files=files)
@@ -167,6 +169,8 @@ def update_from_scan(self, package, user):
         Only blank/null fields are updated. Fields with existing values are skipped.
         An entry is logged in the `package` history using the provided `user`.
         """
+        logger.debug(f'{self.label}: Start "update from scan" for package="{package}"')
+
         History = apps.get_model("dje", "History")
         values_from_scan = {}  # {'model_field': 'value_from_scan'}
         updated_fields = []
@@ -216,6 +220,7 @@ def update_from_scan(self, package, user):
             updated_fields = package.update_from_data(user, values_from_scan)
             if updated_fields:
                 msg = f'Automatically updated {", ".join(updated_fields)} from scan results'
+                logger.debug(f"{self.label}: {msg}")
                 History.log_change(user, package, message=msg)
 
         return updated_fields
@@ -439,4 +444,4 @@ def get_scan_results_as_file_url(project_data):
 def get_package_download_url(project_data):
     input_sources = get_project_input_source(project_data)
     if len(input_sources) == 1:
-        return input_sources[0].get("source", None)
+        return input_sources[0].get("download_url", None)
diff --git a/dje/admin.py b/dje/admin.py
index f8bd28b..254c953 100644
--- a/dje/admin.py
+++ b/dje/admin.py
@@ -300,7 +300,7 @@ def log_addition(self, request, object, change_message=None):
         history_entry = History.log_addition(request.user, object)
 
         if ADDITION in getattr(self, "email_notification_on", []):
-            send_notification_email(request.user, object, ADDITION)
+            send_notification_email(request, object, ADDITION)
 
         return history_entry
 
@@ -319,7 +319,7 @@ def log_change(self, request, object, message):
             # Expending the base message with details
             changes_details = getattr(request, "changes_details", {})
             message += construct_changes_details_message(changes_details)
-            send_notification_email(request.user, object, CHANGE, message)
+            send_notification_email(request, object, CHANGE, message)
 
         return history_entry
 
@@ -764,14 +764,14 @@ def delete_model(self, request, obj):
         History.log_deletion(request.user, obj)
         super().delete_model(request, obj)
         if DELETION in self.email_notification_on:
-            send_notification_email(request.user, obj, DELETION)
+            send_notification_email(request, obj, DELETION)
 
     def delete_queryset(self, request, queryset):
         """
         Add the email notification on bulk deletion through the default django
         'delete_selected' action.
         """
-        send_notification_email_on_queryset(request.user, queryset, DELETION)
+        send_notification_email_on_queryset(request, queryset, DELETION)
         super().delete_queryset(request, queryset)
 
     def get_urls(self):
diff --git a/dje/api.py b/dje/api.py
index 2e2a274..0a5a9a0 100644
--- a/dje/api.py
+++ b/dje/api.py
@@ -10,7 +10,6 @@
 from contextlib import suppress
 from urllib.parse import urlparse
 
-from django.conf import settings
 from django.contrib.contenttypes.models import ContentType
 from django.core.exceptions import ImproperlyConfigured
 from django.core.exceptions import ObjectDoesNotExist
@@ -37,6 +36,7 @@
 from rest_framework.relations import ManyRelatedField
 from rest_framework.response import Response
 
+from dje import outputs
 from dje.api_custom import TabPermission
 from dje.copier import copy_object
 from dje.fields import ExtendedNullBooleanSelect
@@ -177,7 +177,7 @@ def perform_create(self, serializer):
 
         History.log_addition(user, serializer.instance)
         if History.ADDITION in self.email_notification_on:
-            send_notification_email(user, serializer.instance, History.ADDITION)
+            send_notification_email(self.request, serializer.instance, History.ADDITION)
 
     def perform_update(self, serializer):
         """Add the CHANGE History."""
@@ -214,7 +214,9 @@ def perform_update(self, serializer):
             change_message += construct_changes_details_message(
                 {serializer.instance: changes_details}
             )
-            send_notification_email(user, serializer.instance, History.CHANGE, change_message)
+            send_notification_email(
+                self.request, serializer.instance, History.CHANGE, change_message
+            )
 
 
 class ExtraPermissionsViewSetMixin:
@@ -317,14 +319,17 @@ def get_fields(self):
 
     def get_absolute_url(self, obj):
         """
-        Return a fully qualified URL (includes the schema and domains) of the object.
-        Combining the settings site URL and the get_absolute_url() method of the object.
+        Return the object fully qualified URL including the schema and domain.
 
         Usage:
             absolute_url = serializers.SerializerMethodField()
         """
-        site = settings.SITE_URL.rstrip("/")
-        return f"{site}{obj.get_absolute_url()}"
+        absolute_url = obj.get_absolute_url()
+
+        if request := self.context.get("request", None):
+            return request.build_absolute_uri(location=absolute_url)
+
+        return absolute_url
 
     def apply_tabs_permission(self, fields, user):
         model_tabset = get_tabset_for_model(self.Meta.model)
@@ -578,3 +583,46 @@ def get_queryset(self):
             .select_related("content_type")
             .prefetch_related("content_object")
         )
+
+
+class AboutCodeFilesActionMixin:
+    @action(detail=True, name="Download AboutCode files")
+    def aboutcode_files(self, request, uuid):
+        instance = self.get_object()
+        about_files = instance.get_about_files()
+        filename = self.get_filename(instance)
+        return self.get_zipped_response(about_files, filename)
+
+
+class SPDXDocumentActionMixin:
+    @action(detail=True, name="Download SPDX document")
+    def spdx_document(self, request, uuid):
+        spdx_document = outputs.get_spdx_document(self.get_object(), self.request.user)
+
+        spdx_document_json = spdx_document.as_json()
+
+        return outputs.get_attachment_response(
+            file_content=spdx_document_json,
+            filename=outputs.get_spdx_filename(spdx_document),
+            content_type="application/json",
+        )
+
+
+class CycloneDXSOMActionMixin:
+    @action(detail=True, name="Download CycloneDX SBOM")
+    def cyclonedx_sbom(self, request, uuid):
+        instance = self.get_object()
+        spec_version = request.query_params.get("spec_version")
+
+        cyclonedx_bom = outputs.get_cyclonedx_bom(instance, self.request.user)
+        try:
+            cyclonedx_bom_json = outputs.get_cyclonedx_bom_json(cyclonedx_bom, spec_version)
+        except ValueError:
+            error = f"Spec version {spec_version} not supported"
+            return Response(error, status=status.HTTP_400_BAD_REQUEST)
+
+        return outputs.get_attachment_response(
+            file_content=cyclonedx_bom_json,
+            filename=outputs.get_cyclonedx_filename(instance),
+            content_type="application/json",
+        )
diff --git a/dje/context_processors.py b/dje/context_processors.py
index c10ff92..67d7bb0 100644
--- a/dje/context_processors.py
+++ b/dje/context_processors.py
@@ -14,7 +14,8 @@
 def dejacode_context(request):
     """Return all the DejaCode specific context variables."""
     return {
-        "DEJACODE_VERSION": DEJACODE_VERSION,
+        "DEJACODE_VERSION": DEJACODE_VERSION.lstrip("v"),
+        "DEJACODE_SUPPORT_EMAIL": settings.DEJACODE_SUPPORT_EMAIL,
         "FAVICON_HREF": settings.FAVICON_HREF,
         "SITE_TITLE": settings.SITE_TITLE,
         "HEADER_TEMPLATE": settings.HEADER_TEMPLATE,
diff --git a/dje/dashboard.py b/dje/dashboard.py
index f69d75c..b63ca6a 100644
--- a/dje/dashboard.py
+++ b/dje/dashboard.py
@@ -67,6 +67,10 @@ def init_with_context(self, context):
         )
 
         shortcuts = [
+            {
+                "title": _("Documentation"),
+                "url": "https://dejacode.readthedocs.io/en/latest/",
+            },
             {
                 "title": _("Models documentation"),
                 "url": reverse("admin:docs_models"),
diff --git a/dje/filters.py b/dje/filters.py
index 73568c7..b1cbbd2 100644
--- a/dje/filters.py
+++ b/dje/filters.py
@@ -467,7 +467,7 @@ class DataspaceFilter(ChoicesOnlyListFilterMixin, BaseDataspaceLookupsFilter):
     """
 
     title = _("dataspace")
-    parameter_name = "dataspace__id__exact"
+    parameter_name = "dataspace__id"
 
     def lookups(self, request, model_admin):
         """Set the lookup value for the current user dataspace choice to None."""
diff --git a/dje/forms.py b/dje/forms.py
index 4370666..1ca06a6 100644
--- a/dje/forms.py
+++ b/dje/forms.py
@@ -19,7 +19,6 @@
 from django.core.exceptions import ValidationError
 from django.db import IntegrityError
 from django.forms import BoundField
-from django.forms import widgets
 from django.forms.utils import ErrorDict
 from django.forms.utils import ErrorList
 from django.utils.html import conditional_escape
@@ -831,16 +830,18 @@ def prepare_value(self, value):
             return super().prepare_value(value)
 
 
-class JSONListChoiceField(forms.MultipleChoiceField):
-    widget = widgets.TextInput
-
+class JSONListField(forms.CharField):
     def prepare_value(self, value):
         if isinstance(value, list):
             value = ", ".join(value)
         return super().prepare_value(value)
 
     def to_python(self, value):
-        if isinstance(value, str):
+        if not value:
+            return []
+        if isinstance(value, list):
+            return value
+        elif isinstance(value, str):
             return [item.strip() for item in value.split(",") if item.strip()]
         return super().to_python(value)
 
diff --git a/dje/importers.py b/dje/importers.py
index 927651f..97a4a57 100644
--- a/dje/importers.py
+++ b/dje/importers.py
@@ -154,7 +154,7 @@ def pre_process_form(self, data, **kwargs):
             identifier_fields = model_class.get_identifier_fields()
             # Crafting the list of unique filters to match the instance
             for field_name in identifier_fields:
-                value = data.get(prefix + field_name, None)
+                value = data.get(prefix + field_name, "")
                 if value:
                     value = value.strip()
                 filters.update({field_name: value})
@@ -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
@@ -288,6 +288,10 @@ def clean(self):
             raise forms.ValidationError("One of the row is a duplicate.")
 
 
+class ImportableUploadFileForm(forms.Form):
+    file = SmartFileField(extensions=["csv"])
+
+
 class BaseImporter:
     """
     Import in 3 steps:
@@ -309,7 +313,9 @@ class BaseImporter:
 
     model_form = None
     formset_class = BaseImportModelFormSet
+    upload_form_class = ImportableUploadFileForm
     add_to_product = False
+    update_existing = False
 
     def __init__(self, user, file_location=None, formset_data=None):
         if not self.model_form and not isinstance(self.model_form, BaseImportModelForm):
@@ -564,7 +570,7 @@ def get_key_sorted_fields(self):
         """
         model_form_instance = self.model_form(dataspace=self.dataspace, user=self.user)
 
-        for _, field in model_form_instance.fields.items():
+        for field in model_form_instance.fields.values():
             field.supported_values = self.get_supported_values(field)
 
         return sorted(model_form_instance.fields.items())
@@ -582,14 +588,31 @@ def save_all(self):
         if not self.formset.is_valid():  # Just in case...
             return
 
-        self.results = {"added": [], "unmodified": []}
+        self.results = {"added": [], "modified": [], "unmodified": []}
         for form in self.formset:
-            if not form.instance.pk:  # Save only addition for now
-                saved_instance = form.save()
-                self.results["added"].append(saved_instance)
-                History.log_addition(self.user, saved_instance)
-            else:
-                self.results["unmodified"].append(form.instance)
+            self.save_form(form)
+
+    def save_form(self, form):
+        instance = form.instance
+
+        if not instance.pk:
+            saved_instance = form.save()
+            self.results["added"].append(saved_instance)
+            History.log_addition(self.user, saved_instance)
+            return
+
+        elif self.update_existing:
+            # We need to refresh the instance from the db because form.instance has
+            # the unsaved form.cleaned_data modification at that stage.
+            instance.refresh_from_db()
+            updated_fields = instance.update_from_data(self.user, form.cleaned_data, override=False)
+            if updated_fields:
+                self.results["modified"].append(instance)
+                msg = f'Updated {", ".join(updated_fields)} from import'
+                History.log_change(self.user, instance, message=msg)
+                return
+
+        self.results["unmodified"].append(instance)
 
     def get_added_instance_ids(self):
         """Return the list of added instance ids."""
@@ -625,25 +648,11 @@ def get_add_to_product_form(self, request):
             return form
 
 
-class ImportableUploadFileForm(forms.Form):
-    file = SmartFileField(extensions=["csv"])
-
-
-class PackageImportableUploadFileForm(forms.Form):
-    file = SmartFileField(extensions=["csv", "json"])
-
-    @property
-    def header(self):
-        return "Select a CSV (.csv) or JSON (.json) file"
-
-
 @login_required()
 def import_view(request, importer_class):
     user = request.user
     importer = importer_class(user)
-    upload_form_class = ImportableUploadFileForm
-    if importer_class.__name__ == "PackageImporter":
-        upload_form_class = PackageImportableUploadFileForm
+    upload_form_class = importer.upload_form_class
 
     opts = importer.model_form._meta.model._meta
     perm_codename = get_permission_codename("add", opts)
diff --git a/dje/management/commands/flushdataset.py b/dje/management/commands/flushdataset.py
index 9d642b3..de2f6b8 100644
--- a/dje/management/commands/flushdataset.py
+++ b/dje/management/commands/flushdataset.py
@@ -37,6 +37,7 @@ def add_arguments(self, parser):
 
     def handle(self, *args, **options):
         super().handle(*args, **options)
+        dataspace = self.dataspace
 
         models = ALL_MODELS[:]  # Making a copy to not impact the original list
         models += WORKFLOW_MODELS
@@ -52,7 +53,11 @@ def handle(self, *args, **options):
             Webhook,
         ])
 
-        dataspace = self.dataspace
+        # Clear the associated_product_relation_status FK values so the
+        # ProductRelationStatus model can be flushed before the UsagePolicy model.
+        usage_policies = UsagePolicy.objects.filter(dataspace=dataspace)
+        usage_policies.update(associated_product_relation_status=None)
+
         for model_class in models:
             qs = get_unsecured_manager(model_class).filter(dataspace=dataspace)
             if options['verbosity'] > 1:
diff --git a/dje/migrations/0003_alter_dejacodeuser_homepage_layout.py b/dje/migrations/0003_alter_dejacodeuser_homepage_layout.py
new file mode 100644
index 0000000..aa00564
--- /dev/null
+++ b/dje/migrations/0003_alter_dejacodeuser_homepage_layout.py
@@ -0,0 +1,28 @@
+# Generated by Django 5.0.3 on 2024-05-08 08:26
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ("dje", "0002_initial"),
+        ("reporting", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="dejacodeuser",
+            name="homepage_layout",
+            field=models.ForeignKey(
+                blank=True,
+                help_text="Select a Card layout that provides the query results on the DejaCode homepage that are useful and interesting to you.",
+                null=True,
+                on_delete=django.db.models.deletion.SET_NULL,
+                related_name="+",
+                serialize=False,
+                to="reporting.cardlayout",
+            ),
+        ),
+    ]
diff --git a/dje/models.py b/dje/models.py
index 1d908cd..794e811 100644
--- a/dje/models.py
+++ b/dje/models.py
@@ -773,6 +773,17 @@ def update_from_data(self, user, data, override=False):
 
         return updated_fields
 
+    def update(self, **kwargs):
+        """
+        Update this instance with the provided ``kwargs`` values.
+        The full ``save()`` process will be triggered, including signals, and the
+        ``update_fields`` is automatically set.
+        """
+        for field_name, value in kwargs.items():
+            setattr(self, field_name, value)
+
+        self.save(update_fields=list(kwargs.keys()))
+
     def as_json(self):
         try:
             serialized_data = serialize(
@@ -881,7 +892,7 @@ def _get_local_foreign_fields(self):
     local_foreign_fields = property(_get_local_foreign_fields)
 
     @classmethod
-    def get_identifier_fields(cls):
+    def get_identifier_fields(cls, *args, **kwargs):
         """
         Return a list of the fields, based on the Meta unique_together, to be
         used to match a unique instance within a Dataspace.
@@ -1127,13 +1138,15 @@ def clean_extra_spaces_in_identifier_fields(self):
                     setattr(self, field_name, " ".join(field_value.split()))
 
     def mark_all_notifications_as_read(self, user):
-        unread_notifications = Notification.objects.unread().filter(
+        unread_notifications_qs = Notification.objects.unread().filter(
             action_object_content_type__model=self._meta.model_name,
             action_object_object_id=self.id,
             recipient=user,
         )
-        if unread_notifications:
-            unread_notifications.update(unread=False)
+        # Trigger a single UPDATE query on the "unread" Notification.
+        # Even if the QS is empty, this is faster than checking is the QS contains
+        # entries first.
+        unread_notifications_qs.update(unread=False)
 
 
 class HistoryDateFieldsMixin(models.Model):
@@ -1512,7 +1525,7 @@ class DejacodeUser(AbstractUser):
         null=True,
         blank=True,
         related_name="+",
-        on_delete=models.CASCADE,
+        on_delete=models.SET_NULL,
         serialize=False,
         help_text=_(
             "Select a Card layout that provides the query results on the "
diff --git a/dje/notification.py b/dje/notification.py
index a176b73..8088a58 100644
--- a/dje/notification.py
+++ b/dje/notification.py
@@ -46,7 +46,7 @@ def has_email_settings():
     return False
 
 
-def send_notification_email(user, instance, action, message=""):
+def send_notification_email(request, instance, action, message=""):
     if not has_email_settings():
         return
 
@@ -57,6 +57,7 @@ def send_notification_email(user, instance, action, message=""):
     if not recipients:
         return
 
+    user = request.user
     verbose_name = instance._meta.verbose_name.capitalize()
     verbose_action = VERBOSE_ACTION[action]
     subject = f'{verbose_action} {verbose_name}: "{instance}"'
@@ -70,14 +71,14 @@ def send_notification_email(user, instance, action, message=""):
             return
         body += f"\n\n{message}"
 
-    if action is not History.DELETION and settings.SITE_URL:
-        site_url = settings.SITE_URL.rstrip("/")
-        body += f"\n\n{site_url}{instance.get_admin_url()}"
+    if action is not History.DELETION:
+        absolute_url = request.build_absolute_uri(location=instance.get_admin_url())
+        body += f"\n\n{absolute_url}"
 
     send_mail_task.delay(subject, body, settings.DEFAULT_FROM_EMAIL, recipients)
 
 
-def send_notification_email_on_queryset(user, queryset, action, message=""):
+def send_notification_email_on_queryset(request, queryset, action, message=""):
     if not has_email_settings():
         return
 
@@ -85,7 +86,7 @@ def send_notification_email_on_queryset(user, queryset, action, message=""):
         return
 
     if len(queryset) == 1:
-        return send_notification_email(user, queryset[0], action, message)
+        return send_notification_email(request, queryset[0], action, message)
 
     first = queryset[0]
     if not hasattr(first, "dataspace"):
@@ -95,6 +96,7 @@ def send_notification_email_on_queryset(user, queryset, action, message=""):
     if not recipients:
         return
 
+    user = request.user
     verbose_name_plural = first._meta.verbose_name_plural.capitalize()
     verbose_action = VERBOSE_ACTION[action]
 
@@ -107,9 +109,9 @@ def send_notification_email_on_queryset(user, queryset, action, message=""):
     for instance in queryset:
         body += f"\n- {instance}"
 
-        if action is not History.DELETION and settings.SITE_URL:
-            site_url = settings.SITE_URL.rstrip("/")
-            body += f" {site_url}{instance.get_admin_url()}"
+        if action is not History.DELETION:
+            absolute_url = request.build_absolute_uri(location=instance.get_admin_url())
+            body += f" {absolute_url}"
 
     if message:
         body += f"\n\n{message}"
@@ -158,7 +160,7 @@ def successful_mass_update(sender, action, request, queryset, modeladmin, form,
     message = "Changes details:\n\n"
     message += "\n\n".join(f"* {field}\nNew value: {value}" for field, value in changes)
 
-    send_notification_email_on_queryset(request.user, queryset, History.CHANGE, message)
+    send_notification_email_on_queryset(request, queryset, History.CHANGE, message)
 
 
 def send_password_changed_email(user):
@@ -178,9 +180,9 @@ def notify_on_user_locked_out(request, username, **kwargs):
     Webhook defined in the reference Dataspace when the `user_locked_out`
     signal is triggered.
     """
-    site_url = settings.SITE_URL.rstrip("/")
     access_attempt_url = reverse("admin:axes_accessattempt_changelist")
-    access_attempt_link = f"{site_url}{access_attempt_url}?q={username}"
+    access_attempt_absolute_url = request.build_absolute_uri(location=access_attempt_url)
+    access_attempt_link = f"{access_attempt_absolute_url}?q={username}"
     user = DejacodeUser.objects.get_or_none(username=username)
 
     subject = "[DejaCode] Login attempt on locked account requires review!"
@@ -198,7 +200,8 @@ def notify_on_user_locked_out(request, username, **kwargs):
 
     if user:
         user_list_url = reverse("admin:dje_dejacodeuser_changelist")
-        user_list_link = f"{site_url}{user_list_url}?q={username}"
+        user_list_absolute_url = request.build_absolute_uri(location=user_list_url)
+        user_list_link = f"{user_list_absolute_url}?q={username}"
         message += (
             f'"{username}" is an existing DejaCode user in Dataspace '
             f'"{user.dataspace.name}": {user_list_link}\n'
diff --git a/dje/outputs.py b/dje/outputs.py
new file mode 100644
index 0000000..a68f451
--- /dev/null
+++ b/dje/outputs.py
@@ -0,0 +1,171 @@
+#
+# Copyright (c) nexB Inc. and others. All rights reserved.
+# DejaCode is a trademark of nexB Inc.
+# SPDX-License-Identifier: AGPL-3.0-only
+# See https://github.com/nexB/dejacode for support or download.
+# See https://aboutcode.org for more information about AboutCode FOSS projects.
+#
+
+import json
+import re
+
+from django.http import FileResponse
+from django.http import Http404
+
+from cyclonedx import output as cyclonedx_output
+from cyclonedx.model import bom as cyclonedx_bom
+from cyclonedx.schema import SchemaVersion
+from cyclonedx.validation.json import JsonStrictValidator
+
+from dejacode import __version__ as dejacode_version
+from dejacode_toolkit import spdx
+
+CYCLONEDX_DEFAULT_SPEC_VERSION = "1.6"
+
+
+def safe_filename(filename):
+    """Convert the provided `filename` to a safe filename."""
+    return re.sub("[^A-Za-z0-9.-]+", "_", filename).lower()
+
+
+def get_attachment_response(file_content, filename, content_type):
+    if not file_content or not filename:
+        raise Http404
+
+    response = FileResponse(
+        file_content,
+        filename=filename,
+        content_type=content_type,
+    )
+    response["Content-Disposition"] = f'attachment; filename="{filename}"'
+
+    return response
+
+
+def get_spdx_extracted_licenses(spdx_packages):
+    """
+    Return all the licenses to be included in the SPDX extracted_licenses.
+    Those include the `LicenseRef-` licenses, ie: licenses not available in the
+    SPDX list.
+
+    In the case of Product relationships, ProductComponent and ProductPackage,
+    the set of licenses of the related object, Component or Package, is used
+    as the licenses of the relationship is always a subset of the ones of the
+    related object.
+    This ensures that we have all the license required for a valid SPDX document.
+    """
+    from product_portfolio.models import ProductRelationshipMixin
+
+    all_licenses = set()
+    for entry in spdx_packages:
+        if isinstance(entry, ProductRelationshipMixin):
+            all_licenses.update(entry.related_component_or_package.licenses.all())
+        else:
+            all_licenses.update(entry.licenses.all())
+
+    return [
+        license.as_spdx() for license in all_licenses if license.spdx_id.startswith("LicenseRef")
+    ]
+
+
+def get_spdx_document(instance, user):
+    spdx_packages = instance.get_spdx_packages()
+
+    creation_info = spdx.CreationInfo(
+        person_name=f"{user.first_name} {user.last_name}",
+        person_email=user.email,
+        organization_name=user.dataspace.name,
+        tool=f"DejaCode-{dejacode_version}",
+    )
+
+    document = spdx.Document(
+        name=f"dejacode_{instance.dataspace.name}_{instance._meta.model_name}_{instance}",
+        namespace=f"https://dejacode.com/spdxdocs/{instance.uuid}",
+        creation_info=creation_info,
+        packages=[package.as_spdx() for package in spdx_packages],
+        extracted_licenses=get_spdx_extracted_licenses(spdx_packages),
+    )
+
+    return document
+
+
+def get_spdx_filename(spdx_document):
+    document_name = spdx_document.as_dict()["name"]
+    filename = f"{document_name}.spdx.json"
+    return safe_filename(filename)
+
+
+def get_cyclonedx_bom(instance, user):
+    """https://cyclonedx.org/use-cases/#dependency-graph"""
+    root_component = instance.as_cyclonedx()
+
+    bom = cyclonedx_bom.Bom()
+    bom.metadata = cyclonedx_bom.BomMetaData(
+        component=root_component,
+        tools=[
+            cyclonedx_bom.Tool(
+                vendor="nexB",
+                name="DejaCode",
+                version=dejacode_version,
+            )
+        ],
+        authors=[
+            cyclonedx_bom.OrganizationalContact(
+                name=f"{user.first_name} {user.last_name}",
+            )
+        ],
+    )
+
+    cyclonedx_components = []
+    if hasattr(instance, "get_cyclonedx_components"):
+        cyclonedx_components = [
+            component.as_cyclonedx() for component in instance.get_cyclonedx_components()
+        ]
+
+    for component in cyclonedx_components:
+        bom.components.add(component)
+        bom.register_dependency(root_component, [component])
+
+    return bom
+
+
+def get_cyclonedx_bom_json(cyclonedx_bom, spec_version=None):
+    """Generate JSON output for the provided instance in CycloneDX BOM format."""
+    if not spec_version:
+        spec_version = CYCLONEDX_DEFAULT_SPEC_VERSION
+    schema_version = SchemaVersion.from_version(spec_version)
+
+    json_outputter = cyclonedx_output.make_outputter(
+        bom=cyclonedx_bom,
+        output_format=cyclonedx_output.OutputFormat.JSON,
+        schema_version=schema_version,
+    )
+
+    # Using the internal API in place of the output_as_string() method to avoid
+    # a round of deserialization/serialization while fixing the field ordering.
+    json_outputter.generate()
+    bom_as_dict = json_outputter._bom_json
+
+    # The default order out of the outputter is not great, the following sorts the
+    # bom using the order from the schema.
+    sorted_json = sort_bom_with_schema_ordering(bom_as_dict, schema_version)
+
+    return sorted_json
+
+
+def sort_bom_with_schema_ordering(bom_as_dict, schema_version):
+    """Sort the ``bom_as_dict`` using the ordering from the ``schema_version``."""
+    schema_file = JsonStrictValidator(schema_version)._schema_file
+    with open(schema_file) as sf:
+        schema_dict = json.loads(sf.read())
+
+    order_from_schema = list(schema_dict.get("properties", {}).keys())
+    ordered_dict = {key: bom_as_dict.get(key) for key in order_from_schema if key in bom_as_dict}
+
+    return json.dumps(ordered_dict, indent=2)
+
+
+def get_cyclonedx_filename(instance):
+    base_filename = f"dejacode_{instance.dataspace.name}_{instance._meta.model_name}"
+    filename = f"{base_filename}_{instance}.cdx.json"
+    return safe_filename(filename)
diff --git a/dje/registration.py b/dje/registration.py
index 4e3e918..24fd9de 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
@@ -141,9 +141,11 @@ def helper(self):
         helper.form_action = "django_registration_register"
         helper.attrs = {"autocomplete": "off"}
 
-        eula = HTML(
-            '
      By clicking on "Create account" below, you are agreeing '
-            'to our EULA.
      '
+        tos = HTML(
+            '
      '
+            '  By clicking on "Create account" below, you are agreeing to our '
+            '  Terms of Service.'
+            "
      "
         )
 
         helper.layout = Layout(
@@ -167,7 +169,7 @@ def helper(self):
                     css_class="alert alert-primary px-2",
                 ),
                 "hcaptcha",
-                eula,
+                tos,
                 Div(
                     StrictSubmit(
                         "submit",
diff --git a/dje/tasks.py b/dje/tasks.py
index 178085a..724fd45 100644
--- a/dje/tasks.py
+++ b/dje/tasks.py
@@ -6,6 +6,7 @@
 # See https://aboutcode.org for more information about AboutCode FOSS projects.
 #
 
+import logging
 from datetime import datetime
 from io import StringIO
 
@@ -18,16 +19,15 @@
 from django.db import transaction
 from django.template.defaultfilters import pluralize
 
-from celery import shared_task
-from celery.utils.log import get_task_logger
+from django_rq import job
 
 from dejacode_toolkit.scancodeio import ScanCodeIO
 from dje.utils import is_available
 
-tasks_logger = get_task_logger(__name__)
+logger = logging.getLogger(__name__)
 
 
-@shared_task
+@job
 def send_mail_task(subject, message, from_email, recipient_list, fail_silently=True):
     """
     Send an email as an asynchronous task.
@@ -41,7 +41,7 @@ def send_mail_task(subject, message, from_email, recipient_list, fail_silently=T
     send_mail(subject, message, from_email, recipient_list, fail_silently)
 
 
-@shared_task
+@job
 def send_mail_to_admins_task(subject, message, from_email=None, fail_silently=True):
     """Send an email to system administrators as an asynchronous task."""
     if not from_email:
@@ -54,10 +54,10 @@ def send_mail_to_admins_task(subject, message, from_email=None, fail_silently=Tr
     send_mail_task(subject, message, from_email, recipient_list, fail_silently)
 
 
-@shared_task(time_limit=7200)
+@job("default", timeout=7200)
 def call_management_command(name, *args, **options):
     """Run a management command as an asynchronous task."""
-    tasks_logger.info(
+    logger.info(
         f"Entering call_management_command task with name={name} args={args} options={options}"
     )
 
@@ -76,17 +76,17 @@ def call_management_command(name, *args, **options):
         user.email_user(subject, msg)
 
 
-@shared_task
+@job
 def package_collect_data(instance_id):
     """Run Package.collect_data() as an asynchronous task."""
     Package = apps.get_model("component_catalog", "package")
-    tasks_logger.info(f"Entering package_collect_data task for Package.id={instance_id}")
+    logger.info(f"Entering package_collect_data task for Package.id={instance_id}")
     package = Package.objects.get(id=instance_id)
-    tasks_logger.info(f"Package Download URL: {package.download_url}")
+    logger.info(f"Package Download URL: {package.download_url}")
     package.collect_data()
 
 
-@shared_task
+@job
 def scancodeio_submit_scan(uris, user_uuid, dataspace_uuid):
     """
     Submit the provided `uris` to ScanCode.io as an asynchronous task.
@@ -94,7 +94,7 @@ def scancodeio_submit_scan(uris, user_uuid, dataspace_uuid):
     """
     from dje.models import DejacodeUser
 
-    tasks_logger.info(
+    logger.info(
         f"Entering scancodeio_submit_scan task with "
         f"uris={uris} user_uuid={user_uuid} dataspace_uuid={dataspace_uuid}"
     )
@@ -111,20 +111,18 @@ def scancodeio_submit_scan(uris, user_uuid, dataspace_uuid):
         if is_available(uri):
             ScanCodeIO(user).submit_scan(uri, user_uuid, dataspace_uuid)
         else:
-            tasks_logger.info(f'uri="{uri}" is not reachable.')
+            logger.info(f'uri="{uri}" is not reachable.')
 
 
-@shared_task
-def scancodeio_submit_manifest_inspection(scancodeproject_uuid, user_uuid):
-    """
-    Submit the provided `uris` to ScanCode.io as an asynchronous task.
-    Only publicly available URLs are sent to ScanCode.io.
-    """
+@job
+def scancodeio_submit_project(scancodeproject_uuid, user_uuid, pipeline_name):
+    """Submit the provided SBOM file to ScanCode.io as an asynchronous task."""
     from dje.models import DejacodeUser
 
-    tasks_logger.info(
-        f"Entering scancodeio_submit_manifest_inspection task with "
-        f"scancodeproject_uuid={scancodeproject_uuid} user_uuid={user_uuid}"
+    logger.info(
+        f"Entering scancodeio_submit_project task with "
+        f"scancodeproject_uuid={scancodeproject_uuid} user_uuid={user_uuid} "
+        f"pipeline_name={pipeline_name}"
     )
 
     ScanCodeProject = apps.get_model("product_portfolio", "scancodeproject")
@@ -140,40 +138,41 @@ def scancodeio_submit_manifest_inspection(scancodeproject_uuid, user_uuid):
     # Create a Project instance on ScanCode.io without immediate execution of the
     # pipeline. This allows to get instant feedback from ScanCode.io about the Project
     # creation status and its related data, even in SYNC mode.
-    response = scancodeio.submit_manifest_inspection(
+    response = scancodeio.submit_project(
         project_name=scancodeproject_uuid,
+        pipeline_name=pipeline_name,
         file_location=scancode_project.input_file.path,
         user_uuid=user_uuid,
         execute_now=False,
     )
 
     if not response:
-        tasks_logger.info("Error submitting the manifest to ScanCode.io server")
+        logger.info("Error submitting the file to ScanCode.io server")
         scancode_project.status = ScanCodeProject.Status.FAILURE
-        msg = "- Error: Manifest could not be submitted to ScanCode.io"
+        msg = "- Error: File could not be submitted to ScanCode.io"
         scancode_project.append_to_log(msg, save=True)
         return
 
-    tasks_logger.info("Update the ScanCodeProject instance")
+    logger.info("Update the ScanCodeProject instance")
     scancode_project.status = ScanCodeProject.Status.SUBMITTED
     scancode_project.project_uuid = response.get("uuid")
-    msg = "- Manifest submitted to ScanCode.io for inspection"
+    msg = "- File submitted to ScanCode.io for inspection"
     scancode_project.append_to_log(msg, save=True)
 
     # Delay the execution of the pipeline after the ScancodeProject instance was
     # properly saved and committed in order to avoid any race conditions.
     if runs := response.get("runs"):
-        tasks_logger.info("Start the pipeline run")
+        logger.info("Start the pipeline run")
         transaction.on_commit(lambda: scancodeio.start_pipeline(run_url=runs[0]["url"]))
 
 
-@shared_task
+@job("default", timeout=1200)
 def pull_project_data_from_scancodeio(scancodeproject_uuid):
     """
     Pull Project data from ScanCode.io as an asynchronous task for the provided
     `scancodeproject_uuid`.
     """
-    tasks_logger.info(
+    logger.info(
         f"Entering pull_project_data_from_scancodeio task with "
         f"scancodeproject_uuid={scancodeproject_uuid}"
     )
@@ -184,7 +183,7 @@ def pull_project_data_from_scancodeio(scancodeproject_uuid):
     # Make sure the import is not already in progress,
     # or that the import has not completed yet.
     if not scancode_project.can_start_import:
-        tasks_logger.error("Cannot start import")
+        logger.error("Cannot start import")
         return
 
     # Update the status to prevent from starting the task again
@@ -192,8 +191,8 @@ def pull_project_data_from_scancodeio(scancodeproject_uuid):
         status=ScanCodeProject.Status.IMPORT_STARTED
     )
 
-    if scancode_project.type == scancode_project.ProjectType.IMPORT_FROM_MANIFEST:
-        notification_verb = "Import packages from manifest"
+    if scancode_project.type == scancode_project.ProjectType.LOAD_SBOMS:
+        notification_verb = "Load Packages from SBOMs"
     else:
         notification_verb = "Import packages from ScanCode.io"
 
diff --git a/dje/templates/404.html b/dje/templates/404.html
index e84b038..ca31439 100644
--- a/dje/templates/404.html
+++ b/dje/templates/404.html
@@ -4,7 +4,7 @@
 
 {% block page_title %}{% trans 'Page not found' %}{% endblock %}
 
-{% block bodyclass %}body-background{% endblock %}
+{% block bodyclass %}bg-body-tertiary{% endblock %}
 
 {% block content %}
   {% include 'includes/header_title.html' with pretitle='404' title='Page not found' %}
diff --git a/dje/templates/account/2fa_disable.html b/dje/templates/account/2fa_disable.html
index 201b98d..766e5e2 100644
--- a/dje/templates/account/2fa_disable.html
+++ b/dje/templates/account/2fa_disable.html
@@ -3,7 +3,7 @@
 
 {% block page_title %}{% trans 'Two-factor authentication' %}{% endblock %}
 
-{% block bodyclass %}body-background{% endblock %}
+{% block bodyclass %}bg-body-tertiary{% endblock %}
 
 {% block content %}
   {% include 'includes/header_title.html' with pretitle='Security' title='Disable Two-factor Authentication' %}
diff --git a/dje/templates/account/2fa_enable.html b/dje/templates/account/2fa_enable.html
index 6325d0d..a250bcc 100644
--- a/dje/templates/account/2fa_enable.html
+++ b/dje/templates/account/2fa_enable.html
@@ -3,7 +3,7 @@
 
 {% block page_title %}{% trans 'Two-factor authentication' %}{% endblock %}
 
-{% block bodyclass %}body-background{% endblock %}
+{% block bodyclass %}bg-body-tertiary{% endblock %}
 
 {% block content %}
   {% include 'includes/header_title.html' with pretitle='Security' title='Two-factor authentication' %}
diff --git a/dje/templates/account/profile.html b/dje/templates/account/profile.html
index 43bc254..50068da 100644
--- a/dje/templates/account/profile.html
+++ b/dje/templates/account/profile.html
@@ -5,7 +5,7 @@
 
 {% block page_title %}{% trans 'Profile settings' %}{% endblock %}
 
-{% block bodyclass %}body-background{% endblock %}
+{% block bodyclass %}bg-body-tertiary{% endblock %}
 
 {% block content %}
   {% include 'includes/header_title.html' with pretitle='Account' title='Profile settings' %}
@@ -30,15 +30,19 @@
       
      
         
      
           
-          
      
-            
+          
      
+            
             
           
      
+          
      
+            An API key is like a password and should be treated with the same care.
+          
      
+        
      
+        
-        An API key is like a password and should be treated with the same care.
-        Regenerate API key
       
      
     
      
   
@@ -50,7 +54,7 @@
           
      Regenerate API key
      
           
         
-        
      
+        
      
           You are about to regenerate your API key.

      
           Your old key will be unusable once the new one is generated.

      
         
      
@@ -67,18 +71,23 @@ 
      Regenerate API key
      
 {% endblock %}
 
 {% block javascripts %}
-  
+  });
+
 {% endblock %}
\ No newline at end of file
diff --git a/dje/templates/admin/base_site.html b/dje/templates/admin/base_site.html
index 57deb8d..8c7ca25 100644
--- a/dje/templates/admin/base_site.html
+++ b/dje/templates/admin/base_site.html
@@ -2,12 +2,12 @@
 {% load i18n grp_tags static %}
 
 {% block title %}
-    {{ SITE_TITLE }} {{ DEJACODE_VERSION }} Administration
+    {{ SITE_TITLE }} Administration v{{ DEJACODE_VERSION }}
 {% endblock %}
 
 {% block admin_title %}
     
      
-        {{ SITE_TITLE }} {{ DEJACODE_VERSION }} Administration
+        {{ SITE_TITLE }} Administration v{{ DEJACODE_VERSION }}
     
      
 {% endblock %}
 
@@ -120,7 +120,9 @@ 
      
               
             {% endif %}
             
    • 
-                {% trans 'Sign out' %}
+                
      {% csrf_token %}
+                    
+                
             
      • 
         
     
diff --git a/dje/templates/admin/includes/activity_log_dialog.html b/dje/templates/admin/includes/activity_log_dialog.html
index dd2b57a..6963984 100644
--- a/dje/templates/admin/includes/activity_log_dialog.html
+++ b/dje/templates/admin/includes/activity_log_dialog.html
@@ -1,5 +1,6 @@
+{% load admin_urls %}
      + ", html=True) + product1 = response.context_data["object_list"][0] + self.assertEqual(0, product1.productinventoryitem_count) + + ProductComponent.objects.create( + product=self.product1, component=self.component1, dataspace=self.dataspace + ) + response = self.client.get(url) + expected = f'1' + self.assertContains(response, expected, html=True) + product1 = response.context_data["object_list"][0] + self.assertEqual(1, product1.productinventoryitem_count) + + ProductPackage.objects.create( + product=self.product1, package=self.package1, dataspace=self.dataspace + ) + response = self.client.get(url) + expected = f'2' + self.assertContains(response, expected, html=True) + product1 = response.context_data["object_list"][0] + self.assertEqual(2, product1.productinventoryitem_count) + def test_product_portfolio_product_tree_comparison_view_proper(self): self.client.login(username="nexb_user", password="secret") url = resolve_url( @@ -1094,7 +1118,7 @@ def test_product_portfolio_product_tree_comparison_view_proper(self): right_uuid=self.product2.uuid, ) response = self.client.get(url) - expected = f'{self.product1} {self.product2}' + expected = f'{self.product1} {self.product2}' self.assertContains(response, expected) purpose = ProductItemPurpose.objects.create( @@ -1206,6 +1230,61 @@ def test_product_portfolio_product_tree_comparison_view_proper(self): self.assertContains(response, "Added (2)") self.assertContains(response, "Removed (1)") + response = self.client.get(url, data={"download_xlsx": True}) + expected_type = "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" + self.assertEqual(expected_type, response.headers.get("Content-Type")) + expected_disposition = "attachment; filename=product_comparison.xlsx" + self.assertEqual(expected_disposition, response.headers.get("Content-Disposition")) + + def test_product_portfolio_product_tree_comparison_view_package_identifier(self): + self.client.login(username="nexb_user", password="secret") + url = resolve_url( + "product_portfolio:product_tree_comparison", + left_uuid=self.product1.uuid, + right_uuid=self.product2.uuid, + ) + + p1 = Package(dataspace=self.dataspace) + p1.set_package_url("pkg:bar/baz/pypdf@4.1.0") + p1.save() + pp1 = ProductPackage.objects.create( + product=self.product1, package=p1, dataspace=self.dataspace + ) + + # Same name different type and namespace + p2 = Package(dataspace=self.dataspace) + p2.set_package_url("pkg:github/py-pdf/pypdf@4.2.0") + p2.save() + pp2 = ProductPackage.objects.create( + product=self.product2, package=p2, dataspace=self.dataspace + ) + + response = self.client.get(url) + expected = [("removed", pp1, None, None), ("added", None, pp2, None)] + self.assertEqual(expected, response.context["rows"]) + + # Same type, namespace, name combo + p2.set_package_url("pkg:bar/baz/pypdf@4.2.0") + p2.save() + response = self.client.get(url) + expected = [("updated", pp1, pp2, None)] + self.assertEqual(expected, response.context["rows"]) + + # More than 2 packages with same unique identifier + p3 = Package(dataspace=self.dataspace) + p3.set_package_url("pkg:bar/baz/pypdf@4.3.0") + p3.save() + pp3 = ProductPackage.objects.create( + product=self.product2, package=p3, dataspace=self.dataspace + ) + response = self.client.get(url) + expected = [ + ("removed", pp1, None, None), + ("added", None, pp2, None), + ("added", None, pp3, None), + ] + self.assertEqual(expected, response.context["rows"]) + def test_product_portfolio_product_tree_comparison_view_secured_access(self): self.client.login(username=self.basic_user.username, password="secret") url = resolve_url( @@ -1652,8 +1731,6 @@ def test_product_portfolio_product_form_add(self): self.assertIn(status, form.fields["configuration_status"].queryset) self.assertNotIn(alternate_status, form.fields["configuration_status"].queryset) - self.assertEqual([(keyword.label, keyword.label)], form.fields["keywords"].choices) - # NameVersionValidationFormMixin data = { "name": self.product1.name, @@ -1727,11 +1804,15 @@ def test_product_portfolio_productpackage_form(self): # Change status permission form = ProductPackageForm(self.basic_user, instance=productpackage) - self.assertTrue('' in str(form)) + expected = ( + 'Name (descending)', html=True ) self.assertContains( response, - 'Type: "pypi" ' + 'Type: "pypi" ' ' ' "", html=True, ) self.assertContains( response, - '' + '' '' "", html=True, diff --git a/reporting/models.py b/reporting/models.py index bef19d5..b2e3a60 100644 --- a/reporting/models.py +++ b/reporting/models.py @@ -68,7 +68,7 @@ LICENSE_TAG_PREFIX = "tag: " -MULTIVALUE_SEPARATOR = ", " +MULTIVALUE_SEPARATOR = "\n" ERROR_STR = "Error" @@ -662,10 +662,12 @@ def _get_objects_for_field_name(self, objects, field_name, user): result.extend(value if isinstance(value, list) else [value]) return result - def get_value_for_instance(self, instance, user=None): + def get_value_for_instance(self, instance, user=None, multi_as_list=False): """ Return the value to be display in the row, given an instance and the current self.field_name value of this assigned field. + When `multi_as_list` is enabled, return the results as a list instead of + joining on `MULTIVALUE_SEPARATOR`. """ if self.get_model_class() != instance.__class__: raise AssertionError("content types do not match") @@ -674,8 +676,17 @@ def get_value_for_instance(self, instance, user=None): for field_name in self.field_name.split("__"): objects = self._get_objects_for_field_name(objects, field_name, user) - results = [str(val) for val in objects if not (len(objects) < 2 and val is None)] - return MULTIVALUE_SEPARATOR.join(results) + results = [ + # The .strip() ensure the SafeString types are casted to regular str + str(val).strip() + for val in objects + if not (len(objects) < 2 and val is None) + ] + + if multi_as_list: + return results + else: + return MULTIVALUE_SEPARATOR.join(results) class ReportQuerySet(DataspacedQuerySet): @@ -747,23 +758,37 @@ def save(self, *args, **kwargs): def get_absolute_url(self): return reverse("reporting:report_details", args=[self.uuid]) - def get_output(self, queryset=None, user=None, include_view_link=False): + def get_output(self, queryset=None, user=None, include_view_link=False, multi_as_list=False): # Checking if the parameter is given rather than the boolean value of the QuerySet if queryset is None: queryset = self.query.get_qs(user=user) icon = format_html('') rows = [] + for instance in queryset: - cells = [ - field.get_value_for_instance(instance, user=user) - for field in self.column_template.fields.all() - ] + cells = [] if include_view_link: - cells.insert( - 0, instance.get_absolute_link(value=icon, title="View", target="_blank") - ) + view_link = instance.get_absolute_link(value=icon, title="View", target="_blank") + cells.append(view_link) + + for field in self.column_template.fields.all(): + value = field.get_value_for_instance(instance, user, multi_as_list) + + if type(value) is list: + if value == []: + cell_value = "" + elif len(value) > 1: + cell_value = value + else: + cell_value = value[0] + else: + cell_value = value + + cells.append(cell_value) + rows.append(cells) + return rows diff --git a/reporting/templates/reporting/includes/report_list_table.html b/reporting/templates/reporting/includes/report_list_table.html index 4c41f55..fe5d8bc 100644 --- a/reporting/templates/reporting/includes/report_list_table.html +++ b/reporting/templates/reporting/includes/report_list_table.html @@ -47,7 +47,7 @@
        {% for group, reports in object_list.items %} {% if group %} -
      • +
      • {{ group }}
        diff --git a/reporting/templates/reporting/includes/report_results_table.html b/reporting/templates/reporting/includes/report_results_table.html index 41d1da8..ef124dc 100644 --- a/reporting/templates/reporting/includes/report_results_table.html +++ b/reporting/templates/reporting/includes/report_results_table.html @@ -1,4 +1,4 @@ -
      +
      {% trans "Scans" %}: {{ paginator.count|intcomma }} results
      diff --git a/component_catalog/templates/component_catalog/includes/scan_matches_modal.html b/component_catalog/templates/component_catalog/includes/scan_matches_modal.html index d286708..e94b236 100644 --- a/component_catalog/templates/component_catalog/includes/scan_matches_modal.html +++ b/component_catalog/templates/component_catalog/includes/scan_matches_modal.html @@ -1,7 +1,7 @@       		{{ data.child.version }}{{ data.child.owner }}{{ data.child.owner|default_if_none:"" }} {{ data.subcomponent.purpose }} {% if data.subcomponent.license_expression %} @@ -50,7 +50,7 @@ {{ data.subcomponent.is_modified|as_icon }} {% if component.is_active %} -
        +
          • diff --git a/component_catalog/tests/test_admin.py b/component_catalog/tests/test_admin.py index e2c1abd..ae0d7bc 100644 --- a/component_catalog/tests/test_admin.py +++ b/component_catalog/tests/test_admin.py @@ -495,7 +495,7 @@ def test_activity_log_activated(self): def test_component_admin_changelist_list_display_as_popup(self): self.client.login(username="test", password="secret") url = reverse("admin:component_catalog_component_changelist") - expect1 = '' + expect1 = ' + ', + '', ) def test_package_list_view_usage_policy_availability(self): @@ -1562,7 +1576,7 @@ def test_package_send_about_files_view(self): response = self.client.get(about_url) self.assertEqual("application/zip", response["content-type"]) self.assertEqual( - 'attachment; filename="pypi/django_about.zip"', response["content-disposition"] + 'attachment; filename="pkg_pypi_django_about.zip"', response["content-disposition"] ) package.filename = "django.whl" @@ -1728,10 +1742,7 @@ def test_package_details_view_add_to_product(self): self.assertContains(response, expected) self.assertIsNotNone(response.context_data["form"]) - expected_status_select = ( - 'Core') @@ -2035,29 +2046,31 @@ def test_package_details_view_scan_tab_scan_in_progress(
          - 
          Scan running
          + 
          Scan running
          Created date
          - 
          June 21, 2018, 12:32 PM UTC
          + 
          +            June 21, 2018, 12:32 PM UTC
+
          Start date
          - 
          June 21, 2018, 12:32 PM UTC
          + 
          June 21, 2018, 12:32 PM UTC
          End date
          - 
           
          + 
           
          ScanCode.io version
          - 
          31.0.0
          + 
          31.0.0
          """ @@ -2305,7 +2318,7 @@ def test_package_details_view_scan_tab_license_clarity(
      		+10 -10 + 90
      {{ product.configuration_status|default_if_none:'' }} + {% if product.productinventoryitem_count %} + {{ product.productinventoryitem_count }} + {% else %} + 0 + {% endif %} +
        {% for keyword in product.keywords %} diff --git a/product_portfolio/templates/product_portfolio/includes/pull_project_data_modal.html b/product_portfolio/templates/product_portfolio/includes/pull_project_data_modal.html index f11b0b3..4a2fce7 100644 --- a/product_portfolio/templates/product_portfolio/includes/pull_project_data_modal.html +++ b/product_portfolio/templates/product_portfolio/includes/pull_project_data_modal.html @@ -7,7 +7,7 @@
        Pull Project data from ScanCode.io
        -
        +
        You are about to pull data from a ScanCode.io Project to import all its Discovered Packages.
        Imported Packages will be assigned to this Product.

        Note that this may take some time to complete. diff --git a/product_portfolio/templates/product_portfolio/includes/scan_all_packages_modal.html b/product_portfolio/templates/product_portfolio/includes/scan_all_packages_modal.html index 9487535..4f06c9f 100644 --- a/product_portfolio/templates/product_portfolio/includes/scan_all_packages_modal.html +++ b/product_portfolio/templates/product_portfolio/includes/scan_all_packages_modal.html @@ -5,7 +5,7 @@
        Scan all Packages
        -
        +
        You are about to initiate multiple scans on the ScanCode.io server for all of the Packages assigned to your Product, either by direct assignment or by assignment to a Component assigned to your Product.

        diff --git a/product_portfolio/templates/product_portfolio/includes/scancode_project_status_modal.html b/product_portfolio/templates/product_portfolio/includes/scancode_project_status_modal.html index 97be8ad..aa4c1e7 100644 --- a/product_portfolio/templates/product_portfolio/includes/scancode_project_status_modal.html +++ b/product_portfolio/templates/product_portfolio/includes/scancode_project_status_modal.html @@ -5,7 +5,7 @@
        Import status
        -
        +
        Loading the project status ...
        diff --git a/product_portfolio/templates/product_portfolio/import_manifest_form.html b/product_portfolio/templates/product_portfolio/load_sboms_form.html similarity index 50% rename from product_portfolio/templates/product_portfolio/import_manifest_form.html rename to product_portfolio/templates/product_portfolio/load_sboms_form.html index 116878e..86aacad 100644 --- a/product_portfolio/templates/product_portfolio/import_manifest_form.html +++ b/product_portfolio/templates/product_portfolio/load_sboms_form.html @@ -2,7 +2,7 @@ {% load i18n static crispy_forms_tags %} {% load inject_preserved_filters from dje_tags %} -{% block page_title %}{% trans "Import Packages from manifest" %}{% endblock %} +{% block page_title %}{% trans "Load Packages from SBOMs" %}{% endblock %} {% block content %}
        @@ -14,38 +14,50 @@ / {{ object.get_absolute_link }}

        - {% trans "Import Packages from manifest" %} + {% trans "Load Packages from SBOMs" %}

        -

        - Import and create Packages from a package manifest, lockfile, and SBOM (SPDX document). -

        - {% include 'includes/messages_alert.html' %} - - -
        +
        - The following manifest types are supported: -
          -
        • Python requirements.txt
          • + DejaCode supports the following SBOM formats: +
          • CycloneDX BOM as JSON bom.json and .cdx.json
          • SPDX document as JSON .spdx.json
          • AboutCode .ABOUT files
        + Multiple SBOMs: + You can provide multiple SBOMs by packaging them into a zip archive. + DejaCode will handle and process them accordingly. +
        + +
        @@ -60,7 +72,7 @@

        diff --git a/product_portfolio/templates/product_portfolio/object_manage_grid.html b/product_portfolio/templates/product_portfolio/object_manage_grid.html index a4145fd..0248665 100644 --- a/product_portfolio/templates/product_portfolio/object_manage_grid.html +++ b/product_portfolio/templates/product_portfolio/object_manage_grid.html @@ -152,7 +152,7 @@

        Create new Component
        {% csrf_token %} -
        +
        {% crispy component_add_form %}
        @@ -167,7 +167,7 @@
        Create new Component
        {% endblock %} {% block javascripts %} - + {% if component_add_form %} @@ -247,7 +247,7 @@
        Create new Component
        let create_component_modal = $('#create-component-modal'); let license_expression_field = create_component_modal.find('.licenseexpressionwidget'); let licenses_data_for_builder = JSON.parse(document.getElementById("licenses_data_for_builder").textContent); - NEXB.setup_awesomplete_builder(license_expression_field.get(0), null, 100, licenses_data_for_builder); + setup_awesomplete_builder(license_expression_field.get(0), null, 100, licenses_data_for_builder); $('#component-add-form').on('submit', function(e) { e.preventDefault(); diff --git a/product_portfolio/templates/product_portfolio/product_details.html b/product_portfolio/templates/product_portfolio/product_details.html index 5a38c1d..b4ccc25 100644 --- a/product_portfolio/templates/product_portfolio/product_details.html +++ b/product_portfolio/templates/product_portfolio/product_details.html @@ -38,7 +38,8 @@ {% if has_change_permission %} {% trans 'Import data from Scan' %} {% if request.user.dataspace.enable_package_scanning %} - {% trans 'Import Packages from manifest' %} + {% trans 'Load Packages from SBOMs' %} + {% trans 'Import Packages from manifests' %} {% endif %} {% if pull_project_data_form %} {% trans 'Pull ScanCode.io Project data' %} @@ -66,9 +67,12 @@ SPDX document - +
        CycloneDX SBOM - + 1.6 + 1.5 + 1.4 +
        @@ -107,7 +111,7 @@ {% if has_edit_productpackage or has_edit_productcomponent %} {% endif %} - + {% include 'product_portfolio/includes/product_hierarchy.js.html' with relations_feature_grouped=tabsets.Hierarchy.fields.0.1.relations_feature_grouped %} {% if tabsets.Owner.extra %} {% include 'organization/includes/owner_hierarchy.js.html' with current_owner=object.owner parents=tabsets.Owner.extra.context.owner_parents children=tabsets.Owner.extra.context.owner_children tab_name="tab_owner" %} @@ -137,7 +141,7 @@ {% if has_edit_productpackage or has_edit_productcomponent or has_add_productcomponent %} - + \ No newline at end of file diff --git a/product_portfolio/tests/test_api.py b/product_portfolio/tests/test_api.py index 46c270a..65a3bec 100644 --- a/product_portfolio/tests/test_api.py +++ b/product_portfolio/tests/test_api.py @@ -7,8 +7,12 @@ # import json +import uuid +from pathlib import Path +from unittest import mock from django.core import mail +from django.core.files.base import ContentFile from django.test import TestCase from django.urls import reverse @@ -41,9 +45,12 @@ from product_portfolio.models import ProductPackage from product_portfolio.models import ProductRelationStatus from product_portfolio.models import ProductStatus +from product_portfolio.models import ScanCodeProject class ProductAPITestCase(MaxQueryMixin, TestCase): + testfiles_path = Path(__file__).parent / "testfiles" + def setUp(self): self.dataspace = Dataspace.objects.create(name="nexB") self.alternate_dataspace = Dataspace.objects.create(name="Alternate") @@ -343,6 +350,202 @@ def test_api_product_endpoint_update_permissions(self): product1 = Product.unsecured_objects.get(pk=self.product1.pk) self.assertEqual("Updated Name", product1.name) + def test_api_product_endpoint_load_sboms_action(self): + url = reverse("api_v2:product-load-sboms", args=[self.product1.uuid]) + + self.client.login(username=self.base_user.username, password="secret") + response = self.client.get(url) + self.assertEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code) + response = self.client.post(url, data={}) + self.assertEqual(status.HTTP_403_FORBIDDEN, response.status_code) + + # Required permissions + add_perm(self.base_user, "add_product") + assign_perm("view_product", self.base_user, self.product1) + + response = self.client.post(url, data={}) + self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code) + expected = {"input_file": ["This field is required."]} + self.assertEqual(expected, response.data) + + data = { + "input_file": ContentFile("Content", name="sbom.json"), + "update_existing_packages": False, + "scan_all_packages": False, + } + response = self.client.post(url, data) + self.assertEqual(status.HTTP_200_OK, response.status_code) + expected = {"status": "SBOM file submitted to ScanCode.io for inspection."} + self.assertEqual(expected, response.data) + self.assertEqual(1, ScanCodeProject.objects.count()) + + def test_api_product_endpoint_import_manifests_action(self): + url = reverse("api_v2:product-import-manifests", args=[self.product1.uuid]) + + self.client.login(username=self.base_user.username, password="secret") + response = self.client.get(url) + self.assertEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code) + response = self.client.post(url, data={}) + self.assertEqual(status.HTTP_403_FORBIDDEN, response.status_code) + + # Required permissions + add_perm(self.base_user, "add_product") + assign_perm("view_product", self.base_user, self.product1) + + response = self.client.post(url, data={}) + self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code) + expected = {"input_file": ["This field is required."]} + self.assertEqual(expected, response.data) + + data = { + "input_file": ContentFile("Content", name="requirements.txt"), + "update_existing_packages": False, + "scan_all_packages": False, + } + response = self.client.post(url, data) + self.assertEqual(status.HTTP_200_OK, response.status_code) + expected = {"status": "Manifest file submitted to ScanCode.io for inspection."} + self.assertEqual(expected, response.data) + self.assertEqual(1, ScanCodeProject.objects.count()) + + def test_api_product_endpoint_import_from_scan_action(self): + url = reverse("api_v2:product-import-from-scan", args=[self.product1.uuid]) + + self.client.login(username=self.base_user.username, password="secret") + response = self.client.get(url) + self.assertEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code) + response = self.client.post(url, data={}) + self.assertEqual(status.HTTP_403_FORBIDDEN, response.status_code) + + # Required permissions + add_perm(self.base_user, "add_product") + assign_perm("view_product", self.base_user, self.product1) + + response = self.client.post(url, data={}) + self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code) + expected = {"upload_file": ["This field is required."]} + self.assertEqual(expected, response.data) + + data = { + "upload_file": ContentFile("Content", name="scan_results.json"), + "create_codebase_resources": False, + "stop_on_error": False, + } + response = self.client.post(url, data) + self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code) + expected = ["The file content is not proper JSON."] + self.assertEqual(expected, response.data) + + scan_input_location = self.testfiles_path / "import_from_scan.json" + data = { + "upload_file": scan_input_location.open(), + "create_codebase_resources": True, + "stop_on_error": False, + } + response = self.client.post(url, data) + self.assertEqual(status.HTTP_200_OK, response.status_code) + expected = { + "status": "Imported from Scan: 1 Packages, 1 Product Packages, 3 Codebase Resources" + } + self.assertEqual(1, self.product1.productpackages.count()) + self.assertEqual(1, self.product1.packages.count()) + self.assertEqual(3, self.product1.codebaseresources.count()) + + @mock.patch("product_portfolio.forms.PullProjectDataForm.get_project_data") + def test_api_product_endpoint_pull_scancodeio_project_data_action(self, mock_get_project_data): + url = reverse("api_v2:product-pull-scancodeio-project-data", args=[self.product1.uuid]) + + self.client.login(username=self.base_user.username, password="secret") + response = self.client.get(url) + self.assertEqual(status.HTTP_405_METHOD_NOT_ALLOWED, response.status_code) + response = self.client.post(url, data={}) + self.assertEqual(status.HTTP_403_FORBIDDEN, response.status_code) + + # Required permissions + add_perm(self.base_user, "add_product") + assign_perm("view_product", self.base_user, self.product1) + + response = self.client.post(url, data={}) + self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code) + expected = {"project_name_or_uuid": ["This field is required."]} + self.assertEqual(expected, response.data) + + mock_get_project_data.return_value = None + data = { + "project_name_or_uuid": "project_name", + "update_existing_packages": False, + } + response = self.client.post(url, data) + expected = ['Project "project_name" not found on ScanCode.io.'] + self.assertEqual(expected, response.data) + + mock_get_project_data.return_value = {"uuid": uuid.uuid4()} + response = self.client.post(url, data) + self.assertEqual(status.HTTP_200_OK, response.status_code) + expected = {"status": "Packages import from ScanCode.io in progress..."} + self.assertEqual(expected, response.data) + self.assertEqual(1, ScanCodeProject.objects.count()) + + def test_api_product_endpoint_aboutcode_files_action(self): + url = reverse("api_v2:product-aboutcode-files", args=[self.product1.uuid]) + + self.client.login(username=self.base_user.username, password="secret") + response = self.client.get(url) + self.assertEqual(status.HTTP_404_NOT_FOUND, response.status_code) + + # Required permissions + add_perm(self.base_user, "add_product") + assign_perm("view_product", self.base_user, self.product1) + + response = self.client.get(url) + self.assertEqual(status.HTTP_200_OK, response.status_code) + expected = 'attachment; filename="p1_about.zip"' + self.assertEqual(expected, response["Content-Disposition"]) + self.assertEqual("application/zip", response["Content-Type"]) + + def test_api_product_endpoint_spdx_document_action(self): + url = reverse("api_v2:product-spdx-document", args=[self.product1.uuid]) + + self.client.login(username=self.base_user.username, password="secret") + response = self.client.get(url) + self.assertEqual(status.HTTP_404_NOT_FOUND, response.status_code) + + # Required permissions + add_perm(self.base_user, "add_product") + assign_perm("view_product", self.base_user, self.product1) + + response = self.client.get(url) + self.assertEqual(status.HTTP_200_OK, response.status_code) + expected = 'attachment; filename="dejacode_nexb_product_p1.spdx.json"' + self.assertEqual(expected, response["Content-Disposition"]) + self.assertEqual("application/json", response["Content-Type"]) + + def test_api_product_endpoint_cyclonedx_sbom_action(self): + url = reverse("api_v2:product-cyclonedx-sbom", args=[self.product1.uuid]) + + self.client.login(username=self.base_user.username, password="secret") + response = self.client.get(url) + self.assertEqual(status.HTTP_404_NOT_FOUND, response.status_code) + + # Required permissions + add_perm(self.base_user, "add_product") + assign_perm("view_product", self.base_user, self.product1) + + response = self.client.get(url) + self.assertEqual(status.HTTP_200_OK, response.status_code) + expected = 'attachment; filename="dejacode_nexb_product_p1.cdx.json"' + self.assertEqual(expected, response["Content-Disposition"]) + self.assertEqual("application/json", response["Content-Type"]) + self.assertIn('"specVersion": "1.6"', str(response.getvalue())) + + # Old spec version + response = self.client.get(url, data={"spec_version": "1.5"}) + self.assertIn('"specVersion": "1.5"', str(response.getvalue())) + + response = self.client.get(url, data={"spec_version": "10.10"}) + self.assertEqual(status.HTTP_400_BAD_REQUEST, response.status_code) + self.assertEqual("Spec version 10.10 not supported", response.data) + class ProductRelatedAPITestCase(TestCase): def setUp(self): diff --git a/product_portfolio/tests/test_attribution.py b/product_portfolio/tests/test_attribution.py index 40f15b3..bb600b9 100644 --- a/product_portfolio/tests/test_attribution.py +++ b/product_portfolio/tests/test_attribution.py @@ -927,7 +927,9 @@ def test_attribution_generation_include_packages(self): expected = ( '' + 'class="checkboxinput form-check-input" ' + 'aria-describedby="id_include_packages_helptext" id="id_include_packages" ' + "checked>" ) response = self.client.get(url) self.assertContains(response, expected) @@ -935,7 +937,8 @@ def test_attribution_generation_include_packages(self): self.pp1.delete() expected = ( '' + 'class="checkboxinput form-check-input" ' + 'aria-describedby="id_include_packages_helptext" id="id_include_packages">' ) response = self.client.get(url) self.assertContains(response, expected) diff --git a/product_portfolio/tests/test_importers.py b/product_portfolio/tests/test_importers.py index b72fc99..23287cf 100644 --- a/product_portfolio/tests/test_importers.py +++ b/product_portfolio/tests/test_importers.py @@ -26,6 +26,7 @@ from license_library.models import LicenseChoice from organization.models import Owner from product_portfolio.importers import CodebaseResourceImporter +from product_portfolio.importers import ImportFromScan from product_portfolio.importers import ImportPackageFromScanCodeIO from product_portfolio.importers import ProductComponentImporter from product_portfolio.importers import ProductPackageImporter @@ -35,7 +36,6 @@ from product_portfolio.models import ProductItemPurpose from product_portfolio.models import ProductPackage from product_portfolio.models import ProductRelationStatus -from product_portfolio.views import ImportFromScan class ProductRelationImporterTestCase(TestCase): @@ -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/tests/test_models.py b/product_portfolio/tests/test_models.py index 836b6ea..1149e47 100644 --- a/product_portfolio/tests/test_models.py +++ b/product_portfolio/tests/test_models.py @@ -248,8 +248,13 @@ def test_product_model_assign_objects(self): ) self.assertEqual(0, self.product1.productcomponents.count()) - created, unchanged = self.product1.assign_objects([], self.super_user) + with self.assertRaises(ValueError) as cm: + self.product1.assign_objects([status1], self.super_user) + self.assertEqual("Unsupported object model: productrelationstatus", str(cm.exception)) + + created, updated, unchanged = self.product1.assign_objects([], self.super_user) self.assertEqual(0, created) + self.assertEqual(0, updated) self.assertEqual(0, unchanged) component1 = Component.objects.create( @@ -257,8 +262,9 @@ def test_product_model_assign_objects(self): license_expression=self.license1.key, dataspace=self.dataspace, ) - created, unchanged = self.product1.assign_objects([component1], self.super_user) + created, updated, unchanged = self.product1.assign_objects([component1], self.super_user) self.assertEqual(1, created) + self.assertEqual(0, updated) self.assertEqual(0, unchanged) pc = ProductComponent.objects.get(product=self.product1, component=component1) @@ -266,8 +272,8 @@ def test_product_model_assign_objects(self): self.assertEqual(status1, pc.review_status) self.assertEqual(self.super_user, pc.created_by) self.assertEqual(self.super_user, pc.last_modified_by) - self.assertEqual(26, len(str(pc.created_date))) - self.assertEqual(26, len(str(pc.last_modified_date))) + self.assertEqual(32, len(str(pc.created_date))) + self.assertEqual(32, len(str(pc.last_modified_date))) self.product1.refresh_from_db() history_entries = History.objects.get_for_object(self.product1) @@ -281,6 +287,156 @@ def test_product_model_assign_objects(self): ) self.assertEqual(self.super_user, self.product1.last_modified_by) + def test_product_model_assign_object_replace_version_component(self): + component1 = Component.objects.create(name="c", version="1.0", dataspace=self.dataspace) + component2 = Component.objects.create(name="c", version="2.0", dataspace=self.dataspace) + + # Assign component1 + status, relation = self.product1.assign_object(component1, self.super_user) + self.assertEqual("created", status) + self.assertTrue(relation) + self.assertQuerySetEqual([component1], self.product1.components.all()) + + # Re-assign component1, relation already exists. + status, relation = self.product1.assign_object(component1, self.super_user) + self.assertEqual("unchanged", status) + self.assertIsNone(relation) + self.assertQuerySetEqual([component1], self.product1.components.all()) + # With replace_version + status, relation = self.product1.assign_object( + component1, self.super_user, replace_version=1 + ) + self.assertEqual("unchanged", status) + self.assertIsNone(relation) + self.assertQuerySetEqual([component1], self.product1.components.all()) + + # Assign component2 + status, p1_c2 = self.product1.assign_object(component2, self.super_user) + self.assertEqual("created", status) + self.assertTrue(p1_c2) + self.assertQuerySetEqual([component1, component2], self.product1.components.all()) + + # Replacing the current single existing version. + p1_c2.delete() + status, p1_c2 = self.product1.assign_object( + component2, self.super_user, replace_version=True + ) + self.assertEqual("updated", status) + self.assertTrue(p1_c2) + self.assertQuerySetEqual([component2], self.product1.components.all()) + + history_entries = History.objects.get_for_object(self.product1) + expected_message = 'Updated component "c 1.0" to "c 2.0"' + self.assertEqual(expected_message, history_entries.latest("action_time").change_message) + + def test_product_model_assign_object_replace_version_package(self): + package_data = { + "filename": "package.zip", + "type": "deb", + "namespace": "debian", + "name": "curl", + "dataspace": self.dataspace, + } + package1 = Package.objects.create(**package_data, version="1.0") + package2 = Package.objects.create(**package_data, version="2.0") + + # Assign package1 + status, relation = self.product1.assign_object(package1, self.super_user) + self.assertEqual("created", status) + self.assertTrue(relation) + self.assertQuerySetEqual([package1], self.product1.packages.all()) + + # Re-assign package1, relation already exists. + status, relation = self.product1.assign_object(package1, self.super_user) + self.assertEqual("unchanged", status) + self.assertIsNone(relation) + self.assertQuerySetEqual([package1], self.product1.packages.all()) + # With replace_version + status, relation = self.product1.assign_object(package1, self.super_user, replace_version=1) + self.assertEqual("unchanged", status) + self.assertIsNone(relation) + self.assertQuerySetEqual([package1], self.product1.packages.all()) + + # Assign package2 + status, p1_p2 = self.product1.assign_object(package2, self.super_user) + self.assertEqual("created", status) + self.assertTrue(p1_p2) + self.assertQuerySetEqual([package1, package2], self.product1.packages.all()) + + # Replacing the current single existing version. + p1_p2.delete() + status, p1_p2 = self.product1.assign_object(package2, self.super_user, replace_version=True) + self.assertEqual("updated", status) + self.assertTrue(p1_p2) + self.assertQuerySetEqual([package2], self.product1.packages.all()) + + history_entries = History.objects.get_for_object(self.product1) + expected_message = 'Updated package "pkg:deb/debian/curl@1.0" to "pkg:deb/debian/curl@2.0"' + self.assertEqual(expected_message, history_entries.latest("action_time").change_message) + + def test_product_model_find_assigned_other_versions_component(self): + component1 = Component.objects.create(name="c", version="1.0", dataspace=self.dataspace) + component2 = Component.objects.create(name="c", version="2.0", dataspace=self.dataspace) + component3 = Component.objects.create(name="c", version="3.0", dataspace=self.dataspace) + + # No other version assigned + self.assertQuerySetEqual([], self.product1.find_assigned_other_versions(component1)) + self.assertQuerySetEqual([], self.product1.find_assigned_other_versions(component2)) + self.assertQuerySetEqual([], self.product1.find_assigned_other_versions(component3)) + + # 1 other version assigned + _, p1_c1 = self.product1.assign_object(component1, self.super_user) + self.assertQuerySetEqual([], self.product1.find_assigned_other_versions(component1)) + self.assertQuerySetEqual([p1_c1], self.product1.find_assigned_other_versions(component2)) + self.assertQuerySetEqual([p1_c1], self.product1.find_assigned_other_versions(component3)) + + # 2 other versions assigned + _, p1_c2 = self.product1.assign_object(component2, self.super_user) + self.assertQuerySetEqual([p1_c2], self.product1.find_assigned_other_versions(component1)) + self.assertQuerySetEqual([p1_c1], self.product1.find_assigned_other_versions(component2)) + self.assertQuerySetEqual( + [p1_c1, p1_c2], self.product1.find_assigned_other_versions(component3) + ) + + def test_product_model_find_assigned_other_versions_package(self): + package_data = { + "filename": "package.zip", + "type": "deb", + "namespace": "debian", + "name": "curl", + "dataspace": self.dataspace, + } + package1 = Package.objects.create(**package_data, version="1.0") + package2 = Package.objects.create(**package_data, version="2.0") + package3 = Package.objects.create(**package_data, version="3.0") + + # No other version assigned + self.assertQuerySetEqual([], self.product1.find_assigned_other_versions(package1)) + self.assertQuerySetEqual([], self.product1.find_assigned_other_versions(package2)) + self.assertQuerySetEqual([], self.product1.find_assigned_other_versions(package3)) + + # 1 other version assigned + _, p1_p1 = self.product1.assign_object(package1, self.super_user) + self.assertQuerySetEqual([], self.product1.find_assigned_other_versions(package1)) + self.assertQuerySetEqual([p1_p1], self.product1.find_assigned_other_versions(package2)) + self.assertQuerySetEqual([p1_p1], self.product1.find_assigned_other_versions(package3)) + + # 2 other versions assigned + _, p1_p2 = self.product1.assign_object(package2, self.super_user) + self.assertQuerySetEqual([p1_p2], self.product1.find_assigned_other_versions(package1)) + self.assertQuerySetEqual([p1_p1], self.product1.find_assigned_other_versions(package2)) + self.assertQuerySetEqual( + [p1_p1, p1_p2], self.product1.find_assigned_other_versions(package3) + ) + + # Only PURL fields are used as lookups as the filename and download_url + # fields change between version. + package_data["filename"] = "different_filename" + package4 = Package.objects.create(**package_data, version="4.0") + self.assertQuerySetEqual( + [p1_p1, p1_p2], self.product1.find_assigned_other_versions(package4) + ) + def test_product_model_field_changes_mixin(self): self.assertFalse(Product().has_changed("name")) @@ -724,14 +880,17 @@ def test_product_relationship_models_as_spdx(self): self.assertEqual(expected, pp1.as_spdx().as_dict()) def test_product_model_as_cyclonedx(self): - expected_repr = "" - self.assertEqual(expected_repr, repr(self.product1.as_cyclonedx())) + cyclonedx_data = self.product1.as_cyclonedx() + self.assertEqual("application", cyclonedx_data.type) + self.assertEqual(self.product1.name, cyclonedx_data.name) + self.assertEqual(self.product1.version, cyclonedx_data.version) + self.assertEqual(str(self.product1.uuid), str(cyclonedx_data.bom_ref)) def test_product_portfolio_scancode_project_model_can_start_import(self): scancode_project = ScanCodeProject.objects.create( product=self.product1, dataspace=self.product1.dataspace, - type=ScanCodeProject.ProjectType.IMPORT_FROM_MANIFEST, + type=ScanCodeProject.ProjectType.LOAD_SBOMS, ) self.assertTrue(scancode_project.can_start_import) diff --git a/product_portfolio/tests/test_views.py b/product_portfolio/tests/test_views.py index aff0134..143fa7f 100644 --- a/product_portfolio/tests/test_views.py +++ b/product_portfolio/tests/test_views.py @@ -28,18 +28,16 @@ from component_catalog.models import ComponentAssignedPackage from component_catalog.models import ComponentKeyword from component_catalog.models import Package -from dejacode import __version__ as dejacode_version from dejacode_toolkit import scancodeio from dje.models import Dataspace from dje.models import History +from dje.outputs import get_spdx_extracted_licenses +from dje.tasks import logger as tasks_logger from dje.tasks import pull_project_data_from_scancodeio -from dje.tasks import scancodeio_submit_manifest_inspection -from dje.tasks import tasks_logger +from dje.tasks import scancodeio_submit_project from dje.tests import add_perms from dje.tests import create_superuser from dje.tests import create_user -from dje.views import ExportSPDXDocumentView -from dje.views import get_spdx_extracted_licenses from license_library.models import License from organization.models import Owner from policy.models import UsagePolicy @@ -174,7 +172,7 @@ def test_product_portfolio_detail_view_tab_imports(self): ScanCodeProject.objects.create( product=self.product1, dataspace=self.product1.dataspace, - type=ScanCodeProject.ProjectType.IMPORT_FROM_MANIFEST, + type=ScanCodeProject.ProjectType.LOAD_SBOMS, ) response = self.client.get(url) @@ -191,7 +189,7 @@ def test_product_portfolio_detail_view_tab_imports_view(self): project = ScanCodeProject.objects.create( product=self.product1, dataspace=self.product1.dataspace, - type=ScanCodeProject.ProjectType.IMPORT_FROM_MANIFEST, + type=ScanCodeProject.ProjectType.LOAD_SBOMS, status=ScanCodeProject.Status.SUBMITTED, ) @@ -200,13 +198,13 @@ def test_product_portfolio_detail_view_tab_imports_view(self): htmx_refresh = 'hx-trigger="load delay:10s" hx-swap="outerHTML"' self.assertContains(response, htmx_refresh) self.assertContains(response, "Imports are currently in progress.") - self.assertContains(response, "Import from Manifest") + self.assertContains(response, "Load SBOMs") project.status = ScanCodeProject.Status.SUCCESS project.save() response = self.client.get(url) self.assertFalse(response.context["has_projects_in_progress"]) - self.assertContains(response, "Import from Manifest") + self.assertContains(response, "Load SBOMs") self.assertNotContains(response, "hx-trigger") self.assertNotContains(response, "Imports are currently in progress.") @@ -694,12 +692,12 @@ def test_product_portfolio_detail_view_hierarchy_tab(self): self.assertEqual(expected, feature_grouped) expected_in_response = [ - f'
        ', - f'
        ', - f'
        ', - f"target: 'product_{self.product1.id}'", - f"source: 'component_{pc1.id}'", - f"source: 'package_{pp1.id}'", + f'
        ', + f'
        ', + f'
        ', + f"var target_id = 'product_{self.product1.id}'", + f"var source_id = 'component_{pc1.id}'", + f"var source_id = 'package_{pp1.id}'", f'

        {pc1.feature}

        ', f'

        {pp1.feature}

        ', '', @@ -1038,8 +1036,7 @@ def test_product_portfolio_list_view_compare_button(self): url = resolve_url("product_portfolio:product_list") response = self.client.get(url) expected = """ - """ @@ -1086,6 +1083,33 @@ def test_product_portfolio_list_view_search(self): self.assertEqual(1, len(response.context_data["object_list"])) self.assertIn(self.product1, response.context_data["object_list"]) + def test_product_portfolio_list_view_inventory_count(self): + self.client.login(username="nexb_user", password="secret") + url = resolve_url("product_portfolio:product_list") + + response = self.client.get(url) + self.assertContains(response, "
      		0
      +
      {% for header in headers %} @@ -12,9 +12,8 @@ {% for item in list %} {% if format == 'xls' %} - {% elif format == 'html' or not format %} - {% else %} + {# WARNING: Using |urlize breaks the "view_link" #} {% endif %} {% endfor %} diff --git a/reporting/templates/reporting/report_run.html b/reporting/templates/reporting/report_run.html index e3a9fdf..b852f53 100644 --- a/reporting/templates/reporting/report_run.html +++ b/reporting/templates/reporting/report_run.html @@ -43,23 +43,31 @@

      {% endif %} -
      +
      - - +
      +
      + +
      +
      + +
      +
      + +
      +
      {# Put the query string parameters into the form so that the export will respect the runtime parameters #} {% for key, value in query_string_params %} {% endfor %} -
      @@ -78,7 +86,7 @@

      {% endif %}
      -

      {{ item|linebreaksbr }}{{ item|default:' '|urlize|linebreaksbr }}{{ item|default:' '|linebreaksbr }}
      +
      diff --git a/reporting/tests/test_api.py b/reporting/tests/test_api.py index ef691af..6b47ae3 100644 --- a/reporting/tests/test_api.py +++ b/reporting/tests/test_api.py @@ -139,7 +139,8 @@ def test_api_report_detail_endpoint(self): self.assertEqual(str(self.report1.uuid), response.data["uuid"]) self.assertEqual(self.report1.column_template.name, response.data["column_template"]) self.assertEqual(self.report1.description, response.data["description"]) - self.assertIn(self.report1.get_absolute_url(), response.data["absolute_url"]) + expected_url = f"http://testserver{self.report1.get_absolute_url()}" + self.assertEqual(expected_url, response.data["absolute_url"]) self.assertEqual(self.report1.name, response.data["name"]) self.assertEqual(self.report1.query.content_type.model, response.data["content_type"]) self.assertEqual(self.report1.query.name, response.data["query"]) diff --git a/reporting/tests/test_models.py b/reporting/tests/test_models.py index 138017e..0afbd21 100644 --- a/reporting/tests/test_models.py +++ b/reporting/tests/test_models.py @@ -1196,12 +1196,12 @@ def test_get_value_for_instance_on_license_on_various_fields(self): ("owner__children__children", ""), ("owner__children__children__name", ""), # Many2Many - ("tags", "{}, {}".format(self.license_tag, license_tag2)), - ("tags__id", "{}, {}".format(self.license_tag.id, license_tag2.id)), - ("tags__show_in_license_list_view", "False, False"), - ("tags__default_value", "None, True"), - ("tags__label", "Network Redistribution, Tag2"), - ("tags__uuid", "{}, {}".format(self.license_tag.uuid, license_tag2.uuid)), + ("tags", "{}\n{}".format(self.license_tag, license_tag2)), + ("tags__id", "{}\n{}".format(self.license_tag.id, license_tag2.id)), + ("tags__show_in_license_list_view", "False\nFalse"), + ("tags__default_value", "None\nTrue"), + ("tags__label", "Network Redistribution\nTag2"), + ("tags__uuid", "{}\n{}".format(self.license_tag.uuid, license_tag2.uuid)), # Special tag property ("{}{}".format(LICENSE_TAG_PREFIX, self.license_tag.label), "True"), # Related @@ -1342,7 +1342,7 @@ def test_get_value_for_instance_on_component_on_various_fields(self): ("code_view_url", ""), ("bug_tracking_url", ""), ("primary_language", ""), - ("keywords", "Keyword1, Keyword2"), + ("keywords", "Keyword1\nKeyword2"), ("guidance", ""), ("admin_notes", ""), ("is_active", "True"), @@ -1694,9 +1694,9 @@ def test_get_value_for_instance_on_component_for_licenses_tags(self): component=self.component, license=license2, dataspace=self.dataspace ) - expected = "True, False" + expected = "True\nFalse" self.assertEqual(expected, self.field1.get_value_for_instance(self.component)) - expected = "License1, License2" + expected = "License1\nLicense2" self.assertEqual(expected, field2.get_value_for_instance(self.component)) def test_get_value_for_instance_multi_value_ordering(self): @@ -1735,9 +1735,9 @@ def test_get_value_for_instance_multi_value_ordering(self): expected = [license_a.key, license_b.name] self.assertEqual(expected, list(self.component.licenses.values_list("key", flat=True))) - expected = ", ".join([license_a.key, license_b.name]) + expected = "\n".join([license_a.key, license_b.name]) self.assertEqual(expected, field2.get_value_for_instance(self.component)) - expected = ", ".join([str(assigned_tag_a.value), str(assigned_tag_b.value)]) + expected = "\n".join([str(assigned_tag_a.value), str(assigned_tag_b.value)]) self.assertEqual(expected, self.field1.get_value_for_instance(self.component)) def test_column_template_with_fields_copy(self): diff --git a/reporting/views.py b/reporting/views.py index 1191802..a64857e 100644 --- a/reporting/views.py +++ b/reporting/views.py @@ -9,7 +9,6 @@ import datetime import io import json -from collections import OrderedDict from django.contrib.auth.mixins import LoginRequiredMixin from django.core.exceptions import FieldDoesNotExist @@ -25,7 +24,8 @@ from django.views.generic.detail import SingleObjectMixin from django.views.generic.list import MultipleObjectMixin -import pyaml +import saneyaml +import xlsxwriter from dje.utils import get_preserved_filters from dje.views import AdminLinksDropDownMixin @@ -191,38 +191,35 @@ def get_context_data(self, **kwargs): report = self.object model_class = report.column_template.get_model_class() # Only available in the UI since the link is relative to the current URL - include_view_link = hasattr(model_class, "get_absolute_url") and not self.format + include_view_link = not self.format and hasattr(model_class, "get_absolute_url") + interpolated_report_context = self.get_interpolated_report_context(request, report) + multi_as_list = True if self.format in ["json", "yaml"] else False + output = report.get_output( + queryset=context["object_list"], + user=request.user, + include_view_link=include_view_link, + multi_as_list=multi_as_list, + ) context.update( { "opts": self.model._meta, "preserved_filters": get_preserved_filters(request, self.model), - "headers": report.column_template.as_headers(include_view_link=include_view_link), + "headers": report.column_template.as_headers(include_view_link), "runtime_filter_formset": self.runtime_filter_formset, "query_string_params": self.get_query_string_params(), - "interpolated_report_context": self.get_interpolated_report_context( - request, report - ), + "interpolated_report_context": interpolated_report_context, "errors": getattr(self, "errors", []), - "include_view_link": include_view_link, - "output": report.get_output( - queryset=context["object_list"], - user=request.user, - include_view_link=include_view_link, - ), + "output": output, } ) return context def get_dump(self, dumper, **dumper_kwargs): - """ - Return the data dump using provided kwargs. - The columns order form the ColumnTemplateAssignedField sequence is respected - using an OrderedDict. - """ + """Return the data dump using provided kwargs.""" context = self.get_context_data(**self.kwargs) - data = [OrderedDict(zip(context["headers"], values)) for values in context["output"]] + data = [dict(zip(context["headers"], values)) for values in context["output"]] return dumper(data, **dumper_kwargs) def get_json_response(self, **response_kwargs): @@ -231,17 +228,12 @@ def get_json_response(self, **response_kwargs): return HttpResponse(dump, **response_kwargs) def get_yaml_response(self, **response_kwargs): - """ - Return serialized results as yaml content response. - Using pretty-yaml (pyaml) on top of PyYAML for the OrderDict support with safe_dump. - """ - dump = self.get_dump(pyaml.dump, safe=True) + """Return serialized results as yaml content response.""" + dump = self.get_dump(saneyaml.dump) return HttpResponse(dump, **response_kwargs) def get_xlsx_response(self, **response_kwargs): """Return the results as `xlsx` format.""" - import xlsxwriter - context = self.get_context_data(**self.kwargs) report_data = [context["headers"]] + context["output"] diff --git a/setup.cfg b/setup.cfg index f354c52..5d39a16 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,6 +1,6 @@ [metadata] name = dejacode -version = 5.0.1-dev +version = 5.1.1-dev license = AGPL-3.0-only description = Automate open source license compliance and ensure supply chain integrity long_description = file:README.rst @@ -14,7 +14,7 @@ classifiers = Intended Audience :: Legal Industry Programming Language :: Python Programming Language :: Python :: 3 :: Only - Programming Language :: Python :: 3.10 + Programming Language :: Python :: 3.12 Topic :: Utilities keywords = open source @@ -41,28 +41,28 @@ license_files = NOTICE [options] -python_requires = >=3.10 +python_requires = >=3.12 packages=find: include_package_data = true zip_safe = false install_requires = # Base configuration tools - setuptools==69.0.2 - wheel==0.42.0 - pip==23.3.1 + setuptools==69.5.1 + wheel==0.43.0 + pip==24.0 # Django - Django==4.2.8 - asgiref==3.7.2 + Django==5.0.6 + asgiref==3.8.1 typing_extensions==4.2.0 - sqlparse==0.4.4 - pytz==2023.3.post1 + sqlparse==0.5.0 + pytz==2024.1 # Django apps django-crispy-forms==2.1 - crispy_bootstrap5==2023.10 - django-grappelli==3.0.8 - django-filter==23.5 + crispy_bootstrap5==2024.2 + django-grappelli==4.0.1 + django-filter==24.2 django-registration==3.4 - confusable_homoglyphs==3.2.0 + confusable_homoglyphs==3.3.1 django-hcaptcha-field==1.4.0 django-guardian==2.4.0 django-environ==0.11.2 @@ -73,20 +73,20 @@ install_requires = MarkupSafe==2.1.3 coreschema==0.0.4 itypes==1.2.0 - Jinja2==3.1.2 + Jinja2==3.1.4 uritemplate==4.1.1 # Access log django-axes==5.35.0 django-appconf==1.0.5 django-ipware==5.0.2 # Multi-factor authentication - django-otp==1.2.4 + django-otp==1.5.0 qrcode==7.4.2 pypng==0.20220715.0 # Database - psycopg==3.1.14 + psycopg==3.1.19 # Cache - redis==5.0.1 + redis==5.0.4 # redis dependencies: packaging==23.0 pyparsing==3.0.9 @@ -98,25 +98,22 @@ install_requires = # Testing model_bakery==1.10.1 # Task queue - celery==4.4.7 - kombu==4.6.11 - billiard==3.6.3.0 - amqp==2.6.1 - vine==1.3.0 + rq==1.16.2 + django-rq==2.10.2 + fakeredis==2.21.1 # Libs - certifi==2023.11.17 - urllib3==2.1.0 + certifi==2024.2.2 + urllib3==2.2.1 python-dateutil==2.8.2 python-mimeparse==1.6.0 PyJWT==2.4.0 natsort==8.4.0 six==1.16.0 requests==2.31.0 - idna==3.4 - charset-normalizer==3.1.0 + idna==3.7 + charset-normalizer==3.3.2 PyYAML==6.0 Cython==0.29.30 - pyaml==21.10.1 importlib_metadata==4.11.4 zipp==3.8.0 XlsxWriter==3.1.9 @@ -140,7 +137,7 @@ install_requires = funcparserlib==0.3.6 # license expressions boolean.py==4.0 - license_expression==30.2.0 + license_expression==30.3.0 # Webhooks django-rest-hooks==1.6.1 # django-notifications @@ -151,30 +148,35 @@ install_requires = # AboutCode Toolkit aboutcode_toolkit==10.1.0 click==8.1.3 - saneyaml==0.5.2 + saneyaml==0.6.0 openpyxl==3.1.2 et-xmlfile==1.1.0 # PackageURL - packageurl-python==0.12.0 + packageurl-python==0.15.0 # Gunicorn - gunicorn==21.2.0 + gunicorn==22.0.0 # SPDX validation jsonschema==4.16.0 - attrs==22.1.0 + attrs==23.2.0 pyrsistent==0.18.1 # CycloneDX - cyclonedx-python-lib==3.1.0 + cyclonedx-python-lib==7.3.4 sortedcontainers==2.4.0 toml==0.10.2 + py-serializable==1.0.3 + # Git + gitpython==3.1.43 + gitdb==4.0.11 + smmap==5.0.1 [options.extras_require] dev = # Development tools - django-debug-toolbar==4.2.0 + django-debug-toolbar==4.3.0 # Validation - flake8==6.1.0 + flake8==7.0.0 pycodestyle==2.11.1 - pyflakes==3.1.0 + pyflakes==3.2.0 mccabe==0.7.0 doc8==0.11.2 stevedore==5.1.0 @@ -183,9 +185,9 @@ dev = restructuredtext-lint==1.4.0 pbr==5.11.1 # Imports - isort==5.12.0 + isort==5.13.2 # Black - black==23.11.0 + black==24.4.2 mypy-extensions==0.4.3 pathspec==0.10.1 tomli==2.0.1 diff --git a/thirdparty/dist/Django-4.2.8-py3-none-any.whl.ABOUT b/thirdparty/dist/Django-4.2.8-py3-none-any.whl.ABOUT deleted file mode 100644 index 966cb55..0000000 --- a/thirdparty/dist/Django-4.2.8-py3-none-any.whl.ABOUT +++ /dev/null @@ -1,14 +0,0 @@ -about_resource: Django-4.2.8-py3-none-any.whl -name: django -version: 4.2.8 -download_url: https://files.pythonhosted.org/packages/8a/79/7f45e9c129c3cd8e4d54806649efeb1db9c223c54a1c54b30511d246bc60/Django-4.2.8-py3-none-any.whl -package_url: pkg:pypi/django@4.2.8 -license_expression: bsd-new -copyright: Copyright django project contributors -attribute: yes -checksum_md5: 6fd694f0d0519e13138f78caaf1a1c22 -checksum_sha1: 657878b8fac72b91505c61c642f5923be67c2b57 -licenses: - - key: bsd-new - name: BSD-3-Clause - file: bsd-new.LICENSE diff --git a/thirdparty/dist/Django-4.2.8-py3-none-any.whl b/thirdparty/dist/Django-5.0.6-py3-none-any.whl similarity index 68% rename from thirdparty/dist/Django-4.2.8-py3-none-any.whl rename to thirdparty/dist/Django-5.0.6-py3-none-any.whl index 48994d9..a0e76f1 100644 Binary files a/thirdparty/dist/Django-4.2.8-py3-none-any.whl and b/thirdparty/dist/Django-5.0.6-py3-none-any.whl differ diff --git a/thirdparty/dist/Django-5.0.6-py3-none-any.whl.ABOUT b/thirdparty/dist/Django-5.0.6-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..44b44b7 --- /dev/null +++ b/thirdparty/dist/Django-5.0.6-py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: Django-5.0.6-py3-none-any.whl +name: django +version: 5.0.6 +download_url: https://files.pythonhosted.org/packages/1d/23/02f3795a71196019bcfec4c67890a6369e43b023474154fa0b2b7060346d/Django-5.0.6-py3-none-any.whl +package_url: pkg:pypi/django@5.0.6 +license_expression: bsd-new +copyright: Copyright django project contributors +attribute: yes +checksum_md5: ccddc6216c9ecd02fb90f3c9e199c131 +checksum_sha1: e4f133fb87b68138661f6a279c93b6d1de51f4df +licenses: + - key: bsd-new + name: BSD-3-Clause + file: bsd-new.LICENSE diff --git a/thirdparty/dist/GitPython-3.1.43-py3-none-any.whl b/thirdparty/dist/GitPython-3.1.43-py3-none-any.whl new file mode 100644 index 0000000..e8f4f4a Binary files /dev/null and b/thirdparty/dist/GitPython-3.1.43-py3-none-any.whl differ diff --git a/thirdparty/dist/GitPython-3.1.43-py3-none-any.whl.ABOUT b/thirdparty/dist/GitPython-3.1.43-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..2e34b58 --- /dev/null +++ b/thirdparty/dist/GitPython-3.1.43-py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: GitPython-3.1.43-py3-none-any.whl +name: gitpython +version: 3.1.43 +download_url: https://files.pythonhosted.org/packages/e9/bd/cc3a402a6439c15c3d4294333e13042b915bbeab54edc457c723931fed3f/GitPython-3.1.43-py3-none-any.whl +package_url: pkg:pypi/gitpython@3.1.43 +license_expression: bsd-new +copyright: Copyright gitpython project contributors +attribute: yes +checksum_md5: ca4edd790ee6bcb83dc6a5c5039259e9 +checksum_sha1: 3991e2275a5e3cc0ba6ff84ffc5b8be67ab8f849 +licenses: + - key: bsd-new + name: BSD-3-Clause + file: bsd-new.LICENSE diff --git a/thirdparty/dist/Jinja2-3.1.2-py3-none-any.whl b/thirdparty/dist/Jinja2-3.1.2-py3-none-any.whl deleted file mode 100644 index d271ac1..0000000 Binary files a/thirdparty/dist/Jinja2-3.1.2-py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/Jinja2-3.1.2-py3-none-any.whl.ABOUT b/thirdparty/dist/Jinja2-3.1.2-py3-none-any.whl.ABOUT deleted file mode 100644 index e79aba0..0000000 --- a/thirdparty/dist/Jinja2-3.1.2-py3-none-any.whl.ABOUT +++ /dev/null @@ -1,18 +0,0 @@ -about_resource: Jinja2-3.1.2-py3-none-any.whl -name: jinja2 -version: 3.1.2 -download_url: https://files.pythonhosted.org/packages/bc/c3/f068337a370801f372f2f8f6bad74a5c140f6fda3d9de154052708dd3c65/Jinja2-3.1.2-py3-none-any.whl -homepage_url: https://pypi.org/project/jinja2/3.1.2/ -package_url: pkg:pypi/jinja2@3.1.2 -license_expression: bsd-new -copyright: Copyright jinja2 project contributors -attribute: yes -owner: Pocoo -owner_url: http://www.pocoo.org/ -contact: armin.ronacher@active-4.com -checksum_md5: 00ccdb509d3592cc2163b286177d75c8 -checksum_sha1: 94f0c22c77e0633fc8eeed4e268d8b57d53c839f -licenses: - - key: bsd-new - name: BSD-3-Clause - file: bsd-new.LICENSE diff --git a/thirdparty/dist/amqp-2.6.1-py2.py3-none-any.whl b/thirdparty/dist/amqp-2.6.1-py2.py3-none-any.whl deleted file mode 100644 index ab3f53f..0000000 Binary files a/thirdparty/dist/amqp-2.6.1-py2.py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/amqp-2.6.1-py2.py3-none-any.whl.ABOUT b/thirdparty/dist/amqp-2.6.1-py2.py3-none-any.whl.ABOUT deleted file mode 100644 index 967a579..0000000 --- a/thirdparty/dist/amqp-2.6.1-py2.py3-none-any.whl.ABOUT +++ /dev/null @@ -1,20 +0,0 @@ -about_resource: amqp-2.6.1-py2.py3-none-any.whl -name: amqp -version: 2.6.1 -download_url: https://files.pythonhosted.org/packages/bc/90/bb5ce93521772f083cb2d7a413bb82eda5afc62b4192adb7ea4c7b4858b9/amqp-2.6.1-py2.py3-none-any.whl#sha256=aa7f313fb887c91f15474c1229907a04dac0b8135822d6603437803424c0aa59 -description: This is a fork of amqplib which was originally written by Barry Pederson. It is - maintained by the Celery project, and used by kombu as a pure python alternative when librabbitmq - is not available. This library should be API compatible with librabbitmq. -homepage_url: http://github.com/celery/py-amqp -package_url: pkg:pypi/amqp@2.6.1 -license_expression: bsd-new -copyright: Copyright (c) 2015-2016 Ask Solem & contributors. -notice_file: amqp-2.6.1-py2.py3-none-any.whl.NOTICE -attribute: yes -owner: Ask Solem -checksum_md5: 7e7552f78e16e1d0467af9cfb91ac9d0 -checksum_sha1: b4ae4bce329860abbd147501438267fae5e9600d -licenses: - - key: bsd-new - name: BSD-3-Clause - file: bsd-new.LICENSE diff --git a/thirdparty/dist/amqp-2.6.1-py2.py3-none-any.whl.NOTICE b/thirdparty/dist/amqp-2.6.1-py2.py3-none-any.whl.NOTICE deleted file mode 100644 index 5eb43f5..0000000 --- a/thirdparty/dist/amqp-2.6.1-py2.py3-none-any.whl.NOTICE +++ /dev/null @@ -1,3 +0,0 @@ -py-amqp is licensed under The BSD License (3 Clause, also known as -the new BSD license). The license is an OSI approved Open Source -license and is GPL-compatible(1). \ No newline at end of file diff --git a/thirdparty/dist/asgiref-3.7.2-py3-none-any.whl b/thirdparty/dist/asgiref-3.7.2-py3-none-any.whl deleted file mode 100644 index 2a7da06..0000000 Binary files a/thirdparty/dist/asgiref-3.7.2-py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/asgiref-3.7.2-py3-none-any.whl.ABOUT b/thirdparty/dist/asgiref-3.7.2-py3-none-any.whl.ABOUT deleted file mode 100644 index c3185a3..0000000 --- a/thirdparty/dist/asgiref-3.7.2-py3-none-any.whl.ABOUT +++ /dev/null @@ -1,18 +0,0 @@ -about_resource: asgiref-3.7.2-py3-none-any.whl -name: asgiref -version: 3.7.2 -download_url: https://files.pythonhosted.org/packages/9b/80/b9051a4a07ad231558fcd8ffc89232711b4e618c15cb7a392a17384bbeef/asgiref-3.7.2-py3-none-any.whl -homepage_url: https://pypi.org/project/asgiref/3.7.2/ -package_url: pkg:pypi/asgiref@3.7.2 -license_expression: bsd-new -copyright: Copyright asgiref project contributors -attribute: yes -owner: Django Software Foundation -owner_url: https://www.djangoproject.com/foundation/ -contact: https://www.djangoproject.com/contact/foundation/ -checksum_md5: d4d9c9c26865c416dc29553bc712df5b -checksum_sha1: 4de59604f7301d0a3595da7b5ea95833e2fdbdb2 -licenses: - - key: bsd-new - name: BSD-3-Clause - file: bsd-new.LICENSE diff --git a/thirdparty/dist/asgiref-3.8.1-py3-none-any.whl b/thirdparty/dist/asgiref-3.8.1-py3-none-any.whl new file mode 100644 index 0000000..244dc23 Binary files /dev/null and b/thirdparty/dist/asgiref-3.8.1-py3-none-any.whl differ diff --git a/thirdparty/dist/asgiref-3.8.1-py3-none-any.whl.ABOUT b/thirdparty/dist/asgiref-3.8.1-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..d30187d --- /dev/null +++ b/thirdparty/dist/asgiref-3.8.1-py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: asgiref-3.8.1-py3-none-any.whl +name: asgiref +version: 3.8.1 +download_url: https://files.pythonhosted.org/packages/39/e3/893e8757be2612e6c266d9bb58ad2e3651524b5b40cf56761e985a28b13e/asgiref-3.8.1-py3-none-any.whl +package_url: pkg:pypi/asgiref@3.8.1 +license_expression: bsd-new +copyright: Copyright asgiref project contributors +attribute: yes +checksum_md5: 87ef2494bf2bb208cd3652e577c74bc9 +checksum_sha1: b66c85ef24257bdf0f415febcbffcf5f09dc7d83 +licenses: + - key: bsd-new + name: BSD-3-Clause + file: bsd-new.LICENSE diff --git a/thirdparty/dist/attrs-22.1.0-py2.py3-none-any.whl b/thirdparty/dist/attrs-22.1.0-py2.py3-none-any.whl deleted file mode 100644 index d9dc2cd..0000000 Binary files a/thirdparty/dist/attrs-22.1.0-py2.py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/attrs-22.1.0-py2.py3-none-any.whl.ABOUT b/thirdparty/dist/attrs-22.1.0-py2.py3-none-any.whl.ABOUT deleted file mode 100644 index 56cb45a..0000000 --- a/thirdparty/dist/attrs-22.1.0-py2.py3-none-any.whl.ABOUT +++ /dev/null @@ -1,18 +0,0 @@ -about_resource: attrs-22.1.0-py2.py3-none-any.whl -name: attrs -version: 22.1.0 -download_url: https://files.pythonhosted.org/packages/f2/bc/d817287d1aa01878af07c19505fafd1165cd6a119e9d0821ca1d1c20312d/attrs-22.1.0-py2.py3-none-any.whl -homepage_url: https://pypi.org/project/attrs/22.1.0/ -package_url: pkg:pypi/attrs@22.1.0 -license_expression: mit -copyright: Copyright (c) Hynek Schlawack -notice_file: attrs-22.1.0-py2.py3-none-any.whl.NOTICE -attribute: yes -owner: Hynek Schlawack -owner_url: http://attrs.org -checksum_md5: f440620ea6b2c6555964dda7d9efc5d6 -checksum_sha1: e2eb61c9735f403f8ced6db6ecc7a0ee2b17ed30 -licenses: - - key: mit - name: MIT License - file: mit.LICENSE diff --git a/thirdparty/dist/attrs-22.1.0-py2.py3-none-any.whl.NOTICE b/thirdparty/dist/attrs-22.1.0-py2.py3-none-any.whl.NOTICE deleted file mode 100644 index 0958ece..0000000 --- a/thirdparty/dist/attrs-22.1.0-py2.py3-none-any.whl.NOTICE +++ /dev/null @@ -1,20 +0,0 @@ -Copyright (c) Hynek Schlawack -# SPDX-License-Identifier: MIT - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file diff --git a/thirdparty/dist/attrs-23.2.0-py3-none-any.whl b/thirdparty/dist/attrs-23.2.0-py3-none-any.whl new file mode 100644 index 0000000..db9a731 Binary files /dev/null and b/thirdparty/dist/attrs-23.2.0-py3-none-any.whl differ diff --git a/thirdparty/dist/attrs-23.2.0-py3-none-any.whl.ABOUT b/thirdparty/dist/attrs-23.2.0-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..55e7e60 --- /dev/null +++ b/thirdparty/dist/attrs-23.2.0-py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: attrs-23.2.0-py3-none-any.whl +name: attrs +version: 23.2.0 +download_url: https://files.pythonhosted.org/packages/e0/44/827b2a91a5816512fcaf3cc4ebc465ccd5d598c45cefa6703fcf4a79018f/attrs-23.2.0-py3-none-any.whl +package_url: pkg:pypi/attrs@23.2.0 +license_expression: mit +copyright: Copyright attrs project contributors +attribute: yes +checksum_md5: f1cdfc0569b235844915df6a68dd6606 +checksum_sha1: 563b272af703f8960b76f6637d009fa5fc5864d3 +licenses: + - key: mit + name: MIT License + file: mit.LICENSE diff --git a/thirdparty/dist/billiard-3.6.3.0-py3-none-any.whl b/thirdparty/dist/billiard-3.6.3.0-py3-none-any.whl deleted file mode 100644 index 928474e..0000000 Binary files a/thirdparty/dist/billiard-3.6.3.0-py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/billiard-3.6.3.0-py3-none-any.whl.ABOUT b/thirdparty/dist/billiard-3.6.3.0-py3-none-any.whl.ABOUT deleted file mode 100644 index 3c02aff..0000000 --- a/thirdparty/dist/billiard-3.6.3.0-py3-none-any.whl.ABOUT +++ /dev/null @@ -1,20 +0,0 @@ -about_resource: billiard-3.6.3.0-py3-none-any.whl -name: billiard -version: 3.6.3.0 -download_url: https://files.pythonhosted.org/packages/e8/5e/7591866ff45b370354bd20291cb6f87ddb2eef1f1c88c890a38412037e11/billiard-3.6.3.0-py3-none-any.whl#sha256=bff575450859a6e0fbc2f9877d9b715b0bbc07c3565bb7ed2280526a0cdf5ede -description: Multiprocessing Pool Extensions -homepage_url: http://github.com/celery/billiard -package_url: pkg:pypi/billiard@3.6.3.0 -license_expression: bsd-new -copyright: Copyright (c) 2006-2008, R Oudkerk and Contributors -notice_file: billiard-3.6.3.0-py3-none-any.whl.NOTICE -notice_url: https://github.com/celery/billiard/blob/master/LICENSE.txt -attribute: yes -owner: Celery -owner_url: http://celeryproject.org/ -checksum_md5: ef0831df429e9ec89f3b40fea4e143d4 -checksum_sha1: c9100731b41e1bcb3bbaffd777f991057d3bd09b -licenses: - - key: bsd-new - name: BSD-3-Clause - file: bsd-new.LICENSE diff --git a/thirdparty/dist/billiard-3.6.3.0-py3-none-any.whl.NOTICE b/thirdparty/dist/billiard-3.6.3.0-py3-none-any.whl.NOTICE deleted file mode 100644 index 7975127..0000000 --- a/thirdparty/dist/billiard-3.6.3.0-py3-none-any.whl.NOTICE +++ /dev/null @@ -1,28 +0,0 @@ -Copyright (c) 2006-2008, R Oudkerk and Contributors - -All rights reserved. - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions -are met: - -1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. -2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. -3. Neither the name of author nor the names of any contributors may be - used to endorse or promote products derived from this software - without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS "AS IS" AND -ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE -FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY -OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF -SUCH DAMAGE. \ No newline at end of file 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 d8b0521..0000000 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 ed3df9a..0000000 --- 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.4.2-py3-none-any.whl b/thirdparty/dist/black-24.4.2-py3-none-any.whl new file mode 100644 index 0000000..c6a4f2b Binary files /dev/null and b/thirdparty/dist/black-24.4.2-py3-none-any.whl differ diff --git a/thirdparty/dist/black-24.4.2-py3-none-any.whl.ABOUT b/thirdparty/dist/black-24.4.2-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..88ee098 --- /dev/null +++ b/thirdparty/dist/black-24.4.2-py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: black-24.4.2-py3-none-any.whl +name: black +version: 24.4.2 +download_url: https://files.pythonhosted.org/packages/0f/89/294c9a6b6c75a08da55e9d05321d0707e9418735e3062b12ef0f54c33474/black-24.4.2-py3-none-any.whl +package_url: pkg:pypi/black@24.4.2 +license_expression: mit +copyright: Copyright black project contributors +attribute: yes +checksum_md5: 671abe813699f2d19dbdc0a8ad3b1bcd +checksum_sha1: a86357193575e6a44ac2aad4dc72a4edee96dd63 +licenses: + - key: mit + name: MIT License + file: mit.LICENSE diff --git a/thirdparty/dist/celery-4.4.7-py2.py3-none-any.whl b/thirdparty/dist/celery-4.4.7-py2.py3-none-any.whl deleted file mode 100644 index e79c7bb..0000000 Binary files a/thirdparty/dist/celery-4.4.7-py2.py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/celery-4.4.7-py2.py3-none-any.whl.ABOUT b/thirdparty/dist/celery-4.4.7-py2.py3-none-any.whl.ABOUT deleted file mode 100644 index 8fc7fab..0000000 --- a/thirdparty/dist/celery-4.4.7-py2.py3-none-any.whl.ABOUT +++ /dev/null @@ -1,21 +0,0 @@ -about_resource: celery-4.4.7-py2.py3-none-any.whl -name: celery -version: 4.4.7 -download_url: https://files.pythonhosted.org/packages/c8/0c/609e3611d20c9f8d883852d1be5516671f630fb08c8c1e56911567dfba7b/celery-4.4.7-py2.py3-none-any.whl#sha256=a92e1d56e650781fb747032a3997d16236d037c8199eacd5217d1a72893bca45 -description: | - Celery: Distributed Task Queue - - Celery is an asynchronous task queue/job queue based on distributed message passing. It is focused on real-time operation, but supports scheduling as well. - - The execution units, called tasks, are executed concurrently on a single or more worker servers using multiprocessing, Eventlet, or gevent. Tasks can execute asynchronously (in the background) or synchronously (wait until ready). -homepage_url: http://celeryproject.org/ -package_url: pkg:pypi/celery@4.4.7 -license_expression: bsd-new -copyright: Copyright (c) Ask Solem & contributors. -attribute: yes -checksum_md5: 47e3db7a5255406eda40645cf6d62409 -checksum_sha1: 835d42936d1089352b521c25db15ea4b61b7a68a -licenses: - - key: bsd-new - name: BSD-3-Clause - file: bsd-new.LICENSE diff --git a/thirdparty/dist/certifi-2023.11.17-py3-none-any.whl b/thirdparty/dist/certifi-2023.11.17-py3-none-any.whl deleted file mode 100644 index de0787f..0000000 Binary files a/thirdparty/dist/certifi-2023.11.17-py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/certifi-2023.11.17-py3-none-any.whl.ABOUT b/thirdparty/dist/certifi-2023.11.17-py3-none-any.whl.ABOUT deleted file mode 100644 index d29fe71..0000000 --- a/thirdparty/dist/certifi-2023.11.17-py3-none-any.whl.ABOUT +++ /dev/null @@ -1,16 +0,0 @@ -about_resource: certifi-2023.11.17-py3-none-any.whl -name: certifi -version: 2023.11.17 -download_url: https://files.pythonhosted.org/packages/64/62/428ef076be88fa93716b576e4a01f919d25968913e817077a386fcbe4f42/certifi-2023.11.17-py3-none-any.whl -package_url: pkg:pypi/certifi@2023.11.17 -license_expression: mpl-2.0 -copyright: Copyright certifi project contributors -redistribute: yes -attribute: yes -track_changes: yes -checksum_md5: c97d3905f6f805c9ccf70af93c7f0ace -checksum_sha1: 9e99fff8d517d9c5b8d8fe6fe66bc31fa55b0fec -licenses: - - key: mpl-2.0 - name: Mozilla Public License 2.0 - file: mpl-2.0.LICENSE diff --git a/thirdparty/dist/certifi-2024.2.2-py3-none-any.whl b/thirdparty/dist/certifi-2024.2.2-py3-none-any.whl new file mode 100644 index 0000000..450e3bd Binary files /dev/null and b/thirdparty/dist/certifi-2024.2.2-py3-none-any.whl differ diff --git a/thirdparty/dist/certifi-2024.2.2-py3-none-any.whl.ABOUT b/thirdparty/dist/certifi-2024.2.2-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..04156c9 --- /dev/null +++ b/thirdparty/dist/certifi-2024.2.2-py3-none-any.whl.ABOUT @@ -0,0 +1,16 @@ +about_resource: certifi-2024.2.2-py3-none-any.whl +name: certifi +version: 2024.2.2 +download_url: https://files.pythonhosted.org/packages/ba/06/a07f096c664aeb9f01624f858c3add0a4e913d6c96257acb4fce61e7de14/certifi-2024.2.2-py3-none-any.whl +package_url: pkg:pypi/certifi@2024.2.2 +license_expression: mpl-2.0 +copyright: Copyright certifi project contributors +redistribute: yes +attribute: yes +track_changes: yes +checksum_md5: fe1838e892615b884f84483607c86077 +checksum_sha1: 4acb42f49aed94aeb687b33d3dcb6b564ff36fac +licenses: + - key: mpl-2.0 + name: Mozilla Public License 2.0 + file: mpl-2.0.LICENSE diff --git a/thirdparty/dist/charset_normalizer-3.1.0-py3-none-any.whl b/thirdparty/dist/charset_normalizer-3.1.0-py3-none-any.whl deleted file mode 100644 index 8982a4e..0000000 Binary files a/thirdparty/dist/charset_normalizer-3.1.0-py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/charset_normalizer-3.1.0-py3-none-any.whl.ABOUT b/thirdparty/dist/charset_normalizer-3.1.0-py3-none-any.whl.ABOUT deleted file mode 100644 index 88d83fc..0000000 --- a/thirdparty/dist/charset_normalizer-3.1.0-py3-none-any.whl.ABOUT +++ /dev/null @@ -1,14 +0,0 @@ -about_resource: charset_normalizer-3.1.0-py3-none-any.whl -name: charset-normalizer -version: 3.1.0 -download_url: https://files.pythonhosted.org/packages/ef/81/14b3b8f01ddaddad6cdec97f2f599aa2fa466bd5ee9af99b08b7713ccd29/charset_normalizer-3.1.0-py3-none-any.whl -package_url: pkg:pypi/charset-normalizer@3.1.0 -license_expression: mit -copyright: Copyright Ahmed TAHRI @Ousret, Denny Vrandecic, TAHRI Ahmed R. -attribute: yes -checksum_md5: 7269c84deffd441c1c3d6a45e501c114 -checksum_sha1: 3d5e3c1da6fe7e658712422fc243552ae696cbd1 -licenses: - - key: mit - name: MIT License - file: mit.LICENSE diff --git a/thirdparty/dist/charset_normalizer-3.3.2-py3-none-any.whl b/thirdparty/dist/charset_normalizer-3.3.2-py3-none-any.whl new file mode 100644 index 0000000..c2609a2 Binary files /dev/null and b/thirdparty/dist/charset_normalizer-3.3.2-py3-none-any.whl differ diff --git a/thirdparty/dist/charset_normalizer-3.3.2-py3-none-any.whl.ABOUT b/thirdparty/dist/charset_normalizer-3.3.2-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..ab1a3c7 --- /dev/null +++ b/thirdparty/dist/charset_normalizer-3.3.2-py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: charset_normalizer-3.3.2-py3-none-any.whl +name: charset-normalizer +version: 3.3.2 +download_url: https://files.pythonhosted.org/packages/28/76/e6222113b83e3622caa4bb41032d0b1bf785250607392e1b778aca0b8a7d/charset_normalizer-3.3.2-py3-none-any.whl +package_url: pkg:pypi/charset-normalizer@3.3.2 +license_expression: mit +copyright: Copyright Ahmed TAHRI @Ousret, Denny Vrandecic, TAHRI Ahmed R. +attribute: yes +checksum_md5: ea733f7299c80a232262a7f71a4fc698 +checksum_sha1: 1aa12424059bec1d95d9dda38b4ff6d062dededf +licenses: + - key: mit + name: MIT License + file: mit.LICENSE diff --git a/thirdparty/dist/confusable_homoglyphs-3.2.0-py2.py3-none-any.whl b/thirdparty/dist/confusable_homoglyphs-3.2.0-py2.py3-none-any.whl deleted file mode 100644 index 9ed15d9..0000000 Binary files a/thirdparty/dist/confusable_homoglyphs-3.2.0-py2.py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/confusable_homoglyphs-3.2.0-py2.py3-none-any.whl.ABOUT b/thirdparty/dist/confusable_homoglyphs-3.2.0-py2.py3-none-any.whl.ABOUT deleted file mode 100644 index 7bd874c..0000000 --- a/thirdparty/dist/confusable_homoglyphs-3.2.0-py2.py3-none-any.whl.ABOUT +++ /dev/null @@ -1,20 +0,0 @@ -about_resource: confusable_homoglyphs-3.2.0-py2.py3-none-any.whl -name: confusable-homoglyphs -version: 3.2.0 -download_url: https://files.pythonhosted.org/packages/a4/38/aadd1c42ae353943cd1523cdd38ffb267ba95861b4e8bb1a559d975ae612/confusable_homoglyphs-3.2.0-py2.py3-none-any.whl#sha256=e3ce611028d882b74a5faa69e3cbb5bd4dcd9f69936da6e73d33eda42c917944 -description: Detect confusable usage of unicode homoglyphs, prevent homograph attacks. -homepage_url: https://github.com/vhf/confusable_homoglyphs -package_url: pkg:pypi/confusable-homoglyphs@3.2.0 -license_expression: mit -copyright: Copyright (c) 2016 Victor Felder -notice_file: confusable_homoglyphs-3.2.0-py2.py3-none-any.whl.NOTICE -notice_url: https://github.com/vhf/confusable_homoglyphs/blob/master/LICENSE -attribute: yes -owner: Victor Felder -owner_url: https://github.com/vhf -checksum_md5: eff03a1e88ff8583f7c7ef896922481d -checksum_sha1: d7b85ed7dd9b19d46d17cba3b419865ea44fe752 -licenses: - - key: mit - name: MIT License - file: mit.LICENSE diff --git a/thirdparty/dist/confusable_homoglyphs-3.2.0-py2.py3-none-any.whl.NOTICE b/thirdparty/dist/confusable_homoglyphs-3.2.0-py2.py3-none-any.whl.NOTICE deleted file mode 100644 index d4e78f6..0000000 --- a/thirdparty/dist/confusable_homoglyphs-3.2.0-py2.py3-none-any.whl.NOTICE +++ /dev/null @@ -1,21 +0,0 @@ -The MIT License (MIT) - -Copyright (c) 2016 Victor Felder - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files (the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. \ No newline at end of file diff --git a/thirdparty/dist/confusable_homoglyphs-3.3.1-py2.py3-none-any.whl b/thirdparty/dist/confusable_homoglyphs-3.3.1-py2.py3-none-any.whl new file mode 100644 index 0000000..2af1cea Binary files /dev/null and b/thirdparty/dist/confusable_homoglyphs-3.3.1-py2.py3-none-any.whl differ diff --git a/thirdparty/dist/confusable_homoglyphs-3.3.1-py2.py3-none-any.whl.ABOUT b/thirdparty/dist/confusable_homoglyphs-3.3.1-py2.py3-none-any.whl.ABOUT new file mode 100644 index 0000000..dd84c43 --- /dev/null +++ b/thirdparty/dist/confusable_homoglyphs-3.3.1-py2.py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: confusable_homoglyphs-3.3.1-py2.py3-none-any.whl +name: confusable-homoglyphs +version: 3.3.1 +download_url: https://files.pythonhosted.org/packages/c5/6e/c0fcbb7d341a46cf4241a6aa9e6a737734f0657521fc1bcd074953fe4eea/confusable_homoglyphs-3.3.1-py2.py3-none-any.whl +package_url: pkg:pypi/confusable-homoglyphs@3.3.1 +license_expression: mit +copyright: Copyright confusable-homoglyphs project contributors +attribute: yes +checksum_md5: d0e360dfe2222f73e8f0e26942b563d6 +checksum_sha1: d05fff96fc783d05480a8fbf96dfd53252e05492 +licenses: + - key: mit + name: MIT License + file: mit.LICENSE diff --git a/thirdparty/dist/crispy_bootstrap5-2023.10-py3-none-any.whl b/thirdparty/dist/crispy_bootstrap5-2023.10-py3-none-any.whl deleted file mode 100644 index 5463889..0000000 Binary files a/thirdparty/dist/crispy_bootstrap5-2023.10-py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/crispy_bootstrap5-2023.10-py3-none-any.whl.ABOUT b/thirdparty/dist/crispy_bootstrap5-2023.10-py3-none-any.whl.ABOUT deleted file mode 100644 index def4fc6..0000000 --- a/thirdparty/dist/crispy_bootstrap5-2023.10-py3-none-any.whl.ABOUT +++ /dev/null @@ -1,14 +0,0 @@ -about_resource: crispy_bootstrap5-2023.10-py3-none-any.whl -name: crispy-bootstrap5 -version: '2023.10' -download_url: https://files.pythonhosted.org/packages/f4/8d/f08d7079599469f32a05528423887106ee2eec16efd35856285e667692bc/crispy_bootstrap5-2023.10-py3-none-any.whl -package_url: pkg:pypi/crispy-bootstrap5@2023.10 -license_expression: mit -copyright: Copyright crispy-bootstrap5 project contributors -attribute: yes -checksum_md5: 3970bc3108f09c82db622e0cf2452d98 -checksum_sha1: 92b1565d7964e908713cf7968e303246014bdbbb -licenses: - - key: mit - name: MIT License - file: mit.LICENSE diff --git a/thirdparty/dist/crispy_bootstrap5-2024.2-py3-none-any.whl b/thirdparty/dist/crispy_bootstrap5-2024.2-py3-none-any.whl new file mode 100644 index 0000000..716381a Binary files /dev/null and b/thirdparty/dist/crispy_bootstrap5-2024.2-py3-none-any.whl differ diff --git a/thirdparty/dist/crispy_bootstrap5-2024.2-py3-none-any.whl.ABOUT b/thirdparty/dist/crispy_bootstrap5-2024.2-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..925b63c --- /dev/null +++ b/thirdparty/dist/crispy_bootstrap5-2024.2-py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: crispy_bootstrap5-2024.2-py3-none-any.whl +name: crispy-bootstrap5 +version: '2024.2' +download_url: https://files.pythonhosted.org/packages/13/11/a1c22b4c803125901af7d2fa683f4c6eb14d511644da5fc0b45a0cb44cae/crispy_bootstrap5-2024.2-py3-none-any.whl +package_url: pkg:pypi/crispy-bootstrap5@2024.2 +license_expression: mit +copyright: Copyright crispy-bootstrap5 project contributors +attribute: yes +checksum_md5: 92fc180cf23546d83bcf5c62e9167c63 +checksum_sha1: fa73bb9ef292376ed0de04d043b8f70a85c3bdb6 +licenses: + - key: mit + name: MIT License + file: mit.LICENSE diff --git a/thirdparty/dist/cyclonedx_python_lib-3.1.0-py3-none-any.whl b/thirdparty/dist/cyclonedx_python_lib-3.1.0-py3-none-any.whl deleted file mode 100644 index 46bcded..0000000 Binary files a/thirdparty/dist/cyclonedx_python_lib-3.1.0-py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/cyclonedx_python_lib-3.1.0-py3-none-any.whl.ABOUT b/thirdparty/dist/cyclonedx_python_lib-3.1.0-py3-none-any.whl.ABOUT deleted file mode 100644 index 81492fa..0000000 --- a/thirdparty/dist/cyclonedx_python_lib-3.1.0-py3-none-any.whl.ABOUT +++ /dev/null @@ -1,95 +0,0 @@ -about_resource: cyclonedx_python_lib-3.1.0-py3-none-any.whl -name: cyclonedx-python-lib -version: 3.1.0 -download_url: https://files.pythonhosted.org/packages/01/b8/e4cdcebbb27925353d94444be18f6f036b641298c203142e41c283f5cc36/cyclonedx_python_lib-3.1.0-py3-none-any.whl -description: | - A library for producing CycloneDX SBOM (Software Bill of Materials) files. - # Python Library for generating CycloneDX - - [![shield_gh-workflow-test]][link_gh-workflow-test] - [![shield_rtfd]][link_rtfd] - [![shield_pypi-version]][link_pypi] - [![shield_conda-forge-version]][link_conda-forge] - [![shield_license]][license_file] - [![shield_website]][link_website] - [![shield_slack]][link_slack] - [![shield_groups]][link_discussion] - [![shield_twitter-follow]][link_twitter] - - ---- - - This CycloneDX module for Python can generate valid CycloneDX bill-of-material document containing an aggregate of all - project dependencies. - - This module is not designed for standalone use. - - If you're looking for a CycloneDX tool to run to generate (SBOM) software bill-of-materials documents, why not checkout: [CycloneDX Python][cyclonedx-python] - - Additionally, the following tool can be used as well (and this library was written to help improve it) [Jake][jake]. - - Additionally, you can use this module yourself in your application to programmatically generate SBOMs. - - CycloneDX is a lightweight BOM specification that is easily created, human-readable, and simple to parse. - - View our documentation [here](https://cyclonedx-python-library.readthedocs.io/). - - ## Python Support - - We endeavour to support all functionality for all [current actively supported Python versions](https://www.python.org/downloads/). - However, some features may not be possible/present in older Python versions due to their lack of support. - - ## Changelog - - See our [CHANGELOG][chaneglog_file]. - - ## Contributing - - Feel free to open issues, bugreports or pull requests. - See the [CONTRIBUTING][contributing_file] file for details. - - ## Copyright & License - - CycloneDX Python Lib is Copyright (c) OWASP Foundation. All Rights Reserved. - Permission to modify and redistribute is granted under the terms of the Apache 2.0 license. - See the [LICENSE][license_file] file for the full license. - - [cyclonedx-python]: https://github.com/CycloneDX/cyclonedx-python - [jake]: https://github.com/sonatype-nexus-community/jake - - [license_file]: https://github.com/CycloneDX/cyclonedx-python-lib/blob/master/LICENSE - [chaneglog_file]: https://github.com/CycloneDX/cyclonedx-python-lib/blob/master/CHANGELOG.md - [contributing_file]: https://github.com/CycloneDX/cyclonedx-python-lib/blob/master/CONTRIBUTING.md - - [shield_gh-workflow-test]: https://img.shields.io/github/workflow/status/CycloneDX/cyclonedx-python-lib/Python%20CI/main?logo=GitHub&logoColor=white "build" - [shield_pypi-version]: https://img.shields.io/pypi/v/cyclonedx-python-lib?logo=pypi&logoColor=white&label=PyPI "PyPI" - [shield_conda-forge-version]: https://img.shields.io/conda/vn/conda-forge/cyclonedx-python-lib?logo=anaconda&logoColor=white&label=conda-forge "conda-forge" - [shield_rtfd]: https://img.shields.io/readthedocs/cyclonedx-python-library?logo=readthedocs&logoColor=white "Read the Docs" - [shield_license]: https://img.shields.io/github/license/CycloneDX/cyclonedx-python-lib?logo=open%20source%20initiative&logoColor=white "license" - [shield_website]: https://img.shields.io/badge/https://-cyclonedx.org-blue.svg "homepage" - [shield_slack]: https://img.shields.io/badge/slack-join-blue?logo=Slack&logoColor=white "slack join" - [shield_groups]: https://img.shields.io/badge/discussion-groups.io-blue.svg "groups discussion" - [shield_twitter-follow]: https://img.shields.io/badge/Twitter-follow-blue?logo=Twitter&logoColor=white "twitter follow" - [link_gh-workflow-test]: https://github.com/CycloneDX/cyclonedx-python-lib/actions/workflows/poetry.yml?query=branch%3Amain - [link_pypi]: https://pypi.org/project/cyclonedx-python-lib/ - [link_conda-forge]: https://anaconda.org/conda-forge/cyclonedx-python-lib - [link_rtfd]: https://cyclonedx-python-library.readthedocs.io/en/latest/?badge=latest - [link_website]: https://cyclonedx.org/ - [link_slack]: https://cyclonedx.org/slack/invite - [link_discussion]: https://groups.io/g/CycloneDX - [link_twitter]: https://twitter.com/CycloneDX_Spec - - [PEP-508]: https://www.python.org/dev/peps/pep-0508/ -homepage_url: https://github.com/CycloneDX/cyclonedx-python-lib -package_url: pkg:pypi/cyclonedx-python-lib@3.1.0 -license_expression: apache-2.0 -copyright: Copyright (c) OWASP Foundation -notice_file: cyclonedx_python_lib-3.1.0-py3-none-any.whl.NOTICE -attribute: yes -track_changes: yes -owner: OWASP Foundation -checksum_md5: 9f92aa8da627015377f0b34b1b62612a -checksum_sha1: 4191bb0d647ba4346163be5f445ef7ae95cbd821 -licenses: - - key: apache-2.0 - name: Apache License 2.0 - file: apache-2.0.LICENSE diff --git a/thirdparty/dist/cyclonedx_python_lib-3.1.0-py3-none-any.whl.NOTICE b/thirdparty/dist/cyclonedx_python_lib-3.1.0-py3-none-any.whl.NOTICE deleted file mode 100644 index 5ef56b7..0000000 --- a/thirdparty/dist/cyclonedx_python_lib-3.1.0-py3-none-any.whl.NOTICE +++ /dev/null @@ -1,5 +0,0 @@ -## Copyright & License - -CycloneDX Python Lib is Copyright (c) OWASP Foundation. All Rights Reserved. -Permission to modify and redistribute is granted under the terms of the Apache 2.0 license. -See the [LICENSE][license_file] file for the full license. \ No newline at end of file diff --git a/thirdparty/dist/cyclonedx_python_lib-7.3.4-py3-none-any.whl b/thirdparty/dist/cyclonedx_python_lib-7.3.4-py3-none-any.whl new file mode 100644 index 0000000..96bf2ed Binary files /dev/null and b/thirdparty/dist/cyclonedx_python_lib-7.3.4-py3-none-any.whl differ diff --git a/thirdparty/dist/cyclonedx_python_lib-7.3.4-py3-none-any.whl.ABOUT b/thirdparty/dist/cyclonedx_python_lib-7.3.4-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..5a1f344 --- /dev/null +++ b/thirdparty/dist/cyclonedx_python_lib-7.3.4-py3-none-any.whl.ABOUT @@ -0,0 +1,15 @@ +about_resource: cyclonedx_python_lib-7.3.4-py3-none-any.whl +name: cyclonedx-python-lib +version: 7.3.4 +download_url: https://files.pythonhosted.org/packages/2d/b4/d796c016804624b878e25e819a6d7f59ee8a74bc9856a208a84cd422b27d/cyclonedx_python_lib-7.3.4-py3-none-any.whl +package_url: pkg:pypi/cyclonedx-python-lib@7.3.4 +license_expression: apache-2.0 +copyright: Copyright OWASP Foundation +attribute: yes +track_changes: yes +checksum_md5: 64a339684329b2a85b321b1ed7be0ef5 +checksum_sha1: 4e5a6dff6e5abb6e1e55a79430fa8a46a92149ce +licenses: + - key: apache-2.0 + name: Apache License 2.0 + file: apache-2.0.LICENSE diff --git a/thirdparty/dist/django_debug_toolbar-4.1.0-py3-none-any.whl b/thirdparty/dist/django_debug_toolbar-4.1.0-py3-none-any.whl deleted file mode 100644 index ac590f6..0000000 Binary files a/thirdparty/dist/django_debug_toolbar-4.1.0-py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/django_debug_toolbar-4.1.0-py3-none-any.whl.ABOUT b/thirdparty/dist/django_debug_toolbar-4.1.0-py3-none-any.whl.ABOUT deleted file mode 100644 index d62940e..0000000 --- a/thirdparty/dist/django_debug_toolbar-4.1.0-py3-none-any.whl.ABOUT +++ /dev/null @@ -1,17 +0,0 @@ -about_resource: django_debug_toolbar-4.1.0-py3-none-any.whl -name: django-debug-toolbar -version: 4.1.0 -download_url: https://files.pythonhosted.org/packages/5b/11/22ae178ae870945970250bdad22530583384b3438be87e08c075016f3b07/django_debug_toolbar-4.1.0-py3-none-any.whl -homepage_url: https://pypi.org/project/django-debug-toolbar/4.1.0/ -package_url: pkg:pypi/django-debug-toolbar@4.1.0 -license_expression: bsd-new -copyright: Copyright django-debug-toolbar project contributors -attribute: yes -owner: Django Debug Toolbar authors -owner_url: https://github.com/django-debug-toolbar -checksum_md5: a76039dfea390887e6bb2692a9d7dc76 -checksum_sha1: '1916237711a17dd34c40ae73811189b5b0e5d3e3' -licenses: - - key: bsd-new - name: BSD-3-Clause - file: bsd-new.LICENSE diff --git a/thirdparty/dist/django_debug_toolbar-4.2.0-py3-none-any.whl b/thirdparty/dist/django_debug_toolbar-4.3.0-py3-none-any.whl similarity index 82% rename from thirdparty/dist/django_debug_toolbar-4.2.0-py3-none-any.whl rename to thirdparty/dist/django_debug_toolbar-4.3.0-py3-none-any.whl index f756563..698783b 100644 Binary files a/thirdparty/dist/django_debug_toolbar-4.2.0-py3-none-any.whl and b/thirdparty/dist/django_debug_toolbar-4.3.0-py3-none-any.whl differ diff --git a/thirdparty/dist/django_debug_toolbar-4.3.0-py3-none-any.whl.ABOUT b/thirdparty/dist/django_debug_toolbar-4.3.0-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..d7a0f9c --- /dev/null +++ b/thirdparty/dist/django_debug_toolbar-4.3.0-py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: django_debug_toolbar-4.3.0-py3-none-any.whl +name: django-debug-toolbar +version: 4.3.0 +download_url: https://files.pythonhosted.org/packages/ee/0e/73d81b1dfd9a84f24e3869019309758b37a5a5a9fe2bc7e54fca08191ea0/django_debug_toolbar-4.3.0-py3-none-any.whl +package_url: pkg:pypi/django-debug-toolbar@4.3.0 +license_expression: bsd-new +copyright: Copyright django-debug-toolbar project contributors +attribute: yes +checksum_md5: 483d3004798375bc524a43a5b590fa35 +checksum_sha1: 55ce065392c1f650643f4e2ec6d7db4a84432efc +licenses: + - key: bsd-new + name: BSD-3-Clause + file: bsd-new.LICENSE diff --git a/thirdparty/dist/django_filter-23.5-py3-none-any.whl.ABOUT b/thirdparty/dist/django_filter-23.5-py3-none-any.whl.ABOUT deleted file mode 100644 index a34f839..0000000 --- a/thirdparty/dist/django_filter-23.5-py3-none-any.whl.ABOUT +++ /dev/null @@ -1,14 +0,0 @@ -about_resource: django_filter-23.5-py3-none-any.whl -name: django-filter -version: '23.5' -download_url: https://files.pythonhosted.org/packages/79/ff/4ae79361e09c3803562368700bc56672cca37bab7c1a8a91e7a225ce8fa0/django_filter-23.5-py3-none-any.whl -package_url: pkg:pypi/django-filter@23.5 -license_expression: bsd-new -copyright: Copyright django-filter project contributors -attribute: yes -checksum_md5: d11a2d85f12d2ed5dc28ac9af09b6e9d -checksum_sha1: 84c0d71c8494210b708ea3cbb58295f698e5f109 -licenses: - - key: bsd-new - name: BSD-3-Clause - file: bsd-new.LICENSE diff --git a/thirdparty/dist/django_filter-23.5-py3-none-any.whl b/thirdparty/dist/django_filter-24.2-py3-none-any.whl similarity index 62% rename from thirdparty/dist/django_filter-23.5-py3-none-any.whl rename to thirdparty/dist/django_filter-24.2-py3-none-any.whl index d23ce08..24a79d4 100644 Binary files a/thirdparty/dist/django_filter-23.5-py3-none-any.whl and b/thirdparty/dist/django_filter-24.2-py3-none-any.whl differ diff --git a/thirdparty/dist/django_filter-24.2-py3-none-any.whl.ABOUT b/thirdparty/dist/django_filter-24.2-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..c34ef94 --- /dev/null +++ b/thirdparty/dist/django_filter-24.2-py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: django_filter-24.2-py3-none-any.whl +name: django-filter +version: '24.2' +download_url: https://files.pythonhosted.org/packages/7b/7d/ee51b0fd69425035a2efc101b2252cd08eab525c12db92fbea298823cc9f/django_filter-24.2-py3-none-any.whl +package_url: pkg:pypi/django-filter@24.2 +license_expression: bsd-new +copyright: Copyright django-filter project contributors +attribute: yes +checksum_md5: abcde138422c4f7c5e233b01564536bf +checksum_sha1: 7bdec836e54333fb7d57874679dda48ee7019f8a +licenses: + - key: bsd-new + name: BSD-3-Clause + file: bsd-new.LICENSE diff --git a/thirdparty/dist/django_grappelli-3.0.8-py2.py3-none-any.whl.ABOUT b/thirdparty/dist/django_grappelli-3.0.8-py2.py3-none-any.whl.ABOUT deleted file mode 100644 index 568aee5..0000000 --- a/thirdparty/dist/django_grappelli-3.0.8-py2.py3-none-any.whl.ABOUT +++ /dev/null @@ -1,14 +0,0 @@ -about_resource: django_grappelli-3.0.8-py2.py3-none-any.whl -name: django-grappelli -version: 3.0.8 -download_url: https://files.pythonhosted.org/packages/45/45/baefbace6c1af80c4cb4f3fca781b77299b7e512af679295ffaa43eee7e4/django_grappelli-3.0.8-py2.py3-none-any.whl -package_url: pkg:pypi/django-grappelli@3.0.8 -license_expression: bsd-new -copyright: Copyright django-grappelli project contributors -attribute: yes -checksum_md5: 56b835e7195f2fd857ad9b47ba27919b -checksum_sha1: 0b6eed0decf3c64e38022705905363eb7a8c41b5 -licenses: - - key: bsd-new - name: BSD-3-Clause - file: bsd-new.LICENSE diff --git a/thirdparty/dist/django_grappelli-3.0.8-py2.py3-none-any.whl b/thirdparty/dist/django_grappelli-4.0.1-py2.py3-none-any.whl similarity index 93% rename from thirdparty/dist/django_grappelli-3.0.8-py2.py3-none-any.whl rename to thirdparty/dist/django_grappelli-4.0.1-py2.py3-none-any.whl index 689f1c0..bfcf223 100644 Binary files a/thirdparty/dist/django_grappelli-3.0.8-py2.py3-none-any.whl and b/thirdparty/dist/django_grappelli-4.0.1-py2.py3-none-any.whl differ diff --git a/thirdparty/dist/django_grappelli-4.0.1-py2.py3-none-any.whl.ABOUT b/thirdparty/dist/django_grappelli-4.0.1-py2.py3-none-any.whl.ABOUT new file mode 100644 index 0000000..7b0f1a5 --- /dev/null +++ b/thirdparty/dist/django_grappelli-4.0.1-py2.py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: django_grappelli-4.0.1-py2.py3-none-any.whl +name: django-grappelli +version: 4.0.1 +download_url: https://files.pythonhosted.org/packages/63/30/ca6b76f0583a0d1c957ad049d5669d0fc43d7c62d727ab1e23bad2b9b8f5/django_grappelli-4.0.1-py2.py3-none-any.whl +package_url: pkg:pypi/django-grappelli@4.0.1 +license_expression: bsd-new +copyright: Copyright django-grappelli project contributors +attribute: yes +checksum_md5: 32cb6084c89dd83356f76944d9cc75f2 +checksum_sha1: 09e4372790dcfc1c2fb7fcbc9c8cb34336302af2 +licenses: + - key: bsd-new + name: BSD-3-Clause + file: bsd-new.LICENSE diff --git a/thirdparty/dist/django_otp-1.2.4-py3-none-any.whl b/thirdparty/dist/django_otp-1.2.4-py3-none-any.whl deleted file mode 100644 index e4cfcd0..0000000 Binary files a/thirdparty/dist/django_otp-1.2.4-py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/django_otp-1.2.4-py3-none-any.whl.ABOUT b/thirdparty/dist/django_otp-1.2.4-py3-none-any.whl.ABOUT deleted file mode 100644 index a6e2af1..0000000 --- a/thirdparty/dist/django_otp-1.2.4-py3-none-any.whl.ABOUT +++ /dev/null @@ -1,13 +0,0 @@ -about_resource: django_otp-1.2.4-py3-none-any.whl -name: django-otp -version: 1.2.4 -download_url: https://files.pythonhosted.org/packages/59/13/4641e45b72283f1b1c015a8ffbe9693f756282c0485094293ef8e41c7047/django_otp-1.2.4-py3-none-any.whl -package_url: pkg:pypi/django-otp@1.2.4 -license_expression: unlicense -copyright: Copyright django-otp project contributors -checksum_md5: fd86b1a56962bd4ca1adefabd7c50d12 -checksum_sha1: efe2b16340adad4f8c965b87013b651de383de9a -licenses: - - key: unlicense - name: Unlicense - file: unlicense.LICENSE diff --git a/thirdparty/dist/django_otp-1.5.0-py3-none-any.whl b/thirdparty/dist/django_otp-1.5.0-py3-none-any.whl new file mode 100644 index 0000000..3e9509c Binary files /dev/null and b/thirdparty/dist/django_otp-1.5.0-py3-none-any.whl differ diff --git a/thirdparty/dist/django_otp-1.5.0-py3-none-any.whl.ABOUT b/thirdparty/dist/django_otp-1.5.0-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..75e0ad1 --- /dev/null +++ b/thirdparty/dist/django_otp-1.5.0-py3-none-any.whl.ABOUT @@ -0,0 +1,13 @@ +about_resource: django_otp-1.5.0-py3-none-any.whl +name: django-otp +version: 1.5.0 +download_url: https://files.pythonhosted.org/packages/1c/28/057e0021ea735e817fd2a6a8c11ab52bcc2fbf69b8653b2c8712a3b59e5a/django_otp-1.5.0-py3-none-any.whl +package_url: pkg:pypi/django-otp@1.5.0 +license_expression: unlicense +copyright: Copyright django-otp project contributors +checksum_md5: cc30c4a9e6338dde148ebac66e0afdff +checksum_sha1: d1f41649de1858a3531fb3702f03be8aedcec724 +licenses: + - key: unlicense + name: Unlicense + file: unlicense.LICENSE diff --git a/thirdparty/dist/django_rq-2.10.2-py2.py3-none-any.whl b/thirdparty/dist/django_rq-2.10.2-py2.py3-none-any.whl new file mode 100644 index 0000000..effcf7c Binary files /dev/null and b/thirdparty/dist/django_rq-2.10.2-py2.py3-none-any.whl differ diff --git a/thirdparty/dist/django_rq-2.10.2-py2.py3-none-any.whl.ABOUT b/thirdparty/dist/django_rq-2.10.2-py2.py3-none-any.whl.ABOUT new file mode 100644 index 0000000..9be62c0 --- /dev/null +++ b/thirdparty/dist/django_rq-2.10.2-py2.py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: django_rq-2.10.2-py2.py3-none-any.whl +name: django-rq +version: 2.10.2 +download_url: https://files.pythonhosted.org/packages/e7/49/b6a3b20cdf3238e02b56fece067ab7388c57e4d17bd3a21ed3cb069b872b/django_rq-2.10.2-py2.py3-none-any.whl +package_url: pkg:pypi/django-rq@2.10.2 +license_expression: mit +copyright: Copyright django-rq project contributors +attribute: yes +checksum_md5: 13cf9dbbf1a2eb52dae0893b7661be2d +checksum_sha1: 54d1378b04104d348497853986499f8470fb2687 +licenses: + - key: mit + name: MIT License + file: mit.LICENSE diff --git a/thirdparty/dist/djangorestframework-3.15.0-py3-none-any.whl b/thirdparty/dist/djangorestframework-3.15.0-py3-none-any.whl new file mode 100644 index 0000000..3fa40a7 Binary files /dev/null and b/thirdparty/dist/djangorestframework-3.15.0-py3-none-any.whl differ diff --git a/thirdparty/dist/fakeredis-2.21.1-py3-none-any.whl b/thirdparty/dist/fakeredis-2.21.1-py3-none-any.whl new file mode 100644 index 0000000..b22e208 Binary files /dev/null and b/thirdparty/dist/fakeredis-2.21.1-py3-none-any.whl differ diff --git a/thirdparty/dist/fakeredis-2.21.1-py3-none-any.whl.ABOUT b/thirdparty/dist/fakeredis-2.21.1-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..d5d66d3 --- /dev/null +++ b/thirdparty/dist/fakeredis-2.21.1-py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: fakeredis-2.21.1-py3-none-any.whl +name: fakeredis +version: 2.21.1 +download_url: https://files.pythonhosted.org/packages/69/f6/44e67affc150d0b23590f211444d6900dabbbf28e08fe710a74a02067311/fakeredis-2.21.1-py3-none-any.whl +package_url: pkg:pypi/fakeredis@2.21.1 +license_expression: bsd-new +copyright: Copyright fakeredis project contributors +attribute: yes +checksum_md5: 540d6fc390636ae49a4edff3b0072899 +checksum_sha1: c1d447a2c00b4bc2a05e9592c4eec970fbf3a66f +licenses: + - key: bsd-new + name: BSD-3-Clause + file: bsd-new.LICENSE diff --git a/thirdparty/dist/flake8-6.1.0-py2.py3-none-any.whl.ABOUT b/thirdparty/dist/flake8-6.1.0-py2.py3-none-any.whl.ABOUT deleted file mode 100644 index 3132519..0000000 --- a/thirdparty/dist/flake8-6.1.0-py2.py3-none-any.whl.ABOUT +++ /dev/null @@ -1,14 +0,0 @@ -about_resource: flake8-6.1.0-py2.py3-none-any.whl -name: flake8 -version: 6.1.0 -download_url: https://files.pythonhosted.org/packages/b0/24/bbf7175ffc47cb3d3e1eb523ddb23272968359dfcf2e1294707a2bf12fc4/flake8-6.1.0-py2.py3-none-any.whl -package_url: pkg:pypi/flake8@6.1.0 -license_expression: mit -copyright: Copyright flake8 project contributors -attribute: yes -checksum_md5: 03f981c073a79099c08500f56aa0f992 -checksum_sha1: 415da85bcf422672e415a7eefe1d2186aa879c53 -licenses: - - key: mit - name: MIT License - file: mit.LICENSE diff --git a/thirdparty/dist/flake8-6.1.0-py2.py3-none-any.whl b/thirdparty/dist/flake8-7.0.0-py2.py3-none-any.whl similarity index 62% rename from thirdparty/dist/flake8-6.1.0-py2.py3-none-any.whl rename to thirdparty/dist/flake8-7.0.0-py2.py3-none-any.whl index d66249b..e7c1552 100644 Binary files a/thirdparty/dist/flake8-6.1.0-py2.py3-none-any.whl and b/thirdparty/dist/flake8-7.0.0-py2.py3-none-any.whl differ diff --git a/thirdparty/dist/flake8-7.0.0-py2.py3-none-any.whl.ABOUT b/thirdparty/dist/flake8-7.0.0-py2.py3-none-any.whl.ABOUT new file mode 100644 index 0000000..7726bb1 --- /dev/null +++ b/thirdparty/dist/flake8-7.0.0-py2.py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: flake8-7.0.0-py2.py3-none-any.whl +name: flake8 +version: 7.0.0 +download_url: https://files.pythonhosted.org/packages/e3/01/cc8cdec7b61db0315c2ab62d80677a138ef06832ec17f04d87e6ef858f7f/flake8-7.0.0-py2.py3-none-any.whl +package_url: pkg:pypi/flake8@7.0.0 +license_expression: mit +copyright: Copyright flake8 project contributors +attribute: yes +checksum_md5: 27c8c8195d4bae40f7b4909f5f3de445 +checksum_sha1: 8c7a4444b700973e19bd45269eb6635bdcad085e +licenses: + - key: mit + name: MIT License + file: mit.LICENSE diff --git a/thirdparty/dist/gitdb-4.0.11-py3-none-any.whl b/thirdparty/dist/gitdb-4.0.11-py3-none-any.whl new file mode 100644 index 0000000..d26ba41 Binary files /dev/null and b/thirdparty/dist/gitdb-4.0.11-py3-none-any.whl differ diff --git a/thirdparty/dist/gitdb-4.0.11-py3-none-any.whl.ABOUT b/thirdparty/dist/gitdb-4.0.11-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..229f2c4 --- /dev/null +++ b/thirdparty/dist/gitdb-4.0.11-py3-none-any.whl.ABOUT @@ -0,0 +1,7 @@ +about_resource: gitdb-4.0.11-py3-none-any.whl +name: gitdb +version: 4.0.11 +download_url: https://files.pythonhosted.org/packages/fd/5b/8f0c4a5bb9fd491c277c21eff7ccae71b47d43c4446c9d0c6cff2fe8c2c4/gitdb-4.0.11-py3-none-any.whl +package_url: pkg:pypi/gitdb@4.0.11 +checksum_md5: 71b509c059ea22fbd7c9f3e978027de7 +checksum_sha1: cd5e22ef8e579b895cbc25be1703d5273dbe0cfa diff --git a/thirdparty/dist/gunicorn-21.2.0-py3-none-any.whl b/thirdparty/dist/gunicorn-21.2.0-py3-none-any.whl deleted file mode 100644 index 737af52..0000000 Binary files a/thirdparty/dist/gunicorn-21.2.0-py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/gunicorn-21.2.0-py3-none-any.whl.ABOUT b/thirdparty/dist/gunicorn-21.2.0-py3-none-any.whl.ABOUT deleted file mode 100644 index 63248d0..0000000 --- a/thirdparty/dist/gunicorn-21.2.0-py3-none-any.whl.ABOUT +++ /dev/null @@ -1,14 +0,0 @@ -about_resource: gunicorn-21.2.0-py3-none-any.whl -name: gunicorn -version: 21.2.0 -download_url: https://files.pythonhosted.org/packages/0e/2a/c3a878eccb100ccddf45c50b6b8db8cf3301a6adede6e31d48e8531cab13/gunicorn-21.2.0-py3-none-any.whl -package_url: pkg:pypi/gunicorn@21.2.0 -license_expression: mit -copyright: Copyright gunicorn project contributors -attribute: yes -checksum_md5: 1f3b9879f716cf19cf540310a7cf1bae -checksum_sha1: 25f950c66b7d03c37cdc3bfb881821694d89bc53 -licenses: - - key: mit - name: MIT License - file: mit.LICENSE diff --git a/thirdparty/dist/gunicorn-22.0.0-py3-none-any.whl b/thirdparty/dist/gunicorn-22.0.0-py3-none-any.whl new file mode 100644 index 0000000..a8a7404 Binary files /dev/null and b/thirdparty/dist/gunicorn-22.0.0-py3-none-any.whl differ diff --git a/thirdparty/dist/gunicorn-22.0.0-py3-none-any.whl.ABOUT b/thirdparty/dist/gunicorn-22.0.0-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..09365ae --- /dev/null +++ b/thirdparty/dist/gunicorn-22.0.0-py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: gunicorn-22.0.0-py3-none-any.whl +name: gunicorn +version: 22.0.0 +download_url: https://files.pythonhosted.org/packages/29/97/6d610ae77b5633d24b69c2ff1ac3044e0e565ecbd1ec188f02c45073054c/gunicorn-22.0.0-py3-none-any.whl +package_url: pkg:pypi/gunicorn@22.0.0 +license_expression: mit +copyright: Copyright gunicorn project contributors +attribute: yes +checksum_md5: 273b5018f409cd4854576d1012da90b6 +checksum_sha1: 9e5245b32e7820b36d5872247967aaf9da814dc2 +licenses: + - key: mit + name: MIT License + file: mit.LICENSE diff --git a/thirdparty/dist/idna-3.4-py3-none-any.whl b/thirdparty/dist/idna-3.4-py3-none-any.whl deleted file mode 100644 index 7343c68..0000000 Binary files a/thirdparty/dist/idna-3.4-py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/idna-3.4-py3-none-any.whl.ABOUT b/thirdparty/dist/idna-3.4-py3-none-any.whl.ABOUT deleted file mode 100644 index d76d806..0000000 --- a/thirdparty/dist/idna-3.4-py3-none-any.whl.ABOUT +++ /dev/null @@ -1,18 +0,0 @@ -about_resource: idna-3.4-py3-none-any.whl -name: idna -version: '3.4' -download_url: https://files.pythonhosted.org/packages/fc/34/3030de6f1370931b9dbb4dad48f6ab1015ab1d32447850b9fc94e60097be/idna-3.4-py3-none-any.whl -homepage_url: https://pypi.org/project/idna/3.4/ -package_url: pkg:pypi/idna@3.4 -license_expression: bsd-new -copyright: Copyright idna project contributors -attribute: yes -owner: Kim Davies -owner_url: https://github.com/kjd -contact: http://kim.id.au/ -checksum_md5: 7ab9782a3a1180cfa1fef20a1c9c166c -checksum_sha1: 4460f34853efc88e4b14ea5e0e3fa7959b3f0c29 -licenses: - - key: bsd-new - name: BSD-3-Clause - file: bsd-new.LICENSE diff --git a/thirdparty/dist/idna-3.7-py3-none-any.whl b/thirdparty/dist/idna-3.7-py3-none-any.whl new file mode 100644 index 0000000..fa4c95b Binary files /dev/null and b/thirdparty/dist/idna-3.7-py3-none-any.whl differ diff --git a/thirdparty/dist/idna-3.7-py3-none-any.whl.ABOUT b/thirdparty/dist/idna-3.7-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..47d11db --- /dev/null +++ b/thirdparty/dist/idna-3.7-py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: idna-3.7-py3-none-any.whl +name: idna +version: '3.7' +download_url: https://files.pythonhosted.org/packages/e5/3e/741d8c82801c347547f8a2a06aa57dbb1992be9e948df2ea0eda2c8b79e8/idna-3.7-py3-none-any.whl +package_url: pkg:pypi/idna@3.7 +license_expression: bsd-new +copyright: Copyright idna project contributors +attribute: yes +checksum_md5: 6077da9f00e02686ad1bc7a3c0397edc +checksum_sha1: ccb2491074ec1b6ffda6e6c11c1c668f885ed20a +licenses: + - key: bsd-new + name: BSD-3-Clause + file: bsd-new.LICENSE diff --git a/thirdparty/dist/isort-5.10.1-py3-none-any.whl.NOTICE b/thirdparty/dist/isort-5.10.1-py3-none-any.whl.NOTICE deleted file mode 100644 index c9655f5..0000000 --- a/thirdparty/dist/isort-5.10.1-py3-none-any.whl.NOTICE +++ /dev/null @@ -1 +0,0 @@ -Classifier: License :: OSI Approved :: MIT License \ No newline at end of file diff --git a/thirdparty/dist/isort-5.12.0-py3-none-any.whl b/thirdparty/dist/isort-5.12.0-py3-none-any.whl deleted file mode 100644 index 8197491..0000000 Binary files a/thirdparty/dist/isort-5.12.0-py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/isort-5.12.0-py3-none-any.whl.ABOUT b/thirdparty/dist/isort-5.12.0-py3-none-any.whl.ABOUT deleted file mode 100644 index 3d298cc..0000000 --- a/thirdparty/dist/isort-5.12.0-py3-none-any.whl.ABOUT +++ /dev/null @@ -1,16 +0,0 @@ -about_resource: isort-5.12.0-py3-none-any.whl -name: isort -version: 5.12.0 -download_url: https://files.pythonhosted.org/packages/0a/63/4036ae70eea279c63e2304b91ee0ac182f467f24f86394ecfe726092340b/isort-5.12.0-py3-none-any.whl -homepage_url: https://pypi.org/project/isort/5.12.0/ -package_url: pkg:pypi/isort@5.12.0 -license_expression: mit -copyright: Copyright isort project contributors -attribute: yes -owner: Taneli Hukkinen -checksum_md5: 4705ea8a295dd3f22671feed40968d1d -checksum_sha1: ff091ffa658bd4afe300a42a21f24ed4602ce37d -licenses: - - key: mit - name: MIT License - file: mit.LICENSE diff --git a/thirdparty/dist/isort-5.13.2-py3-none-any.whl b/thirdparty/dist/isort-5.13.2-py3-none-any.whl new file mode 100644 index 0000000..dd9a5c0 Binary files /dev/null and b/thirdparty/dist/isort-5.13.2-py3-none-any.whl differ diff --git a/thirdparty/dist/isort-5.13.2-py3-none-any.whl.ABOUT b/thirdparty/dist/isort-5.13.2-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..f7752d8 --- /dev/null +++ b/thirdparty/dist/isort-5.13.2-py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: isort-5.13.2-py3-none-any.whl +name: isort +version: 5.13.2 +download_url: https://files.pythonhosted.org/packages/d1/b3/8def84f539e7d2289a02f0524b944b15d7c75dab7628bedf1c4f0992029c/isort-5.13.2-py3-none-any.whl +package_url: pkg:pypi/isort@5.13.2 +license_expression: mit +copyright: Copyright isort project contributors +attribute: yes +checksum_md5: 0793de0d0994e53cb3bcf057433f7dc8 +checksum_sha1: d4a5070449450b41253589017d5088ef52d0726e +licenses: + - key: mit + name: MIT License + file: mit.LICENSE diff --git a/thirdparty/dist/jinja2-3.1.4-py3-none-any.whl b/thirdparty/dist/jinja2-3.1.4-py3-none-any.whl new file mode 100644 index 0000000..fa6a14b Binary files /dev/null and b/thirdparty/dist/jinja2-3.1.4-py3-none-any.whl differ diff --git a/thirdparty/dist/jinja2-3.1.4-py3-none-any.whl.ABOUT b/thirdparty/dist/jinja2-3.1.4-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..7406a9f --- /dev/null +++ b/thirdparty/dist/jinja2-3.1.4-py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: jinja2-3.1.4-py3-none-any.whl +name: jinja2 +version: 3.1.4 +download_url: https://files.pythonhosted.org/packages/31/80/3a54838c3fb461f6fec263ebf3a3a41771bd05190238de3486aae8540c36/jinja2-3.1.4-py3-none-any.whl +package_url: pkg:pypi/jinja2@3.1.4 +license_expression: bsd-new +copyright: Copyright jinja2 project contributors +attribute: yes +checksum_md5: a5fadd0603a10249348865e85a6f57bc +checksum_sha1: 57760ed83d9ad15fcdf63ad1ffa14941333ef655 +licenses: + - key: bsd-new + name: BSD-3-Clause + file: bsd-new.LICENSE diff --git a/thirdparty/dist/kombu-4.6.11-py2.py3-none-any.whl b/thirdparty/dist/kombu-4.6.11-py2.py3-none-any.whl deleted file mode 100644 index 58b8003..0000000 Binary files a/thirdparty/dist/kombu-4.6.11-py2.py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/kombu-4.6.11-py2.py3-none-any.whl.ABOUT b/thirdparty/dist/kombu-4.6.11-py2.py3-none-any.whl.ABOUT deleted file mode 100644 index 46803cd..0000000 --- a/thirdparty/dist/kombu-4.6.11-py2.py3-none-any.whl.ABOUT +++ /dev/null @@ -1,16 +0,0 @@ -about_resource: kombu-4.6.11-py2.py3-none-any.whl -name: kombu -version: 4.6.11 -download_url: https://files.pythonhosted.org/packages/9e/34/3eea6a3a9ff81b0c7ddbdceb22a1ffc1b5907d863f27ca19a68777d2211d/kombu-4.6.11-py2.py3-none-any.whl#sha256=be48cdffb54a2194d93ad6533d73f69408486483d189fe9f5990ee24255b0e0a -description: Messaging library for Python. -homepage_url: https://github.com/celery/kombu -package_url: pkg:pypi/kombu@4.6.11 -license_expression: bsd-new -copyright: Copyright (c) 2015-2016 Ask Solem & contributors. -attribute: yes -checksum_md5: 897e94e5d08627c9ac649a007dffb9cc -checksum_sha1: 910e6ebf1ed4df2e0bcb9834217bc3ac516a35f9 -licenses: - - key: bsd-new - name: BSD-3-Clause - file: bsd-new.LICENSE diff --git a/thirdparty/dist/license_expression-30.2.0-py3-none-any.whl b/thirdparty/dist/license_expression-30.2.0-py3-none-any.whl deleted file mode 100644 index 9a190a2..0000000 Binary files a/thirdparty/dist/license_expression-30.2.0-py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/license_expression-30.3.0-py3-none-any.whl b/thirdparty/dist/license_expression-30.3.0-py3-none-any.whl new file mode 100644 index 0000000..09b59b1 Binary files /dev/null and b/thirdparty/dist/license_expression-30.3.0-py3-none-any.whl differ diff --git a/thirdparty/dist/license_expression-30.2.0-py3-none-any.whl.ABOUT b/thirdparty/dist/license_expression-30.3.0-py3-none-any.whl.ABOUT similarity index 53% rename from thirdparty/dist/license_expression-30.2.0-py3-none-any.whl.ABOUT rename to thirdparty/dist/license_expression-30.3.0-py3-none-any.whl.ABOUT index 82ae789..d5b944a 100644 --- a/thirdparty/dist/license_expression-30.2.0-py3-none-any.whl.ABOUT +++ b/thirdparty/dist/license_expression-30.3.0-py3-none-any.whl.ABOUT @@ -1,14 +1,14 @@ -about_resource: license_expression-30.2.0-py3-none-any.whl +about_resource: license_expression-30.3.0-py3-none-any.whl name: license-expression -version: 30.2.0 -download_url: https://files.pythonhosted.org/packages/f0/03/86025ce25a5c888e9bb3ecd0bcf38a51c087a35652537047f678df7a2ba8/license_expression-30.2.0-py3-none-any.whl -package_url: pkg:pypi/license-expression@30.2.0 +version: 30.3.0 +download_url: https://files.pythonhosted.org/packages/54/f8/985a9a17d75533a8d6f6750b9e6ce5c0134ee70cf809a7e72ef19a1be756/license_expression-30.3.0-py3-none-any.whl +package_url: pkg:pypi/license-expression@30.3.0 license_expression: apache-2.0 AND cc-by-4.0 AND public-domain copyright: Copyright nexB Inc. and others attribute: yes track_changes: yes -checksum_md5: a23dd2f53d43b27bb4f2520f79124d70 -checksum_sha1: 7a3ea9e153865bf431f8ae58f5010127c2573e23 +checksum_md5: 0cd7c5effb66cb6e575f925dc60cb30b +checksum_sha1: 59992a97169f02dd2eab1ba43a4743ef0e85b1df licenses: - key: apache-2.0 name: Apache License 2.0 diff --git a/thirdparty/dist/packageurl_python-0.12.0-py3-none-any.whl b/thirdparty/dist/packageurl_python-0.12.0-py3-none-any.whl deleted file mode 100644 index c5f1dfb..0000000 Binary files a/thirdparty/dist/packageurl_python-0.12.0-py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/packageurl_python-0.12.0-py3-none-any.whl.ABOUT b/thirdparty/dist/packageurl_python-0.12.0-py3-none-any.whl.ABOUT deleted file mode 100644 index 32d8a13..0000000 --- a/thirdparty/dist/packageurl_python-0.12.0-py3-none-any.whl.ABOUT +++ /dev/null @@ -1,14 +0,0 @@ -about_resource: packageurl_python-0.12.0-py3-none-any.whl -name: packageurl-python -version: 0.12.0 -download_url: https://files.pythonhosted.org/packages/67/6e/27a16d0c746ea3c3c87709571326e74fc8bdcbb57129e5306fc0e370fa88/packageurl_python-0.12.0-py3-none-any.whl -package_url: pkg:pypi/packageurl-python@0.12.0 -license_expression: mit -copyright: Copyright packageurl-python project contributors -attribute: yes -checksum_md5: c51cb6f2c456b9a2c067547a40f30127 -checksum_sha1: be0c657c0ffaf2591619f26dbd118d8e5782c35f -licenses: - - key: mit - name: MIT License - file: mit.LICENSE diff --git a/thirdparty/dist/packageurl_python-0.15.0-py3-none-any.whl b/thirdparty/dist/packageurl_python-0.15.0-py3-none-any.whl new file mode 100644 index 0000000..2857a00 Binary files /dev/null and b/thirdparty/dist/packageurl_python-0.15.0-py3-none-any.whl differ diff --git a/thirdparty/dist/packageurl_python-0.15.0-py3-none-any.whl.ABOUT b/thirdparty/dist/packageurl_python-0.15.0-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..976c7ed --- /dev/null +++ b/thirdparty/dist/packageurl_python-0.15.0-py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: packageurl_python-0.15.0-py3-none-any.whl +name: packageurl-python +version: 0.15.0 +download_url: https://files.pythonhosted.org/packages/d4/05/1ed759f341c543167bd0b8d8812a46c2e40379ca4f8acbb497e5f20534e4/packageurl_python-0.15.0-py3-none-any.whl +package_url: pkg:pypi/packageurl-python@0.15.0 +license_expression: mit +copyright: Copyright packageurl-python project contributors +attribute: yes +checksum_md5: 02d2585ac18eb1f8948ea3ef9873cf91 +checksum_sha1: 4f0fa6bae5df4dd5401f8108af71558faf92de81 +licenses: + - key: mit + name: MIT License + file: mit.LICENSE 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 3ba1cf7..0000000 --- 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 a4faf71..2e6aa9d 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/pip-24.0-py3-none-any.whl.ABOUT b/thirdparty/dist/pip-24.0-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..4d73c5c --- /dev/null +++ b/thirdparty/dist/pip-24.0-py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: pip-24.0-py3-none-any.whl +name: pip +version: '24.0' +download_url: https://files.pythonhosted.org/packages/8a/6a/19e9fe04fca059ccf770861c7d5721ab4c2aebc539889e97c7977528a53b/pip-24.0-py3-none-any.whl +package_url: pkg:pypi/pip@24.0 +license_expression: mit +copyright: Copyright pip project contributors +attribute: yes +checksum_md5: 74e3c5e4082113b1239ca0e9abfd1e82 +checksum_sha1: e44313ae1e6af3c2bd3b60ab2fa8c34308d00555 +licenses: + - key: mit + name: MIT License + file: mit.LICENSE diff --git a/thirdparty/dist/psycopg-3.1.14-py3-none-any.whl b/thirdparty/dist/psycopg-3.1.14-py3-none-any.whl deleted file mode 100644 index ae2c3e5..0000000 Binary files a/thirdparty/dist/psycopg-3.1.14-py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/psycopg-3.1.14-py3-none-any.whl.ABOUT b/thirdparty/dist/psycopg-3.1.14-py3-none-any.whl.ABOUT deleted file mode 100644 index 4336486..0000000 --- a/thirdparty/dist/psycopg-3.1.14-py3-none-any.whl.ABOUT +++ /dev/null @@ -1,16 +0,0 @@ -about_resource: psycopg-3.1.14-py3-none-any.whl -name: psycopg -version: 3.1.14 -download_url: https://files.pythonhosted.org/packages/19/9c/4801c983f06c3e6fa28597fa4ebbbf41b6d9114367ea1ebcc5c365411152/psycopg-3.1.14-py3-none-any.whl -package_url: pkg:pypi/psycopg@3.1.14 -license_expression: lgpl-3.0 -copyright: Copyright The Psycopg Team -redistribute: yes -attribute: yes -track_changes: yes -checksum_md5: 326e5bec0b2238a4986469c34bb4815c -checksum_sha1: 7bbd7f422539bf668a33c56e99ff48666fe4fe3d -licenses: - - key: lgpl-3.0 - name: GNU Lesser General Public License 3.0 - file: lgpl-3.0.LICENSE diff --git a/thirdparty/dist/psycopg-3.1.19-py3-none-any.whl b/thirdparty/dist/psycopg-3.1.19-py3-none-any.whl new file mode 100644 index 0000000..21e0f9e Binary files /dev/null and b/thirdparty/dist/psycopg-3.1.19-py3-none-any.whl differ diff --git a/thirdparty/dist/psycopg-3.1.19-py3-none-any.whl.ABOUT b/thirdparty/dist/psycopg-3.1.19-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..4ffa9f7 --- /dev/null +++ b/thirdparty/dist/psycopg-3.1.19-py3-none-any.whl.ABOUT @@ -0,0 +1,16 @@ +about_resource: psycopg-3.1.19-py3-none-any.whl +name: psycopg +version: 3.1.19 +download_url: https://files.pythonhosted.org/packages/f2/cf/172701ea48987548c681e011681dda1d2605131f723e89225477fe7802e9/psycopg-3.1.19-py3-none-any.whl +package_url: pkg:pypi/psycopg@3.1.19 +license_expression: lgpl-3.0 +copyright: Copyright The Psycopg Team +redistribute: yes +attribute: yes +track_changes: yes +checksum_md5: 6345cae8283bfa16c8eafa43e97bbe1b +checksum_sha1: f5d4245d329c1245afe43414a8b7e4df454c748f +licenses: + - key: lgpl-3.0 + name: GNU Lesser General Public License 3.0 + file: lgpl-3.0.LICENSE diff --git a/thirdparty/dist/py_serializable-1.0.3-py3-none-any.whl b/thirdparty/dist/py_serializable-1.0.3-py3-none-any.whl new file mode 100644 index 0000000..ae7559b Binary files /dev/null and b/thirdparty/dist/py_serializable-1.0.3-py3-none-any.whl differ diff --git a/thirdparty/dist/pyaml-21.10.1-py2.py3-none-any.whl b/thirdparty/dist/pyaml-21.10.1-py2.py3-none-any.whl deleted file mode 100644 index e301223..0000000 Binary files a/thirdparty/dist/pyaml-21.10.1-py2.py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/pyaml-21.10.1-py2.py3-none-any.whl.ABOUT b/thirdparty/dist/pyaml-21.10.1-py2.py3-none-any.whl.ABOUT deleted file mode 100644 index d02b1e4..0000000 --- a/thirdparty/dist/pyaml-21.10.1-py2.py3-none-any.whl.ABOUT +++ /dev/null @@ -1,16 +0,0 @@ -about_resource: pyaml-21.10.1-py2.py3-none-any.whl -name: pyaml -version: 21.10.1 -download_url: https://files.pythonhosted.org/packages/35/fd/78a3a11c7b9b11878ebbf4461a09cbc758bdfc1b45168972727f7334b09a/pyaml-21.10.1-py2.py3-none-any.whl -homepage_url: https://pypi.org/project/pyaml/21.10.1/ -package_url: pkg:pypi/pyaml@21.10.1 -license_expression: wtfpl-2.0 -copyright: Copyright (c) Mike Kazantsev -notice_file: pyaml-21.10.1-py2.py3-none-any.whl.NOTICE -owner: Mike Kazantsev -checksum_md5: a99385e1e3457a3c00867283f0ca9d7c -checksum_sha1: 7cb2074609c542fe4ea2dd3bbc84e28432640168 -licenses: - - key: wtfpl-2.0 - name: WTFPL 2.0 - file: wtfpl-2.0.LICENSE diff --git a/thirdparty/dist/pyaml-21.10.1-py2.py3-none-any.whl.NOTICE b/thirdparty/dist/pyaml-21.10.1-py2.py3-none-any.whl.NOTICE deleted file mode 100644 index 009a76d..0000000 --- a/thirdparty/dist/pyaml-21.10.1-py2.py3-none-any.whl.NOTICE +++ /dev/null @@ -1 +0,0 @@ -License: WTFPL \ No newline at end of file diff --git a/thirdparty/dist/pyflakes-3.1.0-py2.py3-none-any.whl.ABOUT b/thirdparty/dist/pyflakes-3.1.0-py2.py3-none-any.whl.ABOUT deleted file mode 100644 index a105d3e..0000000 --- a/thirdparty/dist/pyflakes-3.1.0-py2.py3-none-any.whl.ABOUT +++ /dev/null @@ -1,14 +0,0 @@ -about_resource: pyflakes-3.1.0-py2.py3-none-any.whl -name: pyflakes -version: 3.1.0 -download_url: https://files.pythonhosted.org/packages/00/e9/1e1fd7fae559bfd07704991e9a59dd1349b72423c904256c073ce88a9940/pyflakes-3.1.0-py2.py3-none-any.whl -package_url: pkg:pypi/pyflakes@3.1.0 -license_expression: mit -copyright: Copyright pyflakes project contributors -attribute: yes -checksum_md5: 8fe9be379ddf5f077238690c049532a9 -checksum_sha1: 3a3ce0968cf3da51db88b36c218a49931071d5c8 -licenses: - - key: mit - name: MIT License - file: mit.LICENSE diff --git a/thirdparty/dist/pyflakes-3.1.0-py2.py3-none-any.whl b/thirdparty/dist/pyflakes-3.2.0-py2.py3-none-any.whl similarity index 85% rename from thirdparty/dist/pyflakes-3.1.0-py2.py3-none-any.whl rename to thirdparty/dist/pyflakes-3.2.0-py2.py3-none-any.whl index b5d24e8..3c5f972 100644 Binary files a/thirdparty/dist/pyflakes-3.1.0-py2.py3-none-any.whl and b/thirdparty/dist/pyflakes-3.2.0-py2.py3-none-any.whl differ diff --git a/thirdparty/dist/pyflakes-3.2.0-py2.py3-none-any.whl.ABOUT b/thirdparty/dist/pyflakes-3.2.0-py2.py3-none-any.whl.ABOUT new file mode 100644 index 0000000..e0cad50 --- /dev/null +++ b/thirdparty/dist/pyflakes-3.2.0-py2.py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: pyflakes-3.2.0-py2.py3-none-any.whl +name: pyflakes +version: 3.2.0 +download_url: https://files.pythonhosted.org/packages/d4/d7/f1b7db88d8e4417c5d47adad627a93547f44bdc9028372dbd2313f34a855/pyflakes-3.2.0-py2.py3-none-any.whl +package_url: pkg:pypi/pyflakes@3.2.0 +license_expression: mit +copyright: Copyright pyflakes project contributors +attribute: yes +checksum_md5: a8da02dcbc3c4881e1523a3f0e22fbbd +checksum_sha1: 7e762da6df0c7060707cd135f03233396f7a899f +licenses: + - key: mit + name: MIT License + file: mit.LICENSE diff --git a/thirdparty/dist/pytz-2023.3.post1-py2.py3-none-any.whl b/thirdparty/dist/pytz-2023.3.post1-py2.py3-none-any.whl deleted file mode 100644 index e6a4b3f..0000000 Binary files a/thirdparty/dist/pytz-2023.3.post1-py2.py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/pytz-2023.3.post1-py2.py3-none-any.whl.ABOUT b/thirdparty/dist/pytz-2023.3.post1-py2.py3-none-any.whl.ABOUT deleted file mode 100644 index fe16ffd..0000000 --- a/thirdparty/dist/pytz-2023.3.post1-py2.py3-none-any.whl.ABOUT +++ /dev/null @@ -1,14 +0,0 @@ -about_resource: pytz-2023.3.post1-py2.py3-none-any.whl -name: pytz -version: 2023.3.post1 -download_url: https://files.pythonhosted.org/packages/32/4d/aaf7eff5deb402fd9a24a1449a8119f00d74ae9c2efa79f8ef9994261fc2/pytz-2023.3.post1-py2.py3-none-any.whl -package_url: pkg:pypi/pytz@2023.3.post1 -license_expression: mit -copyright: Copyright pytz project contributors -attribute: yes -checksum_md5: 689e3bcbde7448826b0e4df41a5fbd0e -checksum_sha1: 08472b3fd1bcb696fd121bf0a20fa93329cfbbad -licenses: - - key: mit - name: MIT License - file: mit.LICENSE diff --git a/thirdparty/dist/pytz-2024.1-py2.py3-none-any.whl b/thirdparty/dist/pytz-2024.1-py2.py3-none-any.whl new file mode 100644 index 0000000..571f586 Binary files /dev/null and b/thirdparty/dist/pytz-2024.1-py2.py3-none-any.whl differ diff --git a/thirdparty/dist/pytz-2024.1-py2.py3-none-any.whl.ABOUT b/thirdparty/dist/pytz-2024.1-py2.py3-none-any.whl.ABOUT new file mode 100644 index 0000000..ba12ec3 --- /dev/null +++ b/thirdparty/dist/pytz-2024.1-py2.py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: pytz-2024.1-py2.py3-none-any.whl +name: pytz +version: '2024.1' +download_url: https://files.pythonhosted.org/packages/9c/3d/a121f284241f08268b21359bd425f7d4825cffc5ac5cd0e1b3d82ffd2b10/pytz-2024.1-py2.py3-none-any.whl +package_url: pkg:pypi/pytz@2024.1 +license_expression: mit +copyright: Copyright pytz project contributors +attribute: yes +checksum_md5: 1167f1cd8008a6e4425f6cbdcbe866f5 +checksum_sha1: a94fff518068cfd1541e61b8f7e8b9103835f2d0 +licenses: + - key: mit + name: MIT License + file: mit.LICENSE diff --git a/thirdparty/dist/redis-5.0.1-py3-none-any.whl b/thirdparty/dist/redis-5.0.1-py3-none-any.whl deleted file mode 100644 index 68c8184..0000000 Binary files a/thirdparty/dist/redis-5.0.1-py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/redis-5.0.1-py3-none-any.whl.ABOUT b/thirdparty/dist/redis-5.0.1-py3-none-any.whl.ABOUT deleted file mode 100644 index 4aaa889..0000000 --- a/thirdparty/dist/redis-5.0.1-py3-none-any.whl.ABOUT +++ /dev/null @@ -1,14 +0,0 @@ -about_resource: redis-5.0.1-py3-none-any.whl -name: redis -version: 5.0.1 -download_url: https://files.pythonhosted.org/packages/0b/34/a01250ac1fc9bf9161e07956d2d580413106ce02d5591470130a25c599e3/redis-5.0.1-py3-none-any.whl -package_url: pkg:pypi/redis@5.0.1 -license_expression: mit -copyright: Copyright redis project contributors -attribute: yes -checksum_md5: 92201fd34ea7cb46888bb8603e1fa206 -checksum_sha1: 64343aae0e061a6e6594d107e81e839470a0d2d8 -licenses: - - key: mit - name: MIT License - file: mit.LICENSE diff --git a/thirdparty/dist/redis-5.0.4-py3-none-any.whl b/thirdparty/dist/redis-5.0.4-py3-none-any.whl new file mode 100644 index 0000000..9bfd0eb Binary files /dev/null and b/thirdparty/dist/redis-5.0.4-py3-none-any.whl differ diff --git a/thirdparty/dist/redis-5.0.4-py3-none-any.whl.ABOUT b/thirdparty/dist/redis-5.0.4-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..b4189f1 --- /dev/null +++ b/thirdparty/dist/redis-5.0.4-py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: redis-5.0.4-py3-none-any.whl +name: redis +version: 5.0.4 +download_url: https://files.pythonhosted.org/packages/65/f2/540ad07910732733138beb192991c67c69e7f6ebf549ce1a3a77846cbae7/redis-5.0.4-py3-none-any.whl +package_url: pkg:pypi/redis@5.0.4 +license_expression: mit +copyright: Copyright redis project contributors +attribute: yes +checksum_md5: 2960078731a392b060edf700fb3e4a16 +checksum_sha1: feba2bdf451a89b0d81fee3a2ab681d36e7c9fa3 +licenses: + - key: mit + name: MIT License + file: mit.LICENSE diff --git a/thirdparty/dist/rq-1.16.2-py3-none-any.whl b/thirdparty/dist/rq-1.16.2-py3-none-any.whl new file mode 100644 index 0000000..b5d1bfb Binary files /dev/null and b/thirdparty/dist/rq-1.16.2-py3-none-any.whl differ diff --git a/thirdparty/dist/rq-1.16.2-py3-none-any.whl.ABOUT b/thirdparty/dist/rq-1.16.2-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..672a5fd --- /dev/null +++ b/thirdparty/dist/rq-1.16.2-py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: rq-1.16.2-py3-none-any.whl +name: rq +version: 1.16.2 +download_url: https://files.pythonhosted.org/packages/46/35/db396caf7cfe71a9e661cea520b276f1472df25015e7cb9143c65a1dca6d/rq-1.16.2-py3-none-any.whl +package_url: pkg:pypi/rq@1.16.2 +license_expression: bsd-new +copyright: Copyright rq project contributors +attribute: yes +checksum_md5: 00ce3a406e3b9e22752d660a7772790d +checksum_sha1: 4afdbd191e0907f34707ee61839d3d81f149bcc9 +licenses: + - key: bsd-new + name: BSD-3-Clause + file: bsd-new.LICENSE diff --git a/thirdparty/dist/saneyaml-0.5.2-py3-none-any.whl.ABOUT b/thirdparty/dist/saneyaml-0.5.2-py3-none-any.whl.ABOUT deleted file mode 100644 index 9adea1f..0000000 --- a/thirdparty/dist/saneyaml-0.5.2-py3-none-any.whl.ABOUT +++ /dev/null @@ -1,12 +0,0 @@ -about_resource: saneyaml-0.5.2-py3-none-any.whl -name: saneyaml -version: 0.5.2 -download_url: https://files.pythonhosted.org/packages/7e/62/68fe1eb6012393324af20f772fc37b2148cadcebbd8a610949e5a1b145b4/saneyaml-0.5.2-py3-none-any.whl -license_expression: apache-2.0 -attribute: yes -track_changes: yes -package_url: pkg:pypi/saneyaml@0.5.2 -licenses: - - key: apache-2.0 - name: Apache License 2.0 - file: apache-2.0.LICENSE diff --git a/thirdparty/dist/saneyaml-0.5.2-py3-none-any.whl b/thirdparty/dist/saneyaml-0.6.0-py3-none-any.whl similarity index 59% rename from thirdparty/dist/saneyaml-0.5.2-py3-none-any.whl rename to thirdparty/dist/saneyaml-0.6.0-py3-none-any.whl index 7f9edce..5552140 100644 Binary files a/thirdparty/dist/saneyaml-0.5.2-py3-none-any.whl and b/thirdparty/dist/saneyaml-0.6.0-py3-none-any.whl differ diff --git a/thirdparty/dist/saneyaml-0.6.0-py3-none-any.whl.ABOUT b/thirdparty/dist/saneyaml-0.6.0-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..935bf47 --- /dev/null +++ b/thirdparty/dist/saneyaml-0.6.0-py3-none-any.whl.ABOUT @@ -0,0 +1,15 @@ +about_resource: saneyaml-0.6.0-py3-none-any.whl +name: saneyaml +version: 0.6.0 +download_url: https://files.pythonhosted.org/packages/4e/08/b5216a1f1ecad5510975cbd5619c04cc615be25c4062214dca3a4a8ce957/saneyaml-0.6.0-py3-none-any.whl +package_url: pkg:pypi/saneyaml@0.6.0 +license_expression: apache-2.0 +copyright: Copyright saneyaml project contributors +attribute: yes +track_changes: yes +checksum_md5: affa2fb6c0ceb87044c2fb2972dacb68 +checksum_sha1: cfffdddce895e65cb2706e4a57e2fd92f40503f2 +licenses: + - key: apache-2.0 + name: Apache License 2.0 + file: apache-2.0.LICENSE diff --git a/thirdparty/dist/setuptools-69.0.2-py3-none-any.whl b/thirdparty/dist/setuptools-69.0.2-py3-none-any.whl deleted file mode 100644 index a609341..0000000 Binary files a/thirdparty/dist/setuptools-69.0.2-py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/setuptools-69.0.2-py3-none-any.whl.ABOUT b/thirdparty/dist/setuptools-69.0.2-py3-none-any.whl.ABOUT deleted file mode 100644 index 235422a..0000000 --- a/thirdparty/dist/setuptools-69.0.2-py3-none-any.whl.ABOUT +++ /dev/null @@ -1,14 +0,0 @@ -about_resource: setuptools-69.0.2-py3-none-any.whl -name: setuptools -version: 69.0.2 -download_url: https://files.pythonhosted.org/packages/bb/e1/ed2dd0850446b8697ad28d118df885ad04140c64ace06c4bd559f7c8a94f/setuptools-69.0.2-py3-none-any.whl -package_url: pkg:pypi/setuptools@69.0.2 -license_expression: mit -copyright: Copyright setuptools project contributors -attribute: yes -checksum_md5: f096ed836f4036a11aa277fa16dc09ff -checksum_sha1: 4227225bb193e3a45542f45966caf777d4c913e8 -licenses: - - key: mit - name: MIT License - file: mit.LICENSE diff --git a/thirdparty/dist/setuptools-69.5.1-py3-none-any.whl b/thirdparty/dist/setuptools-69.5.1-py3-none-any.whl new file mode 100644 index 0000000..4bd4c0e Binary files /dev/null and b/thirdparty/dist/setuptools-69.5.1-py3-none-any.whl differ diff --git a/thirdparty/dist/setuptools-69.5.1-py3-none-any.whl.ABOUT b/thirdparty/dist/setuptools-69.5.1-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..45a59be --- /dev/null +++ b/thirdparty/dist/setuptools-69.5.1-py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: setuptools-69.5.1-py3-none-any.whl +name: setuptools +version: 69.5.1 +download_url: https://files.pythonhosted.org/packages/f7/29/13965af254e3373bceae8fb9a0e6ea0d0e571171b80d6646932131d6439b/setuptools-69.5.1-py3-none-any.whl +package_url: pkg:pypi/setuptools@69.5.1 +license_expression: mit +copyright: Copyright setuptools project contributors +attribute: yes +checksum_md5: 1555b24e28b53f3342e557500dedf8f3 +checksum_sha1: 49841be6743b2d129d01d02d5fd339dd693c99dc +licenses: + - key: mit + name: MIT License + file: mit.LICENSE diff --git a/thirdparty/dist/smmap-5.0.1-py3-none-any.whl b/thirdparty/dist/smmap-5.0.1-py3-none-any.whl new file mode 100644 index 0000000..2d625b1 Binary files /dev/null and b/thirdparty/dist/smmap-5.0.1-py3-none-any.whl differ diff --git a/thirdparty/dist/smmap-5.0.1-py3-none-any.whl.ABOUT b/thirdparty/dist/smmap-5.0.1-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..88d963a --- /dev/null +++ b/thirdparty/dist/smmap-5.0.1-py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: smmap-5.0.1-py3-none-any.whl +name: smmap +version: 5.0.1 +download_url: https://files.pythonhosted.org/packages/a7/a5/10f97f73544edcdef54409f1d839f6049a0d79df68adbc1ceb24d1aaca42/smmap-5.0.1-py3-none-any.whl +package_url: pkg:pypi/smmap@5.0.1 +license_expression: bsd-new +copyright: Copyright smmap project contributors +attribute: yes +checksum_md5: fbeb9e7c083a701e69cb4eac48f3651f +checksum_sha1: ae56f988e8bcc87b338e3e20090d4466c0daab57 +licenses: + - key: bsd-new + name: BSD-3-Clause + file: bsd-new.LICENSE diff --git a/thirdparty/dist/sqlparse-0.4.4-py3-none-any.whl b/thirdparty/dist/sqlparse-0.4.4-py3-none-any.whl deleted file mode 100644 index c7a3e0f..0000000 Binary files a/thirdparty/dist/sqlparse-0.4.4-py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/sqlparse-0.4.4-py3-none-any.whl.ABOUT b/thirdparty/dist/sqlparse-0.4.4-py3-none-any.whl.ABOUT deleted file mode 100644 index 555493d..0000000 --- a/thirdparty/dist/sqlparse-0.4.4-py3-none-any.whl.ABOUT +++ /dev/null @@ -1,18 +0,0 @@ -about_resource: sqlparse-0.4.4-py3-none-any.whl -name: sqlparse -version: 0.4.4 -download_url: https://files.pythonhosted.org/packages/98/5a/66d7c9305baa9f11857f247d4ba761402cea75db6058ff850ed7128957b7/sqlparse-0.4.4-py3-none-any.whl -homepage_url: https://pypi.org/project/sqlparse/0.4.4/ -package_url: pkg:pypi/sqlparse@0.4.4 -license_expression: bsd-new -copyright: Copyright sqlparse project contributors -attribute: yes -owner: Andi Albrecht -owner_url: http://andialbrecht.de/ -contact: albrecht.andi@gmail.com -checksum_md5: 1c30ac6faaef1d750454841a54d9d9a9 -checksum_sha1: 848f0c8c1d359367177bc701daca64ad4b502529 -licenses: - - key: bsd-new - name: BSD-3-Clause - file: bsd-new.LICENSE diff --git a/thirdparty/dist/sqlparse-0.5.0-py3-none-any.whl b/thirdparty/dist/sqlparse-0.5.0-py3-none-any.whl new file mode 100644 index 0000000..60b04f1 Binary files /dev/null and b/thirdparty/dist/sqlparse-0.5.0-py3-none-any.whl differ diff --git a/thirdparty/dist/sqlparse-0.5.0-py3-none-any.whl.ABOUT b/thirdparty/dist/sqlparse-0.5.0-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..b6df1c2 --- /dev/null +++ b/thirdparty/dist/sqlparse-0.5.0-py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: sqlparse-0.5.0-py3-none-any.whl +name: sqlparse +version: 0.5.0 +download_url: https://files.pythonhosted.org/packages/43/5d/a0fdd88fd486b39ae1fd1a75ff75b4e29a0df96c0304d462fd407b82efe0/sqlparse-0.5.0-py3-none-any.whl +package_url: pkg:pypi/sqlparse@0.5.0 +license_expression: bsd-new +copyright: Copyright sqlparse project contributors +attribute: yes +checksum_md5: f22879a0ed4eb42d721e3c2c57c6a29c +checksum_sha1: 5a8083d37e0c4dbe95769cb82cb5f2022b52f309 +licenses: + - key: bsd-new + name: BSD-3-Clause + file: bsd-new.LICENSE diff --git a/thirdparty/dist/urllib3-2.1.0-py3-none-any.whl b/thirdparty/dist/urllib3-2.1.0-py3-none-any.whl deleted file mode 100644 index 0951ac3..0000000 Binary files a/thirdparty/dist/urllib3-2.1.0-py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/urllib3-2.1.0-py3-none-any.whl.ABOUT b/thirdparty/dist/urllib3-2.1.0-py3-none-any.whl.ABOUT deleted file mode 100644 index 1d7e895..0000000 --- a/thirdparty/dist/urllib3-2.1.0-py3-none-any.whl.ABOUT +++ /dev/null @@ -1,14 +0,0 @@ -about_resource: urllib3-2.1.0-py3-none-any.whl -name: urllib3 -version: 2.1.0 -download_url: https://files.pythonhosted.org/packages/96/94/c31f58c7a7f470d5665935262ebd7455c7e4c7782eb525658d3dbf4b9403/urllib3-2.1.0-py3-none-any.whl -package_url: pkg:pypi/urllib3@2.1.0 -license_expression: mit -copyright: Copyright urllib3 project contributors -attribute: yes -checksum_md5: 56a1919e2243cc6af59b23c06eda3783 -checksum_sha1: 1e197082cd0d0f98bc97f2fbfd7d2a597e3ff3e4 -licenses: - - key: mit - name: MIT License - file: mit.LICENSE diff --git a/thirdparty/dist/urllib3-2.2.1-py3-none-any.whl b/thirdparty/dist/urllib3-2.2.1-py3-none-any.whl new file mode 100644 index 0000000..d7cca6a Binary files /dev/null and b/thirdparty/dist/urllib3-2.2.1-py3-none-any.whl differ diff --git a/thirdparty/dist/urllib3-2.2.1-py3-none-any.whl.ABOUT b/thirdparty/dist/urllib3-2.2.1-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..68e8fec --- /dev/null +++ b/thirdparty/dist/urllib3-2.2.1-py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: urllib3-2.2.1-py3-none-any.whl +name: urllib3 +version: 2.2.1 +download_url: https://files.pythonhosted.org/packages/a2/73/a68704750a7679d0b6d3ad7aa8d4da8e14e151ae82e6fee774e6e0d05ec8/urllib3-2.2.1-py3-none-any.whl +package_url: pkg:pypi/urllib3@2.2.1 +license_expression: mit +copyright: Copyright urllib3 project contributors +attribute: yes +checksum_md5: 826986cd62165de59653bdd7c9685284 +checksum_sha1: fe4c49d871becc8029044f32093cf46b0f787801 +licenses: + - key: mit + name: MIT License + file: mit.LICENSE diff --git a/thirdparty/dist/vine-1.3.0-py2.py3-none-any.whl b/thirdparty/dist/vine-1.3.0-py2.py3-none-any.whl deleted file mode 100644 index a9f40ee..0000000 Binary files a/thirdparty/dist/vine-1.3.0-py2.py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/vine-1.3.0-py2.py3-none-any.whl.ABOUT b/thirdparty/dist/vine-1.3.0-py2.py3-none-any.whl.ABOUT deleted file mode 100644 index 7882176..0000000 --- a/thirdparty/dist/vine-1.3.0-py2.py3-none-any.whl.ABOUT +++ /dev/null @@ -1,20 +0,0 @@ -about_resource: vine-1.3.0-py2.py3-none-any.whl -name: vine -version: 1.3.0 -download_url: https://files.pythonhosted.org/packages/7f/60/82c03047396126c8331ceb64da1dc52d4f1317209f32e8fe286d0c07365a/vine-1.3.0-py2.py3-none-any.whl#sha256=ea4947cc56d1fd6f2095c8d543ee25dad966f78692528e68b4fada11ba3f98af -description: promise, async, future -homepage_url: https://vine.readthedocs.io/en/latest/ -package_url: pkg:pypi/vine@1.3.0 -license_expression: bsd-new -copyright: Copyright (c) Ask Solem & contributors. -notice_file: vine-1.3.0-py2.py3-none-any.whl.NOTICE -notice_url: https://github.com/celery/vine/blob/master/LICENSE -attribute: yes -owner: Celery -owner_url: http://celeryproject.org/ -checksum_md5: b0fd55deefc4e7ae9f04608fe8c238d5 -checksum_sha1: 9604a73d855097bf3774b27699632ed0a53328e5 -licenses: - - key: bsd-new - name: BSD-3-Clause - file: bsd-new.LICENSE diff --git a/thirdparty/dist/vine-1.3.0-py2.py3-none-any.whl.NOTICE b/thirdparty/dist/vine-1.3.0-py2.py3-none-any.whl.NOTICE deleted file mode 100644 index 7d67d67..0000000 --- a/thirdparty/dist/vine-1.3.0-py2.py3-none-any.whl.NOTICE +++ /dev/null @@ -1,52 +0,0 @@ -Copyright (c) 2015-2016 Ask Solem & contributors. All rights reserved. - -Vine is licensed under The BSD License (3 Clause, also known as -the new BSD license). The license is an OSI approved Open Source -license and is GPL-compatible(1). - -The license text can also be found here: -http://www.opensource.org/licenses/BSD-3-Clause - -License -======= - -Redistribution and use in source and binary forms, with or without -modification, are permitted provided that the following conditions are met: - * Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - * Neither the name of Ask Solem, nor the - names of its contributors may be used to endorse or promote products - derived from this software without specific prior written permission. - -THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL Ask Solem OR CONTRIBUTORS -BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -POSSIBILITY OF SUCH DAMAGE. - -Documentation License -===================== - -The documentation portion of Vine (the rendered contents of the -"docs" directory of a software distribution or checkout) is supplied -under the "Creative Commons Attribution-ShareAlike 4.0 -International" (CC BY-SA 4.0) License as described by -http://creativecommons.org/licenses/by-sa/4.0/ - -Footnotes -========= -(1) A GPL-compatible license makes it possible to - combine Vine with other software that is released - under the GPL, it does not mean that we're distributing - Vine under the GPL license. The BSD license, unlike the GPL, - let you distribute a modified version without making your -changes open source. \ No newline at end of file diff --git a/thirdparty/dist/wheel-0.42.0-py3-none-any.whl b/thirdparty/dist/wheel-0.42.0-py3-none-any.whl deleted file mode 100644 index 8044b19..0000000 Binary files a/thirdparty/dist/wheel-0.42.0-py3-none-any.whl and /dev/null differ diff --git a/thirdparty/dist/wheel-0.42.0-py3-none-any.whl.ABOUT b/thirdparty/dist/wheel-0.42.0-py3-none-any.whl.ABOUT deleted file mode 100644 index bd01b70..0000000 --- a/thirdparty/dist/wheel-0.42.0-py3-none-any.whl.ABOUT +++ /dev/null @@ -1,14 +0,0 @@ -about_resource: wheel-0.42.0-py3-none-any.whl -name: wheel -version: 0.42.0 -download_url: https://files.pythonhosted.org/packages/c7/c3/55076fc728723ef927521abaa1955213d094933dc36d4a2008d5101e1af5/wheel-0.42.0-py3-none-any.whl -package_url: pkg:pypi/wheel@0.42.0 -license_expression: mit -copyright: Copyright wheel project contributors -attribute: yes -checksum_md5: 779d91395ceb12e15e3a585b30b53f9f -checksum_sha1: fcf4ad8d5d8216d661bc98eede0d9210cbc5b697 -licenses: - - key: mit - name: MIT License - file: mit.LICENSE diff --git a/thirdparty/dist/wheel-0.43.0-py3-none-any.whl b/thirdparty/dist/wheel-0.43.0-py3-none-any.whl new file mode 100644 index 0000000..67e2308 Binary files /dev/null and b/thirdparty/dist/wheel-0.43.0-py3-none-any.whl differ diff --git a/thirdparty/dist/wheel-0.43.0-py3-none-any.whl.ABOUT b/thirdparty/dist/wheel-0.43.0-py3-none-any.whl.ABOUT new file mode 100644 index 0000000..046e466 --- /dev/null +++ b/thirdparty/dist/wheel-0.43.0-py3-none-any.whl.ABOUT @@ -0,0 +1,14 @@ +about_resource: wheel-0.43.0-py3-none-any.whl +name: wheel +version: 0.43.0 +download_url: https://files.pythonhosted.org/packages/7d/cd/d7460c9a869b16c3dd4e1e403cce337df165368c71d6af229a74699622ce/wheel-0.43.0-py3-none-any.whl +package_url: pkg:pypi/wheel@0.43.0 +license_expression: mit +copyright: Copyright wheel project contributors +attribute: yes +checksum_md5: e65b1197e1dfc6bbc8df362935f5943d +checksum_sha1: 71a83a2237cb57ab45bdafed364564e36ca5dc95 +licenses: + - key: mit + name: MIT License + file: mit.LICENSE diff --git a/workflow/api.py b/workflow/api.py index 3834cd1..b4c3fdd 100644 --- a/workflow/api.py +++ b/workflow/api.py @@ -391,11 +391,11 @@ def get_queryset(self): def perform_create(self, serializer): super().perform_create(serializer) - send_request_notification(serializer.instance, created=True) + send_request_notification(self.request, serializer.instance, created=True) def perform_update(self, serializer): super().perform_update(serializer) - send_request_notification(serializer.instance, created=False) + send_request_notification(self.request, serializer.instance, created=False) serializer.instance.events.create( user=self.request.user, text="Request edited.", diff --git a/workflow/forms.py b/workflow/forms.py index 473969a..1596501 100644 --- a/workflow/forms.py +++ b/workflow/forms.py @@ -245,7 +245,7 @@ def helper_right_side(self): ) request_fields = [ - Field(field, css_class="form-control-sm") + Field(field) for field in self._meta.fields if field in self.fields.keys() and field != "title" ] diff --git a/workflow/notification.py b/workflow/notification.py index a3615fc..8c117ad 100644 --- a/workflow/notification.py +++ b/workflow/notification.py @@ -27,7 +27,7 @@ def get_recipient_emails(recipients, cc_emails): return list(emails) -def send_request_notification(req, created, extra=None): +def send_request_notification(http_request, req, created, extra=None): """ Send an email notification following a Request creation or edition. An email is sent to the users involved in the Request, based on their @@ -41,7 +41,7 @@ def send_request_notification(req, created, extra=None): "content_object_verbose": content_object_verbose, "action": "submitted" if created else "updated", "action_user": action_user, - "site_url": settings.SITE_URL.rstrip("/"), + "site_url": http_request.build_absolute_uri(location="/").rstrip("/"), } subject = ( @@ -68,7 +68,7 @@ def send_request_notification(req, created, extra=None): ) -def send_request_comment_notification(comment, closed=False): +def send_request_comment_notification(http_request, comment, closed=False): """ Send an email notification following the addition of a comment on a Request. An email is sent to the users involved in the Request except for the @@ -85,7 +85,7 @@ def send_request_comment_notification(comment, closed=False): "req": req, "action": "closed" if closed else "commented", "content_object_verbose": content_object_verbose, - "site_url": settings.SITE_URL.rstrip("/"), + "site_url": http_request.build_absolute_uri(location="/").rstrip("/"), } subject = ( diff --git a/workflow/templates/workflow/includes/attachments_section.html b/workflow/templates/workflow/includes/attachments_section.html index ae90fb6..ab4cbb5 100644 --- a/workflow/templates/workflow/includes/attachments_section.html +++ b/workflow/templates/workflow/includes/attachments_section.html @@ -1,6 +1,6 @@ {% load naturaltime from humanize %} {% load crispy_forms_tags %} -
      +
      Attachments
      diff --git a/workflow/templates/workflow/includes/delete_attachment_modal.html b/workflow/templates/workflow/includes/delete_attachment_modal.html index 2e075ac..769864d 100644 --- a/workflow/templates/workflow/includes/delete_attachment_modal.html +++ b/workflow/templates/workflow/includes/delete_attachment_modal.html @@ -7,7 +7,7 @@
      Delete {% trans 'Attachment' %}
      -
      +

      You are about to delete:
      diff --git a/workflow/templates/workflow/includes/delete_comment_modal.html b/workflow/templates/workflow/includes/delete_comment_modal.html index d546377..9c3a118 100644 --- a/workflow/templates/workflow/includes/delete_comment_modal.html +++ b/workflow/templates/workflow/includes/delete_comment_modal.html @@ -7,7 +7,7 @@

      Delete {% trans 'Comment' %}
      -
      +

      Are you sure you want to delete this comment?

      diff --git a/workflow/templates/workflow/includes/new_request_modal.html b/workflow/templates/workflow/includes/new_request_modal.html index ed18524..d487213 100644 --- a/workflow/templates/workflow/includes/new_request_modal.html +++ b/workflow/templates/workflow/includes/new_request_modal.html @@ -6,7 +6,7 @@
      New {% trans "Request" %}
      -
      +

      You can attach a new {% trans "Request" %} to an existing Product, Component, Package, or License from its details page.
      Locate and select a Component, diff --git a/workflow/templates/workflow/includes/request_close_modal.html b/workflow/templates/workflow/includes/request_close_modal.html index 2bc5d48..63695c5 100644 --- a/workflow/templates/workflow/includes/request_close_modal.html +++ b/workflow/templates/workflow/includes/request_close_modal.html @@ -6,7 +6,7 @@

      Close Request
      -
      +
      diff --git a/workflow/templates/workflow/includes/request_list_table.html b/workflow/templates/workflow/includes/request_list_table.html index 9f5ea31..81b3479 100644 --- a/workflow/templates/workflow/includes/request_list_table.html +++ b/workflow/templates/workflow/includes/request_list_table.html @@ -102,7 +102,7 @@ {% if filter.form.priority %}{% endif %} {% endif %} - + {% include 'workflow/includes/request_status_icon.html' %} {{ req.get_status_display }} diff --git a/workflow/templates/workflow/request_details.html b/workflow/templates/workflow/request_details.html index e41465b..a960a2b 100644 --- a/workflow/templates/workflow/request_details.html +++ b/workflow/templates/workflow/request_details.html @@ -132,7 +132,7 @@

      {{ request_instance.request_template.name }}

      {% if question.value and question.input_type != 'BooleanField' %} {% endif %} - 
      {% if question.input_type == 'BooleanField' %}{% if question.value == '1' or question.value == 1 %}Yes{% else %}No{% endif %}{% else %}{{ question.value|default_if_none:" "|default:" " }}{% endif %}
      + 
      {% if question.input_type == 'BooleanField' %}{% if question.value == '1' or question.value == 1 %}Yes{% else %}No{% endif %}{% else %}{{ question.value|default_if_none:" "|default:" " }}{% endif %}
      {% endfor %} diff --git a/workflow/templates/workflow/request_form.html b/workflow/templates/workflow/request_form.html index 8a83bc8..677d996 100644 --- a/workflow/templates/workflow/request_form.html +++ b/workflow/templates/workflow/request_form.html @@ -39,14 +39,16 @@

      {{ form.request_template.name }}

      - {{ form.request_template.description }} + + {{ form.request_template.description }} +
      {% crispy form %}

      -
      +
      {% crispy form form.helper_right_side %}
      @@ -55,7 +57,7 @@

      {{ form.request_template.name }}

      {% block extrastyle %} {{ block.super }} - + {% endblock %} {% block javascripts %} diff --git a/workflow/tests/test_api.py b/workflow/tests/test_api.py index 3bfd695..0053c9f 100644 --- a/workflow/tests/test_api.py +++ b/workflow/tests/test_api.py @@ -43,7 +43,6 @@ EMAIL_HOST="localhost", EMAIL_PORT=25, DEFAULT_FROM_EMAIL="webmaster@localhost", - SITE_URL="server.dejacode.nexb", ) class RequestAPITestCase(TestCase): def setUp(self): @@ -273,6 +272,8 @@ def test_api_request_detail_endpoint(self): self.assertContains(response, self.request1_detail_url) self.assertIn(self.request1_detail_url, response.data["api_url"]) + expected_url = f"http://testserver{self.request1.get_absolute_url()}" + self.assertEqual(expected_url, response.data["absolute_url"]) self.assertEqual(self.request1.status, response.data["status"]) self.assertEqual(str(self.request1.uuid), response.data["uuid"]) self.assertEqual(self.request1.title, response.data["title"]) @@ -289,16 +290,10 @@ def test_api_request_detail_endpoint(self): self.assertEqual(self.request1.priority.label, response.data["priority"]) self.assertIsNone(response.data["last_modified_by"]) - expected_comments = [ - { - "uuid": str(comment1.uuid), - "user": "base_user", - "text": "Comment text", - "created_date": comment1.created_date.isoformat(), - "last_modified_date": comment1.last_modified_date.isoformat(), - } - ] - self.assertEqual(expected_comments, response.data["comments"]) + comment = response.data["comments"][0] + self.assertEqual(str(comment1.uuid), comment["uuid"]) + self.assertEqual("base_user", comment["user"]) + self.assertEqual("Comment text", comment["text"]) def test_api_secured_product_context_request_detail_endpoint(self): product1 = Product.objects.create(name="p1", dataspace=self.dataspace) diff --git a/workflow/tests/test_views.py b/workflow/tests/test_views.py index aa72454..d2de8b9 100644 --- a/workflow/tests/test_views.py +++ b/workflow/tests/test_views.py @@ -333,7 +333,7 @@ def test_workflow_request_details_view_serialized_data(self): - 
      char
      + 
      char
      """ @@ -346,17 +346,20 @@ def test_workflow_request_add_view_get_form(self): self.assertContains( response, '
      Field