Skip to content

Commit 639b35a

Browse files
authored
feat: support CycloneDX 1.6 output (#720)
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
1 parent b51be59 commit 639b35a

File tree

175 files changed

+93487
-15
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

175 files changed

+93487
-15
lines changed

docs/usage.rst

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,11 @@ The full documentation can be issued by running with ``--help``:
2929
-h, --help show this help message and exit
3030
--version show program's version number and exit
3131
32-
Example usage: save SBOM in CycloneDX 1.5 XML format, generated from current python environment
32+
Example usage: save SBOM in CycloneDX 1.6 XML format, generated from current python environment
3333

3434
.. code-block:: shell
3535
36-
cyclonedx-py environment --outfile my-sbom.xml --schema-version 1.5 --output-format XML
36+
cyclonedx-py environment --outfile my-sbom.xml --schema-version 1.6 --output-format XML
3737
3838
3939
For Python (virtual) environment
@@ -78,7 +78,7 @@ The full documentation can be issued by running with ``environment --help``:
7878
(default: -)
7979
--sv <version>, --schema-version <version>
8080
The CycloneDX schema version for your SBOM
81-
{choices: 1.5, 1.4, 1.3, 1.2, 1.1, 1.0}
81+
{choices: 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0}
8282
(default: 1.5)
8383
--of <format>, --output-format <format>
8484
The output format for your SBOM
@@ -238,7 +238,7 @@ The full documentation can be issued by running with ``pipenv --help``:
238238
(default: -)
239239
--sv <version>, --schema-version <version>
240240
The CycloneDX schema version for your SBOM
241-
{choices: 1.5, 1.4, 1.3, 1.2, 1.1, 1.0}
241+
{choices: 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0}
242242
(default: 1.5)
243243
--of <format>, --output-format <format>
244244
The output format for your SBOM
@@ -313,7 +313,8 @@ The full documentation can be issued by running with ``poetry --help``:
313313
(default: -)
314314
--sv <version>, --schema-version <version>
315315
The CycloneDX schema version for your SBOM
316-
{choices: 1.5, 1.4, 1.3, 1.2, 1.1, 1.0} (default: 1.5)
316+
{choices: 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0}
317+
(default: 1.5)
317318
--of <format>, --output-format <format>
318319
The output format for your SBOM
319320
{choices: JSON, XML}
@@ -383,7 +384,7 @@ The full documentation can be issued by running with ``requirements --help``:
383384
(default: -)
384385
--sv <version>, --schema-version <version>
385386
The CycloneDX schema version for your SBOM
386-
{choices: 1.5, 1.4, 1.3, 1.2, 1.1, 1.0}
387+
{choices: 1.6, 1.5, 1.4, 1.3, 1.2, 1.1, 1.0}
387388
(default: 1.5)
388389
--of <format>, --output-format <format>
389390
The output format for your SBOM

pyproject.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,10 +69,10 @@ cyclonedx-py = "cyclonedx_py._internal.cli:run"
6969

7070
[tool.poetry.dependencies]
7171
python = "^3.8"
72-
cyclonedx-python-lib = { version = "^6.1.0", extras = ["validation"] }
72+
cyclonedx-python-lib = { version = "^7.0.0", extras = ["validation"] }
7373
packageurl-python = ">=0.11, <2" # keep in sync with same dep in `cyclonedx-python-lib`
7474
pip-requirements-parser = "^32.0"
75-
packaging = "^22||^23 || ^24"
75+
packaging = "^22 || ^23 || ^24"
7676
tomli = { version = "^2.0.1", python = "<3.11" }
7777
chardet = "^5.1"
7878

tests/_data/snapshots/environment/plain_editable-self_1.6.json.bin

Lines changed: 64 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/_data/snapshots/environment/plain_editable-self_1.6.xml.bin

Lines changed: 77 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

tests/_data/snapshots/environment/plain_local_1.6.json.bin

Lines changed: 122 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)