Skip to content

fix: set --version cannot be combined with --version-range #218

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

Merged
italvi merged 2 commits into from
Aug 26, 2024
Merged

fix: set --version cannot be combined with --version-range #218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a2bf5f6
fix: set --version cannot be used with --version-range
mmarseu Jul 4, 2024
9b4408c
Merge branch 'main' into exclusive-set-version-options
italvi Aug 26, 2024
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: 4 additions & 2 deletions cdxev/__main__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -604,12 +604,14 @@ def create_set_parser(
metavar="<group>",
help="Group of target component. If specified, name must also be specified.",
)
identifiers.add_argument(

group = identifiers.add_mutually_exclusive_group()
group.add_argument(
"--version",
metavar="<version>",
help="Version of target component. If specified, name must also be specified.",
)
identifiers.add_argument(
group.add_argument(
"--version-range",
metavar="<version>",
help="Version range of target components. If specified, name must also be specified.",
Expand Down
4 changes: 3 additions & 1 deletion tests/integration/test_integration.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -546,20 +546,22 @@ def test_from_file(
["purl", "swid", "key", "value"],
["name", "cpe", "key", "value"],
["version", "group", "key", "value"],
["name", "version", "version-range", "key", "value"],
["key", "value"],
["name", "key"],
["name", "value"],
["from-file", "name"],
["from-file", "key", "value"],
],
ids=lambda keys: "only: " + ", ".join(keys),
ids=lambda keys: "options: " + ", ".join(keys),
)
def test_invalid_option_combinations(
self, use_only: list[str], input_file: Path, argv: Callable[..., None]
):
options = {
"name": "comp",
"version": "1.0.0",
"version-range": "vers:generic/>1.0.0",
"group": "acme",
"purl": "pkg:test/comp@1.0.0",
"swid": "foo",
Expand Down