From 3f26ce93bc14c997b778012b076b479c9400062f Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Fri, 15 Nov 2024 16:32:38 +0000 Subject: [PATCH 1/2] Move cli args to inside main Signed-off-by: Prabhu Subramanian --- .github/workflows/dockertests.yml | 4 ++-- .github/workflows/gobintests.yml | 2 +- depscan/cli.py | 6 +++--- pyproject.toml | 1 + 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dockertests.yml b/.github/workflows/dockertests.yml index 1fd6372c..1eb5bcfc 100644 --- a/.github/workflows/dockertests.yml +++ b/.github/workflows/dockertests.yml @@ -11,7 +11,7 @@ jobs: strategy: matrix: os: [ubuntu-latest] - python-version: ['3.10', '3.11', '3.12'] + python-version: ['3.10', '3.11', '3.12', '3.13'] fail-fast: false steps: - uses: actions/checkout@v4 @@ -147,7 +147,7 @@ jobs: strategy: matrix: os: [ macos-latest, windows-latest ] - python-version: [ '3.10', '3.11', '3.12' ] + python-version: [ '3.10', '3.11', '3.12', '3.13' ] fail-fast: false steps: - uses: actions/checkout@v4 diff --git a/.github/workflows/gobintests.yml b/.github/workflows/gobintests.yml index 5c955285..72b83655 100644 --- a/.github/workflows/gobintests.yml +++ b/.github/workflows/gobintests.yml @@ -11,7 +11,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - python-version: ['3.10', '3.11', '3.12'] + python-version: ['3.10', '3.11', '3.12', '3.13'] fail-fast: false steps: - uses: actions/checkout@v4 diff --git a/depscan/cli.py b/depscan/cli.py index 6b9ebada..82b73a4a 100755 --- a/depscan/cli.py +++ b/depscan/cli.py @@ -697,11 +697,12 @@ def run_server(args): ) -def main(args): +def main(): """ Detects the project type, performs various scans and audits, and generates reports based on the results. """ + args = build_args() perform_risk_audit = args.risk_audit # declare variables that get initialized only conditionally ( @@ -1076,5 +1077,4 @@ def main(args): if __name__ == "__main__": - cli_args = build_args() - main(cli_args) + main() diff --git a/pyproject.toml b/pyproject.toml index d5afcc15..e64501c3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -33,6 +33,7 @@ classifiers = [ "Programming Language :: Python :: 3.10", "Programming Language :: Python :: 3.11", "Programming Language :: Python :: 3.12", + "Programming Language :: Python :: 3.13", "Topic :: Security", "Topic :: Utilities", ] From 6b9d26783a79c075517d328f4d18b0609337a200 Mon Sep 17 00:00:00 2001 From: Prabhu Subramanian Date: Fri, 15 Nov 2024 16:34:24 +0000 Subject: [PATCH 2/2] Update vdb version Signed-off-by: Prabhu Subramanian --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index e64501c3..76bc8d59 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -6,7 +6,7 @@ authors = [ {name = "Team AppThreat", email = "cloud@appthreat.com"}, ] dependencies = [ - "appthreat-vulnerability-db~=6.1.0", + "appthreat-vulnerability-db~=6.2.1", "custom-json-diff~=2.1.1", "defusedxml", "oras==0.1.30",