From a11298b8c5cf2acb884ac6ca46a30327894ff6f7 Mon Sep 17 00:00:00 2001 From: Trong Nhan Mai Date: Fri, 13 Dec 2024 13:51:15 +1000 Subject: [PATCH] chore: remove the remaining of --skip-deps --- docs/source/pages/cli_usage/command_analyze.rst | 6 +----- src/macaron/__main__.py | 16 ---------------- 2 files changed, 1 insertion(+), 21 deletions(-) diff --git a/docs/source/pages/cli_usage/command_analyze.rst b/docs/source/pages/cli_usage/command_analyze.rst index 2bb7f3f6a..bd2a0ea8f 100644 --- a/docs/source/pages/cli_usage/command_analyze.rst +++ b/docs/source/pages/cli_usage/command_analyze.rst @@ -22,7 +22,7 @@ Usage usage: ./run_macaron.sh analyze [-h] [-sbom SBOM_PATH] [-purl PURL] [-rp REPO_PATH] [-b BRANCH] [-d DIGEST] [-pe PROVENANCE_EXPECTATION] - [--skip-deps] [--deps-depth DEPS_DEPTH] [-g TEMPLATE_PATH] + [--deps-depth DEPS_DEPTH] [-g TEMPLATE_PATH] [--python-venv PYTHON_VENV] ------- @@ -63,10 +63,6 @@ Options The path to the provenance file in in-toto format. -.. option:: --skip-deps - - DEPRECATED. Dependency resolution is off by default. This flag does nothing and will be removed in the next release. - .. option:: --deps-depth DEPS_DEPTH The depth of the dependency resolution. 0: disable, 1: direct dependencies, inf: all transitive dependencies. (Default: 0) diff --git a/src/macaron/__main__.py b/src/macaron/__main__.py index 3e541d633..5d188bd1e 100644 --- a/src/macaron/__main__.py +++ b/src/macaron/__main__.py @@ -145,12 +145,6 @@ def analyze_slsa_levels_single(analyzer_single_args: argparse.Namespace) -> None logger.error("Error while loading the input provenance file: %s", error) sys.exit(os.EX_DATAERR) - if analyzer_single_args.skip_deps: - logger.warning( - "The --skip-deps flag has been deprecated and WILL NOT do anything. " - + "Dependency resolution is off by default. This flag does nothing and will be removed in the next release." - ) - status_code = analyzer.run( run_config, analyzer_single_args.sbom_path, @@ -415,16 +409,6 @@ def main(argv: list[str] | None = None) -> None: help=("The path to the provenance file in in-toto format."), ) - single_analyze_parser.add_argument( - "--skip-deps", - required=False, - action="store_true", - default=False, - help=( - "DEPRECATED. Dependency resolution is off by default. This flag does nothing and will be removed in the next release." - ), - ) - single_analyze_parser.add_argument( "--deps-depth", required=False,