Skip to content

Commit

Permalink
refactor: remove the deprecated --skip-deps command-line option. (#943)
Browse files Browse the repository at this point in the history
Signed-off-by: Trong Nhan Mai <trong.nhan.mai@oracle.com>
  • Loading branch information
tromai authored Feb 13, 2025
1 parent 4f20e9b commit a6460d1
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 21 deletions.
6 changes: 1 addition & 5 deletions docs/source/pages/cli_usage/command_analyze.rst
Original file line number Diff line number Diff line change
Expand Up @@ -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]
[--local-maven-repo LOCAL_MAVEN_REPO]
Expand Down Expand Up @@ -64,10 +64,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)
Expand Down
16 changes: 0 additions & 16 deletions src/macaron/__main__.py
Original file line number Diff line number Diff line change
Expand Up @@ -168,12 +168,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,
Expand Down Expand Up @@ -439,16 +433,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,
Expand Down

0 comments on commit a6460d1

Please sign in to comment.