Skip to content

Commit 38eaceb

Browse files
authored
Integrate blint as an extension (#399)
* Adds blint and atom-tools as an extension Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com> * Update blint version Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com> --------- Signed-off-by: Prabhu Subramanian <prabhu@appthreat.com>
1 parent b6cd3c9 commit 38eaceb

File tree

5 files changed

+330
-95
lines changed

5 files changed

+330
-95
lines changed

README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ sudo npm install -g @cyclonedx/cdxgen
8585
# Normal version recommended for most users (MIT)
8686
pip install owasp-depscan
8787

88-
# For a performant version, that uses valkey cache during risk audit (BSD-3-Clause)
88+
# For a full version with all extensions and server mode (Multiple Licenses)
8989
pip install owasp-depscan[all]
9090
```
9191

depscan/cli.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
from vdb.lib import config, db6 as db_lib
1717
from vdb.lib.utils import parse_purl
1818
from depscan import get_version
19-
from depscan.lib import explainer, github, utils
19+
from depscan.lib import explainer, utils
2020
from depscan.lib.analysis import (
2121
PrepareVdrOptions,
2222
analyse_licenses,

depscan/lib/analysis.py

-1
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,6 @@ def generate_console_output(pkg_vulnerabilities, bom_dependency_tree, include_pk
397397

398398

399399
def output_results(counts, direct_purls, options, pkg_group_rows, pkg_vulnerabilities, reached_purls, table):
400-
json_dump("pkg_vulnerabilities.json", pkg_vulnerabilities, True, log=LOG)
401400
if pkg_vulnerabilities:
402401
console.print()
403402
console.print(table)

pyproject.toml

+21-19
Original file line numberDiff line numberDiff line change
@@ -7,16 +7,15 @@ authors = [
77
]
88
dependencies = [
99
"appthreat-vulnerability-db[oras]",
10-
"custom-json-diff",
11-
"defusedxml",
12-
"PyYAML",
13-
"rich",
14-
"PyGithub",
15-
"toml",
16-
"pdfkit",
17-
"Jinja2",
18-
"packageurl-python",
19-
"cvss",
10+
"custom-json-diff>=2.1.5",
11+
"defusedxml>=0.7.1",
12+
"PyYAML>=6.0.2",
13+
"rich>=13.9.4",
14+
"toml>=0.10.2",
15+
"pdfkit>=1.0.0",
16+
"Jinja2>=3.1.5",
17+
"packageurl-python>=0.16.0",
18+
"cvss>=3.4",
2019
]
2120

2221
requires-python = ">=3.10"
@@ -46,15 +45,17 @@ depscan = "depscan.cli:main"
4645
scan = "depscan.cli:main"
4746

4847
[project.optional-dependencies]
49-
dev = ["black",
50-
"flake8",
51-
"pytest",
52-
"pytest-cov",
53-
"httpretty"
48+
dev = [
49+
"black>=25.1.0",
50+
"flake8>=7.1.2",
51+
"pytest>=8.3.4",
52+
"pytest-cov>=6.0.0",
53+
"httpretty>=1.1.4"
5454
]
55-
server = ["quart"]
56-
perf = ["hishel[redis]"]
57-
all = ["quart", "hishel[redis]"]
55+
server = ["quart>=0.20.0"]
56+
ext = ["atom-tools>=0.7.1", "blint"]
57+
perf = ["hishel[redis]>=0.1.1"]
58+
all = ["atom-tools>=0.7.1", "blint", "quart>=0.20.0", "PyGithub>=2.6.1", "hishel[redis]>=0.1.1"]
5859

5960
[build-system]
6061
requires = ["setuptools>=61", "wheel"]
@@ -77,4 +78,5 @@ select = "B,C,E,F,W,T4,B9"
7778
line-length = 99
7879

7980
[tool.uv.sources]
80-
appthreat-vulnerability-db = { git = "https://github.com/appthreat/vulnerability-db", rev = "f693bfb7e16e0dcf419cdf6cddc34ed5f3373b56" }
81+
appthreat-vulnerability-db = { git = "https://github.com/appthreat/vulnerability-db", rev = "ba88de9194bde83b23d31c2b48a72c60d0ca1944" }
82+
blint = { git = "https://github.com/owasp-dep-scan/blint", rev = "79f28886d64d568aa789195ced64489ed3232406" }

0 commit comments

Comments
 (0)