Skip to content

Commit 2be98e5

Browse files
authored
feat!: remove deprecated CLI switches --schema-version and --outfile, use --spec-version and --output-file instead (#892)
Closes #873. --------- Signed-off-by: virgo-o <[email protected]>
1 parent 6b81028 commit 2be98e5

File tree

2 files changed

+0
-25
lines changed

2 files changed

+0
-25
lines changed

cyclonedx_py/_internal/cli.py

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -68,13 +68,6 @@ def make_argument_parser(cls, sco: ArgumentParser, **kwargs: Any) -> ArgumentPar
6868
action='store_true',
6969
dest='short_purls',
7070
default=False)
71-
op.add_argument('--schema-version', # DEPRECATED
72-
metavar='<version>',
73-
help='DEPRECATED alias for option "--spec-version".',
74-
dest='spec_version',
75-
choices=SchemaVersion,
76-
type=SchemaVersion.from_version,
77-
default=SchemaVersion.V1_6.to_version())
7871
op.add_argument('--sv', '--spec-version',
7972
metavar='<version>',
8073
help='Which version of CycloneDX to use.'
@@ -99,12 +92,6 @@ def make_argument_parser(cls, sco: ArgumentParser, **kwargs: Any) -> ArgumentPar
9992
choices=OutputFormat,
10093
type=argparse_type4enum(OutputFormat),
10194
default=OutputFormat.JSON.name)
102-
op.add_argument('--outfile', # DEPRECATED
103-
metavar='<file>',
104-
help='DEPRECATED alias for "--output-file".',
105-
type=FileType('wt', encoding='utf8'),
106-
dest='output_file',
107-
default=OPTION_OUTPUT_STDOUT)
10895
op.add_argument('-o', '--output-file',
10996
metavar='<file>',
11097
help='Path to the output file.'

docs/usage.rst

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,6 @@ The full documentation can be issued by running with ``environment --help``:
7979
(default: application)
8080
--short-PURLs Omit all qualifiers from PackageURLs.
8181
This causes information loss in trade-off shorter PURLs, which might improve ingesting these strings.
82-
--schema-version <version>
83-
DEPRECATED alias for "--spec-version"
8482
--sv <version>, --spec-version <version>
8583
Which version of CycloneDX to use.
8684
{choices: 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0}
@@ -92,7 +90,6 @@ The full documentation can be issued by running with ``environment --help``:
9290
Which output format to use.
9391
{choices: JSON, XML}
9492
(default: JSON)
95-
--outfile <file> DEPRECATED alias for "--output-file".
9693
-o <file>, --output-file <file>
9794
Path to the output file.
9895
(set to "-" to output to STDOUT)
@@ -253,8 +250,6 @@ The full documentation can be issued by running with ``pipenv --help``:
253250
(default: application)
254251
--short-PURLs Omit all qualifiers from PackageURLs.
255252
This causes information loss in trade-off shorter PURLs, which might improve ingesting these strings.
256-
--schema-version <version>
257-
DEPRECATED alias for "--spec-version"
258253
--sv <version>, --spec-version <version>
259254
Which version of CycloneDX to use.
260255
{choices: 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0}
@@ -266,7 +261,6 @@ The full documentation can be issued by running with ``pipenv --help``:
266261
Which output format to use.
267262
{choices: JSON, XML}
268263
(default: JSON)
269-
--outfile <file> DEPRECATED alias for "--output-file".
270264
-o <file>, --output-file <file>
271265
Path to the output file.
272266
(set to "-" to output to STDOUT)
@@ -331,8 +325,6 @@ The full documentation can be issued by running with ``poetry --help``:
331325
(default: application)
332326
--short-PURLs Omit all qualifiers from PackageURLs.
333327
This causes information loss in trade-off shorter PURLs, which might improve ingesting these strings.
334-
--schema-version <version>
335-
DEPRECATED alias for "--spec-version"
336328
--sv <version>, --spec-version <version>
337329
Which version of CycloneDX to use.
338330
{choices: 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0}
@@ -344,7 +336,6 @@ The full documentation can be issued by running with ``poetry --help``:
344336
Which output format to use.
345337
{choices: JSON, XML}
346338
(default: JSON)
347-
--outfile <file> DEPRECATED alias for "--output-file".
348339
-o <file>, --output-file <file>
349340
Path to the output file.
350341
(set to "-" to output to STDOUT)
@@ -405,8 +396,6 @@ The full documentation can be issued by running with ``requirements --help``:
405396
(default: application)
406397
--short-PURLs Omit all qualifiers from PackageURLs.
407398
This causes information loss in trade-off shorter PURLs, which might improve ingesting these strings.
408-
--schema-version <version>
409-
DEPRECATED alias for "--spec-version"
410399
--sv <version>, --spec-version <version>
411400
Which version of CycloneDX to use.
412401
{choices: 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0}
@@ -418,7 +407,6 @@ The full documentation can be issued by running with ``requirements --help``:
418407
Which output format to use.
419408
{choices: JSON, XML}
420409
(default: JSON)
421-
--outfile <file> DEPRECATED alias for "--output-file".
422410
-o <file>, --output-file <file>
423411
Path to the output file.
424412
(set to "-" to output to STDOUT)

0 commit comments

Comments
 (0)