Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 7 additions & 3 deletions dje/tasks.py
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@

from django_rq import job

from dejacode_toolkit.scancodeio import ScanCodeIO
from dejacode_toolkit.scancodeio import update_package_from_existing_scan_data
from dje.utils import is_available
# WARNING: Imports must stay local to each task function to avoid circular imports
# between the tasks module and the models/services it depends on.


logger = logging.getLogger(__name__)

Expand Down Expand Up @@ -102,6 +102,10 @@ def scancodeio_submit_scan(uris, user_uuid, dataspace_uuid):
Submit the provided `uris` to ScanCode.io as an asynchronous task.
Only publicly available URLs are sent to ScanCode.io.
"""
from dejacode_toolkit.scancodeio import ScanCodeIO
from dejacode_toolkit.scancodeio import update_package_from_existing_scan_data
from dje.utils import is_available

logger.info(
f"Entering scancodeio_submit_scan task with "
f"uris={uris} user_uuid={user_uuid} dataspace_uuid={dataspace_uuid}"
Expand Down
4 changes: 2 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@ dependencies = [
# Database
"psycopg==3.3.2",
# Cache
"redis==7.1.1",
"redis==7.2.0",
# Antivirus
"clamd==1.0.2",
# Testing
"model_bakery==1.23.2",
# Task queue
"rq==2.6.1",
"rq==2.7.0",
"croniter==6.0.0",
"django-rq==3.2.2",
"fakeredis==2.33.0",
Expand Down
Binary file removed thirdparty/dist/redis-7.1.1-py3-none-any.whl
Binary file not shown.
14 changes: 0 additions & 14 deletions thirdparty/dist/redis-7.1.1-py3-none-any.whl.ABOUT

This file was deleted.

Binary file added thirdparty/dist/redis-7.2.0-py3-none-any.whl
Binary file not shown.
14 changes: 14 additions & 0 deletions thirdparty/dist/redis-7.2.0-py3-none-any.whl.ABOUT
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
about_resource: redis-7.2.0-py3-none-any.whl
name: redis
version: 7.2.0
download_url: https://files.pythonhosted.org/packages/86/cf/f6180b67f99688d83e15c84c5beda831d1d341e95872d224f87ccafafe61/redis-7.2.0-py3-none-any.whl
package_url: pkg:pypi/redis@7.2.0
license_expression: mit
copyright: Copyright redis project contributors
attribute: yes
checksum_md5: b3b5a69ef30700bfa7260a8a692c3a1e
checksum_sha1: b7e56900aaafd8c3904e85e16c0b412f8e85a9b2
licenses:
- key: mit
name: MIT License
file: mit.LICENSE
Binary file removed thirdparty/dist/rq-2.6.1-py3-none-any.whl
Binary file not shown.
14 changes: 0 additions & 14 deletions thirdparty/dist/rq-2.6.1-py3-none-any.whl.ABOUT

This file was deleted.

Binary file added thirdparty/dist/rq-2.7.0-py3-none-any.whl
Binary file not shown.
14 changes: 14 additions & 0 deletions thirdparty/dist/rq-2.7.0-py3-none-any.whl.ABOUT
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
about_resource: rq-2.7.0-py3-none-any.whl
name: rq
version: 2.7.0
download_url: https://files.pythonhosted.org/packages/0d/1a/3b64696bc0c33aa1d86d3e6add03c4e0afe51110264fd41208bd95c2665c/rq-2.7.0-py3-none-any.whl
package_url: pkg:pypi/rq@2.7.0
license_expression: bsd-new
copyright: Copyright rq project contributors
attribute: yes
checksum_md5: 5a6184ae6d00d0267d1c8d4939b0a087
checksum_sha1: bdc76c843a02b0104474fd65171c829a9cc03692
licenses:
- key: bsd-new
name: BSD-3-Clause
file: bsd-new.LICENSE
Loading