Skip to content

Commit a6460d1

Browse files
author
Trong Nhan Mai
authored
refactor: remove the deprecated --skip-deps command-line option. (#943)
Signed-off-by: Trong Nhan Mai <trong.nhan.mai@oracle.com>
1 parent 4f20e9b commit a6460d1

File tree

2 files changed

+1
-21
lines changed

2 files changed

+1
-21
lines changed

docs/source/pages/cli_usage/command_analyze.rst

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ Usage
2222
usage: ./run_macaron.sh analyze
2323
[-h] [-sbom SBOM_PATH] [-purl PURL] [-rp REPO_PATH] [-b BRANCH]
2424
[-d DIGEST] [-pe PROVENANCE_EXPECTATION]
25-
[--skip-deps] [--deps-depth DEPS_DEPTH] [-g TEMPLATE_PATH]
25+
[--deps-depth DEPS_DEPTH] [-g TEMPLATE_PATH]
2626
[--python-venv PYTHON_VENV]
2727
[--local-maven-repo LOCAL_MAVEN_REPO]
2828
@@ -64,10 +64,6 @@ Options
6464

6565
The path to the provenance file in in-toto format.
6666

67-
.. option:: --skip-deps
68-
69-
DEPRECATED. Dependency resolution is off by default. This flag does nothing and will be removed in the next release.
70-
7167
.. option:: --deps-depth DEPS_DEPTH
7268

7369
The depth of the dependency resolution. 0: disable, 1: direct dependencies, inf: all transitive dependencies. (Default: 0)

src/macaron/__main__.py

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -168,12 +168,6 @@ def analyze_slsa_levels_single(analyzer_single_args: argparse.Namespace) -> None
168168
logger.error("Error while loading the input provenance file: %s", error)
169169
sys.exit(os.EX_DATAERR)
170170

171-
if analyzer_single_args.skip_deps:
172-
logger.warning(
173-
"The --skip-deps flag has been deprecated and WILL NOT do anything. "
174-
+ "Dependency resolution is off by default. This flag does nothing and will be removed in the next release."
175-
)
176-
177171
status_code = analyzer.run(
178172
run_config,
179173
analyzer_single_args.sbom_path,
@@ -439,16 +433,6 @@ def main(argv: list[str] | None = None) -> None:
439433
help=("The path to the provenance file in in-toto format."),
440434
)
441435

442-
single_analyze_parser.add_argument(
443-
"--skip-deps",
444-
required=False,
445-
action="store_true",
446-
default=False,
447-
help=(
448-
"DEPRECATED. Dependency resolution is off by default. This flag does nothing and will be removed in the next release."
449-
),
450-
)
451-
452436
single_analyze_parser.add_argument(
453437
"--deps-depth",
454438
required=False,

0 commit comments

Comments
 (0)