From bf2a90db586ce5287210d828e3f920294e7989af Mon Sep 17 00:00:00 2001 From: virgo-o Date: Sun, 4 May 2025 15:28:26 +0200 Subject: [PATCH 1/2] remove switches from argparse definition Signed-off-by: virgo-o --- cyclonedx_py/_internal/cli.py | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/cyclonedx_py/_internal/cli.py b/cyclonedx_py/_internal/cli.py index bb54ab463..14a87397c 100644 --- a/cyclonedx_py/_internal/cli.py +++ b/cyclonedx_py/_internal/cli.py @@ -68,13 +68,6 @@ def make_argument_parser(cls, sco: ArgumentParser, **kwargs: Any) -> ArgumentPar action='store_true', dest='short_purls', default=False) - op.add_argument('--schema-version', # DEPRECATED - metavar='', - help='DEPRECATED alias for option "--spec-version".', - dest='spec_version', - choices=SchemaVersion, - type=SchemaVersion.from_version, - default=SchemaVersion.V1_6.to_version()) op.add_argument('--sv', '--spec-version', metavar='', help='Which version of CycloneDX to use.' @@ -99,12 +92,6 @@ def make_argument_parser(cls, sco: ArgumentParser, **kwargs: Any) -> ArgumentPar choices=OutputFormat, type=argparse_type4enum(OutputFormat), default=OutputFormat.JSON.name) - op.add_argument('--outfile', # DEPRECATED - metavar='', - help='DEPRECATED alias for "--output-file".', - type=FileType('wt', encoding='utf8'), - dest='output_file', - default=OPTION_OUTPUT_STDOUT) op.add_argument('-o', '--output-file', metavar='', help='Path to the output file.' From a5375c3964deb2c46fd850284e55460aecd04438 Mon Sep 17 00:00:00 2001 From: virgo-o Date: Sun, 4 May 2025 15:30:36 +0200 Subject: [PATCH 2/2] remove cli switches from docs Signed-off-by: virgo-o --- docs/usage.rst | 12 ------------ 1 file changed, 12 deletions(-) diff --git a/docs/usage.rst b/docs/usage.rst index 516a3520c..cec4abb85 100644 --- a/docs/usage.rst +++ b/docs/usage.rst @@ -81,8 +81,6 @@ The full documentation can be issued by running with ``environment --help``: (default: application) --short-PURLs Omit all qualifiers from PackageURLs. This causes information loss in trade-off shorter PURLs, which might improve ingesting these strings. - --schema-version - DEPRECATED alias for "--spec-version" --sv , --spec-version Which version of CycloneDX to use. {choices: 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0} @@ -94,7 +92,6 @@ The full documentation can be issued by running with ``environment --help``: Which output format to use. {choices: JSON, XML} (default: JSON) - --outfile DEPRECATED alias for "--output-file". -o , --output-file Path to the output file. (set to "-" to output to STDOUT) @@ -255,8 +252,6 @@ The full documentation can be issued by running with ``pipenv --help``: (default: application) --short-PURLs Omit all qualifiers from PackageURLs. This causes information loss in trade-off shorter PURLs, which might improve ingesting these strings. - --schema-version - DEPRECATED alias for "--spec-version" --sv , --spec-version Which version of CycloneDX to use. {choices: 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0} @@ -268,7 +263,6 @@ The full documentation can be issued by running with ``pipenv --help``: Which output format to use. {choices: JSON, XML} (default: JSON) - --outfile DEPRECATED alias for "--output-file". -o , --output-file Path to the output file. (set to "-" to output to STDOUT) @@ -333,8 +327,6 @@ The full documentation can be issued by running with ``poetry --help``: (default: application) --short-PURLs Omit all qualifiers from PackageURLs. This causes information loss in trade-off shorter PURLs, which might improve ingesting these strings. - --schema-version - DEPRECATED alias for "--spec-version" --sv , --spec-version Which version of CycloneDX to use. {choices: 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0} @@ -346,7 +338,6 @@ The full documentation can be issued by running with ``poetry --help``: Which output format to use. {choices: JSON, XML} (default: JSON) - --outfile DEPRECATED alias for "--output-file". -o , --output-file Path to the output file. (set to "-" to output to STDOUT) @@ -407,8 +398,6 @@ The full documentation can be issued by running with ``requirements --help``: (default: application) --short-PURLs Omit all qualifiers from PackageURLs. This causes information loss in trade-off shorter PURLs, which might improve ingesting these strings. - --schema-version - DEPRECATED alias for "--spec-version" --sv , --spec-version Which version of CycloneDX to use. {choices: 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0} @@ -420,7 +409,6 @@ The full documentation can be issued by running with ``requirements --help``: Which output format to use. {choices: JSON, XML} (default: JSON) - --outfile DEPRECATED alias for "--output-file". -o , --output-file Path to the output file. (set to "-" to output to STDOUT)