Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: remove the remaining of --skip-deps #943

Open
wants to merge 1 commit into
base: staging
Choose a base branch
from
Open

chore: remove the remaining of --skip-deps #943

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 1 addition & 5 deletions docs/source/pages/cli_usage/command_analyze.rst
View file
Open in desktop
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]

-------
Expand Down Expand Up @@ -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)
Expand Down
16 changes: 0 additions & 16 deletions src/macaron/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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,
Expand Down Expand Up @@ -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,
Expand Down
Loading