From c133c5cfebc3de316194b9a0ffa42f919ee8b51e Mon Sep 17 00:00:00 2001 From: Keshav Priyadarshi Date: Wed, 1 May 2024 19:10:00 +0530 Subject: [PATCH 1/2] Bump scancode.io Signed-off-by: Keshav Priyadarshi --- requirements.txt | 8 ++++---- setup.cfg | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/requirements.txt b/requirements.txt index 02b4da4f..022c4858 100644 --- a/requirements.txt +++ b/requirements.txt @@ -21,7 +21,7 @@ container-inspector==32.0.1 crispy-bootstrap3==2024.1 crontab==1.0.1 cryptography==42.0.5 -cyclonedx-python-lib==7.1.0 +cyclonedx-python-lib==7.3.0 debian_inspector==31.1.0 defusedxml==0.7.1 Deprecated==1.2.14 @@ -74,7 +74,7 @@ lxml==5.2.1 Markdown==3.5.1 markdown-it-py==3.0.0 MarkupSafe==2.1.5 -matchcode-toolkit==4.0.0 +matchcode-toolkit==4.1.0 mdurl==0.1.2 mock==5.1.0 more-itertools==10.2.0 @@ -128,7 +128,7 @@ rq-scheduler==0.13.1 rubymarshal==1.0.3 saneyaml==0.6.0 scancode-toolkit @ git+https://github.com/nexB/scancode-toolkit.git@684360f2ca01bc676368bc8621eed65065bf0f11 -scancodeio @ git+https://github.com/nexB/scancode.io.git@ab68916b5fc73f9b054f4513dec0a9798e0e795f +scancodeio @ git+https://github.com/nexB/scancode.io.git@58a45cc67d504401693ccca43bb6e2cca98fbe60 semantic-version==2.10.0 semver==3.0.2 setuptools==69.5.1 @@ -136,7 +136,7 @@ six==1.16.0 smmap==5.0.1 sortedcontainers==2.4.0 soupsieve==2.5 -source-inspector==0.3.0 +source-inspector==0.5.0 spdx-tools==0.8.2 sqlparse==0.5.0 text-unidecode==1.3 diff --git a/setup.cfg b/setup.cfg index 84a5c15f..399f4157 100644 --- a/setup.cfg +++ b/setup.cfg @@ -59,9 +59,9 @@ install_requires = rubymarshal == 1.0.3 scancode-toolkit[packages] @ git+https://github.com/nexB/scancode-toolkit.git@684360f2ca01bc676368bc8621eed65065bf0f11 urlpy == 0.5 - matchcode-toolkit == 4.0.0 + matchcode-toolkit == 4.1.0 univers == 30.11.0 - scancodeio @ git+https://github.com/nexB/scancode.io.git@ab68916b5fc73f9b054f4513dec0a9798e0e795f + scancodeio @ git+https://github.com/nexB/scancode.io.git@58a45cc67d504401693ccca43bb6e2cca98fbe60 setup_requires = setuptools_scm[toml] >= 4 python_requires = >=3.8 From 1a7e411df80a79a86aac641743d2d4004fb87584 Mon Sep 17 00:00:00 2001 From: Keshav Priyadarshi Date: Wed, 1 May 2024 19:31:24 +0530 Subject: [PATCH 2/2] Add python tools for symbol collection Signed-off-by: Keshav Priyadarshi --- minecode/model_utils.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/minecode/model_utils.py b/minecode/model_utils.py index ba305288..d43aa816 100644 --- a/minecode/model_utils.py +++ b/minecode/model_utils.py @@ -35,8 +35,10 @@ # These are the list of supported addon pipelines to run when we scan a Package for # indexing. SUPPORTED_ADDON_PIPELINES = ( - 'collect_symbols', + 'collect_pygments_symbols', 'collect_source_strings', + 'collect_symbols', + 'collect_tree_sitter_symbols', 'inspect_elf_binaries', )