From 7e0a4c05bc8930259534caea8d69fe4b4a70d2d6 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sat, 5 Oct 2024 15:01:16 +0200 Subject: [PATCH 1/4] chore(deps-dev): Update tox requirement from 4.20.0 to 4.21.2 (#808) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Updates the requirements on [tox](https://github.com/tox-dev/tox) to permit the latest version.

Release notes

Sourced from tox's releases.

4.21.2

What's Changed

Update sdist rules to include tox.toml (#3389) by @mgorny in tox-dev/tox#3390

Full Changelog: https://github.com/tox-dev/tox/compare/4.21.1...4.21.2

Changelog

Sourced from tox's changelog.

v4.21.2 (2024-10-03)

Bugfixes - 4.21.2
- Include ``tox.toml`` in sdist archives to fix test failures
resulting from its lack.
  - by :user:`mgorny` (:issue:`3389`)
v4.21.1 (2024-10-02)
Bugfixes - 4.21.1
Fix error when using requires within a TOML configuration file - by :user:gaborbernat. (:issue:3386)

Fix error when using deps within a TOML configuration file - by :user:gaborbernat. (:issue:3387)

Multiple fixes for the TOML configuration by :user:gaborbernat.:

Do not fail when there is an empty command within commands.

Allow references for set_env by accepting list of dictionaries for it.

Do not try to be smart about reference unrolling, instead allow the user to control it via the extend flag, available both for posargs and ref replacements.

The ref replacements raw key has been renamed to of. (:issue:3388)

v4.21.0 (2024-09-30)

Features - 4.21.0
- Native TOML configuration support - by :user:`gaborbernat`.
(:issue:`999`)
Improved Documentation - 4.21.0
Update Loader docs - by :user:ziima (:issue:3352)

v4.20.0 (2024-09-18)

Features - 4.20.0
- Separate the list dependencies functionality to a separate
abstract class allowing code reuse in plugins (such as
  ``tox-uv``) - by :gaborbernat`. (:issue:`3347`)
v4.19.0 (2024-09-17)
Features - 4.19.0
Support pypy-<major>.<minor> environment names for PyPy environments - by :user:gaborbernat. (:issue:3346)

v4.18.1 (2024-09-07)

... (truncated)

Commits

c953f4f release 4.21.2
3ab1d3e Update sdist rules to include tox.toml (#3389) (#3390)
172a952 Fix user guide typo
434ac18 release 4.21.1
34d3adc Fix TOML configuration errors (#3388)
719b346 Update installation.rst
46bef9e release 4.21.0
cea105b True TOML config support (#3353)
a04b039 [pre-commit.ci] pre-commit autoupdate (#3385)
f5eba31 Update Loader docs (#3352)
Additional commits viewable in compare view

Dependabot will resolve any conflicts with this PR as long as you don't alter it yourself. You can also trigger a rebase manually by commenting `@dependabot rebase`. [//]: # (dependabot-automerge-start) [//]: # (dependabot-automerge-end) ---

Dependabot commands and options

You can trigger Dependabot actions by commenting on this PR: - `@dependabot rebase` will rebase this PR - `@dependabot recreate` will recreate this PR, overwriting any edits that have been made to it - `@dependabot merge` will merge this PR after your CI passes on it - `@dependabot squash and merge` will squash and merge this PR after your CI passes on it - `@dependabot cancel merge` will cancel a previously requested merge and block automerging - `@dependabot reopen` will reopen this PR if it is closed - `@dependabot close` will close this PR and stop Dependabot recreating it. You can achieve the same result by closing it manually - `@dependabot show ignore conditions` will show all of the ignore conditions of the specified dependency - `@dependabot ignore this major version` will close this PR and stop Dependabot creating any more for this major version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this minor version` will close this PR and stop Dependabot creating any more for this minor version (unless you reopen the PR or upgrade to it yourself) - `@dependabot ignore this dependency` will close this PR and stop Dependabot creating any more for this dependency (unless you reopen the PR or upgrade to it yourself)

Signed-off-by: dependabot[bot] Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> --- pyproject.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pyproject.toml b/pyproject.toml index 3bd0dd4a..36ad6d38 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -92,7 +92,7 @@ isort = "5.13.2" autopep8 = "2.3.1" mypy = "1.11.2" bandit = "1.7.10" -tox = "4.20.0" +tox = "4.21.2" # min version required to be able to install some dependencies # see https://github.com/MichaelKim0407/flake8-use-fstring/issues/33 setuptools = ">= 47.0.0" From 67079598b520fc7319f1c83ff562584f4acdd09c Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Sat, 12 Oct 2024 14:15:32 +0200 Subject: [PATCH 2/4] docs(chaneglog): omit chore/ci/refactor/style/test/build (#813) Signed-off-by: Jan Kowalleck --- CHANGELOG.md | 1041 +----------------------------------------------- pyproject.toml | 11 +- 2 files changed, 14 insertions(+), 1038 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index fbaf8844..2a6a5bf6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,20 +1,17 @@ # CHANGELOG +## Unreleased -## v4.6.1 (2024-09-30) +### Documentation -### Chore +* docs(chaneglog): omit chore/ci/refactor/style/test/build + +Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`824dc28`](https://github.com/CycloneDX/cyclonedx-python/commit/824dc2898cb21f14841f835b8b2703301e87f0f8)) -* chore: trusted publishing (#795) -fixes #794 - ---------- - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> -Signed-off-by: semantic-release <semantic-release@bot.local> -Co-authored-by: semantic-release <semantic-release@bot.local> ([`721f12d`](https://github.com/CycloneDX/cyclonedx-python/commit/721f12d1a5799e9766fd4da79f54fd11c5776824)) + +## v4.6.1 (2024-09-30) ### Documentation @@ -34,12 +31,6 @@ Signed-off-by: Steve (Gadget) Barnes <gadgetsteve@hotmail.com> Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> Co-authored-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`9e8a5d7`](https://github.com/CycloneDX/cyclonedx-python/commit/9e8a5d72045b3477e5523ed891493c29a584f35f)) -### Unknown - -* tests: consolidate cli runner (#806) - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`c7b5b1a`](https://github.com/CycloneDX/cyclonedx-python/commit/c7b5b1a37332b3991f3066d306cb179d6004fe5a)) - ## v4.6.0 (2024-09-20) @@ -88,25 +79,6 @@ Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`dddcb5d`](https: ## v4.5.0 (2024-06-10) -### Chore - -* chore: shield_ossf-best-practices subbary - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`1a1ad60`](https://github.com/CycloneDX/cyclonedx-python/commit/1a1ad606af261fc0e13095306571b2073ad4b3c3)) - -### Ci - -* ci: modernize artifact action (#737) - -supersedes #625 -supersedes #624 - ---------- - -Signed-off-by: dependabot[bot] <support@github.com> -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`1222201`](https://github.com/CycloneDX/cyclonedx-python/commit/122220199bf1185c2c607c2c9774e4f39427e866)) - ### Documentation * docs: exclude dep bumps from changelog (#750) @@ -140,16 +112,6 @@ only if `--PEP-639` is also given. Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`e9cc805`](https://github.com/CycloneDX/cyclonedx-python/commit/e9cc8058bb299e98a6f645426a2626bcfa3f06eb)) -### Refactor - -* refactor: const for purl type `pypi` (#754) - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`cba521e`](https://github.com/CycloneDX/cyclonedx-python/commit/cba521ee01aeb7bd3309518b4f46ba71d74abac9)) - -* refactor: `extred` -> `extref` (#753) - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`a178d2e`](https://github.com/CycloneDX/cyclonedx-python/commit/a178d2ec62e2af7afab05a9807cc24102ff51a19)) - ### Unknown * Create config.yml @@ -199,12 +161,6 @@ Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`8ba9d0b`](https: ## v4.4.0 (2024-04-21) -### Chore - -* chore: semantic-release git commit/sign valid email address - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`692b8ea`](https://github.com/CycloneDX/cyclonedx-python/commit/692b8eaa0aecf7821e829edd6324cf33f07a86b7)) - ### Feature * feat: publish to GHCR (#724) @@ -281,12 +237,6 @@ Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`8ade6e1`](https: ## v4.1.3 (2024-03-15) -### Ci - -* ci: default to python 3.12 (#693) - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`dc81c35`](https://github.com/CycloneDX/cyclonedx-python/commit/dc81c35e3389906ef1fe6944ee720b17c47a19e7)) - ### Documentation * docs: imprve `environment` use cases and examples (#690) @@ -340,10 +290,6 @@ Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`50d2a4b`](https: ### Unknown -* tests: modernize testbeds (#667) - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`2fd3faf`](https://github.com/CycloneDX/cyclonedx-python/commit/2fd3faf45a5d3b9024bbf47d6e50c995880e2fd4)) - * docs (#666) Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`491e875`](https://github.com/CycloneDX/cyclonedx-python/commit/491e87564d124ccc91e21772423a10434ba5ff28)) @@ -475,12 +421,6 @@ Automatically generated by python-semantic-release ([`70889be`](https://github.c ## v3.11.3 (2023-10-19) -### Chore - -* chore: Update CONTRIBUTING.md - -Signed-off-by: Jan Kowalleck <jan.kowalleck@owasp.org> ([`4adab1c`](https://github.com/CycloneDX/cyclonedx-python/commit/4adab1c4b5d79416db6fa6b24928ec7358ad4268)) - ### Documentation * docs: publish coverage (#600) @@ -544,71 +484,6 @@ Automatically generated by python-semantic-release ([`614f6fa`](https://github.c ## v3.11.1 (2023-07-12) -### Chore - -* chore: finish transition to main branch (#561) - -somebody renamed the `master` branch to `main`. -but forgot to transition the CI triggers. - -fixed this - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`ea233cb`](https://github.com/CycloneDX/cyclonedx-python/commit/ea233cbfced743859842336bfcc0cdd07ad3a7da)) - -* chore: rename file for lowest constraints/requirements (#517) - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`b4f0403`](https://github.com/CycloneDX/cyclonedx-python/commit/b4f04033452403dd3bf75d3ead034b7c2a92ae8e)) - -* chore: rename file for lowest constraints/requirements (#516) - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`a262bdb`](https://github.com/CycloneDX/cyclonedx-python/commit/a262bdb4a1e2692872d6b31ecf694c3cf6f0616f)) - -* chore: rename file for lowest constraints/requirements (#515) - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`a096cc7`](https://github.com/CycloneDX/cyclonedx-python/commit/a096cc7c1e890ef87005ccf271bcf5da5093240a)) - -* chore: rename file for lowest constraints/requirements (#514) - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`02d8437`](https://github.com/CycloneDX/cyclonedx-python/commit/02d8437bbddf8e02727368abdfb80a7b5313d210)) - -* chore: adjust lowest constraints/requirements (#513) - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`c8e6d0d`](https://github.com/CycloneDX/cyclonedx-python/commit/c8e6d0d3f25c8acc1f74b498bfaaf814885da48a)) - -### Ci - -* ci: finish transition to main branch (#560) - -somebody renamed the `master` branch to `main`. -but forgot to transition the CI triggers. - -fixed this - -followup of #558 - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`0ea56c7`](https://github.com/CycloneDX/cyclonedx-python/commit/0ea56c764870240a5636be2ca2ec16ae2e342e43)) - -* ci: adjust release concurrecncy (#559) - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`4b0ceac`](https://github.com/CycloneDX/cyclonedx-python/commit/4b0ceac138d309e2b0e4a516161ca3f5b9567c1a)) - -* ci: finish transition to main branch (#558) - -somebody renamed the `master` branch to `main`. -but forgot to transition the CI triggers. - -fixed this - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`7556eb9`](https://github.com/CycloneDX/cyclonedx-python/commit/7556eb98e4e985304a8afd876c8dd2c79f62d298)) - -* ci: add build concurrency (#557) - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`fbcde26`](https://github.com/CycloneDX/cyclonedx-python/commit/fbcde26d392a5e3ab463ea92b602ba09d0f941ec)) - -* ci: disable tests on windows with py>=3.8 (#556) - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`c95e384`](https://github.com/CycloneDX/cyclonedx-python/commit/c95e384e3f071d6370440410f0d4944c969922ca)) - ### Fix * fix: fix typo in help page (#552) @@ -628,20 +503,6 @@ Automatically generated by python-semantic-release ([`d90b45c`](https://github.c ## v3.11.0 (2023-02-11) -### Chore - -* chore: fix lowest requirements for tests (#499) - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`4928515`](https://github.com/CycloneDX/cyclonedx-python/commit/492851592fe8c130a3e55fe79c46bdf1d0def7bc)) - -* chore: add Paul Horton & Jan Kowalleck as a maintainer - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`b1a52fc`](https://github.com/CycloneDX/cyclonedx-python/commit/b1a52fc297f0ee774e77ceff47b99d780a4cc58c)) - -* chore: editorconfig - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`2122dba`](https://github.com/CycloneDX/cyclonedx-python/commit/2122dba8fada2336f7fd07dff33321dea165858b)) - ### Documentation * docs: fix typo in CLI help page (#490) ([`a8a8445`](https://github.com/CycloneDX/cyclonedx-python/commit/a8a844504494d10c217ba4739e6ff09b4ca34f67)) @@ -752,17 +613,6 @@ Automatically generated by python-semantic-release ([`24c4163`](https://github.c ## v3.7.4 (2022-12-12) -### Chore - -* chore: dependabot fix config - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`889a83e`](https://github.com/CycloneDX/cyclonedx-python/commit/889a83e4959391d010e536e3ed72f6ddf7a5cb1f)) - -* chore: dependabot interval weekly (#454) - - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`876ed30`](https://github.com/CycloneDX/cyclonedx-python/commit/876ed30b55300ad4abd4b078609d1b8d6e0e08a5)) - ### Fix * fix: ignore broken licenses in env parser (#463) @@ -780,44 +630,6 @@ Automatically generated by python-semantic-release ([`de188b8`](https://github.c ## v3.7.3 (2022-12-11) -### Chore - -* chore: Bump flake8-bugbear from 22.8.23 to 22.9.23 (#422) - -Bumps [flake8-bugbear](https://github.com/PyCQA/flake8-bugbear) from 22.8.23 to 22.9.23. -- [Release notes](https://github.com/PyCQA/flake8-bugbear/releases) -- [Commits](https://github.com/PyCQA/flake8-bugbear/compare/22.8.23...22.9.23) - ---- -updated-dependencies: -- dependency-name: flake8-bugbear - dependency-type: direct:development - update-type: version-update:semver-minor -... - -Signed-off-by: dependabot[bot] <support@github.com> -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> - -Signed-off-by: dependabot[bot] <support@github.com> -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`b05c55a`](https://github.com/CycloneDX/cyclonedx-python/commit/b05c55a7f191521a4d0b4bda29bdef3d250d8b4a)) - -### Ci - -* ci: test dockerimage with more unique version identifier (#453) - - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`5a7fb9a`](https://github.com/CycloneDX/cyclonedx-python/commit/5a7fb9a374b336ee72852d8f4ccd9bcd0dfe0a36)) - -* ci: migrate `set-output` to `>> $GITHUB_OUTPUT` (#452) - - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`bf133a3`](https://github.com/CycloneDX/cyclonedx-python/commit/bf133a3c7a436a25bd6930eae7be435747c8b521)) - -* ci: fix py36 (#451) - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`b35e2bf`](https://github.com/CycloneDX/cyclonedx-python/commit/b35e2bfaf5703dc23fd9790114f014825a56404e)) - ### Fix * fix: adjust dependency `pip-requirements-parser` to a working version (#450) @@ -854,28 +666,6 @@ Automatically generated by python-semantic-release ([`7aff239`](https://github.c ## v3.7.1 (2022-11-10) -### Chore - -* chore(dep): bump and devide `coverage` (#438) - -* chore(deps): bump `coverage` -* chore(deps): bump `coverage` locked - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`db051d1`](https://github.com/CycloneDX/cyclonedx-python/commit/db051d12660c5b6cc8209234a48f51b9e0657cec)) - -### Ci - -* ci: enable py311 & bump `poetry` (#437) - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`b7d5a4e`](https://github.com/CycloneDX/cyclonedx-python/commit/b7d5a4eb09e2348df34942d2afdf2a149efd9378)) - -* ci: fix python-version for static-code-analysis (#439) - - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`86daf68`](https://github.com/CycloneDX/cyclonedx-python/commit/86daf688a12c385406422dae3a582a48d0ca5e82)) - ### Fix * fix(EnvironmentParser): reduced crashes if no Classifiers are found (#441) @@ -942,27 +732,6 @@ Automatically generated by python-semantic-release ([`ddea61e`](https://github.c ## v3.6.2 (2022-09-19) -### Chore - -* chore: Bump packageurl-python from 0.9.9 to 0.10.3 (#416) - -Bumps [packageurl-python](https://github.com/package-url/packageurl-python) from 0.9.9 to 0.10.3. -- [Release notes](https://github.com/package-url/packageurl-python/releases) -- [Changelog](https://github.com/package-url/packageurl-python/blob/main/CHANGELOG.rst) -- [Commits](https://github.com/package-url/packageurl-python/compare/v0.9.9...v0.10.3) - ---- -updated-dependencies: -- dependency-name: packageurl-python - dependency-type: direct:production - update-type: version-update:semver-minor -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Signed-off-by: dependabot[bot] <support@github.com> -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`2d6dade`](https://github.com/CycloneDX/cyclonedx-python/commit/2d6dadef49c6c2fb6bafb2ef10702125f2af11cb)) - ### Fix * fix: CI release pipeline @@ -995,139 +764,6 @@ Automatically generated by python-semantic-release ([`89c262a`](https://github.c ## v3.6.0 (2022-09-16) -### Chore - -* chore: package manifest fix link to homepage and documentation (#401) - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`aa5ba35`](https://github.com/CycloneDX/cyclonedx-python/commit/aa5ba35a3677d8ebf5ac4643b2d403003267ef8b)) - -* chore: fix poetry in tox (#411) - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`b5ceec5`](https://github.com/CycloneDX/cyclonedx-python/commit/b5ceec5f3fb58959a20c26db85316b39e522b8a2)) - -* chore: Bump flake8-bugbear from 22.8.22 to 22.8.23 (#404) - -Bumps [flake8-bugbear](https://github.com/PyCQA/flake8-bugbear) from 22.8.22 to 22.8.23. -- [Release notes](https://github.com/PyCQA/flake8-bugbear/releases) -- [Commits](https://github.com/PyCQA/flake8-bugbear/compare/22.8.22...22.8.23) - ---- -updated-dependencies: -- dependency-name: flake8-bugbear - dependency-type: direct:development - update-type: version-update:semver-patch -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Signed-off-by: dependabot[bot] <support@github.com> -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`37f18f8`](https://github.com/CycloneDX/cyclonedx-python/commit/37f18f88337bbfa89f5a40fa203d22aad6b852ef)) - -* chore: Bump flake8-bugbear from 22.7.1 to 22.8.22 (#403) - -Bumps [flake8-bugbear](https://github.com/PyCQA/flake8-bugbear) from 22.7.1 to 22.8.22. -- [Release notes](https://github.com/PyCQA/flake8-bugbear/releases) -- [Commits](https://github.com/PyCQA/flake8-bugbear/compare/22.7.1...22.8.22) - ---- -updated-dependencies: -- dependency-name: flake8-bugbear - dependency-type: direct:development - update-type: version-update:semver-minor -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Signed-off-by: dependabot[bot] <support@github.com> -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`1b6e7a0`](https://github.com/CycloneDX/cyclonedx-python/commit/1b6e7a062f8598187122599305eebbad5c76915a)) - -* chore: Bump flake8-isort from 4.1.1 to 4.2.0 (#400) - -Bumps [flake8-isort](https://github.com/gforcada/flake8-isort) from 4.1.1 to 4.2.0. -- [Release notes](https://github.com/gforcada/flake8-isort/releases) -- [Changelog](https://github.com/gforcada/flake8-isort/blob/master/CHANGES.rst) -- [Commits](https://github.com/gforcada/flake8-isort/compare/4.1.1...4.2.0) - ---- -updated-dependencies: -- dependency-name: flake8-isort - dependency-type: direct:development - update-type: version-update:semver-minor -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`b4275e7`](https://github.com/CycloneDX/cyclonedx-python/commit/b4275e7943d4428805c8533da386313c1229a83a)) - -* chore: Bump types-toml from 0.10.7 to 0.10.8 (#387) - -Bumps [types-toml](https://github.com/python/typeshed) from 0.10.7 to 0.10.8. -- [Release notes](https://github.com/python/typeshed/releases) -- [Commits](https://github.com/python/typeshed/commits) - ---- -updated-dependencies: -- dependency-name: types-toml - dependency-type: direct:production - update-type: version-update:semver-patch -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`4a68f5f`](https://github.com/CycloneDX/cyclonedx-python/commit/4a68f5fd47c657735f57dceb66c9625d0839e2b3)) - -* chore: Bump mypy from 0.961 to 0.971 (#390) - -Bumps [mypy](https://github.com/python/mypy) from 0.961 to 0.971. -- [Release notes](https://github.com/python/mypy/releases) -- [Commits](https://github.com/python/mypy/compare/v0.961...v0.971) - ---- -updated-dependencies: -- dependency-name: mypy - dependency-type: direct:development - update-type: version-update:semver-minor -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`f2a7ec4`](https://github.com/CycloneDX/cyclonedx-python/commit/f2a7ec4b2c4919e32d73957e22fb320fb9ca843c)) - -* chore: Bump tox from 3.25.0 to 3.25.1 (#384) - -Bumps [tox](https://github.com/tox-dev/tox) from 3.25.0 to 3.25.1. -- [Release notes](https://github.com/tox-dev/tox/releases) -- [Changelog](https://github.com/tox-dev/tox/blob/master/docs/changelog.rst) -- [Commits](https://github.com/tox-dev/tox/compare/3.25.0...3.25.1) - ---- -updated-dependencies: -- dependency-name: tox - dependency-type: direct:development - update-type: version-update:semver-patch -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`cfd4a73`](https://github.com/CycloneDX/cyclonedx-python/commit/cfd4a736e2e8df83d6d998cadb68eeb822d6a8b1)) - -* chore: Bump flake8-bugbear from 22.6.22 to 22.7.1 (#385) - -Bumps [flake8-bugbear](https://github.com/PyCQA/flake8-bugbear) from 22.6.22 to 22.7.1. -- [Release notes](https://github.com/PyCQA/flake8-bugbear/releases) -- [Commits](https://github.com/PyCQA/flake8-bugbear/compare/22.6.22...22.7.1) - ---- -updated-dependencies: -- dependency-name: flake8-bugbear - dependency-type: direct:development - update-type: version-update:semver-minor -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`3ac5df9`](https://github.com/CycloneDX/cyclonedx-python/commit/3ac5df95f45675c1780b6c8cb7a9e2ecf422da81)) - ### Documentation * docs: describe `cyclonedx-py` rather than `cyclonedx-bom` @@ -1163,25 +799,6 @@ docs: describe command line usages as `cyclonedx-py` rather than `cyclonedx-bom` ## v3.5.0 (2022-06-27) -### Chore - -* chore: Bump flake8-bugbear from 22.4.25 to 22.6.22 (#376) - -Bumps [flake8-bugbear](https://github.com/PyCQA/flake8-bugbear) from 22.4.25 to 22.6.22. -- [Release notes](https://github.com/PyCQA/flake8-bugbear/releases) -- [Commits](https://github.com/PyCQA/flake8-bugbear/compare/22.4.25...22.6.22) - ---- -updated-dependencies: -- dependency-name: flake8-bugbear - dependency-type: direct:development - update-type: version-update:semver-minor -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`7139bb0`](https://github.com/CycloneDX/cyclonedx-python/commit/7139bb093e9c7b3585abaf193a2dee5a63c1ec1b)) - ### Feature * feat: optionally force `bom_ref` to be `purl` rather that the default random UUID format - thanks @RodneyRichardson @@ -1232,82 +849,10 @@ Automatically generated by python-semantic-release ([`cf7c625`](https://github.c ## v3.3.0 (2022-06-16) -### Chore - -* chore: Bump actions/setup-python from 3 to 4 (#369) - -Bumps [actions/setup-python](https://github.com/actions/setup-python) from 3 to 4. -- [Release notes](https://github.com/actions/setup-python/releases) -- [Commits](https://github.com/actions/setup-python/compare/v3...v4) - ---- -updated-dependencies: -- dependency-name: actions/setup-python - dependency-type: direct:production - update-type: version-update:semver-major -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`eecf04a`](https://github.com/CycloneDX/cyclonedx-python/commit/eecf04ac95f8beb0a32488a0f6b57d082f632214)) - -* chore: Bump mypy from 0.960 to 0.961 (#365) - -Bumps [mypy](https://github.com/python/mypy) from 0.960 to 0.961. -- [Release notes](https://github.com/python/mypy/releases) -- [Commits](https://github.com/python/mypy/compare/v0.960...v0.961) - ---- -updated-dependencies: -- dependency-name: mypy - dependency-type: direct:development - update-type: version-update:semver-minor -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`3bab869`](https://github.com/CycloneDX/cyclonedx-python/commit/3bab86909701f7e6a3af8815969625aeed2dfdc4)) - -* chore: Bump mypy from 0.942 to 0.960 (#356) - -* chore: Bump mypy from 0.942 to 0.960 - -Bumps [mypy](https://github.com/python/mypy) from 0.942 to 0.960. -- [Release notes](https://github.com/python/mypy/releases) -- [Commits](https://github.com/python/mypy/compare/v0.942...v0.960) - ---- -updated-dependencies: -- dependency-name: mypy - dependency-type: direct:development - update-type: version-update:semver-minor -... - -Signed-off-by: dependabot[bot] <support@github.com> - -* chore: try type fixes - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> -Co-authored-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`b62fc5e`](https://github.com/CycloneDX/cyclonedx-python/commit/b62fc5e2e8bfe2f85765b0e566f4d119dee20b8b)) - ### Feature * feat: Add Conda MD5 hash to Component.hashes, if available - thanks @RodneyRichardson ([`772c517`](https://github.com/CycloneDX/cyclonedx-python/commit/772c517521da0fd8ddbd1ed8abdf22243f418217)) -### Test - -* test: extend `TestRequirementsParser` to check `hashes` (#368) - -* Extend TestRequirementsParser.test_example_with_hashes() to check hashes - -Signed-off-by: Rodney Richardson <rodney.richardson@cambridgeconsultants.com> - -* Add additional test for hash. - -Signed-off-by: Rodney Richardson <rodney.richardson@cambridgeconsultants.com> ([`e2be444`](https://github.com/CycloneDX/cyclonedx-python/commit/e2be444b8db7dd12031f3e9b481dfdae23f3e59e)) - ### Unknown * 3.3.0 @@ -1358,109 +903,6 @@ Signed-off-by: Rodney Richardson <rodney.richardson@cambridgeconsultants.com& ## v3.2.2 (2022-06-02) -### Chore - -* chore: Bump cyclonedx-python-lib from 2.1.0 to 2.4.0 (#353) - -Bumps [cyclonedx-python-lib](https://github.com/CycloneDX/cyclonedx-python-lib) from 2.1.0 to 2.4.0. -- [Release notes](https://github.com/CycloneDX/cyclonedx-python-lib/releases) -- [Changelog](https://github.com/CycloneDX/cyclonedx-python-lib/blob/main/CHANGELOG.md) -- [Commits](https://github.com/CycloneDX/cyclonedx-python-lib/compare/v2.1.0...v2.4.0) - ---- -updated-dependencies: -- dependency-name: cyclonedx-python-lib - dependency-type: direct:production - update-type: version-update:semver-minor -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`350297e`](https://github.com/CycloneDX/cyclonedx-python/commit/350297ee11cfaa312f4d4d08b983ac7c3d0ca719)) - -* chore: Bump flake8-bugbear from 22.3.23 to 22.4.25 (#351) - -Bumps [flake8-bugbear](https://github.com/PyCQA/flake8-bugbear) from 22.3.23 to 22.4.25. -- [Release notes](https://github.com/PyCQA/flake8-bugbear/releases) -- [Commits](https://github.com/PyCQA/flake8-bugbear/compare/22.3.23...22.4.25) - ---- -updated-dependencies: -- dependency-name: flake8-bugbear - dependency-type: direct:development - update-type: version-update:semver-minor -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`ecfb175`](https://github.com/CycloneDX/cyclonedx-python/commit/ecfb17560f1be39e1d28aa64f009344871db4162)) - -* chore: Bump tox from 3.24.5 to 3.25.0 (#345) - -Bumps [tox](https://github.com/tox-dev/tox) from 3.24.5 to 3.25.0. -- [Release notes](https://github.com/tox-dev/tox/releases) -- [Changelog](https://github.com/tox-dev/tox/blob/master/docs/changelog.rst) -- [Commits](https://github.com/tox-dev/tox/compare/3.24.5...3.25.0) - ---- -updated-dependencies: -- dependency-name: tox - dependency-type: direct:development - update-type: version-update:semver-minor -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`194d287`](https://github.com/CycloneDX/cyclonedx-python/commit/194d2878fe088f8f1a680cc4eb95504c046d34a2)) - -* chore: Bump actions/download-artifact from 2 to 3 (#343) - -Bumps [actions/download-artifact](https://github.com/actions/download-artifact) from 2 to 3. -- [Release notes](https://github.com/actions/download-artifact/releases) -- [Commits](https://github.com/actions/download-artifact/compare/v2...v3) - ---- -updated-dependencies: -- dependency-name: actions/download-artifact - dependency-type: direct:production - update-type: version-update:semver-major -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`259351e`](https://github.com/CycloneDX/cyclonedx-python/commit/259351ea468c7d7642be4640783e76826a56d39a)) - -* chore: Bump actions/upload-artifact from 2 to 3 (#342) - -Bumps [actions/upload-artifact](https://github.com/actions/upload-artifact) from 2 to 3. -- [Release notes](https://github.com/actions/upload-artifact/releases) -- [Commits](https://github.com/actions/upload-artifact/compare/v2...v3) - ---- -updated-dependencies: -- dependency-name: actions/upload-artifact - dependency-type: direct:production - update-type: version-update:semver-major -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`4b74fa0`](https://github.com/CycloneDX/cyclonedx-python/commit/4b74fa064b40051bbe0e2aad298caecff6ef7940)) - -### Ci - -* ci: pin GH-action `semantic-release` to v7.28.1 (#359) - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`ec417c7`](https://github.com/CycloneDX/cyclonedx-python/commit/ec417c7418b3eef456c90bccb1bc8c29f038beca)) - -* ci: introduce `timeout-minutes` and drop `dependabot` branches for CI #344 - -Signed-off-by: Paul Horton <paul.horton@owasp.org> ([`3591849`](https://github.com/CycloneDX/cyclonedx-python/commit/359184951f18a49c7c6dd47f7e0945a215507360)) - -* ci: introduce `timeout-minutes` and drop `dependabot` branches for CI - -Signed-off-by: Paul Horton <paul.horton@owasp.org> ([`72c4967`](https://github.com/CycloneDX/cyclonedx-python/commit/72c4967ccad4ceabb2367177c90c0a80388193b7)) - ### Fix * fix: add actively used (transitive) dependencies (#363) @@ -1509,64 +951,6 @@ fix: cli default file name for json format ([`929e26d`](https://github.com/Cyclo ## v3.2.0 (2022-04-05) -### Chore - -* chore: Bump cyclonedx-python-lib from 2.0.0 to 2.1.0 (#340) - -Bumps [cyclonedx-python-lib](https://github.com/CycloneDX/cyclonedx-python-lib) from 2.0.0 to 2.1.0. -- [Release notes](https://github.com/CycloneDX/cyclonedx-python-lib/releases) -- [Changelog](https://github.com/CycloneDX/cyclonedx-python-lib/blob/main/CHANGELOG.md) -- [Commits](https://github.com/CycloneDX/cyclonedx-python-lib/compare/v2.0.0...v2.1.0) - ---- -updated-dependencies: -- dependency-name: cyclonedx-python-lib - dependency-type: direct:production - update-type: version-update:semver-minor -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`171aafe`](https://github.com/CycloneDX/cyclonedx-python/commit/171aafe8daf2ca3fc0ec15b7aa2d0cacf3c208e4)) - -* chore: Bump mypy from 0.941 to 0.942 (#339) - -Bumps [mypy](https://github.com/python/mypy) from 0.941 to 0.942. -- [Release notes](https://github.com/python/mypy/releases) -- [Commits](https://github.com/python/mypy/compare/v0.941...v0.942) - ---- -updated-dependencies: -- dependency-name: mypy - dependency-type: direct:development - update-type: version-update:semver-minor -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`7cb551c`](https://github.com/CycloneDX/cyclonedx-python/commit/7cb551c182d05d3cc54bf2c5cca5f408c96fa4cd)) - -* chore: Bump flake8-bugbear from 22.3.20 to 22.3.23 (#336) - -Bumps [flake8-bugbear](https://github.com/PyCQA/flake8-bugbear) from 22.3.20 to 22.3.23. -- [Release notes](https://github.com/PyCQA/flake8-bugbear/releases) -- [Commits](https://github.com/PyCQA/flake8-bugbear/compare/22.3.20...22.3.23) - ---- -updated-dependencies: -- dependency-name: flake8-bugbear - dependency-type: direct:development - update-type: version-update:semver-patch -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`11fcb60`](https://github.com/CycloneDX/cyclonedx-python/commit/11fcb60d8be0e95ad44e2b3d6d7431c9a1e018e1)) - -* chore: dependabot prefixes with `chore` and scope (#324) - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`1985b56`](https://github.com/CycloneDX/cyclonedx-python/commit/1985b56ba235e48e79071667bc1425c0a3552974)) - ### Fix * fix: cli default file for json format @@ -1575,29 +959,6 @@ fixes #337 Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`8747620`](https://github.com/CycloneDX/cyclonedx-python/commit/8747620dac7ed3eeff69369c05dfb6386a56e549)) -### Test - -* test: fix malformed or wrong test setups (#333) - -* test: corrected malformed/broken tests - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> - -* test: fix tests and fixtures - -Signed-off-by: Mostafa Moradian <mostafamoradian0@gmail.com> - -* test: corrected malformed/broken tests - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> - -* fix: fix style and remove unnecessary package - -Signed-off-by: Mostafa Moradian <mostafamoradian0@gmail.com> -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> - -Co-authored-by: Mostafa Moradian <mostafamoradian0@gmail.com> ([`0ff6493`](https://github.com/CycloneDX/cyclonedx-python/commit/0ff6493dd59d2e8efafd35d4460847525e590937)) - ### Unknown * 3.2.0 @@ -1613,59 +974,6 @@ feat: make package/module callable ([`193f1a4`](https://github.com/CycloneDX/cyc ## v3.1.1 (2022-03-21) -### Chore - -* chore: Bump flake8-bugbear from 22.1.11 to 22.3.20 (#335) - -Bumps [flake8-bugbear](https://github.com/PyCQA/flake8-bugbear) from 22.1.11 to 22.3.20. -- [Release notes](https://github.com/PyCQA/flake8-bugbear/releases) -- [Commits](https://github.com/PyCQA/flake8-bugbear/compare/22.1.11...22.3.20) - ---- -updated-dependencies: -- dependency-name: flake8-bugbear - dependency-type: direct:development - update-type: version-update:semver-minor -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`5e344e2`](https://github.com/CycloneDX/cyclonedx-python/commit/5e344e223a19048c896b394bf1e6fe1a3a8d4855)) - -* chore: Bump mypy from 0.940 to 0.941 (#330) - -Bumps [mypy](https://github.com/python/mypy) from 0.940 to 0.941. -- [Release notes](https://github.com/python/mypy/releases) -- [Commits](https://github.com/python/mypy/compare/v0.940...v0.941) - ---- -updated-dependencies: -- dependency-name: mypy - dependency-type: direct:development - update-type: version-update:semver-minor -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`c02d770`](https://github.com/CycloneDX/cyclonedx-python/commit/c02d770cf18a57e118347a0a57db29ae65919c35)) - -* chore: Bump mypy from 0.931 to 0.940 (#329) - -Bumps [mypy](https://github.com/python/mypy) from 0.931 to 0.940. -- [Release notes](https://github.com/python/mypy/releases) -- [Commits](https://github.com/python/mypy/compare/v0.931...v0.940) - ---- -updated-dependencies: -- dependency-name: mypy - dependency-type: direct:development - update-type: version-update:semver-minor -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`133ef9f`](https://github.com/CycloneDX/cyclonedx-python/commit/133ef9f432253923b7533852cbf5ba637363002e)) - ### Documentation * docs: describe methods to call the tool @@ -1719,55 +1027,6 @@ docs: add and fix hint to rtfd ([`3b3477b`](https://github.com/CycloneDX/cyclone ## v3.1.0 (2022-03-10) -### Chore - -* chore: added documentation to CONTRIBUTING guidelines - -Signed-off-by: Paul Horton <paul.horton@owasp.org> ([`8d7d6b6`](https://github.com/CycloneDX/cyclonedx-python/commit/8d7d6b638d22309124c8dc80aa494590cce9422d)) - -* chore: Bump actions/setup-python from 2 to 3 (#322) - -Bumps [actions/setup-python](https://github.com/actions/setup-python) from 2 to 3. -- [Release notes](https://github.com/actions/setup-python/releases) -- [Commits](https://github.com/actions/setup-python/compare/v2...v3) - ---- -updated-dependencies: -- dependency-name: actions/setup-python - dependency-type: direct:production - update-type: version-update:semver-major -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`69de237`](https://github.com/CycloneDX/cyclonedx-python/commit/69de237fb6bd327f7e2a6f1047122dfafb65e388)) - -* chore: Bump actions/checkout from 2.4.0 to 3 (#323) - -Bumps [actions/checkout](https://github.com/actions/checkout) from 2.4.0 to 3. -- [Release notes](https://github.com/actions/checkout/releases) -- [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) -- [Commits](https://github.com/actions/checkout/compare/v2.4.0...v3) - ---- -updated-dependencies: -- dependency-name: actions/checkout - dependency-type: direct:production - update-type: version-update:semver-major -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`cae737f`](https://github.com/CycloneDX/cyclonedx-python/commit/cae737f2b6fcbb9c44f7d6602260bc460da23858)) - -* chore: make isort and flake8-isort available - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`c6b561e`](https://github.com/CycloneDX/cyclonedx-python/commit/c6b561eabfbfb81c29ab0a44056d08e55cd23a91)) - -* chore: manually fixed CHANGELOG after accidental 2.1.0 - -2.1.0 should have been 3.0.0 ([`33c4437`](https://github.com/CycloneDX/cyclonedx-python/commit/33c4437aec7c29b331bbbf8e9abb63b86c6f6964)) - ### Documentation * docs: update RequirementsFileParser docs to include nested file support @@ -1790,49 +1049,6 @@ Signed-off-by: Mostafa Moradian <mostafamoradian0@gmail.com> ([`fdec44b`]( Signed-off-by: Mostafa Moradian <mostafamoradian0@gmail.com> ([`684d4f0`](https://github.com/CycloneDX/cyclonedx-python/commit/684d4f03ad6f8c0764dfaf8f3a38a09b91b69e5d)) -### Refactor - -* refactor: Apply suggestions by @jkowalleck - -Signed-off-by: Mostafa Moradian <mostafamoradian0@gmail.com> ([`90b336f`](https://github.com/CycloneDX/cyclonedx-python/commit/90b336ff4a0b49176162e6d2ea4c25faa21e3d99)) - -* refactor: ignore mypy type errors and add proper annotation to _TemporaryFileWrapper - -Signed-off-by: Mostafa Moradian <mostafamoradian0@gmail.com> ([`82cb655`](https://github.com/CycloneDX/cyclonedx-python/commit/82cb6556927aacf911ee69fef86006c5c6ca7e76)) - -* refactor: remove unnecessary import (flake8 error) - -Signed-off-by: Mostafa Moradian <mostafamoradian0@gmail.com> ([`ef8148f`](https://github.com/CycloneDX/cyclonedx-python/commit/ef8148f05c31a2d254cb72048f20f98dce450aef)) - -* refactor: Replace requirements file parser - -feat: Add support for hashes, local packages and private repositories -Signed-off-by: Mostafa Moradian <mostafamoradian0@gmail.com> ([`addc21a`](https://github.com/CycloneDX/cyclonedx-python/commit/addc21ae832f642298f665d426c576822038fb2f)) - -### Style - -* style: sort imports - -Signed-off-by: Mostafa Moradian <mostafamoradian0@gmail.com> ([`75d325d`](https://github.com/CycloneDX/cyclonedx-python/commit/75d325d2872b01e3cfb31883fb4044c5b7991609)) - -* style: sorted all imports - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`804420a`](https://github.com/CycloneDX/cyclonedx-python/commit/804420afc9bb02ac01c04c18fa0828024688bd42)) - -### Test - -* test: add remote URL as requirements line - -Signed-off-by: Mostafa Moradian <mostafamoradian0@gmail.com> ([`4be30e2`](https://github.com/CycloneDX/cyclonedx-python/commit/4be30e29aa7da993dedc66560d5df7360932fd7e)) - -* test: add test for nested requirements file parsing - -Signed-off-by: Mostafa Moradian <mostafamoradian0@gmail.com> ([`d0856e9`](https://github.com/CycloneDX/cyclonedx-python/commit/d0856e90743926648977f91981cfda500502fc51)) - -* test: Add test for Git URLs - -Signed-off-by: Mostafa Moradian <mostafamoradian0@gmail.com> ([`25333c4`](https://github.com/CycloneDX/cyclonedx-python/commit/25333c4e4bb041373fea06489ea672e5e2db176f)) - ### Unknown * 3.1.0 @@ -1965,53 +1181,6 @@ link to pep8 ([`4f87341`](https://github.com/CycloneDX/cyclonedx-python/commit/4 ## v2.0.1 (2022-01-24) -### Chore - -* chore: add CI artifacts and improve build consistency (#290) - -fixes #292 -prep for #289 - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`185b300`](https://github.com/CycloneDX/cyclonedx-python/commit/185b30071acc2fb310e4632a7a1b735b9cc9382e)) - -* chore: Bump flake8-bugbear from 21.11.29 to 22.1.11 (#301) - -Bumps [flake8-bugbear](https://github.com/PyCQA/flake8-bugbear) from 21.11.29 to 22.1.11. -- [Release notes](https://github.com/PyCQA/flake8-bugbear/releases) -- [Commits](https://github.com/PyCQA/flake8-bugbear/compare/21.11.29...22.1.11) - ---- -updated-dependencies: -- dependency-name: flake8-bugbear - dependency-type: direct:development - update-type: version-update:semver-major -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`1b6e042`](https://github.com/CycloneDX/cyclonedx-python/commit/1b6e0422d6932dac0accbad78169b850602162ca)) - -* chore: Bump mypy from 0.930 to 0.931 (#297) - -Bumps [mypy](https://github.com/python/mypy) from 0.930 to 0.931. -- [Release notes](https://github.com/python/mypy/releases) -- [Commits](https://github.com/python/mypy/compare/v0.930...v0.931) - ---- -updated-dependencies: -- dependency-name: mypy - dependency-type: direct:development - update-type: version-update:semver-minor -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`19b285c`](https://github.com/CycloneDX/cyclonedx-python/commit/19b285c9590cc4a66c07a32bcbbd54df8839dc7b)) - -* chore: corrected next version - -Signed-off-by: Paul Horton <paul.horton@owasp.org> ([`ea8a963`](https://github.com/CycloneDX/cyclonedx-python/commit/ea8a9633f3a06c294a8c57a2169d1707af927e46)) - ### Fix * fix: bump dependencies to get latest `cyclonedx-python-lib` @@ -2027,134 +1196,6 @@ Automatically generated by python-semantic-release ([`a4a4c42`](https://github.c ## v2.0.0 (2022-01-13) -### Build - -* build(deps-dev): Bump coverage from 6.1.2 to 6.2 - -Bumps [coverage](https://github.com/nedbat/coveragepy) from 6.1.2 to 6.2. -- [Release notes](https://github.com/nedbat/coveragepy/releases) -- [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) -- [Commits](https://github.com/nedbat/coveragepy/compare/6.1.2...6.2) - ---- -updated-dependencies: -- dependency-name: coverage - dependency-type: direct:development - update-type: version-update:semver-minor -... - -Signed-off-by: dependabot[bot] <support@github.com> ([`82f0dba`](https://github.com/CycloneDX/cyclonedx-python/commit/82f0dba359030b513e9fcf3f8e8c561afc794c1d)) - -* build(deps-dev): Bump flake8-bugbear from 21.9.2 to 21.11.29 - -Bumps [flake8-bugbear](https://github.com/PyCQA/flake8-bugbear) from 21.9.2 to 21.11.29. -- [Release notes](https://github.com/PyCQA/flake8-bugbear/releases) -- [Commits](https://github.com/PyCQA/flake8-bugbear/compare/21.9.2...21.11.29) - ---- -updated-dependencies: -- dependency-name: flake8-bugbear - dependency-type: direct:development - update-type: version-update:semver-minor -... - -Signed-off-by: dependabot[bot] <support@github.com> ([`a3d0b87`](https://github.com/CycloneDX/cyclonedx-python/commit/a3d0b87152183682dfeed459c6e44af4bc69a8c8)) - -### Chore - -* chore: add pre-release manual GH workflow - -Signed-off-by: Paul Horton <phorton@sonatype.com> ([`8343c0d`](https://github.com/CycloneDX/cyclonedx-python/commit/8343c0d20fe8ce2ffaf41016155dee7953f4eb57)) - -* chore: Bump cyclonedx-python-lib from 0.12.2 to 0.12.3 (#285) - -Bumps [cyclonedx-python-lib](https://github.com/CycloneDX/cyclonedx-python-lib) from 0.12.2 to 0.12.3. -- [Release notes](https://github.com/CycloneDX/cyclonedx-python-lib/releases) -- [Changelog](https://github.com/CycloneDX/cyclonedx-python-lib/blob/main/CHANGELOG.md) -- [Commits](https://github.com/CycloneDX/cyclonedx-python-lib/compare/v0.12.2...v0.12.3) - ---- -updated-dependencies: -- dependency-name: cyclonedx-python-lib - dependency-type: direct:production - update-type: version-update:semver-patch -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`2ef2b3e`](https://github.com/CycloneDX/cyclonedx-python/commit/2ef2b3eb767ed45c329390abc2800927c6324948)) - -* chore: Bump mypy from 0.920 to 0.930 (#288) - -Bumps [mypy](https://github.com/python/mypy) from 0.920 to 0.930. -- [Release notes](https://github.com/python/mypy/releases) -- [Commits](https://github.com/python/mypy/compare/v0.920...v0.930) - ---- -updated-dependencies: -- dependency-name: mypy - dependency-type: direct:development - update-type: version-update:semver-minor -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`a58ed74`](https://github.com/CycloneDX/cyclonedx-python/commit/a58ed740fd5f6a603d76a0308d69551a186f8c65)) - -* chore: update `flake8` to v4 and add `autopep8` (#283) - -closes #275 - -update locked dependencies: - • Updating pycodestyle (2.7.0 -> 2.8.0) - • Updating pyflakes (2.3.1 -> 2.4.0) - • Updating flake8 (3.9.2 -> 4.0.1) - • Installing autopep8 (1.6.0) - • Updating flake8-annotations (2.0.1 -> 2.7.0) - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`87aa348`](https://github.com/CycloneDX/cyclonedx-python/commit/87aa3487864ca94cab3c2c9dff3c263f0a849c21)) - -* chore: Bump mypy from 0.910 to 0.920 (#286) - -Bumps [mypy](https://github.com/python/mypy) from 0.910 to 0.920. -- [Release notes](https://github.com/python/mypy/releases) -- [Commits](https://github.com/python/mypy/compare/v0.910...v0.920) - ---- -updated-dependencies: -- dependency-name: mypy - dependency-type: direct:development - update-type: version-update:semver-minor -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`a2dc03f`](https://github.com/CycloneDX/cyclonedx-python/commit/a2dc03f15a994361c973e97f2f9c406a41f9d7cd)) - -* chore: build(deps): Bump cyclonedx-python-lib from 0.11.1 to 0.12.2 (#282) - -Bumps [cyclonedx-python-lib](https://github.com/CycloneDX/cyclonedx-python-lib) from 0.11.1 to 0.12.2. -- [Release notes](https://github.com/CycloneDX/cyclonedx-python-lib/releases) -- [Changelog](https://github.com/CycloneDX/cyclonedx-python-lib/blob/main/CHANGELOG.md) -- [Commits](https://github.com/CycloneDX/cyclonedx-python-lib/compare/v0.11.1...v0.12.2) - ---- -updated-dependencies: -- dependency-name: cyclonedx-python-lib - dependency-type: direct:production - update-type: version-update:semver-minor -... - -Signed-off-by: dependabot[bot] <support@github.com> - -Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> ([`6b51a66`](https://github.com/CycloneDX/cyclonedx-python/commit/6b51a66094afa5e424d8548724e5d09ea3851f7d)) - -* chore: remove dev-container (#265) - -closes #262 - -Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`16349cb`](https://github.com/CycloneDX/cyclonedx-python/commit/16349cbef449ded638c0fdcba01d3b1a6978678a)) - ### Documentation * docs: readme maintenance - shields & links (#266) @@ -2284,12 +1325,6 @@ Signed-off-by: Paul Horton <paul.horton@owasp.org> Signed-off-by: Paul Horton <paul.horton@owasp.org> ([`7bb6d32`](https://github.com/CycloneDX/cyclonedx-python/commit/7bb6d328adec59cdd4c3ab80eb5f39568ca3bc9c)) -### Test - -* test: CI/CT for the docker image - -CI for the docker image ([`6c4a6de`](https://github.com/CycloneDX/cyclonedx-python/commit/6c4a6deb3293dfaf059d0d114a93b570257e5dfb)) - ### Unknown * 1.6.0 @@ -2421,12 +1456,6 @@ Automatically generated by python-semantic-release ([`31fdd93`](https://github.c ## v1.4.3 (2021-11-16) -### Ci - -* ci: run release action on push to master - -Signed-off-by: Paul Horton <phorton@sonatype.com> ([`24477a0`](https://github.com/CycloneDX/cyclonedx-python/commit/24477a0c30e3ffbc088837b55bcc4336a3d564a1)) - ### Fix * fix: add static code analysis, better typing and bump cyclonedx-python-lib to 0.11 @@ -2489,40 +1518,6 @@ Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`3080b57`](https: ## v1.4.2 (2021-11-12) -### Build - -* build(deps-dev): Bump coverage from 6.1.1 to 6.1.2 - -Bumps [coverage](https://github.com/nedbat/coveragepy) from 6.1.1 to 6.1.2. -- [Release notes](https://github.com/nedbat/coveragepy/releases) -- [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) -- [Commits](https://github.com/nedbat/coveragepy/compare/6.1.1...6.1.2) - ---- -updated-dependencies: -- dependency-name: coverage - dependency-type: direct:development - update-type: version-update:semver-patch -... - -Signed-off-by: dependabot[bot] <support@github.com> ([`3ce6467`](https://github.com/CycloneDX/cyclonedx-python/commit/3ce64679915a7ab83aa67da05087ca6b4e84c4ef)) - -* build(deps-dev): Bump coverage from 5.5 to 6.1.1 - -Bumps [coverage](https://github.com/nedbat/coveragepy) from 5.5 to 6.1.1. -- [Release notes](https://github.com/nedbat/coveragepy/releases) -- [Changelog](https://github.com/nedbat/coveragepy/blob/master/CHANGES.rst) -- [Commits](https://github.com/nedbat/coveragepy/compare/coverage-5.5...6.1.1) - ---- -updated-dependencies: -- dependency-name: coverage - dependency-type: direct:development - update-type: version-update:semver-major -... - -Signed-off-by: dependabot[bot] <support@github.com> ([`bd63845`](https://github.com/CycloneDX/cyclonedx-python/commit/bd63845c397490e56e2bcd64a7b7e879ef9bc027)) - ### Fix * fix: if no input file is supplied and no input is provided on STDIN, we will now try to automatically locate (in the current working directory) a manifest with default name for the input type specified. This works for PIP (Pipfile.lock), Poetry (poetry.lock) and Requirements (requirements.txt) @@ -2568,12 +1563,6 @@ Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com> ([`a29525a`](https: ## v1.4.1 (2021-10-26) -### Chore - -* chore: manual addition of breaking changes in 1.4.0 into CHANGELOG - -Signed-off-by: Paul Horton <phorton@sonatype.com> ([`84fceb2`](https://github.com/CycloneDX/cyclonedx-python/commit/84fceb293aeeef2e716866edd53e589b91ba9340)) - ### Fix * fix: corrected documentation after deprecation of `-rf`, `-pf`, `--poetry-file`, `--requirements-file` and `--pip-file` @@ -2747,28 +1736,12 @@ Signed-off-by: Paul Horton <phorton@sonatype.com> ([`a8fed84`](https://git Signed-off-by: Paul Horton <phorton@sonatype.com> ([`616b949`](https://github.com/CycloneDX/cyclonedx-python/commit/616b949e0d3200cd7c3a3e5131213e2e9bb51cfe)) -### Ci - -* ci: define missing env variable in CI workflow - -Signed-off-by: Paul Horton <phorton@sonatype.com> ([`49db8c2`](https://github.com/CycloneDX/cyclonedx-python/commit/49db8c2c587ab75cdcfb12513a89905b61b6e854)) - -* ci: updated GitHub workflows to align with those used in cyclonedx-python-lib - -Signed-off-by: Paul Horton <phorton@sonatype.com> ([`0b11f5a`](https://github.com/CycloneDX/cyclonedx-python/commit/0b11f5a7d7699a88e0d689f4cc33108a3017f355)) - ### Fix * fix: default to "requirements.txt" in current directory when "-r" flag is supplied but not "-rf" flag is supplied Signed-off-by: Paul Horton <phorton@sonatype.com> ([`bb7e30a`](https://github.com/CycloneDX/cyclonedx-python/commit/bb7e30a869300b1e63a00d7db4bcc7f35d68552d)) -### Test - -* test: align Tox configuration with cyclonedx-python-lib - -Signed-off-by: Paul Horton <phorton@sonatype.com> ([`1e5c6b6`](https://github.com/CycloneDX/cyclonedx-python/commit/1e5c6b61542a1f2b5459ce2f2a84923505e86a1f)) - ### Unknown * 1.0.3 diff --git a/pyproject.toml b/pyproject.toml index 36ad6d38..64a63ad3 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -124,9 +124,12 @@ upload_to_vcs_release = true [tool.semantic_release.changelog] changelog_file = "CHANGELOG.md" exclude_commit_patterns = [ - "chore\$release\$:", - "chore\$deps\$:", - "chore\$deps-dev\$:", + '''chore(?:$[^)]*?$)?: .+''', + '''ci(?:$[^)]*?$)?: .+''', + '''refactor(?:$[^)]*?$)?: .+''', + '''style(?:$[^)]*?$)?: .+''', + '''tests?(?:$[^)]*?$)?: .+''', + '''build$(?!deps$: .+)''', ] [tool.semantic_release.branches.main] @@ -134,7 +137,7 @@ match = "(main|master)" prerelease = false [tool.semantic_release.branches."step"] -match = "(build|chore|ci|docs|feat|fix|perf|style|refactor|test)" +match = "(build|chore|ci|docs|feat|fix|perf|style|refactor|tests?)" prerelease = true prerelease_token = "alpha" From 34cf6e316f5f065b00cdebbed0791662500e6c4c Mon Sep 17 00:00:00 2001 From: Jan Kowalleck Date: Tue, 15 Oct 2024 15:19:36 +0200 Subject: [PATCH 3/4] feat!: v5.0.0 (#797) ### BREAKING Changes * Emitted metadata tool name is `cyclonedx-py`, was `cyclonedx-bom`. * Emitted metadata tools are up to non-deprecated CycloneDX specification. * No longer emit deprecated or undocumented properties in namespace [`cdx:poetry`](https://github.com/CycloneDX/cyclonedx-property-taxonomy/blob/main/cdx/poetry.md) (see previous release 4.6.0 for official replacements). - `cdx:poetry:source:package:reference` - `cdx:poetry:package:source:resolved_reference` - `cdx:poetry:package:source:vcs:requested_revision` - `cdx:poetry:package:source:vcs:commit_id` The mentioned changes are considered "breaking" for processes that relied on the respective data structures. Migration paths are self-explanatory. ### Dependencies * Requires `cyclonedx-python-lib>=8.0.0,<9 ` now, was `>=7.3.0,<8.0.0,!=7.3.1`. --------- Signed-off-by: Jan Kowalleck --- cyclonedx_py/_internal/__init__.py | 7 - cyclonedx_py/_internal/environment.py | 6 - cyclonedx_py/_internal/poetry.py | 10 -- cyclonedx_py/_internal/utils/__init__.py | 16 +++ cyclonedx_py/_internal/utils/cdx.py | 95 ++++++++------ pyproject.toml | 4 +- tests/__init__.py | 120 ++++++++++++++---- ...639-texts_with-license-pep639_1.2.json.bin | 2 +- ...p639-texts_with-license-pep639_1.2.xml.bin | 2 +- ...639-texts_with-license-pep639_1.3.json.bin | 2 +- ...p639-texts_with-license-pep639_1.3.xml.bin | 2 +- ...639-texts_with-license-pep639_1.4.json.bin | 39 ++++++ ...p639-texts_with-license-pep639_1.4.xml.bin | 2 +- ...639-texts_with-license-pep639_1.5.json.bin | 69 ++++++++-- ...p639-texts_with-license-pep639_1.5.xml.bin | 84 ++++++------ ...639-texts_with-license-pep639_1.6.json.bin | 70 ++++++++-- ...p639-texts_with-license-pep639_1.6.xml.bin | 84 ++++++------ .../pep639_with-license-pep639_1.2.json.bin | 2 +- .../pep639_with-license-pep639_1.2.xml.bin | 2 +- .../pep639_with-license-pep639_1.3.json.bin | 2 +- .../pep639_with-license-pep639_1.3.xml.bin | 2 +- .../pep639_with-license-pep639_1.4.json.bin | 39 ++++++ .../pep639_with-license-pep639_1.4.xml.bin | 2 +- .../pep639_with-license-pep639_1.5.json.bin | 69 ++++++++-- .../pep639_with-license-pep639_1.5.xml.bin | 84 ++++++------ .../pep639_with-license-pep639_1.6.json.bin | 70 ++++++++-- .../pep639_with-license-pep639_1.6.xml.bin | 84 ++++++------ .../plain_editable-self_1.2.json.bin | 2 +- .../plain_editable-self_1.2.xml.bin | 2 +- .../plain_editable-self_1.3.json.bin | 2 +- .../plain_editable-self_1.3.xml.bin | 2 +- .../plain_editable-self_1.4.json.bin | 39 ++++++ .../plain_editable-self_1.4.xml.bin | 2 +- .../plain_editable-self_1.5.json.bin | 69 ++++++++-- .../plain_editable-self_1.5.xml.bin | 84 ++++++------ .../plain_editable-self_1.6.json.bin | 70 ++++++++-- .../plain_editable-self_1.6.xml.bin | 84 ++++++------ .../environment/plain_local_1.2.json.bin | 2 +- .../environment/plain_local_1.2.xml.bin | 2 +- .../environment/plain_local_1.3.json.bin | 2 +- .../environment/plain_local_1.3.xml.bin | 2 +- .../environment/plain_local_1.4.json.bin | 39 ++++++ .../environment/plain_local_1.4.xml.bin | 2 +- .../environment/plain_local_1.5.json.bin | 69 ++++++++-- .../environment/plain_local_1.5.xml.bin | 84 ++++++------ .../environment/plain_local_1.6.json.bin | 70 ++++++++-- .../environment/plain_local_1.6.xml.bin | 84 ++++++------ .../environment/plain_no-deps_1.2.json.bin | 2 +- .../environment/plain_no-deps_1.2.xml.bin | 2 +- .../environment/plain_no-deps_1.3.json.bin | 2 +- .../environment/plain_no-deps_1.3.xml.bin | 2 +- .../environment/plain_no-deps_1.4.json.bin | 39 ++++++ .../environment/plain_no-deps_1.4.xml.bin | 2 +- .../environment/plain_no-deps_1.5.json.bin | 69 ++++++++-- .../environment/plain_no-deps_1.5.xml.bin | 84 ++++++------ .../environment/plain_no-deps_1.6.json.bin | 70 ++++++++-- .../environment/plain_no-deps_1.6.xml.bin | 84 ++++++------ .../plain_normalize-packagename_1.2.json.bin | 2 +- .../plain_normalize-packagename_1.2.xml.bin | 2 +- .../plain_normalize-packagename_1.3.json.bin | 2 +- .../plain_normalize-packagename_1.3.xml.bin | 2 +- .../plain_normalize-packagename_1.4.json.bin | 39 ++++++ .../plain_normalize-packagename_1.4.xml.bin | 2 +- .../plain_normalize-packagename_1.5.json.bin | 69 ++++++++-- .../plain_normalize-packagename_1.5.xml.bin | 84 ++++++------ .../plain_normalize-packagename_1.6.json.bin | 70 ++++++++-- .../plain_normalize-packagename_1.6.xml.bin | 84 ++++++------ .../plain_private-packages_1.2.json.bin | 2 +- .../plain_private-packages_1.2.xml.bin | 2 +- .../plain_private-packages_1.3.json.bin | 2 +- .../plain_private-packages_1.3.xml.bin | 2 +- .../plain_private-packages_1.4.json.bin | 39 ++++++ .../plain_private-packages_1.4.xml.bin | 2 +- .../plain_private-packages_1.5.json.bin | 69 ++++++++-- .../plain_private-packages_1.5.xml.bin | 84 ++++++------ .../plain_private-packages_1.6.json.bin | 70 ++++++++-- .../plain_private-packages_1.6.xml.bin | 84 ++++++------ .../environment/plain_via-pdm_1.2.json.bin | 2 +- .../environment/plain_via-pdm_1.2.xml.bin | 2 +- .../environment/plain_via-pdm_1.3.json.bin | 2 +- .../environment/plain_via-pdm_1.3.xml.bin | 2 +- .../environment/plain_via-pdm_1.4.json.bin | 39 ++++++ .../environment/plain_via-pdm_1.4.xml.bin | 2 +- .../environment/plain_via-pdm_1.5.json.bin | 69 ++++++++-- .../environment/plain_via-pdm_1.5.xml.bin | 84 ++++++------ .../environment/plain_via-pdm_1.6.json.bin | 70 ++++++++-- .../environment/plain_via-pdm_1.6.xml.bin | 84 ++++++------ .../environment/plain_via-pipenv_1.2.json.bin | 2 +- .../environment/plain_via-pipenv_1.2.xml.bin | 2 +- .../environment/plain_via-pipenv_1.3.json.bin | 2 +- .../environment/plain_via-pipenv_1.3.xml.bin | 2 +- .../environment/plain_via-pipenv_1.4.json.bin | 39 ++++++ .../environment/plain_via-pipenv_1.4.xml.bin | 2 +- .../environment/plain_via-pipenv_1.5.json.bin | 69 ++++++++-- .../environment/plain_via-pipenv_1.5.xml.bin | 84 ++++++------ .../environment/plain_via-pipenv_1.6.json.bin | 70 ++++++++-- .../environment/plain_via-pipenv_1.6.xml.bin | 84 ++++++------ .../environment/plain_via-poetry_1.2.json.bin | 2 +- .../environment/plain_via-poetry_1.2.xml.bin | 2 +- .../environment/plain_via-poetry_1.3.json.bin | 2 +- .../environment/plain_via-poetry_1.3.xml.bin | 2 +- .../environment/plain_via-poetry_1.4.json.bin | 39 ++++++ .../environment/plain_via-poetry_1.4.xml.bin | 2 +- .../environment/plain_via-poetry_1.5.json.bin | 69 ++++++++-- .../environment/plain_via-poetry_1.5.xml.bin | 84 ++++++------ .../environment/plain_via-poetry_1.6.json.bin | 70 ++++++++-- .../environment/plain_via-poetry_1.6.xml.bin | 84 ++++++------ .../plain_with-extras_1.2.json.bin | 2 +- .../environment/plain_with-extras_1.2.xml.bin | 2 +- .../plain_with-extras_1.3.json.bin | 2 +- .../environment/plain_with-extras_1.3.xml.bin | 2 +- .../plain_with-extras_1.4.json.bin | 39 ++++++ .../environment/plain_with-extras_1.4.xml.bin | 2 +- .../plain_with-extras_1.5.json.bin | 69 ++++++++-- .../environment/plain_with-extras_1.5.xml.bin | 84 ++++++------ .../plain_with-extras_1.6.json.bin | 70 ++++++++-- .../environment/plain_with-extras_1.6.xml.bin | 84 ++++++------ .../plain_with-license-file_1.2.json.bin | 2 +- .../plain_with-license-file_1.2.xml.bin | 2 +- .../plain_with-license-file_1.3.json.bin | 2 +- .../plain_with-license-file_1.3.xml.bin | 2 +- .../plain_with-license-file_1.4.json.bin | 39 ++++++ .../plain_with-license-file_1.4.xml.bin | 2 +- .../plain_with-license-file_1.5.json.bin | 69 ++++++++-- .../plain_with-license-file_1.5.xml.bin | 84 ++++++------ .../plain_with-license-file_1.6.json.bin | 70 ++++++++-- .../plain_with-license-file_1.6.xml.bin | 84 ++++++------ .../plain_with-license-pep639_1.2.json.bin | 2 +- .../plain_with-license-pep639_1.2.xml.bin | 2 +- .../plain_with-license-pep639_1.3.json.bin | 2 +- .../plain_with-license-pep639_1.3.xml.bin | 2 +- .../plain_with-license-pep639_1.4.json.bin | 39 ++++++ .../plain_with-license-pep639_1.4.xml.bin | 2 +- .../plain_with-license-pep639_1.5.json.bin | 69 ++++++++-- .../plain_with-license-pep639_1.5.xml.bin | 84 ++++++------ .../plain_with-license-pep639_1.6.json.bin | 70 ++++++++-- .../plain_with-license-pep639_1.6.xml.bin | 84 ++++++------ .../plain_with-license-text_1.2.json.bin | 2 +- .../plain_with-license-text_1.2.xml.bin | 2 +- .../plain_with-license-text_1.3.json.bin | 2 +- .../plain_with-license-text_1.3.xml.bin | 2 +- .../plain_with-license-text_1.4.json.bin | 39 ++++++ .../plain_with-license-text_1.4.xml.bin | 2 +- .../plain_with-license-text_1.5.json.bin | 69 ++++++++-- .../plain_with-license-text_1.5.xml.bin | 84 ++++++------ .../plain_with-license-text_1.6.json.bin | 70 ++++++++-- .../plain_with-license-text_1.6.xml.bin | 84 ++++++------ .../environment/plain_with-urls_1.2.json.bin | 2 +- .../environment/plain_with-urls_1.2.xml.bin | 2 +- .../environment/plain_with-urls_1.3.json.bin | 10 +- .../environment/plain_with-urls_1.3.xml.bin | 4 +- .../environment/plain_with-urls_1.4.json.bin | 47 +++++-- .../environment/plain_with-urls_1.4.xml.bin | 4 +- .../environment/plain_with-urls_1.5.json.bin | 77 ++++++++--- .../environment/plain_with-urls_1.5.xml.bin | 86 +++++++------ .../environment/plain_with-urls_1.6.json.bin | 78 +++++++++--- .../environment/plain_with-urls_1.6.xml.bin | 86 +++++++------ .../texts_with-license-pep639_1.2.json.bin | 2 +- .../texts_with-license-pep639_1.2.xml.bin | 2 +- .../texts_with-license-pep639_1.3.json.bin | 2 +- .../texts_with-license-pep639_1.3.xml.bin | 2 +- .../texts_with-license-pep639_1.4.json.bin | 39 ++++++ .../texts_with-license-pep639_1.4.xml.bin | 2 +- .../texts_with-license-pep639_1.5.json.bin | 69 ++++++++-- .../texts_with-license-pep639_1.5.xml.bin | 84 ++++++------ .../texts_with-license-pep639_1.6.json.bin | 70 ++++++++-- .../texts_with-license-pep639_1.6.xml.bin | 84 ++++++------ .../pipenv/plain_category-deps_1.2.json.bin | 2 +- .../pipenv/plain_category-deps_1.2.xml.bin | 2 +- .../pipenv/plain_category-deps_1.3.json.bin | 2 +- .../pipenv/plain_category-deps_1.3.xml.bin | 2 +- .../pipenv/plain_category-deps_1.4.json.bin | 39 ++++++ .../pipenv/plain_category-deps_1.4.xml.bin | 2 +- .../pipenv/plain_category-deps_1.5.json.bin | 69 ++++++++-- .../pipenv/plain_category-deps_1.5.xml.bin | 84 ++++++------ .../pipenv/plain_category-deps_1.6.json.bin | 70 ++++++++-- .../pipenv/plain_category-deps_1.6.xml.bin | 84 ++++++------ .../pipenv/plain_default-and-dev_1.2.json.bin | 2 +- .../pipenv/plain_default-and-dev_1.2.xml.bin | 2 +- .../pipenv/plain_default-and-dev_1.3.json.bin | 2 +- .../pipenv/plain_default-and-dev_1.3.xml.bin | 2 +- .../pipenv/plain_default-and-dev_1.4.json.bin | 39 ++++++ .../pipenv/plain_default-and-dev_1.4.xml.bin | 2 +- .../pipenv/plain_default-and-dev_1.5.json.bin | 69 ++++++++-- .../pipenv/plain_default-and-dev_1.5.xml.bin | 84 ++++++------ .../pipenv/plain_default-and-dev_1.6.json.bin | 70 ++++++++-- .../pipenv/plain_default-and-dev_1.6.xml.bin | 84 ++++++------ .../pipenv/plain_editable-self_1.2.json.bin | 2 +- .../pipenv/plain_editable-self_1.2.xml.bin | 2 +- .../pipenv/plain_editable-self_1.3.json.bin | 2 +- .../pipenv/plain_editable-self_1.3.xml.bin | 2 +- .../pipenv/plain_editable-self_1.4.json.bin | 39 ++++++ .../pipenv/plain_editable-self_1.4.xml.bin | 2 +- .../pipenv/plain_editable-self_1.5.json.bin | 69 ++++++++-- .../pipenv/plain_editable-self_1.5.xml.bin | 84 ++++++------ .../pipenv/plain_editable-self_1.6.json.bin | 70 ++++++++-- .../pipenv/plain_editable-self_1.6.xml.bin | 84 ++++++------ .../snapshots/pipenv/plain_local_1.2.json.bin | 2 +- .../snapshots/pipenv/plain_local_1.2.xml.bin | 2 +- .../snapshots/pipenv/plain_local_1.3.json.bin | 2 +- .../snapshots/pipenv/plain_local_1.3.xml.bin | 2 +- .../snapshots/pipenv/plain_local_1.4.json.bin | 39 ++++++ .../snapshots/pipenv/plain_local_1.4.xml.bin | 2 +- .../snapshots/pipenv/plain_local_1.5.json.bin | 69 ++++++++-- .../snapshots/pipenv/plain_local_1.5.xml.bin | 84 ++++++------ .../snapshots/pipenv/plain_local_1.6.json.bin | 70 ++++++++-- .../snapshots/pipenv/plain_local_1.6.xml.bin | 84 ++++++------ .../pipenv/plain_no-deps_1.2.json.bin | 2 +- .../pipenv/plain_no-deps_1.2.xml.bin | 2 +- .../pipenv/plain_no-deps_1.3.json.bin | 2 +- .../pipenv/plain_no-deps_1.3.xml.bin | 2 +- .../pipenv/plain_no-deps_1.4.json.bin | 39 ++++++ .../pipenv/plain_no-deps_1.4.xml.bin | 2 +- .../pipenv/plain_no-deps_1.5.json.bin | 69 ++++++++-- .../pipenv/plain_no-deps_1.5.xml.bin | 84 ++++++------ .../pipenv/plain_no-deps_1.6.json.bin | 70 ++++++++-- .../pipenv/plain_no-deps_1.6.xml.bin | 84 ++++++------ .../plain_normalize-packagename_1.2.json.bin | 2 +- .../plain_normalize-packagename_1.2.xml.bin | 2 +- .../plain_normalize-packagename_1.3.json.bin | 2 +- .../plain_normalize-packagename_1.3.xml.bin | 2 +- .../plain_normalize-packagename_1.4.json.bin | 39 ++++++ .../plain_normalize-packagename_1.4.xml.bin | 2 +- .../plain_normalize-packagename_1.5.json.bin | 69 ++++++++-- .../plain_normalize-packagename_1.5.xml.bin | 84 ++++++------ .../plain_normalize-packagename_1.6.json.bin | 70 ++++++++-- .../plain_normalize-packagename_1.6.xml.bin | 84 ++++++------ .../plain_private-packages_1.2.json.bin | 2 +- .../pipenv/plain_private-packages_1.2.xml.bin | 2 +- .../plain_private-packages_1.3.json.bin | 2 +- .../pipenv/plain_private-packages_1.3.xml.bin | 2 +- .../plain_private-packages_1.4.json.bin | 39 ++++++ .../pipenv/plain_private-packages_1.4.xml.bin | 2 +- .../plain_private-packages_1.5.json.bin | 69 ++++++++-- .../pipenv/plain_private-packages_1.5.xml.bin | 84 ++++++------ .../plain_private-packages_1.6.json.bin | 70 ++++++++-- .../pipenv/plain_private-packages_1.6.xml.bin | 84 ++++++------ .../pipenv/plain_with-extras_1.2.json.bin | 2 +- .../pipenv/plain_with-extras_1.2.xml.bin | 2 +- .../pipenv/plain_with-extras_1.3.json.bin | 2 +- .../pipenv/plain_with-extras_1.3.xml.bin | 2 +- .../pipenv/plain_with-extras_1.4.json.bin | 39 ++++++ .../pipenv/plain_with-extras_1.4.xml.bin | 2 +- .../pipenv/plain_with-extras_1.5.json.bin | 69 ++++++++-- .../pipenv/plain_with-extras_1.5.xml.bin | 84 ++++++------ .../pipenv/plain_with-extras_1.6.json.bin | 70 ++++++++-- .../pipenv/plain_with-extras_1.6.xml.bin | 84 ++++++------ .../pipenv/plain_with-urls_1.2.json.bin | 2 +- .../pipenv/plain_with-urls_1.2.xml.bin | 2 +- .../pipenv/plain_with-urls_1.3.json.bin | 2 +- .../pipenv/plain_with-urls_1.3.xml.bin | 2 +- .../pipenv/plain_with-urls_1.4.json.bin | 39 ++++++ .../pipenv/plain_with-urls_1.4.xml.bin | 2 +- .../pipenv/plain_with-urls_1.5.json.bin | 69 ++++++++-- .../pipenv/plain_with-urls_1.5.xml.bin | 84 ++++++------ .../pipenv/plain_with-urls_1.6.json.bin | 70 ++++++++-- .../pipenv/plain_with-urls_1.6.xml.bin | 84 ++++++------ .../pypi-mirror_private-packages_1.2.json.bin | 2 +- .../pypi-mirror_private-packages_1.2.xml.bin | 2 +- .../pypi-mirror_private-packages_1.3.json.bin | 2 +- .../pypi-mirror_private-packages_1.3.xml.bin | 2 +- .../pypi-mirror_private-packages_1.4.json.bin | 39 ++++++ .../pypi-mirror_private-packages_1.4.xml.bin | 2 +- .../pypi-mirror_private-packages_1.5.json.bin | 69 ++++++++-- .../pypi-mirror_private-packages_1.5.xml.bin | 84 ++++++------ .../pypi-mirror_private-packages_1.6.json.bin | 70 ++++++++-- .../pypi-mirror_private-packages_1.6.xml.bin | 84 ++++++------ ...some-categories_category-deps_1.2.json.bin | 2 +- .../some-categories_category-deps_1.2.xml.bin | 2 +- ...some-categories_category-deps_1.3.json.bin | 2 +- .../some-categories_category-deps_1.3.xml.bin | 2 +- ...some-categories_category-deps_1.4.json.bin | 39 ++++++ .../some-categories_category-deps_1.4.xml.bin | 2 +- ...some-categories_category-deps_1.5.json.bin | 69 ++++++++-- .../some-categories_category-deps_1.5.xml.bin | 84 ++++++------ ...some-categories_category-deps_1.6.json.bin | 70 ++++++++-- .../some-categories_category-deps_1.6.xml.bin | 84 ++++++------ .../with-dev_default-and-dev_1.2.json.bin | 2 +- .../with-dev_default-and-dev_1.2.xml.bin | 2 +- .../with-dev_default-and-dev_1.3.json.bin | 2 +- .../with-dev_default-and-dev_1.3.xml.bin | 2 +- .../with-dev_default-and-dev_1.4.json.bin | 39 ++++++ .../with-dev_default-and-dev_1.4.xml.bin | 2 +- .../with-dev_default-and-dev_1.5.json.bin | 69 ++++++++-- .../with-dev_default-and-dev_1.5.xml.bin | 84 ++++++------ .../with-dev_default-and-dev_1.6.json.bin | 70 ++++++++-- .../with-dev_default-and-dev_1.6.xml.bin | 84 ++++++------ ...all-extras_with-extras_lock10_1.2.json.bin | 2 +- .../all-extras_with-extras_lock10_1.2.xml.bin | 2 +- ...all-extras_with-extras_lock10_1.3.json.bin | 2 +- .../all-extras_with-extras_lock10_1.3.xml.bin | 2 +- ...all-extras_with-extras_lock10_1.4.json.bin | 39 ++++++ .../all-extras_with-extras_lock10_1.4.xml.bin | 2 +- ...all-extras_with-extras_lock10_1.5.json.bin | 69 ++++++++-- .../all-extras_with-extras_lock10_1.5.xml.bin | 84 ++++++------ ...all-extras_with-extras_lock10_1.6.json.bin | 70 ++++++++-- .../all-extras_with-extras_lock10_1.6.xml.bin | 84 ++++++------ ...all-extras_with-extras_lock11_1.2.json.bin | 2 +- .../all-extras_with-extras_lock11_1.2.xml.bin | 2 +- ...all-extras_with-extras_lock11_1.3.json.bin | 2 +- .../all-extras_with-extras_lock11_1.3.xml.bin | 2 +- ...all-extras_with-extras_lock11_1.4.json.bin | 39 ++++++ .../all-extras_with-extras_lock11_1.4.xml.bin | 2 +- ...all-extras_with-extras_lock11_1.5.json.bin | 69 ++++++++-- .../all-extras_with-extras_lock11_1.5.xml.bin | 84 ++++++------ ...all-extras_with-extras_lock11_1.6.json.bin | 70 ++++++++-- .../all-extras_with-extras_lock11_1.6.xml.bin | 84 ++++++------ ...all-extras_with-extras_lock20_1.2.json.bin | 2 +- .../all-extras_with-extras_lock20_1.2.xml.bin | 2 +- ...all-extras_with-extras_lock20_1.3.json.bin | 2 +- .../all-extras_with-extras_lock20_1.3.xml.bin | 2 +- ...all-extras_with-extras_lock20_1.4.json.bin | 39 ++++++ .../all-extras_with-extras_lock20_1.4.xml.bin | 2 +- ...all-extras_with-extras_lock20_1.5.json.bin | 69 ++++++++-- .../all-extras_with-extras_lock20_1.5.xml.bin | 84 ++++++------ ...all-extras_with-extras_lock20_1.6.json.bin | 70 ++++++++-- .../all-extras_with-extras_lock20_1.6.xml.bin | 84 ++++++------ .../no-dev_group-deps_lock11_1.2.json.bin | 2 +- .../no-dev_group-deps_lock11_1.2.xml.bin | 2 +- .../no-dev_group-deps_lock11_1.3.json.bin | 2 +- .../no-dev_group-deps_lock11_1.3.xml.bin | 2 +- .../no-dev_group-deps_lock11_1.4.json.bin | 39 ++++++ .../no-dev_group-deps_lock11_1.4.xml.bin | 2 +- .../no-dev_group-deps_lock11_1.5.json.bin | 69 ++++++++-- .../no-dev_group-deps_lock11_1.5.xml.bin | 84 ++++++------ .../no-dev_group-deps_lock11_1.6.json.bin | 70 ++++++++-- .../no-dev_group-deps_lock11_1.6.xml.bin | 84 ++++++------ .../no-dev_group-deps_lock20_1.2.json.bin | 2 +- .../no-dev_group-deps_lock20_1.2.xml.bin | 2 +- .../no-dev_group-deps_lock20_1.3.json.bin | 2 +- .../no-dev_group-deps_lock20_1.3.xml.bin | 2 +- .../no-dev_group-deps_lock20_1.4.json.bin | 39 ++++++ .../no-dev_group-deps_lock20_1.4.xml.bin | 2 +- .../no-dev_group-deps_lock20_1.5.json.bin | 69 ++++++++-- .../no-dev_group-deps_lock20_1.5.xml.bin | 84 ++++++------ .../no-dev_group-deps_lock20_1.6.json.bin | 70 ++++++++-- .../no-dev_group-deps_lock20_1.6.xml.bin | 84 ++++++------ .../no-dev_main-and-dev_lock10_1.2.json.bin | 2 +- .../no-dev_main-and-dev_lock10_1.2.xml.bin | 2 +- .../no-dev_main-and-dev_lock10_1.3.json.bin | 2 +- .../no-dev_main-and-dev_lock10_1.3.xml.bin | 2 +- .../no-dev_main-and-dev_lock10_1.4.json.bin | 39 ++++++ .../no-dev_main-and-dev_lock10_1.4.xml.bin | 2 +- .../no-dev_main-and-dev_lock10_1.5.json.bin | 69 ++++++++-- .../no-dev_main-and-dev_lock10_1.5.xml.bin | 84 ++++++------ .../no-dev_main-and-dev_lock10_1.6.json.bin | 70 ++++++++-- .../no-dev_main-and-dev_lock10_1.6.xml.bin | 84 ++++++------ .../no-dev_main-and-dev_lock11_1.2.json.bin | 2 +- .../no-dev_main-and-dev_lock11_1.2.xml.bin | 2 +- .../no-dev_main-and-dev_lock11_1.3.json.bin | 2 +- .../no-dev_main-and-dev_lock11_1.3.xml.bin | 2 +- .../no-dev_main-and-dev_lock11_1.4.json.bin | 39 ++++++ .../no-dev_main-and-dev_lock11_1.4.xml.bin | 2 +- .../no-dev_main-and-dev_lock11_1.5.json.bin | 69 ++++++++-- .../no-dev_main-and-dev_lock11_1.5.xml.bin | 84 ++++++------ .../no-dev_main-and-dev_lock11_1.6.json.bin | 70 ++++++++-- .../no-dev_main-and-dev_lock11_1.6.xml.bin | 84 ++++++------ .../no-dev_main-and-dev_lock20_1.2.json.bin | 2 +- .../no-dev_main-and-dev_lock20_1.2.xml.bin | 2 +- .../no-dev_main-and-dev_lock20_1.3.json.bin | 2 +- .../no-dev_main-and-dev_lock20_1.3.xml.bin | 2 +- .../no-dev_main-and-dev_lock20_1.4.json.bin | 39 ++++++ .../no-dev_main-and-dev_lock20_1.4.xml.bin | 2 +- .../no-dev_main-and-dev_lock20_1.5.json.bin | 69 ++++++++-- .../no-dev_main-and-dev_lock20_1.5.xml.bin | 84 ++++++------ .../no-dev_main-and-dev_lock20_1.6.json.bin | 70 ++++++++-- .../no-dev_main-and-dev_lock20_1.6.xml.bin | 84 ++++++------ ...only-groups_group-deps_lock11_1.2.json.bin | 2 +- .../only-groups_group-deps_lock11_1.2.xml.bin | 2 +- ...only-groups_group-deps_lock11_1.3.json.bin | 2 +- .../only-groups_group-deps_lock11_1.3.xml.bin | 2 +- ...only-groups_group-deps_lock11_1.4.json.bin | 39 ++++++ .../only-groups_group-deps_lock11_1.4.xml.bin | 2 +- ...only-groups_group-deps_lock11_1.5.json.bin | 69 ++++++++-- .../only-groups_group-deps_lock11_1.5.xml.bin | 84 ++++++------ ...only-groups_group-deps_lock11_1.6.json.bin | 70 ++++++++-- .../only-groups_group-deps_lock11_1.6.xml.bin | 84 ++++++------ ...only-groups_group-deps_lock20_1.2.json.bin | 2 +- .../only-groups_group-deps_lock20_1.2.xml.bin | 2 +- ...only-groups_group-deps_lock20_1.3.json.bin | 2 +- .../only-groups_group-deps_lock20_1.3.xml.bin | 2 +- ...only-groups_group-deps_lock20_1.4.json.bin | 39 ++++++ .../only-groups_group-deps_lock20_1.4.xml.bin | 2 +- ...only-groups_group-deps_lock20_1.5.json.bin | 69 ++++++++-- .../only-groups_group-deps_lock20_1.5.xml.bin | 84 ++++++------ ...only-groups_group-deps_lock20_1.6.json.bin | 70 ++++++++-- .../only-groups_group-deps_lock20_1.6.xml.bin | 84 ++++++------ .../plain_group-deps_lock11_1.2.json.bin | 2 +- .../plain_group-deps_lock11_1.2.xml.bin | 2 +- .../plain_group-deps_lock11_1.3.json.bin | 2 +- .../plain_group-deps_lock11_1.3.xml.bin | 2 +- .../plain_group-deps_lock11_1.4.json.bin | 39 ++++++ .../plain_group-deps_lock11_1.4.xml.bin | 2 +- .../plain_group-deps_lock11_1.5.json.bin | 69 ++++++++-- .../plain_group-deps_lock11_1.5.xml.bin | 84 ++++++------ .../plain_group-deps_lock11_1.6.json.bin | 70 ++++++++-- .../plain_group-deps_lock11_1.6.xml.bin | 84 ++++++------ .../plain_group-deps_lock20_1.2.json.bin | 2 +- .../plain_group-deps_lock20_1.2.xml.bin | 2 +- .../plain_group-deps_lock20_1.3.json.bin | 2 +- .../plain_group-deps_lock20_1.3.xml.bin | 2 +- .../plain_group-deps_lock20_1.4.json.bin | 39 ++++++ .../plain_group-deps_lock20_1.4.xml.bin | 2 +- .../plain_group-deps_lock20_1.5.json.bin | 69 ++++++++-- .../plain_group-deps_lock20_1.5.xml.bin | 84 ++++++------ .../plain_group-deps_lock20_1.6.json.bin | 70 ++++++++-- .../plain_group-deps_lock20_1.6.xml.bin | 84 ++++++------ .../poetry/plain_local_lock10_1.2.json.bin | 2 +- .../poetry/plain_local_lock10_1.2.xml.bin | 2 +- .../poetry/plain_local_lock10_1.3.json.bin | 2 +- .../poetry/plain_local_lock10_1.3.xml.bin | 2 +- .../poetry/plain_local_lock10_1.4.json.bin | 39 ++++++ .../poetry/plain_local_lock10_1.4.xml.bin | 2 +- .../poetry/plain_local_lock10_1.5.json.bin | 69 ++++++++-- .../poetry/plain_local_lock10_1.5.xml.bin | 84 ++++++------ .../poetry/plain_local_lock10_1.6.json.bin | 70 ++++++++-- .../poetry/plain_local_lock10_1.6.xml.bin | 84 ++++++------ .../poetry/plain_local_lock11_1.2.json.bin | 2 +- .../poetry/plain_local_lock11_1.2.xml.bin | 2 +- .../poetry/plain_local_lock11_1.3.json.bin | 2 +- .../poetry/plain_local_lock11_1.3.xml.bin | 2 +- .../poetry/plain_local_lock11_1.4.json.bin | 39 ++++++ .../poetry/plain_local_lock11_1.4.xml.bin | 2 +- .../poetry/plain_local_lock11_1.5.json.bin | 69 ++++++++-- .../poetry/plain_local_lock11_1.5.xml.bin | 84 ++++++------ .../poetry/plain_local_lock11_1.6.json.bin | 70 ++++++++-- .../poetry/plain_local_lock11_1.6.xml.bin | 84 ++++++------ .../poetry/plain_local_lock20_1.2.json.bin | 2 +- .../poetry/plain_local_lock20_1.2.xml.bin | 2 +- .../poetry/plain_local_lock20_1.3.json.bin | 2 +- .../poetry/plain_local_lock20_1.3.xml.bin | 2 +- .../poetry/plain_local_lock20_1.4.json.bin | 39 ++++++ .../poetry/plain_local_lock20_1.4.xml.bin | 2 +- .../poetry/plain_local_lock20_1.5.json.bin | 69 ++++++++-- .../poetry/plain_local_lock20_1.5.xml.bin | 84 ++++++------ .../poetry/plain_local_lock20_1.6.json.bin | 70 ++++++++-- .../poetry/plain_local_lock20_1.6.xml.bin | 84 ++++++------ .../plain_main-and-dev_lock10_1.2.json.bin | 2 +- .../plain_main-and-dev_lock10_1.2.xml.bin | 2 +- .../plain_main-and-dev_lock10_1.3.json.bin | 2 +- .../plain_main-and-dev_lock10_1.3.xml.bin | 2 +- .../plain_main-and-dev_lock10_1.4.json.bin | 39 ++++++ .../plain_main-and-dev_lock10_1.4.xml.bin | 2 +- .../plain_main-and-dev_lock10_1.5.json.bin | 69 ++++++++-- .../plain_main-and-dev_lock10_1.5.xml.bin | 84 ++++++------ .../plain_main-and-dev_lock10_1.6.json.bin | 70 ++++++++-- .../plain_main-and-dev_lock10_1.6.xml.bin | 84 ++++++------ .../plain_main-and-dev_lock11_1.2.json.bin | 2 +- .../plain_main-and-dev_lock11_1.2.xml.bin | 2 +- .../plain_main-and-dev_lock11_1.3.json.bin | 2 +- .../plain_main-and-dev_lock11_1.3.xml.bin | 2 +- .../plain_main-and-dev_lock11_1.4.json.bin | 39 ++++++ .../plain_main-and-dev_lock11_1.4.xml.bin | 2 +- .../plain_main-and-dev_lock11_1.5.json.bin | 69 ++++++++-- .../plain_main-and-dev_lock11_1.5.xml.bin | 84 ++++++------ .../plain_main-and-dev_lock11_1.6.json.bin | 70 ++++++++-- .../plain_main-and-dev_lock11_1.6.xml.bin | 84 ++++++------ .../plain_main-and-dev_lock20_1.2.json.bin | 2 +- .../plain_main-and-dev_lock20_1.2.xml.bin | 2 +- .../plain_main-and-dev_lock20_1.3.json.bin | 2 +- .../plain_main-and-dev_lock20_1.3.xml.bin | 2 +- .../plain_main-and-dev_lock20_1.4.json.bin | 39 ++++++ .../plain_main-and-dev_lock20_1.4.xml.bin | 2 +- .../plain_main-and-dev_lock20_1.5.json.bin | 69 ++++++++-- .../plain_main-and-dev_lock20_1.5.xml.bin | 84 ++++++------ .../plain_main-and-dev_lock20_1.6.json.bin | 70 ++++++++-- .../plain_main-and-dev_lock20_1.6.xml.bin | 84 ++++++------ ..._multi-constraint-deps_lock11_1.2.json.bin | 2 +- ...n_multi-constraint-deps_lock11_1.2.xml.bin | 2 +- ..._multi-constraint-deps_lock11_1.3.json.bin | 2 +- ...n_multi-constraint-deps_lock11_1.3.xml.bin | 2 +- ..._multi-constraint-deps_lock11_1.4.json.bin | 39 ++++++ ...n_multi-constraint-deps_lock11_1.4.xml.bin | 2 +- ..._multi-constraint-deps_lock11_1.5.json.bin | 69 ++++++++-- ...n_multi-constraint-deps_lock11_1.5.xml.bin | 84 ++++++------ ..._multi-constraint-deps_lock11_1.6.json.bin | 70 ++++++++-- ...n_multi-constraint-deps_lock11_1.6.xml.bin | 84 ++++++------ ..._multi-constraint-deps_lock20_1.2.json.bin | 2 +- ...n_multi-constraint-deps_lock20_1.2.xml.bin | 2 +- ..._multi-constraint-deps_lock20_1.3.json.bin | 10 +- ...n_multi-constraint-deps_lock20_1.3.xml.bin | 4 +- ..._multi-constraint-deps_lock20_1.4.json.bin | 47 +++++-- ...n_multi-constraint-deps_lock20_1.4.xml.bin | 4 +- ..._multi-constraint-deps_lock20_1.5.json.bin | 77 ++++++++--- ...n_multi-constraint-deps_lock20_1.5.xml.bin | 86 +++++++------ ..._multi-constraint-deps_lock20_1.6.json.bin | 78 +++++++++--- ...n_multi-constraint-deps_lock20_1.6.xml.bin | 86 +++++++------ .../poetry/plain_no-deps_lock20_1.2.json.bin | 2 +- .../poetry/plain_no-deps_lock20_1.2.xml.bin | 2 +- .../poetry/plain_no-deps_lock20_1.3.json.bin | 2 +- .../poetry/plain_no-deps_lock20_1.3.xml.bin | 2 +- .../poetry/plain_no-deps_lock20_1.4.json.bin | 39 ++++++ .../poetry/plain_no-deps_lock20_1.4.xml.bin | 2 +- .../poetry/plain_no-deps_lock20_1.5.json.bin | 69 ++++++++-- .../poetry/plain_no-deps_lock20_1.5.xml.bin | 84 ++++++------ .../poetry/plain_no-deps_lock20_1.6.json.bin | 70 ++++++++-- .../poetry/plain_no-deps_lock20_1.6.xml.bin | 84 ++++++------ ..._normalize-packagename_lock10_1.2.json.bin | 2 +- ...n_normalize-packagename_lock10_1.2.xml.bin | 2 +- ..._normalize-packagename_lock10_1.3.json.bin | 2 +- ...n_normalize-packagename_lock10_1.3.xml.bin | 2 +- ..._normalize-packagename_lock10_1.4.json.bin | 39 ++++++ ...n_normalize-packagename_lock10_1.4.xml.bin | 2 +- ..._normalize-packagename_lock10_1.5.json.bin | 69 ++++++++-- ...n_normalize-packagename_lock10_1.5.xml.bin | 84 ++++++------ ..._normalize-packagename_lock10_1.6.json.bin | 70 ++++++++-- ...n_normalize-packagename_lock10_1.6.xml.bin | 84 ++++++------ ..._normalize-packagename_lock20_1.2.json.bin | 2 +- ...n_normalize-packagename_lock20_1.2.xml.bin | 2 +- ..._normalize-packagename_lock20_1.3.json.bin | 2 +- ...n_normalize-packagename_lock20_1.3.xml.bin | 2 +- ..._normalize-packagename_lock20_1.4.json.bin | 39 ++++++ ...n_normalize-packagename_lock20_1.4.xml.bin | 2 +- ..._normalize-packagename_lock20_1.5.json.bin | 69 ++++++++-- ...n_normalize-packagename_lock20_1.5.xml.bin | 84 ++++++------ ..._normalize-packagename_lock20_1.6.json.bin | 70 ++++++++-- ...n_normalize-packagename_lock20_1.6.xml.bin | 84 ++++++------ .../plain_private-packges_lock10_1.2.json.bin | 2 +- .../plain_private-packges_lock10_1.2.xml.bin | 2 +- .../plain_private-packges_lock10_1.3.json.bin | 2 +- .../plain_private-packges_lock10_1.3.xml.bin | 2 +- .../plain_private-packges_lock10_1.4.json.bin | 39 ++++++ .../plain_private-packges_lock10_1.4.xml.bin | 2 +- .../plain_private-packges_lock10_1.5.json.bin | 69 ++++++++-- .../plain_private-packges_lock10_1.5.xml.bin | 84 ++++++------ .../plain_private-packges_lock10_1.6.json.bin | 70 ++++++++-- .../plain_private-packges_lock10_1.6.xml.bin | 84 ++++++------ .../plain_private-packges_lock11_1.2.json.bin | 2 +- .../plain_private-packges_lock11_1.2.xml.bin | 2 +- .../plain_private-packges_lock11_1.3.json.bin | 2 +- .../plain_private-packges_lock11_1.3.xml.bin | 2 +- .../plain_private-packges_lock11_1.4.json.bin | 39 ++++++ .../plain_private-packges_lock11_1.4.xml.bin | 2 +- .../plain_private-packges_lock11_1.5.json.bin | 69 ++++++++-- .../plain_private-packges_lock11_1.5.xml.bin | 84 ++++++------ .../plain_private-packges_lock11_1.6.json.bin | 70 ++++++++-- .../plain_private-packges_lock11_1.6.xml.bin | 84 ++++++------ .../plain_private-packges_lock20_1.2.json.bin | 2 +- .../plain_private-packges_lock20_1.2.xml.bin | 2 +- .../plain_private-packges_lock20_1.3.json.bin | 2 +- .../plain_private-packges_lock20_1.3.xml.bin | 2 +- .../plain_private-packges_lock20_1.4.json.bin | 39 ++++++ .../plain_private-packges_lock20_1.4.xml.bin | 2 +- .../plain_private-packges_lock20_1.5.json.bin | 69 ++++++++-- .../plain_private-packges_lock20_1.5.xml.bin | 84 ++++++------ .../plain_private-packges_lock20_1.6.json.bin | 70 ++++++++-- .../plain_private-packges_lock20_1.6.xml.bin | 84 ++++++------ ...in_regression-issue611_lock20_1.2.json.bin | 2 +- ...ain_regression-issue611_lock20_1.2.xml.bin | 2 +- ...in_regression-issue611_lock20_1.3.json.bin | 2 +- ...ain_regression-issue611_lock20_1.3.xml.bin | 2 +- ...in_regression-issue611_lock20_1.4.json.bin | 39 ++++++ ...ain_regression-issue611_lock20_1.4.xml.bin | 2 +- ...in_regression-issue611_lock20_1.5.json.bin | 69 ++++++++-- ...ain_regression-issue611_lock20_1.5.xml.bin | 84 ++++++------ ...in_regression-issue611_lock20_1.6.json.bin | 70 ++++++++-- ...ain_regression-issue611_lock20_1.6.xml.bin | 84 ++++++------ ...in_regression-issue702_lock10_1.2.json.bin | 2 +- ...ain_regression-issue702_lock10_1.2.xml.bin | 2 +- ...in_regression-issue702_lock10_1.3.json.bin | 2 +- ...ain_regression-issue702_lock10_1.3.xml.bin | 2 +- ...in_regression-issue702_lock10_1.4.json.bin | 39 ++++++ ...ain_regression-issue702_lock10_1.4.xml.bin | 2 +- ...in_regression-issue702_lock10_1.5.json.bin | 69 ++++++++-- ...ain_regression-issue702_lock10_1.5.xml.bin | 84 ++++++------ ...in_regression-issue702_lock10_1.6.json.bin | 70 ++++++++-- ...ain_regression-issue702_lock10_1.6.xml.bin | 84 ++++++------ ...in_regression-issue702_lock11_1.2.json.bin | 2 +- ...ain_regression-issue702_lock11_1.2.xml.bin | 2 +- ...in_regression-issue702_lock11_1.3.json.bin | 2 +- ...ain_regression-issue702_lock11_1.3.xml.bin | 2 +- ...in_regression-issue702_lock11_1.4.json.bin | 39 ++++++ ...ain_regression-issue702_lock11_1.4.xml.bin | 2 +- ...in_regression-issue702_lock11_1.5.json.bin | 69 ++++++++-- ...ain_regression-issue702_lock11_1.5.xml.bin | 84 ++++++------ ...in_regression-issue702_lock11_1.6.json.bin | 70 ++++++++-- ...ain_regression-issue702_lock11_1.6.xml.bin | 84 ++++++------ ...in_regression-issue702_lock20_1.2.json.bin | 2 +- ...ain_regression-issue702_lock20_1.2.xml.bin | 2 +- ...in_regression-issue702_lock20_1.3.json.bin | 2 +- ...ain_regression-issue702_lock20_1.3.xml.bin | 2 +- ...in_regression-issue702_lock20_1.4.json.bin | 39 ++++++ ...ain_regression-issue702_lock20_1.4.xml.bin | 2 +- ...in_regression-issue702_lock20_1.5.json.bin | 69 ++++++++-- ...ain_regression-issue702_lock20_1.5.xml.bin | 84 ++++++------ ...in_regression-issue702_lock20_1.6.json.bin | 70 ++++++++-- ...ain_regression-issue702_lock20_1.6.xml.bin | 84 ++++++------ ...in_regression-issue727_lock20_1.2.json.bin | 2 +- ...ain_regression-issue727_lock20_1.2.xml.bin | 2 +- ...in_regression-issue727_lock20_1.3.json.bin | 2 +- ...ain_regression-issue727_lock20_1.3.xml.bin | 2 +- ...in_regression-issue727_lock20_1.4.json.bin | 39 ++++++ ...ain_regression-issue727_lock20_1.4.xml.bin | 2 +- ...in_regression-issue727_lock20_1.5.json.bin | 69 ++++++++-- ...ain_regression-issue727_lock20_1.5.xml.bin | 84 ++++++------ ...in_regression-issue727_lock20_1.6.json.bin | 70 ++++++++-- ...ain_regression-issue727_lock20_1.6.xml.bin | 84 ++++++------ .../plain_with-extras_lock10_1.2.json.bin | 2 +- .../plain_with-extras_lock10_1.2.xml.bin | 2 +- .../plain_with-extras_lock10_1.3.json.bin | 2 +- .../plain_with-extras_lock10_1.3.xml.bin | 2 +- .../plain_with-extras_lock10_1.4.json.bin | 39 ++++++ .../plain_with-extras_lock10_1.4.xml.bin | 2 +- .../plain_with-extras_lock10_1.5.json.bin | 69 ++++++++-- .../plain_with-extras_lock10_1.5.xml.bin | 84 ++++++------ .../plain_with-extras_lock10_1.6.json.bin | 70 ++++++++-- .../plain_with-extras_lock10_1.6.xml.bin | 84 ++++++------ .../plain_with-extras_lock11_1.2.json.bin | 2 +- .../plain_with-extras_lock11_1.2.xml.bin | 2 +- .../plain_with-extras_lock11_1.3.json.bin | 2 +- .../plain_with-extras_lock11_1.3.xml.bin | 2 +- .../plain_with-extras_lock11_1.4.json.bin | 39 ++++++ .../plain_with-extras_lock11_1.4.xml.bin | 2 +- .../plain_with-extras_lock11_1.5.json.bin | 69 ++++++++-- .../plain_with-extras_lock11_1.5.xml.bin | 84 ++++++------ .../plain_with-extras_lock11_1.6.json.bin | 70 ++++++++-- .../plain_with-extras_lock11_1.6.xml.bin | 84 ++++++------ .../plain_with-extras_lock20_1.2.json.bin | 2 +- .../plain_with-extras_lock20_1.2.xml.bin | 2 +- .../plain_with-extras_lock20_1.3.json.bin | 2 +- .../plain_with-extras_lock20_1.3.xml.bin | 2 +- .../plain_with-extras_lock20_1.4.json.bin | 39 ++++++ .../plain_with-extras_lock20_1.4.xml.bin | 2 +- .../plain_with-extras_lock20_1.5.json.bin | 69 ++++++++-- .../plain_with-extras_lock20_1.5.xml.bin | 84 ++++++------ .../plain_with-extras_lock20_1.6.json.bin | 70 ++++++++-- .../plain_with-extras_lock20_1.6.xml.bin | 84 ++++++------ .../plain_with-urls_lock10_1.2.json.bin | 2 +- .../poetry/plain_with-urls_lock10_1.2.xml.bin | 2 +- .../plain_with-urls_lock10_1.3.json.bin | 10 +- .../poetry/plain_with-urls_lock10_1.3.xml.bin | 4 +- .../plain_with-urls_lock10_1.4.json.bin | 47 +++++-- .../poetry/plain_with-urls_lock10_1.4.xml.bin | 4 +- .../plain_with-urls_lock10_1.5.json.bin | 77 ++++++++--- .../poetry/plain_with-urls_lock10_1.5.xml.bin | 86 +++++++------ .../plain_with-urls_lock10_1.6.json.bin | 78 +++++++++--- .../poetry/plain_with-urls_lock10_1.6.xml.bin | 86 +++++++------ .../plain_with-urls_lock11_1.2.json.bin | 2 +- .../poetry/plain_with-urls_lock11_1.2.xml.bin | 2 +- .../plain_with-urls_lock11_1.3.json.bin | 18 +-- .../poetry/plain_with-urls_lock11_1.3.xml.bin | 6 +- .../plain_with-urls_lock11_1.4.json.bin | 55 +++++--- .../poetry/plain_with-urls_lock11_1.4.xml.bin | 6 +- .../plain_with-urls_lock11_1.5.json.bin | 85 +++++++++---- .../poetry/plain_with-urls_lock11_1.5.xml.bin | 88 +++++++------ .../plain_with-urls_lock11_1.6.json.bin | 86 +++++++++---- .../poetry/plain_with-urls_lock11_1.6.xml.bin | 88 +++++++------ .../plain_with-urls_lock20_1.2.json.bin | 2 +- .../poetry/plain_with-urls_lock20_1.2.xml.bin | 2 +- .../plain_with-urls_lock20_1.3.json.bin | 18 +-- .../poetry/plain_with-urls_lock20_1.3.xml.bin | 6 +- .../plain_with-urls_lock20_1.4.json.bin | 55 +++++--- .../poetry/plain_with-urls_lock20_1.4.xml.bin | 6 +- .../plain_with-urls_lock20_1.5.json.bin | 85 +++++++++---- .../poetry/plain_with-urls_lock20_1.5.xml.bin | 88 +++++++------ .../plain_with-urls_lock20_1.6.json.bin | 86 +++++++++---- .../poetry/plain_with-urls_lock20_1.6.xml.bin | 88 +++++++------ ...ome-extras_with-extras_lock10_1.2.json.bin | 2 +- ...some-extras_with-extras_lock10_1.2.xml.bin | 2 +- ...ome-extras_with-extras_lock10_1.3.json.bin | 2 +- ...some-extras_with-extras_lock10_1.3.xml.bin | 2 +- ...ome-extras_with-extras_lock10_1.4.json.bin | 39 ++++++ ...some-extras_with-extras_lock10_1.4.xml.bin | 2 +- ...ome-extras_with-extras_lock10_1.5.json.bin | 69 ++++++++-- ...some-extras_with-extras_lock10_1.5.xml.bin | 84 ++++++------ ...ome-extras_with-extras_lock10_1.6.json.bin | 70 ++++++++-- ...some-extras_with-extras_lock10_1.6.xml.bin | 84 ++++++------ ...ome-extras_with-extras_lock11_1.2.json.bin | 2 +- ...some-extras_with-extras_lock11_1.2.xml.bin | 2 +- ...ome-extras_with-extras_lock11_1.3.json.bin | 2 +- ...some-extras_with-extras_lock11_1.3.xml.bin | 2 +- ...ome-extras_with-extras_lock11_1.4.json.bin | 39 ++++++ ...some-extras_with-extras_lock11_1.4.xml.bin | 2 +- ...ome-extras_with-extras_lock11_1.5.json.bin | 69 ++++++++-- ...some-extras_with-extras_lock11_1.5.xml.bin | 84 ++++++------ ...ome-extras_with-extras_lock11_1.6.json.bin | 70 ++++++++-- ...some-extras_with-extras_lock11_1.6.xml.bin | 84 ++++++------ ...ome-extras_with-extras_lock20_1.2.json.bin | 2 +- ...some-extras_with-extras_lock20_1.2.xml.bin | 2 +- ...ome-extras_with-extras_lock20_1.3.json.bin | 2 +- ...some-extras_with-extras_lock20_1.3.xml.bin | 2 +- ...ome-extras_with-extras_lock20_1.4.json.bin | 39 ++++++ ...some-extras_with-extras_lock20_1.4.xml.bin | 2 +- ...ome-extras_with-extras_lock20_1.5.json.bin | 69 ++++++++-- ...some-extras_with-extras_lock20_1.5.xml.bin | 84 ++++++------ ...ome-extras_with-extras_lock20_1.6.json.bin | 70 ++++++++-- ...some-extras_with-extras_lock20_1.6.xml.bin | 84 ++++++------ ...some-groups_group-deps_lock11_1.2.json.bin | 2 +- .../some-groups_group-deps_lock11_1.2.xml.bin | 2 +- ...some-groups_group-deps_lock11_1.3.json.bin | 2 +- .../some-groups_group-deps_lock11_1.3.xml.bin | 2 +- ...some-groups_group-deps_lock11_1.4.json.bin | 39 ++++++ .../some-groups_group-deps_lock11_1.4.xml.bin | 2 +- ...some-groups_group-deps_lock11_1.5.json.bin | 69 ++++++++-- .../some-groups_group-deps_lock11_1.5.xml.bin | 84 ++++++------ ...some-groups_group-deps_lock11_1.6.json.bin | 70 ++++++++-- .../some-groups_group-deps_lock11_1.6.xml.bin | 84 ++++++------ ...some-groups_group-deps_lock20_1.2.json.bin | 2 +- .../some-groups_group-deps_lock20_1.2.xml.bin | 2 +- ...some-groups_group-deps_lock20_1.3.json.bin | 2 +- .../some-groups_group-deps_lock20_1.3.xml.bin | 2 +- ...some-groups_group-deps_lock20_1.4.json.bin | 39 ++++++ .../some-groups_group-deps_lock20_1.4.xml.bin | 2 +- ...some-groups_group-deps_lock20_1.5.json.bin | 69 ++++++++-- .../some-groups_group-deps_lock20_1.5.xml.bin | 84 ++++++------ ...some-groups_group-deps_lock20_1.6.json.bin | 70 ++++++++-- .../some-groups_group-deps_lock20_1.6.xml.bin | 84 ++++++------ .../requirements/file_frozen_1.2.json.bin | 2 +- .../requirements/file_frozen_1.2.xml.bin | 2 +- .../requirements/file_frozen_1.3.json.bin | 2 +- .../requirements/file_frozen_1.3.xml.bin | 2 +- .../requirements/file_frozen_1.4.json.bin | 39 ++++++ .../requirements/file_frozen_1.4.xml.bin | 2 +- .../requirements/file_frozen_1.5.json.bin | 69 ++++++++-- .../requirements/file_frozen_1.5.xml.bin | 84 ++++++------ .../requirements/file_frozen_1.6.json.bin | 70 ++++++++-- .../requirements/file_frozen_1.6.xml.bin | 84 ++++++------ .../requirements/file_local_1.2.json.bin | 2 +- .../requirements/file_local_1.2.xml.bin | 2 +- .../requirements/file_local_1.3.json.bin | 2 +- .../requirements/file_local_1.3.xml.bin | 2 +- .../requirements/file_local_1.4.json.bin | 39 ++++++ .../requirements/file_local_1.4.xml.bin | 2 +- .../requirements/file_local_1.5.json.bin | 69 ++++++++-- .../requirements/file_local_1.5.xml.bin | 84 ++++++------ .../requirements/file_local_1.6.json.bin | 70 ++++++++-- .../requirements/file_local_1.6.xml.bin | 84 ++++++------ .../requirements/file_nested_1.2.json.bin | 2 +- .../requirements/file_nested_1.2.xml.bin | 2 +- .../requirements/file_nested_1.3.json.bin | 2 +- .../requirements/file_nested_1.3.xml.bin | 2 +- .../requirements/file_nested_1.4.json.bin | 39 ++++++ .../requirements/file_nested_1.4.xml.bin | 2 +- .../requirements/file_nested_1.5.json.bin | 69 ++++++++-- .../requirements/file_nested_1.5.xml.bin | 84 ++++++------ .../requirements/file_nested_1.6.json.bin | 70 ++++++++-- .../requirements/file_nested_1.6.xml.bin | 84 ++++++------ .../file_private-packages_1.2.json.bin | 2 +- .../file_private-packages_1.2.xml.bin | 2 +- .../file_private-packages_1.3.json.bin | 2 +- .../file_private-packages_1.3.xml.bin | 2 +- .../file_private-packages_1.4.json.bin | 39 ++++++ .../file_private-packages_1.4.xml.bin | 2 +- .../file_private-packages_1.5.json.bin | 69 ++++++++-- .../file_private-packages_1.5.xml.bin | 84 ++++++------ .../file_private-packages_1.6.json.bin | 70 ++++++++-- .../file_private-packages_1.6.xml.bin | 84 ++++++------ ...egression-issue448.cp1252.txt_1.2.json.bin | 2 +- ...regression-issue448.cp1252.txt_1.2.xml.bin | 2 +- ...egression-issue448.cp1252.txt_1.3.json.bin | 2 +- ...regression-issue448.cp1252.txt_1.3.xml.bin | 2 +- ...egression-issue448.cp1252.txt_1.4.json.bin | 39 ++++++ ...regression-issue448.cp1252.txt_1.4.xml.bin | 2 +- ...egression-issue448.cp1252.txt_1.5.json.bin | 69 ++++++++-- ...regression-issue448.cp1252.txt_1.5.xml.bin | 84 ++++++------ ...egression-issue448.cp1252.txt_1.6.json.bin | 70 ++++++++-- ...regression-issue448.cp1252.txt_1.6.xml.bin | 84 ++++++------ .../file_with-comments_1.2.json.bin | 2 +- .../file_with-comments_1.2.xml.bin | 2 +- .../file_with-comments_1.3.json.bin | 2 +- .../file_with-comments_1.3.xml.bin | 2 +- .../file_with-comments_1.4.json.bin | 39 ++++++ .../file_with-comments_1.4.xml.bin | 2 +- .../file_with-comments_1.5.json.bin | 69 ++++++++-- .../file_with-comments_1.5.xml.bin | 84 ++++++------ .../file_with-comments_1.6.json.bin | 70 ++++++++-- .../file_with-comments_1.6.xml.bin | 84 ++++++------ .../file_with-extras_1.2.json.bin | 2 +- .../requirements/file_with-extras_1.2.xml.bin | 2 +- .../file_with-extras_1.3.json.bin | 2 +- .../requirements/file_with-extras_1.3.xml.bin | 2 +- .../file_with-extras_1.4.json.bin | 39 ++++++ .../requirements/file_with-extras_1.4.xml.bin | 2 +- .../file_with-extras_1.5.json.bin | 69 ++++++++-- .../requirements/file_with-extras_1.5.xml.bin | 84 ++++++------ .../file_with-extras_1.6.json.bin | 70 ++++++++-- .../requirements/file_with-extras_1.6.xml.bin | 84 ++++++------ .../file_with-hashes_1.2.json.bin | 2 +- .../requirements/file_with-hashes_1.2.xml.bin | 2 +- .../file_with-hashes_1.3.json.bin | 2 +- .../requirements/file_with-hashes_1.3.xml.bin | 2 +- .../file_with-hashes_1.4.json.bin | 39 ++++++ .../requirements/file_with-hashes_1.4.xml.bin | 2 +- .../file_with-hashes_1.5.json.bin | 69 ++++++++-- .../requirements/file_with-hashes_1.5.xml.bin | 84 ++++++------ .../file_with-hashes_1.6.json.bin | 70 ++++++++-- .../requirements/file_with-hashes_1.6.xml.bin | 84 ++++++------ .../requirements/file_with-urls_1.2.json.bin | 2 +- .../requirements/file_with-urls_1.2.xml.bin | 2 +- .../requirements/file_with-urls_1.3.json.bin | 2 +- .../requirements/file_with-urls_1.3.xml.bin | 2 +- .../requirements/file_with-urls_1.4.json.bin | 39 ++++++ .../requirements/file_with-urls_1.4.xml.bin | 2 +- .../requirements/file_with-urls_1.5.json.bin | 69 ++++++++-- .../requirements/file_with-urls_1.5.xml.bin | 84 ++++++------ .../requirements/file_with-urls_1.6.json.bin | 70 ++++++++-- .../requirements/file_with-urls_1.6.xml.bin | 84 ++++++------ .../file_without-pinned-versions_1.2.json.bin | 2 +- .../file_without-pinned-versions_1.2.xml.bin | 2 +- .../file_without-pinned-versions_1.3.json.bin | 2 +- .../file_without-pinned-versions_1.3.xml.bin | 2 +- .../file_without-pinned-versions_1.4.json.bin | 39 ++++++ .../file_without-pinned-versions_1.4.xml.bin | 2 +- .../file_without-pinned-versions_1.5.json.bin | 69 ++++++++-- .../file_without-pinned-versions_1.5.xml.bin | 84 ++++++------ .../file_without-pinned-versions_1.6.json.bin | 70 ++++++++-- .../file_without-pinned-versions_1.6.xml.bin | 84 ++++++------ .../index_auth_frozen_1.2.json.bin | 2 +- .../index_auth_frozen_1.2.xml.bin | 2 +- .../index_auth_frozen_1.3.json.bin | 2 +- .../index_auth_frozen_1.3.xml.bin | 2 +- .../index_auth_frozen_1.4.json.bin | 39 ++++++ .../index_auth_frozen_1.4.xml.bin | 2 +- .../index_auth_frozen_1.5.json.bin | 69 ++++++++-- .../index_auth_frozen_1.5.xml.bin | 84 ++++++------ .../index_auth_frozen_1.6.json.bin | 70 ++++++++-- .../index_auth_frozen_1.6.xml.bin | 84 ++++++------ .../requirements/stream_frozen_1.2.json.bin | 2 +- .../requirements/stream_frozen_1.2.xml.bin | 2 +- .../requirements/stream_frozen_1.3.json.bin | 2 +- .../requirements/stream_frozen_1.3.xml.bin | 2 +- .../requirements/stream_frozen_1.4.json.bin | 39 ++++++ .../requirements/stream_frozen_1.4.xml.bin | 2 +- .../requirements/stream_frozen_1.5.json.bin | 69 ++++++++-- .../requirements/stream_frozen_1.5.xml.bin | 84 ++++++------ .../requirements/stream_frozen_1.6.json.bin | 70 ++++++++-- .../requirements/stream_frozen_1.6.xml.bin | 84 ++++++------ .../requirements/stream_local_1.2.json.bin | 2 +- .../requirements/stream_local_1.2.xml.bin | 2 +- .../requirements/stream_local_1.3.json.bin | 2 +- .../requirements/stream_local_1.3.xml.bin | 2 +- .../requirements/stream_local_1.4.json.bin | 39 ++++++ .../requirements/stream_local_1.4.xml.bin | 2 +- .../requirements/stream_local_1.5.json.bin | 69 ++++++++-- .../requirements/stream_local_1.5.xml.bin | 84 ++++++------ .../requirements/stream_local_1.6.json.bin | 70 ++++++++-- .../requirements/stream_local_1.6.xml.bin | 84 ++++++------ .../requirements/stream_nested_1.2.json.bin | 2 +- .../requirements/stream_nested_1.2.xml.bin | 2 +- .../requirements/stream_nested_1.3.json.bin | 2 +- .../requirements/stream_nested_1.3.xml.bin | 2 +- .../requirements/stream_nested_1.4.json.bin | 39 ++++++ .../requirements/stream_nested_1.4.xml.bin | 2 +- .../requirements/stream_nested_1.5.json.bin | 69 ++++++++-- .../requirements/stream_nested_1.5.xml.bin | 84 ++++++------ .../requirements/stream_nested_1.6.json.bin | 70 ++++++++-- .../requirements/stream_nested_1.6.xml.bin | 84 ++++++------ .../stream_private-packages_1.2.json.bin | 2 +- .../stream_private-packages_1.2.xml.bin | 2 +- .../stream_private-packages_1.3.json.bin | 2 +- .../stream_private-packages_1.3.xml.bin | 2 +- .../stream_private-packages_1.4.json.bin | 39 ++++++ .../stream_private-packages_1.4.xml.bin | 2 +- .../stream_private-packages_1.5.json.bin | 69 ++++++++-- .../stream_private-packages_1.5.xml.bin | 84 ++++++------ .../stream_private-packages_1.6.json.bin | 70 ++++++++-- .../stream_private-packages_1.6.xml.bin | 84 ++++++------ ...egression-issue448.cp1252.txt_1.2.json.bin | 2 +- ...regression-issue448.cp1252.txt_1.2.xml.bin | 2 +- ...egression-issue448.cp1252.txt_1.3.json.bin | 2 +- ...regression-issue448.cp1252.txt_1.3.xml.bin | 2 +- ...egression-issue448.cp1252.txt_1.4.json.bin | 39 ++++++ ...regression-issue448.cp1252.txt_1.4.xml.bin | 2 +- ...egression-issue448.cp1252.txt_1.5.json.bin | 69 ++++++++-- ...regression-issue448.cp1252.txt_1.5.xml.bin | 84 ++++++------ ...egression-issue448.cp1252.txt_1.6.json.bin | 70 ++++++++-- ...regression-issue448.cp1252.txt_1.6.xml.bin | 84 ++++++------ .../stream_with-comments_1.2.json.bin | 2 +- .../stream_with-comments_1.2.xml.bin | 2 +- .../stream_with-comments_1.3.json.bin | 2 +- .../stream_with-comments_1.3.xml.bin | 2 +- .../stream_with-comments_1.4.json.bin | 39 ++++++ .../stream_with-comments_1.4.xml.bin | 2 +- .../stream_with-comments_1.5.json.bin | 69 ++++++++-- .../stream_with-comments_1.5.xml.bin | 84 ++++++------ .../stream_with-comments_1.6.json.bin | 70 ++++++++-- .../stream_with-comments_1.6.xml.bin | 84 ++++++------ .../stream_with-extras_1.2.json.bin | 2 +- .../stream_with-extras_1.2.xml.bin | 2 +- .../stream_with-extras_1.3.json.bin | 2 +- .../stream_with-extras_1.3.xml.bin | 2 +- .../stream_with-extras_1.4.json.bin | 39 ++++++ .../stream_with-extras_1.4.xml.bin | 2 +- .../stream_with-extras_1.5.json.bin | 69 ++++++++-- .../stream_with-extras_1.5.xml.bin | 84 ++++++------ .../stream_with-extras_1.6.json.bin | 70 ++++++++-- .../stream_with-extras_1.6.xml.bin | 84 ++++++------ .../stream_with-hashes_1.2.json.bin | 2 +- .../stream_with-hashes_1.2.xml.bin | 2 +- .../stream_with-hashes_1.3.json.bin | 2 +- .../stream_with-hashes_1.3.xml.bin | 2 +- .../stream_with-hashes_1.4.json.bin | 39 ++++++ .../stream_with-hashes_1.4.xml.bin | 2 +- .../stream_with-hashes_1.5.json.bin | 69 ++++++++-- .../stream_with-hashes_1.5.xml.bin | 84 ++++++------ .../stream_with-hashes_1.6.json.bin | 70 ++++++++-- .../stream_with-hashes_1.6.xml.bin | 84 ++++++------ .../stream_with-urls_1.2.json.bin | 2 +- .../requirements/stream_with-urls_1.2.xml.bin | 2 +- .../stream_with-urls_1.3.json.bin | 2 +- .../requirements/stream_with-urls_1.3.xml.bin | 2 +- .../stream_with-urls_1.4.json.bin | 39 ++++++ .../requirements/stream_with-urls_1.4.xml.bin | 2 +- .../stream_with-urls_1.5.json.bin | 69 ++++++++-- .../requirements/stream_with-urls_1.5.xml.bin | 84 ++++++------ .../stream_with-urls_1.6.json.bin | 70 ++++++++-- .../requirements/stream_with-urls_1.6.xml.bin | 84 ++++++------ ...tream_without-pinned-versions_1.2.json.bin | 2 +- ...stream_without-pinned-versions_1.2.xml.bin | 2 +- ...tream_without-pinned-versions_1.3.json.bin | 2 +- ...stream_without-pinned-versions_1.3.xml.bin | 2 +- ...tream_without-pinned-versions_1.4.json.bin | 39 ++++++ ...stream_without-pinned-versions_1.4.xml.bin | 2 +- ...tream_without-pinned-versions_1.5.json.bin | 69 ++++++++-- ...stream_without-pinned-versions_1.5.xml.bin | 84 ++++++------ ...tream_without-pinned-versions_1.6.json.bin | 70 ++++++++-- ...stream_without-pinned-versions_1.6.xml.bin | 84 ++++++------ tests/unit/test_cli.py | 4 +- tests/unit/test_utils_cdx.py | 80 ++++++++++++ 919 files changed, 23999 insertions(+), 9019 deletions(-) create mode 100644 cyclonedx_py/_internal/utils/__init__.py create mode 100644 tests/unit/test_utils_cdx.py diff --git a/cyclonedx_py/_internal/__init__.py b/cyclonedx_py/_internal/__init__.py index d718f27b..1206f2ad 100644 --- a/cyclonedx_py/_internal/__init__.py +++ b/cyclonedx_py/_internal/__init__.py @@ -71,13 +71,6 @@ class PropertyName(Enum): # region poetry # see https://github.com/CycloneDX/cyclonedx-property-taxonomy/blob/main/cdx/poetry.md PoetryGroup = 'cdx:poetry:group' - # region poetry-deprecated - # the following property names are deprecated - PoetryPackageSourceReference_misspelled = 'cdx:poetry:source:package:reference' - PoetryPackageSourceResolvedReference = 'cdx:poetry:package:source:resolved_reference' - PoetryPackageSourceVcsRequestedRevision = 'cdx:poetry:package:source:vcs:requested_revision' - PoetryPackageSourceVcsCommitId = 'cdx:poetry:package:source:vcs:commit_id' - # endregion poetry-deprecated # endregion poetry # region pipenv diff --git a/cyclonedx_py/_internal/environment.py b/cyclonedx_py/_internal/environment.py index b676db2d..afec4726 100644 --- a/cyclonedx_py/_internal/environment.py +++ b/cyclonedx_py/_internal/environment.py @@ -245,16 +245,10 @@ def __component_add_extref_and_purl(self, component: 'Component', component.properties.add(Property( name=PropertyName.PythonPackageSourceVcsCommitId.value, value=packagesource.commit_id)) - component.properties.add(Property( - name=PropertyName.PoetryPackageSourceVcsCommitId.value, # deprecated - value=packagesource.commit_id)) if packagesource.requested_revision: component.properties.add(Property( name=PropertyName.PythonPackageSourceVcsRequestedRevision.value, value=packagesource.requested_revision)) - component.properties.add(Property( - name=PropertyName.PoetryPackageSourceVcsRequestedRevision.value, # deprecated - value=packagesource.requested_revision)) elif isinstance(packagesource, PackageSourceArchive): if '://files.pythonhosted.org/' not in packagesource.url: # skip PURL bloat, do not add implicit information diff --git a/cyclonedx_py/_internal/poetry.py b/cyclonedx_py/_internal/poetry.py index 36d13b6a..df80ef50 100644 --- a/cyclonedx_py/_internal/poetry.py +++ b/cyclonedx_py/_internal/poetry.py @@ -416,16 +416,6 @@ def __make_component4lock(self, package: 'T_NameDict') -> 'Component': name=PropertyName.PoetryGroup.value, value=package['category'] ) if 'category' in package else None, - # region deprecated - Property( - name=PropertyName.PoetryPackageSourceReference_misspelled.value, # deprecated - value=source['reference'] - ) if is_vcs and 'reference' in source else None, - Property( - name=PropertyName.PoetryPackageSourceResolvedReference.value, # deprecated - value=source['resolved_reference'] - ) if is_vcs and 'resolved_reference' in source else None, - # endregion deprecated )), purl=PackageURL( type=PurlTypePypi, diff --git a/cyclonedx_py/_internal/utils/__init__.py b/cyclonedx_py/_internal/utils/__init__.py new file mode 100644 index 00000000..e6cc2315 --- /dev/null +++ b/cyclonedx_py/_internal/utils/__init__.py @@ -0,0 +1,16 @@ +# This file is part of CycloneDX Python +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# +# SPDX-License-Identifier: Apache-2.0 +# Copyright (c) OWASP Foundation. All Rights Reserved. diff --git a/cyclonedx_py/_internal/utils/cdx.py b/cyclonedx_py/_internal/utils/cdx.py index b6abc6f5..4ac1c534 100644 --- a/cyclonedx_py/_internal/utils/cdx.py +++ b/cyclonedx_py/_internal/utils/cdx.py @@ -23,54 +23,67 @@ from re import compile as re_compile from typing import Any, Dict, Iterable -from cyclonedx.model import ExternalReference, ExternalReferenceType, Tool, XsUri +from cyclonedx.builder.this import this_component as lib_component +from cyclonedx.model import ExternalReference, ExternalReferenceType, XsUri from cyclonedx.model.bom import Bom -from cyclonedx.model.license import License, LicenseExpression +from cyclonedx.model.component import Component, ComponentType +from cyclonedx.model.license import DisjunctiveLicense, License, LicenseAcknowledgement, LicenseExpression -from cyclonedx_py import __version__ +from ... import __version__ as __THIS_VERSION # noqa:N812 def make_bom(**kwargs: Any) -> Bom: bom = Bom(**kwargs) - bom.metadata.tools.add(Tool( - # keep in sync with `../../../pyproject.toml` - vendor='CycloneDX', - name='cyclonedx-bom', - version=__version__, - external_references=[ - ExternalReference( - type=ExternalReferenceType.BUILD_SYSTEM, - url=XsUri('https://github.com/CycloneDX/cyclonedx-python/actions') + bom.metadata.tools.components.update(( + lib_component(), + Component( + type=ComponentType.APPLICATION, + group='CycloneDX', + # package is called 'cyclonedx-bom', but the tool is called 'cyclonedx-py' + name='cyclonedx-py', + version=__THIS_VERSION, + description='CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments', + licenses=(DisjunctiveLicense(id='Apache-2.0', + acknowledgement=LicenseAcknowledgement.DECLARED),), + external_references=( + # let's assume this is not a fork + ExternalReference( + type=ExternalReferenceType.WEBSITE, + url=XsUri('https://github.com/CycloneDX/cyclonedx-python/#readme') + ), + ExternalReference( + type=ExternalReferenceType.DOCUMENTATION, + url=XsUri('https://cyclonedx-bom-tool.readthedocs.io/') + ), + ExternalReference( + type=ExternalReferenceType.VCS, + url=XsUri('https://github.com/CycloneDX/cyclonedx-python/') + ), + ExternalReference( + type=ExternalReferenceType.BUILD_SYSTEM, + url=XsUri('https://github.com/CycloneDX/cyclonedx-python/actions') + ), + ExternalReference( + type=ExternalReferenceType.ISSUE_TRACKER, + url=XsUri('https://github.com/CycloneDX/cyclonedx-python/issues') + ), + ExternalReference( + type=ExternalReferenceType.LICENSE, + url=XsUri('https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE') + ), + ExternalReference( + type=ExternalReferenceType.RELEASE_NOTES, + url=XsUri('https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md') + ), + # we cannot assert where the lib was fetched from, but we can give a hint + ExternalReference( + type=ExternalReferenceType.DISTRIBUTION, + url=XsUri('https://pypi.org/project/cyclonedx-bom/') + ), ), - ExternalReference( - type=ExternalReferenceType.DISTRIBUTION, - url=XsUri('https://pypi.org/project/cyclonedx-bom/') - ), - ExternalReference( - type=ExternalReferenceType.DOCUMENTATION, - url=XsUri('https://cyclonedx-bom-tool.readthedocs.io/') - ), - ExternalReference( - type=ExternalReferenceType.ISSUE_TRACKER, - url=XsUri('https://github.com/CycloneDX/cyclonedx-python/issues') - ), - ExternalReference( - type=ExternalReferenceType.LICENSE, - url=XsUri('https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE') - ), - ExternalReference( - type=ExternalReferenceType.RELEASE_NOTES, - url=XsUri('https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md') - ), - ExternalReference( - type=ExternalReferenceType.VCS, - url=XsUri('https://github.com/CycloneDX/cyclonedx-python/') - ), - ExternalReference( - type=ExternalReferenceType.WEBSITE, - url=XsUri('https://github.com/CycloneDX/cyclonedx-python/#readme') - ) - ])) + # to be extended... + ), + )) return bom diff --git a/pyproject.toml b/pyproject.toml index 64a63ad3..bd9a9d36 100644 --- a/pyproject.toml +++ b/pyproject.toml @@ -5,7 +5,6 @@ build-backend = "poetry.core.masonry.api" [tool.poetry] -# keep in sync with `cyclonedx_py/_internal/utils/cdx.py` name = "cyclonedx-bom" version = "4.6.1" description = "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments" @@ -69,7 +68,7 @@ cyclonedx-py = "cyclonedx_py._internal.cli:run" [tool.poetry.dependencies] python = "^3.8" -cyclonedx-python-lib = { version = "^7.3.0, !=7.3.1", extras = ["validation"] } +cyclonedx-python-lib = { version = "^8.0", extras = ["validation"] } packageurl-python = ">=0.11, <2" # keep in sync with same dep in `cyclonedx-python-lib` pip-requirements-parser = "^32.0" packaging = "^22 || ^23 || ^24" @@ -92,6 +91,7 @@ isort = "5.13.2" autopep8 = "2.3.1" mypy = "1.11.2" bandit = "1.7.10" +tomli = { version = "^2.0.1", python = "<3.11" } tox = "4.21.2" # min version required to be able to install some dependencies # see https://github.com/MichaelKim0407/flake8-use-fstring/issues/33 diff --git a/tests/__init__.py b/tests/__init__.py index 0205481e..2451c992 100644 --- a/tests/__init__.py +++ b/tests/__init__.py @@ -15,14 +15,12 @@ # SPDX-License-Identifier: Apache-2.0 # Copyright (c) OWASP Foundation. All Rights Reserved. - +import sys from json import dumps as json_dumps -from os import getenv -from os.path import dirname, join +from os import getenv, path from pathlib import Path from re import sub as re_sub -from sys import stderr -from typing import Union +from typing import Any, Dict, Union from unittest import TestCase from xml.sax.saxutils import escape as xml_escape, quoteattr as xml_quoteattr # nosec:B406 @@ -32,16 +30,16 @@ RECREATE_SNAPSHOTS = '1' == getenv('CDX_TEST_RECREATE_SNAPSHOTS') if RECREATE_SNAPSHOTS: - print('!!! WILL RECREATE ALL SNAPSHOTS !!!', file=stderr) + print('!!! WILL RECREATE ALL SNAPSHOTS !!!', file=sys.stderr) INIT_TESTBEDS = '1' != getenv('CDX_TEST_SKIP_INIT_TESTBEDS') if INIT_TESTBEDS: - print('!!! WILL INIT TESTBEDS !!!', file=stderr) + print('!!! WILL INIT TESTBEDS !!!', file=sys.stderr) -_TESTDATA_DIRECTORY = join(dirname(__file__), '_data') +_TESTDATA_DIRECTORY = path.join(path.dirname(__file__), '_data') -INFILES_DIRECTORY = join(_TESTDATA_DIRECTORY, 'infiles') -SNAPSHOTS_DIRECTORY = join(_TESTDATA_DIRECTORY, 'snapshots') +INFILES_DIRECTORY = path.join(_TESTDATA_DIRECTORY, 'infiles') +SNAPSHOTS_DIRECTORY = path.join(_TESTDATA_DIRECTORY, 'snapshots') UNSUPPORTED_OF_SV = ( (OutputFormat.JSON, SchemaVersion.V1_1), @@ -60,7 +58,7 @@ class SnapshotMixin: @staticmethod def getSnapshotFile(snapshot_name: str) -> str: # noqa: N802 - return join(SNAPSHOTS_DIRECTORY, f'{snapshot_name}.bin') + return path.join(SNAPSHOTS_DIRECTORY, f'{snapshot_name}.bin') @classmethod def writeSnapshot(cls, snapshot_name: str, data: str) -> None: # noqa: N802 @@ -92,18 +90,46 @@ def assertEqualSnapshot(self: Union[TestCase, 'SnapshotMixin'], # noqa: N802 _root_file_uri_xml_attr = xml_quoteattr(_root_file_uri)[1:-1] _root_file_uri_json = json_dumps(_root_file_uri)[1:-1] +# package is called 'cyclonedx-bom', but the tool is called 'cyclonedx-py' +EXPECTED_TOOL_NAME = 'cyclonedx-py' + def make_xml_comparable(bom: str) -> str: bom = bom.replace(_root_file_uri_xml, 'file://.../') bom = bom.replace(_root_file_uri_xml_attr, 'file://.../') - bom = bom.replace( # replace metadata.tools.version + bom = bom.replace( # replace this version in metadata.tools.components + ' CycloneDX\n' + f' {EXPECTED_TOOL_NAME}\n' + f' {__this_version}', + ' CycloneDX\n' + f' {EXPECTED_TOOL_NAME}\n' + ' thisVersion-testing') + bom = bom.replace( # replace this version in metadata.tools ' CycloneDX\n' - ' cyclonedx-bom\n' + f' {EXPECTED_TOOL_NAME}\n' f' {__this_version}', ' CycloneDX\n' - ' cyclonedx-bom\n' + f' {EXPECTED_TOOL_NAME}\n' ' thisVersion-testing') - bom = re_sub( # replace metadata.tools.version + bom = re_sub( # replace lib-dynamics in metadata.tools.components + ' CycloneDX\n' + ' cyclonedx-python-lib\n' + ' .*?\n' + ' .*?\n' + ' \n' + '(?: .*?\n)*' + ' \n' + ' \n' + '(?: .*?\n)*' + ' ', + ' CycloneDX\n' + ' cyclonedx-python-lib\n' + ' libVersion-testing\n' + ' \n' + ' \n' + ' ', + bom) + bom = re_sub( # replace lib-dynamics version in metadata.tools[] ' CycloneDX\n' ' cyclonedx-python-lib\n' ' .*?', @@ -111,14 +137,16 @@ def make_xml_comparable(bom: str) -> str: ' cyclonedx-python-lib\n' ' libVersion-testing', bom) - bom = re_sub( # replace metadata.tools.externalReferences + bom = re_sub( # replace lib-dynamics externalReferences in metadata.tools[] ' CycloneDX\n' ' cyclonedx-python-lib\n' - r' (.*?)\n' - r' [\s\S]*?', + ' (.*?)\n' + ' \n' + '(?: .*?\n)*' + ' ', ' CycloneDX\n' ' cyclonedx-python-lib\n' - r' \1''\n' + ' \\1\n' ' ', bom) return bom @@ -126,14 +154,41 @@ def make_xml_comparable(bom: str) -> str: def make_json_comparable(bom: str) -> str: bom = bom.replace(_root_file_uri_json, 'file://.../') - bom = bom.replace( # replace metadata.tools.version - ' "name": "cyclonedx-bom",\n' + bom = bom.replace( # replace this version in metadata.tools.components[] + f' "name": {json_dumps(EXPECTED_TOOL_NAME)},\n' + ' "type": "application",\n' + f' "version": {json_dumps(__this_version)}', + f' "name": {json_dumps(EXPECTED_TOOL_NAME)},\n' + ' "type": "application",\n' + ' "version": "thisVersion-testing"') + bom = bom.replace( # replace this version in metadata.tools[] + f' "name": {json_dumps(EXPECTED_TOOL_NAME)},\n' ' "vendor": "CycloneDX",\n' f' "version": {json_dumps(__this_version)}', - ' "name": "cyclonedx-bom",\n' + f' "name": {json_dumps(EXPECTED_TOOL_NAME)},\n' ' "vendor": "CycloneDX",\n' ' "version": "thisVersion-testing"') - bom = re_sub( # replace metadata.tools.version + bom = re_sub( # replace lib-dynamics in metadata.tools.components[] + ' "description": ".*?",\n' + ' "externalReferences": \\[\n' + '(?: .*?\n)*' + ' \\],\n' + ' "group": "CycloneDX",\n' + ' "licenses": \\[\n' + '(?: .*?\n)*' + ' \\],\n' + ' "name": "cyclonedx-python-lib",\n' + ' "type": "library",\n' + ' "version": ".*?"', + ' "description": "stripped",\n' + ' "externalReferences": [ ],\n' + ' "group": "CycloneDX",\n' + ' "licenses": [ ],\n' + ' "name": "cyclonedx-python-lib",\n' + ' "type": "library",\n' + ' "version": "libVersion-testing"', + bom) + bom = re_sub( # replace lib-dynamics version in metadata.tools[] ' "name": "cyclonedx-python-lib",\n' ' "vendor": "CycloneDX",\n' ' "version": ".*?"', @@ -141,13 +196,15 @@ def make_json_comparable(bom: str) -> str: ' "vendor": "CycloneDX",\n' ' "version": "libVersion-testing"', bom) - bom = re_sub( # replace metadata.tools.externalReferences - r' "externalReferences": \[[\s\S]*?\],\n' + bom = re_sub( # replace lib-dynamics externalReferences in metadata.tools[] + ' "externalReferences": \\[\n' + '(?: .*?\n)*' + ' \\],\n' ' "name": "cyclonedx-python-lib",\n' - ' "vendor": "CycloneDX"', + ' "vendor": "CycloneDX",\n', ' "externalReferences": [ ],\n' ' "name": "cyclonedx-python-lib",\n' - ' "vendor": "CycloneDX"', + ' "vendor": "CycloneDX",\n', bom) return bom @@ -160,3 +217,12 @@ def make_comparable(bom: str, of: OutputFormat) -> str: raise NotImplementedError(f'unknown OutputFormat: {of!r}') # endregion reproducible test results + + +def load_pyproject() -> Dict[str, Any]: + if sys.version_info >= (3, 11): + from tomllib import load as toml_load + else: + from tomli import load as toml_load + with open(path.join(path.dirname(__file__), '..', 'pyproject.toml'), 'rb') as f: + return toml_load(f) diff --git a/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.2.json.bin b/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.2.json.bin index acc12748..94975105 100644 --- a/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.2.json.bin +++ b/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.2.json.bin @@ -307,7 +307,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.2.xml.bin b/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.2.xml.bin index f531e83b..1d5886dd 100644 --- a/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.2.xml.bin +++ b/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.3.json.bin b/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.3.json.bin index 0ee6f49e..fc0328e7 100644 --- a/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.3.json.bin +++ b/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.3.json.bin @@ -313,7 +313,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.3.xml.bin b/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.3.xml.bin index 12a6ec53..fb78a50f 100644 --- a/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.3.xml.bin +++ b/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.4.json.bin b/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.4.json.bin index b098a46a..2ad474f7 100644 --- a/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.4.json.bin +++ b/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.4.json.bin @@ -312,6 +312,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.4.xml.bin b/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.4.xml.bin index f3a66a4f..621aa107 100644 --- a/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.4.xml.bin +++ b/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.5.json.bin b/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.5.json.bin index 5dbbf535..26d54ed5 100644 --- a/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.5.json.bin +++ b/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.5.json.bin @@ -311,14 +311,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.5.xml.bin b/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.5.xml.bin index 49c9f3e2..a1d6b48f 100644 --- a/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.5.xml.bin +++ b/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-extras diff --git a/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.6.json.bin b/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.6.json.bin index b4e0c7be..194ebe9d 100644 --- a/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.6.json.bin +++ b/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.6.json.bin @@ -331,14 +331,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.6.xml.bin b/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.6.xml.bin index d57d04f8..cf8c9f06 100644 --- a/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.6.xml.bin +++ b/tests/_data/snapshots/environment/pep639-texts_with-license-pep639_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-extras diff --git a/tests/_data/snapshots/environment/pep639_with-license-pep639_1.2.json.bin b/tests/_data/snapshots/environment/pep639_with-license-pep639_1.2.json.bin index 2f2f678d..07ab2198 100644 --- a/tests/_data/snapshots/environment/pep639_with-license-pep639_1.2.json.bin +++ b/tests/_data/snapshots/environment/pep639_with-license-pep639_1.2.json.bin @@ -190,7 +190,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/pep639_with-license-pep639_1.2.xml.bin b/tests/_data/snapshots/environment/pep639_with-license-pep639_1.2.xml.bin index 7fe5601e..f6694405 100644 --- a/tests/_data/snapshots/environment/pep639_with-license-pep639_1.2.xml.bin +++ b/tests/_data/snapshots/environment/pep639_with-license-pep639_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/pep639_with-license-pep639_1.3.json.bin b/tests/_data/snapshots/environment/pep639_with-license-pep639_1.3.json.bin index 946efb40..b5fc2710 100644 --- a/tests/_data/snapshots/environment/pep639_with-license-pep639_1.3.json.bin +++ b/tests/_data/snapshots/environment/pep639_with-license-pep639_1.3.json.bin @@ -196,7 +196,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/pep639_with-license-pep639_1.3.xml.bin b/tests/_data/snapshots/environment/pep639_with-license-pep639_1.3.xml.bin index a9a7f53e..7332598c 100644 --- a/tests/_data/snapshots/environment/pep639_with-license-pep639_1.3.xml.bin +++ b/tests/_data/snapshots/environment/pep639_with-license-pep639_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/pep639_with-license-pep639_1.4.json.bin b/tests/_data/snapshots/environment/pep639_with-license-pep639_1.4.json.bin index 8460caae..565f0e8c 100644 --- a/tests/_data/snapshots/environment/pep639_with-license-pep639_1.4.json.bin +++ b/tests/_data/snapshots/environment/pep639_with-license-pep639_1.4.json.bin @@ -195,6 +195,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/environment/pep639_with-license-pep639_1.4.xml.bin b/tests/_data/snapshots/environment/pep639_with-license-pep639_1.4.xml.bin index 15201240..61db29c5 100644 --- a/tests/_data/snapshots/environment/pep639_with-license-pep639_1.4.xml.bin +++ b/tests/_data/snapshots/environment/pep639_with-license-pep639_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/pep639_with-license-pep639_1.5.json.bin b/tests/_data/snapshots/environment/pep639_with-license-pep639_1.5.json.bin index 1b8833e1..db5b81a8 100644 --- a/tests/_data/snapshots/environment/pep639_with-license-pep639_1.5.json.bin +++ b/tests/_data/snapshots/environment/pep639_with-license-pep639_1.5.json.bin @@ -194,14 +194,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/environment/pep639_with-license-pep639_1.5.xml.bin b/tests/_data/snapshots/environment/pep639_with-license-pep639_1.5.xml.bin index bf911fb1..1e93e3eb 100644 --- a/tests/_data/snapshots/environment/pep639_with-license-pep639_1.5.xml.bin +++ b/tests/_data/snapshots/environment/pep639_with-license-pep639_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-extras diff --git a/tests/_data/snapshots/environment/pep639_with-license-pep639_1.6.json.bin b/tests/_data/snapshots/environment/pep639_with-license-pep639_1.6.json.bin index 516b4621..4d3832ff 100644 --- a/tests/_data/snapshots/environment/pep639_with-license-pep639_1.6.json.bin +++ b/tests/_data/snapshots/environment/pep639_with-license-pep639_1.6.json.bin @@ -201,14 +201,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/environment/pep639_with-license-pep639_1.6.xml.bin b/tests/_data/snapshots/environment/pep639_with-license-pep639_1.6.xml.bin index 6089decd..5c97bd7c 100644 --- a/tests/_data/snapshots/environment/pep639_with-license-pep639_1.6.xml.bin +++ b/tests/_data/snapshots/environment/pep639_with-license-pep639_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-extras diff --git a/tests/_data/snapshots/environment/plain_editable-self_1.2.json.bin b/tests/_data/snapshots/environment/plain_editable-self_1.2.json.bin index d1c2f622..cc39ad90 100644 --- a/tests/_data/snapshots/environment/plain_editable-self_1.2.json.bin +++ b/tests/_data/snapshots/environment/plain_editable-self_1.2.json.bin @@ -44,7 +44,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/plain_editable-self_1.2.xml.bin b/tests/_data/snapshots/environment/plain_editable-self_1.2.xml.bin index 7a3ad29a..47c3717e 100644 --- a/tests/_data/snapshots/environment/plain_editable-self_1.2.xml.bin +++ b/tests/_data/snapshots/environment/plain_editable-self_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_editable-self_1.3.json.bin b/tests/_data/snapshots/environment/plain_editable-self_1.3.json.bin index c9e9b4e6..0e06fe0f 100644 --- a/tests/_data/snapshots/environment/plain_editable-self_1.3.json.bin +++ b/tests/_data/snapshots/environment/plain_editable-self_1.3.json.bin @@ -50,7 +50,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/plain_editable-self_1.3.xml.bin b/tests/_data/snapshots/environment/plain_editable-self_1.3.xml.bin index 581ab83a..810d605f 100644 --- a/tests/_data/snapshots/environment/plain_editable-self_1.3.xml.bin +++ b/tests/_data/snapshots/environment/plain_editable-self_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_editable-self_1.4.json.bin b/tests/_data/snapshots/environment/plain_editable-self_1.4.json.bin index 1515817b..60174815 100644 --- a/tests/_data/snapshots/environment/plain_editable-self_1.4.json.bin +++ b/tests/_data/snapshots/environment/plain_editable-self_1.4.json.bin @@ -49,6 +49,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/environment/plain_editable-self_1.4.xml.bin b/tests/_data/snapshots/environment/plain_editable-self_1.4.xml.bin index cda2f5bf..6a3abd68 100644 --- a/tests/_data/snapshots/environment/plain_editable-self_1.4.xml.bin +++ b/tests/_data/snapshots/environment/plain_editable-self_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_editable-self_1.5.json.bin b/tests/_data/snapshots/environment/plain_editable-self_1.5.json.bin index 01f7a341..2ed6f486 100644 --- a/tests/_data/snapshots/environment/plain_editable-self_1.5.json.bin +++ b/tests/_data/snapshots/environment/plain_editable-self_1.5.json.bin @@ -48,14 +48,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/environment/plain_editable-self_1.5.xml.bin b/tests/_data/snapshots/environment/plain_editable-self_1.5.xml.bin index b2a372b8..97b92c3b 100644 --- a/tests/_data/snapshots/environment/plain_editable-self_1.5.xml.bin +++ b/tests/_data/snapshots/environment/plain_editable-self_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + editable-self diff --git a/tests/_data/snapshots/environment/plain_editable-self_1.6.json.bin b/tests/_data/snapshots/environment/plain_editable-self_1.6.json.bin index 670df120..6eae686a 100644 --- a/tests/_data/snapshots/environment/plain_editable-self_1.6.json.bin +++ b/tests/_data/snapshots/environment/plain_editable-self_1.6.json.bin @@ -49,14 +49,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/environment/plain_editable-self_1.6.xml.bin b/tests/_data/snapshots/environment/plain_editable-self_1.6.xml.bin index 9189d4b0..d8d21b5f 100644 --- a/tests/_data/snapshots/environment/plain_editable-self_1.6.xml.bin +++ b/tests/_data/snapshots/environment/plain_editable-self_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + editable-self diff --git a/tests/_data/snapshots/environment/plain_local_1.2.json.bin b/tests/_data/snapshots/environment/plain_local_1.2.json.bin index 74aea42f..0a7dbfd0 100644 --- a/tests/_data/snapshots/environment/plain_local_1.2.json.bin +++ b/tests/_data/snapshots/environment/plain_local_1.2.json.bin @@ -95,7 +95,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/plain_local_1.2.xml.bin b/tests/_data/snapshots/environment/plain_local_1.2.xml.bin index 61150894..277351d1 100644 --- a/tests/_data/snapshots/environment/plain_local_1.2.xml.bin +++ b/tests/_data/snapshots/environment/plain_local_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_local_1.3.json.bin b/tests/_data/snapshots/environment/plain_local_1.3.json.bin index b74fc7a3..52504fb4 100644 --- a/tests/_data/snapshots/environment/plain_local_1.3.json.bin +++ b/tests/_data/snapshots/environment/plain_local_1.3.json.bin @@ -113,7 +113,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/plain_local_1.3.xml.bin b/tests/_data/snapshots/environment/plain_local_1.3.xml.bin index 1eaa9e31..87fa1a2f 100644 --- a/tests/_data/snapshots/environment/plain_local_1.3.xml.bin +++ b/tests/_data/snapshots/environment/plain_local_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_local_1.4.json.bin b/tests/_data/snapshots/environment/plain_local_1.4.json.bin index 622555a9..9eecb3b5 100644 --- a/tests/_data/snapshots/environment/plain_local_1.4.json.bin +++ b/tests/_data/snapshots/environment/plain_local_1.4.json.bin @@ -112,6 +112,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/environment/plain_local_1.4.xml.bin b/tests/_data/snapshots/environment/plain_local_1.4.xml.bin index a2a1e908..12cc36f1 100644 --- a/tests/_data/snapshots/environment/plain_local_1.4.xml.bin +++ b/tests/_data/snapshots/environment/plain_local_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_local_1.5.json.bin b/tests/_data/snapshots/environment/plain_local_1.5.json.bin index 4e2b448a..861579e0 100644 --- a/tests/_data/snapshots/environment/plain_local_1.5.json.bin +++ b/tests/_data/snapshots/environment/plain_local_1.5.json.bin @@ -111,14 +111,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/environment/plain_local_1.5.xml.bin b/tests/_data/snapshots/environment/plain_local_1.5.xml.bin index 62522a1d..a800704b 100644 --- a/tests/_data/snapshots/environment/plain_local_1.5.xml.bin +++ b/tests/_data/snapshots/environment/plain_local_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + local diff --git a/tests/_data/snapshots/environment/plain_local_1.6.json.bin b/tests/_data/snapshots/environment/plain_local_1.6.json.bin index 602fbe26..9cf26e79 100644 --- a/tests/_data/snapshots/environment/plain_local_1.6.json.bin +++ b/tests/_data/snapshots/environment/plain_local_1.6.json.bin @@ -115,14 +115,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/environment/plain_local_1.6.xml.bin b/tests/_data/snapshots/environment/plain_local_1.6.xml.bin index 21001a09..d1e6d73e 100644 --- a/tests/_data/snapshots/environment/plain_local_1.6.xml.bin +++ b/tests/_data/snapshots/environment/plain_local_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + local diff --git a/tests/_data/snapshots/environment/plain_no-deps_1.2.json.bin b/tests/_data/snapshots/environment/plain_no-deps_1.2.json.bin index 6de193b1..f7ab17f1 100644 --- a/tests/_data/snapshots/environment/plain_no-deps_1.2.json.bin +++ b/tests/_data/snapshots/environment/plain_no-deps_1.2.json.bin @@ -51,7 +51,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/plain_no-deps_1.2.xml.bin b/tests/_data/snapshots/environment/plain_no-deps_1.2.xml.bin index a982f421..5c6c1fc0 100644 --- a/tests/_data/snapshots/environment/plain_no-deps_1.2.xml.bin +++ b/tests/_data/snapshots/environment/plain_no-deps_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_no-deps_1.3.json.bin b/tests/_data/snapshots/environment/plain_no-deps_1.3.json.bin index 4922946d..3cfa3a05 100644 --- a/tests/_data/snapshots/environment/plain_no-deps_1.3.json.bin +++ b/tests/_data/snapshots/environment/plain_no-deps_1.3.json.bin @@ -57,7 +57,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/plain_no-deps_1.3.xml.bin b/tests/_data/snapshots/environment/plain_no-deps_1.3.xml.bin index f70c1e34..c326a1fb 100644 --- a/tests/_data/snapshots/environment/plain_no-deps_1.3.xml.bin +++ b/tests/_data/snapshots/environment/plain_no-deps_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_no-deps_1.4.json.bin b/tests/_data/snapshots/environment/plain_no-deps_1.4.json.bin index 354ca1e5..9c91dd7a 100644 --- a/tests/_data/snapshots/environment/plain_no-deps_1.4.json.bin +++ b/tests/_data/snapshots/environment/plain_no-deps_1.4.json.bin @@ -56,6 +56,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/environment/plain_no-deps_1.4.xml.bin b/tests/_data/snapshots/environment/plain_no-deps_1.4.xml.bin index e0d55c55..374af51d 100644 --- a/tests/_data/snapshots/environment/plain_no-deps_1.4.xml.bin +++ b/tests/_data/snapshots/environment/plain_no-deps_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_no-deps_1.5.json.bin b/tests/_data/snapshots/environment/plain_no-deps_1.5.json.bin index e246c19d..5445bead 100644 --- a/tests/_data/snapshots/environment/plain_no-deps_1.5.json.bin +++ b/tests/_data/snapshots/environment/plain_no-deps_1.5.json.bin @@ -55,14 +55,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/environment/plain_no-deps_1.5.xml.bin b/tests/_data/snapshots/environment/plain_no-deps_1.5.xml.bin index d4d39154..c08c97e1 100644 --- a/tests/_data/snapshots/environment/plain_no-deps_1.5.xml.bin +++ b/tests/_data/snapshots/environment/plain_no-deps_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + no-deps diff --git a/tests/_data/snapshots/environment/plain_no-deps_1.6.json.bin b/tests/_data/snapshots/environment/plain_no-deps_1.6.json.bin index 60631689..4dba1ef2 100644 --- a/tests/_data/snapshots/environment/plain_no-deps_1.6.json.bin +++ b/tests/_data/snapshots/environment/plain_no-deps_1.6.json.bin @@ -56,14 +56,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/environment/plain_no-deps_1.6.xml.bin b/tests/_data/snapshots/environment/plain_no-deps_1.6.xml.bin index 8081bd9d..aa980c04 100644 --- a/tests/_data/snapshots/environment/plain_no-deps_1.6.xml.bin +++ b/tests/_data/snapshots/environment/plain_no-deps_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + no-deps diff --git a/tests/_data/snapshots/environment/plain_normalize-packagename_1.2.json.bin b/tests/_data/snapshots/environment/plain_normalize-packagename_1.2.json.bin index bf95cfa4..9657d83b 100644 --- a/tests/_data/snapshots/environment/plain_normalize-packagename_1.2.json.bin +++ b/tests/_data/snapshots/environment/plain_normalize-packagename_1.2.json.bin @@ -125,7 +125,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/plain_normalize-packagename_1.2.xml.bin b/tests/_data/snapshots/environment/plain_normalize-packagename_1.2.xml.bin index ce3a500b..ce11abd1 100644 --- a/tests/_data/snapshots/environment/plain_normalize-packagename_1.2.xml.bin +++ b/tests/_data/snapshots/environment/plain_normalize-packagename_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_normalize-packagename_1.3.json.bin b/tests/_data/snapshots/environment/plain_normalize-packagename_1.3.json.bin index 4d73455c..9ec32cf5 100644 --- a/tests/_data/snapshots/environment/plain_normalize-packagename_1.3.json.bin +++ b/tests/_data/snapshots/environment/plain_normalize-packagename_1.3.json.bin @@ -137,7 +137,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/plain_normalize-packagename_1.3.xml.bin b/tests/_data/snapshots/environment/plain_normalize-packagename_1.3.xml.bin index 75be771b..dddb8143 100644 --- a/tests/_data/snapshots/environment/plain_normalize-packagename_1.3.xml.bin +++ b/tests/_data/snapshots/environment/plain_normalize-packagename_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_normalize-packagename_1.4.json.bin b/tests/_data/snapshots/environment/plain_normalize-packagename_1.4.json.bin index ba9ed46a..40bc62dc 100644 --- a/tests/_data/snapshots/environment/plain_normalize-packagename_1.4.json.bin +++ b/tests/_data/snapshots/environment/plain_normalize-packagename_1.4.json.bin @@ -136,6 +136,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/environment/plain_normalize-packagename_1.4.xml.bin b/tests/_data/snapshots/environment/plain_normalize-packagename_1.4.xml.bin index deded9be..854dc5c4 100644 --- a/tests/_data/snapshots/environment/plain_normalize-packagename_1.4.xml.bin +++ b/tests/_data/snapshots/environment/plain_normalize-packagename_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_normalize-packagename_1.5.json.bin b/tests/_data/snapshots/environment/plain_normalize-packagename_1.5.json.bin index 05011519..e547eb15 100644 --- a/tests/_data/snapshots/environment/plain_normalize-packagename_1.5.json.bin +++ b/tests/_data/snapshots/environment/plain_normalize-packagename_1.5.json.bin @@ -135,14 +135,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/environment/plain_normalize-packagename_1.5.xml.bin b/tests/_data/snapshots/environment/plain_normalize-packagename_1.5.xml.bin index efdf8ff9..99d0154d 100644 --- a/tests/_data/snapshots/environment/plain_normalize-packagename_1.5.xml.bin +++ b/tests/_data/snapshots/environment/plain_normalize-packagename_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + normalize-packagename diff --git a/tests/_data/snapshots/environment/plain_normalize-packagename_1.6.json.bin b/tests/_data/snapshots/environment/plain_normalize-packagename_1.6.json.bin index 721a7a36..c36faba6 100644 --- a/tests/_data/snapshots/environment/plain_normalize-packagename_1.6.json.bin +++ b/tests/_data/snapshots/environment/plain_normalize-packagename_1.6.json.bin @@ -139,14 +139,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/environment/plain_normalize-packagename_1.6.xml.bin b/tests/_data/snapshots/environment/plain_normalize-packagename_1.6.xml.bin index 0f4ee721..67f23071 100644 --- a/tests/_data/snapshots/environment/plain_normalize-packagename_1.6.xml.bin +++ b/tests/_data/snapshots/environment/plain_normalize-packagename_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + normalize-packagename diff --git a/tests/_data/snapshots/environment/plain_private-packages_1.2.json.bin b/tests/_data/snapshots/environment/plain_private-packages_1.2.json.bin index e6be519f..7034e743 100644 --- a/tests/_data/snapshots/environment/plain_private-packages_1.2.json.bin +++ b/tests/_data/snapshots/environment/plain_private-packages_1.2.json.bin @@ -74,7 +74,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/plain_private-packages_1.2.xml.bin b/tests/_data/snapshots/environment/plain_private-packages_1.2.xml.bin index 89416304..7498dda1 100644 --- a/tests/_data/snapshots/environment/plain_private-packages_1.2.xml.bin +++ b/tests/_data/snapshots/environment/plain_private-packages_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_private-packages_1.3.json.bin b/tests/_data/snapshots/environment/plain_private-packages_1.3.json.bin index 4d2c51c2..f58bf3e5 100644 --- a/tests/_data/snapshots/environment/plain_private-packages_1.3.json.bin +++ b/tests/_data/snapshots/environment/plain_private-packages_1.3.json.bin @@ -86,7 +86,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/plain_private-packages_1.3.xml.bin b/tests/_data/snapshots/environment/plain_private-packages_1.3.xml.bin index dd4cd546..b9df9aad 100644 --- a/tests/_data/snapshots/environment/plain_private-packages_1.3.xml.bin +++ b/tests/_data/snapshots/environment/plain_private-packages_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_private-packages_1.4.json.bin b/tests/_data/snapshots/environment/plain_private-packages_1.4.json.bin index 0bf61e13..2f075318 100644 --- a/tests/_data/snapshots/environment/plain_private-packages_1.4.json.bin +++ b/tests/_data/snapshots/environment/plain_private-packages_1.4.json.bin @@ -85,6 +85,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/environment/plain_private-packages_1.4.xml.bin b/tests/_data/snapshots/environment/plain_private-packages_1.4.xml.bin index 362e2921..2597a674 100644 --- a/tests/_data/snapshots/environment/plain_private-packages_1.4.xml.bin +++ b/tests/_data/snapshots/environment/plain_private-packages_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_private-packages_1.5.json.bin b/tests/_data/snapshots/environment/plain_private-packages_1.5.json.bin index 45e85ae8..e95da34c 100644 --- a/tests/_data/snapshots/environment/plain_private-packages_1.5.json.bin +++ b/tests/_data/snapshots/environment/plain_private-packages_1.5.json.bin @@ -84,14 +84,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/environment/plain_private-packages_1.5.xml.bin b/tests/_data/snapshots/environment/plain_private-packages_1.5.xml.bin index a0f93b5a..17cdfb63 100644 --- a/tests/_data/snapshots/environment/plain_private-packages_1.5.xml.bin +++ b/tests/_data/snapshots/environment/plain_private-packages_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-urls diff --git a/tests/_data/snapshots/environment/plain_private-packages_1.6.json.bin b/tests/_data/snapshots/environment/plain_private-packages_1.6.json.bin index 783d2d5e..14186830 100644 --- a/tests/_data/snapshots/environment/plain_private-packages_1.6.json.bin +++ b/tests/_data/snapshots/environment/plain_private-packages_1.6.json.bin @@ -86,14 +86,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/environment/plain_private-packages_1.6.xml.bin b/tests/_data/snapshots/environment/plain_private-packages_1.6.xml.bin index 586af2fd..300f9547 100644 --- a/tests/_data/snapshots/environment/plain_private-packages_1.6.xml.bin +++ b/tests/_data/snapshots/environment/plain_private-packages_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-urls diff --git a/tests/_data/snapshots/environment/plain_via-pdm_1.2.json.bin b/tests/_data/snapshots/environment/plain_via-pdm_1.2.json.bin index b49f2597..7e4ed029 100644 --- a/tests/_data/snapshots/environment/plain_via-pdm_1.2.json.bin +++ b/tests/_data/snapshots/environment/plain_via-pdm_1.2.json.bin @@ -49,7 +49,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/plain_via-pdm_1.2.xml.bin b/tests/_data/snapshots/environment/plain_via-pdm_1.2.xml.bin index cf306fae..4641e71b 100644 --- a/tests/_data/snapshots/environment/plain_via-pdm_1.2.xml.bin +++ b/tests/_data/snapshots/environment/plain_via-pdm_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_via-pdm_1.3.json.bin b/tests/_data/snapshots/environment/plain_via-pdm_1.3.json.bin index 6c3d6f01..2d8465d0 100644 --- a/tests/_data/snapshots/environment/plain_via-pdm_1.3.json.bin +++ b/tests/_data/snapshots/environment/plain_via-pdm_1.3.json.bin @@ -55,7 +55,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/plain_via-pdm_1.3.xml.bin b/tests/_data/snapshots/environment/plain_via-pdm_1.3.xml.bin index 191aa85d..8b6cd0f1 100644 --- a/tests/_data/snapshots/environment/plain_via-pdm_1.3.xml.bin +++ b/tests/_data/snapshots/environment/plain_via-pdm_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_via-pdm_1.4.json.bin b/tests/_data/snapshots/environment/plain_via-pdm_1.4.json.bin index 2ff0947f..7de54884 100644 --- a/tests/_data/snapshots/environment/plain_via-pdm_1.4.json.bin +++ b/tests/_data/snapshots/environment/plain_via-pdm_1.4.json.bin @@ -54,6 +54,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/environment/plain_via-pdm_1.4.xml.bin b/tests/_data/snapshots/environment/plain_via-pdm_1.4.xml.bin index 52967690..766915a0 100644 --- a/tests/_data/snapshots/environment/plain_via-pdm_1.4.xml.bin +++ b/tests/_data/snapshots/environment/plain_via-pdm_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_via-pdm_1.5.json.bin b/tests/_data/snapshots/environment/plain_via-pdm_1.5.json.bin index 46562689..2128bdba 100644 --- a/tests/_data/snapshots/environment/plain_via-pdm_1.5.json.bin +++ b/tests/_data/snapshots/environment/plain_via-pdm_1.5.json.bin @@ -53,14 +53,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/environment/plain_via-pdm_1.5.xml.bin b/tests/_data/snapshots/environment/plain_via-pdm_1.5.xml.bin index f337ab36..0b2f2ca4 100644 --- a/tests/_data/snapshots/environment/plain_via-pdm_1.5.xml.bin +++ b/tests/_data/snapshots/environment/plain_via-pdm_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + via-pdm diff --git a/tests/_data/snapshots/environment/plain_via-pdm_1.6.json.bin b/tests/_data/snapshots/environment/plain_via-pdm_1.6.json.bin index 6e4020e7..cf56a3c8 100644 --- a/tests/_data/snapshots/environment/plain_via-pdm_1.6.json.bin +++ b/tests/_data/snapshots/environment/plain_via-pdm_1.6.json.bin @@ -55,14 +55,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/environment/plain_via-pdm_1.6.xml.bin b/tests/_data/snapshots/environment/plain_via-pdm_1.6.xml.bin index e63e9873..0f8ffee9 100644 --- a/tests/_data/snapshots/environment/plain_via-pdm_1.6.xml.bin +++ b/tests/_data/snapshots/environment/plain_via-pdm_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + via-pdm diff --git a/tests/_data/snapshots/environment/plain_via-pipenv_1.2.json.bin b/tests/_data/snapshots/environment/plain_via-pipenv_1.2.json.bin index 42e34cb2..7544046d 100644 --- a/tests/_data/snapshots/environment/plain_via-pipenv_1.2.json.bin +++ b/tests/_data/snapshots/environment/plain_via-pipenv_1.2.json.bin @@ -81,7 +81,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/plain_via-pipenv_1.2.xml.bin b/tests/_data/snapshots/environment/plain_via-pipenv_1.2.xml.bin index 0efa51b3..c6b1be3a 100644 --- a/tests/_data/snapshots/environment/plain_via-pipenv_1.2.xml.bin +++ b/tests/_data/snapshots/environment/plain_via-pipenv_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_via-pipenv_1.3.json.bin b/tests/_data/snapshots/environment/plain_via-pipenv_1.3.json.bin index 6a254989..52fe11ee 100644 --- a/tests/_data/snapshots/environment/plain_via-pipenv_1.3.json.bin +++ b/tests/_data/snapshots/environment/plain_via-pipenv_1.3.json.bin @@ -87,7 +87,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/plain_via-pipenv_1.3.xml.bin b/tests/_data/snapshots/environment/plain_via-pipenv_1.3.xml.bin index a30a4395..b317f5d8 100644 --- a/tests/_data/snapshots/environment/plain_via-pipenv_1.3.xml.bin +++ b/tests/_data/snapshots/environment/plain_via-pipenv_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_via-pipenv_1.4.json.bin b/tests/_data/snapshots/environment/plain_via-pipenv_1.4.json.bin index a4de0646..ebddcb7d 100644 --- a/tests/_data/snapshots/environment/plain_via-pipenv_1.4.json.bin +++ b/tests/_data/snapshots/environment/plain_via-pipenv_1.4.json.bin @@ -86,6 +86,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/environment/plain_via-pipenv_1.4.xml.bin b/tests/_data/snapshots/environment/plain_via-pipenv_1.4.xml.bin index 6d286bf9..e5688431 100644 --- a/tests/_data/snapshots/environment/plain_via-pipenv_1.4.xml.bin +++ b/tests/_data/snapshots/environment/plain_via-pipenv_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_via-pipenv_1.5.json.bin b/tests/_data/snapshots/environment/plain_via-pipenv_1.5.json.bin index 96416a11..21836742 100644 --- a/tests/_data/snapshots/environment/plain_via-pipenv_1.5.json.bin +++ b/tests/_data/snapshots/environment/plain_via-pipenv_1.5.json.bin @@ -85,14 +85,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/environment/plain_via-pipenv_1.5.xml.bin b/tests/_data/snapshots/environment/plain_via-pipenv_1.5.xml.bin index 41aa4241..208a2e53 100644 --- a/tests/_data/snapshots/environment/plain_via-pipenv_1.5.xml.bin +++ b/tests/_data/snapshots/environment/plain_via-pipenv_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + via-pipenv diff --git a/tests/_data/snapshots/environment/plain_via-pipenv_1.6.json.bin b/tests/_data/snapshots/environment/plain_via-pipenv_1.6.json.bin index 441e4293..0c8973f9 100644 --- a/tests/_data/snapshots/environment/plain_via-pipenv_1.6.json.bin +++ b/tests/_data/snapshots/environment/plain_via-pipenv_1.6.json.bin @@ -87,14 +87,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/environment/plain_via-pipenv_1.6.xml.bin b/tests/_data/snapshots/environment/plain_via-pipenv_1.6.xml.bin index 2a3679b4..741acb5f 100644 --- a/tests/_data/snapshots/environment/plain_via-pipenv_1.6.xml.bin +++ b/tests/_data/snapshots/environment/plain_via-pipenv_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + via-pipenv diff --git a/tests/_data/snapshots/environment/plain_via-poetry_1.2.json.bin b/tests/_data/snapshots/environment/plain_via-poetry_1.2.json.bin index b3175a0d..1882a9b0 100644 --- a/tests/_data/snapshots/environment/plain_via-poetry_1.2.json.bin +++ b/tests/_data/snapshots/environment/plain_via-poetry_1.2.json.bin @@ -81,7 +81,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/plain_via-poetry_1.2.xml.bin b/tests/_data/snapshots/environment/plain_via-poetry_1.2.xml.bin index d52ebd1e..aaf2c0d4 100644 --- a/tests/_data/snapshots/environment/plain_via-poetry_1.2.xml.bin +++ b/tests/_data/snapshots/environment/plain_via-poetry_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_via-poetry_1.3.json.bin b/tests/_data/snapshots/environment/plain_via-poetry_1.3.json.bin index 1706c191..4b29daa2 100644 --- a/tests/_data/snapshots/environment/plain_via-poetry_1.3.json.bin +++ b/tests/_data/snapshots/environment/plain_via-poetry_1.3.json.bin @@ -87,7 +87,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/plain_via-poetry_1.3.xml.bin b/tests/_data/snapshots/environment/plain_via-poetry_1.3.xml.bin index d7dab0de..cc721dde 100644 --- a/tests/_data/snapshots/environment/plain_via-poetry_1.3.xml.bin +++ b/tests/_data/snapshots/environment/plain_via-poetry_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_via-poetry_1.4.json.bin b/tests/_data/snapshots/environment/plain_via-poetry_1.4.json.bin index 8b77717b..18f33bb3 100644 --- a/tests/_data/snapshots/environment/plain_via-poetry_1.4.json.bin +++ b/tests/_data/snapshots/environment/plain_via-poetry_1.4.json.bin @@ -86,6 +86,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/environment/plain_via-poetry_1.4.xml.bin b/tests/_data/snapshots/environment/plain_via-poetry_1.4.xml.bin index 001ff5b4..f56a2e3d 100644 --- a/tests/_data/snapshots/environment/plain_via-poetry_1.4.xml.bin +++ b/tests/_data/snapshots/environment/plain_via-poetry_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_via-poetry_1.5.json.bin b/tests/_data/snapshots/environment/plain_via-poetry_1.5.json.bin index 405169b6..8d4d2fee 100644 --- a/tests/_data/snapshots/environment/plain_via-poetry_1.5.json.bin +++ b/tests/_data/snapshots/environment/plain_via-poetry_1.5.json.bin @@ -85,14 +85,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/environment/plain_via-poetry_1.5.xml.bin b/tests/_data/snapshots/environment/plain_via-poetry_1.5.xml.bin index cd305196..56587e1c 100644 --- a/tests/_data/snapshots/environment/plain_via-poetry_1.5.xml.bin +++ b/tests/_data/snapshots/environment/plain_via-poetry_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + via-poetry diff --git a/tests/_data/snapshots/environment/plain_via-poetry_1.6.json.bin b/tests/_data/snapshots/environment/plain_via-poetry_1.6.json.bin index 20eefc85..bd203fec 100644 --- a/tests/_data/snapshots/environment/plain_via-poetry_1.6.json.bin +++ b/tests/_data/snapshots/environment/plain_via-poetry_1.6.json.bin @@ -87,14 +87,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/environment/plain_via-poetry_1.6.xml.bin b/tests/_data/snapshots/environment/plain_via-poetry_1.6.xml.bin index fd8eed5b..e68e76c0 100644 --- a/tests/_data/snapshots/environment/plain_via-poetry_1.6.xml.bin +++ b/tests/_data/snapshots/environment/plain_via-poetry_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + via-poetry diff --git a/tests/_data/snapshots/environment/plain_with-extras_1.2.json.bin b/tests/_data/snapshots/environment/plain_with-extras_1.2.json.bin index 0a52e833..bb23087e 100644 --- a/tests/_data/snapshots/environment/plain_with-extras_1.2.json.bin +++ b/tests/_data/snapshots/environment/plain_with-extras_1.2.json.bin @@ -1138,7 +1138,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/plain_with-extras_1.2.xml.bin b/tests/_data/snapshots/environment/plain_with-extras_1.2.xml.bin index 59c1d097..6ce4e6c9 100644 --- a/tests/_data/snapshots/environment/plain_with-extras_1.2.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-extras_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_with-extras_1.3.json.bin b/tests/_data/snapshots/environment/plain_with-extras_1.3.json.bin index fc3e8582..325645da 100644 --- a/tests/_data/snapshots/environment/plain_with-extras_1.3.json.bin +++ b/tests/_data/snapshots/environment/plain_with-extras_1.3.json.bin @@ -1156,7 +1156,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/plain_with-extras_1.3.xml.bin b/tests/_data/snapshots/environment/plain_with-extras_1.3.xml.bin index 79d4f9e3..c925acca 100644 --- a/tests/_data/snapshots/environment/plain_with-extras_1.3.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-extras_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_with-extras_1.4.json.bin b/tests/_data/snapshots/environment/plain_with-extras_1.4.json.bin index 4106026f..8d705f39 100644 --- a/tests/_data/snapshots/environment/plain_with-extras_1.4.json.bin +++ b/tests/_data/snapshots/environment/plain_with-extras_1.4.json.bin @@ -1155,6 +1155,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/environment/plain_with-extras_1.4.xml.bin b/tests/_data/snapshots/environment/plain_with-extras_1.4.xml.bin index 98d29529..2a510cf5 100644 --- a/tests/_data/snapshots/environment/plain_with-extras_1.4.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-extras_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_with-extras_1.5.json.bin b/tests/_data/snapshots/environment/plain_with-extras_1.5.json.bin index 884049b9..99d61b30 100644 --- a/tests/_data/snapshots/environment/plain_with-extras_1.5.json.bin +++ b/tests/_data/snapshots/environment/plain_with-extras_1.5.json.bin @@ -1154,14 +1154,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/environment/plain_with-extras_1.5.xml.bin b/tests/_data/snapshots/environment/plain_with-extras_1.5.xml.bin index 11375eb7..fb952581 100644 --- a/tests/_data/snapshots/environment/plain_with-extras_1.5.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-extras_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-extras diff --git a/tests/_data/snapshots/environment/plain_with-extras_1.6.json.bin b/tests/_data/snapshots/environment/plain_with-extras_1.6.json.bin index 1966ac04..af786cda 100644 --- a/tests/_data/snapshots/environment/plain_with-extras_1.6.json.bin +++ b/tests/_data/snapshots/environment/plain_with-extras_1.6.json.bin @@ -1197,14 +1197,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/environment/plain_with-extras_1.6.xml.bin b/tests/_data/snapshots/environment/plain_with-extras_1.6.xml.bin index 921e6243..90da156f 100644 --- a/tests/_data/snapshots/environment/plain_with-extras_1.6.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-extras_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-extras diff --git a/tests/_data/snapshots/environment/plain_with-license-file_1.2.json.bin b/tests/_data/snapshots/environment/plain_with-license-file_1.2.json.bin index 1ee914a9..7c99638f 100644 --- a/tests/_data/snapshots/environment/plain_with-license-file_1.2.json.bin +++ b/tests/_data/snapshots/environment/plain_with-license-file_1.2.json.bin @@ -26,7 +26,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/plain_with-license-file_1.2.xml.bin b/tests/_data/snapshots/environment/plain_with-license-file_1.2.xml.bin index 8b335021..710c26d9 100644 --- a/tests/_data/snapshots/environment/plain_with-license-file_1.2.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-license-file_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_with-license-file_1.3.json.bin b/tests/_data/snapshots/environment/plain_with-license-file_1.3.json.bin index 0c62fac8..2e92b093 100644 --- a/tests/_data/snapshots/environment/plain_with-license-file_1.3.json.bin +++ b/tests/_data/snapshots/environment/plain_with-license-file_1.3.json.bin @@ -32,7 +32,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/plain_with-license-file_1.3.xml.bin b/tests/_data/snapshots/environment/plain_with-license-file_1.3.xml.bin index ca266c8c..29a9c22a 100644 --- a/tests/_data/snapshots/environment/plain_with-license-file_1.3.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-license-file_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_with-license-file_1.4.json.bin b/tests/_data/snapshots/environment/plain_with-license-file_1.4.json.bin index c913eef1..8d424333 100644 --- a/tests/_data/snapshots/environment/plain_with-license-file_1.4.json.bin +++ b/tests/_data/snapshots/environment/plain_with-license-file_1.4.json.bin @@ -31,6 +31,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/environment/plain_with-license-file_1.4.xml.bin b/tests/_data/snapshots/environment/plain_with-license-file_1.4.xml.bin index 51e9cbe4..08fd7e21 100644 --- a/tests/_data/snapshots/environment/plain_with-license-file_1.4.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-license-file_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_with-license-file_1.5.json.bin b/tests/_data/snapshots/environment/plain_with-license-file_1.5.json.bin index 01298deb..ab180b3f 100644 --- a/tests/_data/snapshots/environment/plain_with-license-file_1.5.json.bin +++ b/tests/_data/snapshots/environment/plain_with-license-file_1.5.json.bin @@ -30,14 +30,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/environment/plain_with-license-file_1.5.xml.bin b/tests/_data/snapshots/environment/plain_with-license-file_1.5.xml.bin index 0dc1b63d..5c5345a5 100644 --- a/tests/_data/snapshots/environment/plain_with-license-file_1.5.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-license-file_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-license-file diff --git a/tests/_data/snapshots/environment/plain_with-license-file_1.6.json.bin b/tests/_data/snapshots/environment/plain_with-license-file_1.6.json.bin index 9eb7de34..8da5bfc2 100644 --- a/tests/_data/snapshots/environment/plain_with-license-file_1.6.json.bin +++ b/tests/_data/snapshots/environment/plain_with-license-file_1.6.json.bin @@ -31,14 +31,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/environment/plain_with-license-file_1.6.xml.bin b/tests/_data/snapshots/environment/plain_with-license-file_1.6.xml.bin index 89460f5b..0af5025b 100644 --- a/tests/_data/snapshots/environment/plain_with-license-file_1.6.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-license-file_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-license-file diff --git a/tests/_data/snapshots/environment/plain_with-license-pep639_1.2.json.bin b/tests/_data/snapshots/environment/plain_with-license-pep639_1.2.json.bin index 2f2f678d..07ab2198 100644 --- a/tests/_data/snapshots/environment/plain_with-license-pep639_1.2.json.bin +++ b/tests/_data/snapshots/environment/plain_with-license-pep639_1.2.json.bin @@ -190,7 +190,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/plain_with-license-pep639_1.2.xml.bin b/tests/_data/snapshots/environment/plain_with-license-pep639_1.2.xml.bin index 7fe5601e..f6694405 100644 --- a/tests/_data/snapshots/environment/plain_with-license-pep639_1.2.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-license-pep639_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_with-license-pep639_1.3.json.bin b/tests/_data/snapshots/environment/plain_with-license-pep639_1.3.json.bin index 946efb40..b5fc2710 100644 --- a/tests/_data/snapshots/environment/plain_with-license-pep639_1.3.json.bin +++ b/tests/_data/snapshots/environment/plain_with-license-pep639_1.3.json.bin @@ -196,7 +196,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/plain_with-license-pep639_1.3.xml.bin b/tests/_data/snapshots/environment/plain_with-license-pep639_1.3.xml.bin index a9a7f53e..7332598c 100644 --- a/tests/_data/snapshots/environment/plain_with-license-pep639_1.3.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-license-pep639_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_with-license-pep639_1.4.json.bin b/tests/_data/snapshots/environment/plain_with-license-pep639_1.4.json.bin index 8460caae..565f0e8c 100644 --- a/tests/_data/snapshots/environment/plain_with-license-pep639_1.4.json.bin +++ b/tests/_data/snapshots/environment/plain_with-license-pep639_1.4.json.bin @@ -195,6 +195,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/environment/plain_with-license-pep639_1.4.xml.bin b/tests/_data/snapshots/environment/plain_with-license-pep639_1.4.xml.bin index 15201240..61db29c5 100644 --- a/tests/_data/snapshots/environment/plain_with-license-pep639_1.4.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-license-pep639_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_with-license-pep639_1.5.json.bin b/tests/_data/snapshots/environment/plain_with-license-pep639_1.5.json.bin index 1b8833e1..db5b81a8 100644 --- a/tests/_data/snapshots/environment/plain_with-license-pep639_1.5.json.bin +++ b/tests/_data/snapshots/environment/plain_with-license-pep639_1.5.json.bin @@ -194,14 +194,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/environment/plain_with-license-pep639_1.5.xml.bin b/tests/_data/snapshots/environment/plain_with-license-pep639_1.5.xml.bin index bf911fb1..1e93e3eb 100644 --- a/tests/_data/snapshots/environment/plain_with-license-pep639_1.5.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-license-pep639_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-extras diff --git a/tests/_data/snapshots/environment/plain_with-license-pep639_1.6.json.bin b/tests/_data/snapshots/environment/plain_with-license-pep639_1.6.json.bin index 516b4621..4d3832ff 100644 --- a/tests/_data/snapshots/environment/plain_with-license-pep639_1.6.json.bin +++ b/tests/_data/snapshots/environment/plain_with-license-pep639_1.6.json.bin @@ -201,14 +201,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/environment/plain_with-license-pep639_1.6.xml.bin b/tests/_data/snapshots/environment/plain_with-license-pep639_1.6.xml.bin index 6089decd..5c97bd7c 100644 --- a/tests/_data/snapshots/environment/plain_with-license-pep639_1.6.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-license-pep639_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-extras diff --git a/tests/_data/snapshots/environment/plain_with-license-text_1.2.json.bin b/tests/_data/snapshots/environment/plain_with-license-text_1.2.json.bin index 56683c7f..14ac614b 100644 --- a/tests/_data/snapshots/environment/plain_with-license-text_1.2.json.bin +++ b/tests/_data/snapshots/environment/plain_with-license-text_1.2.json.bin @@ -106,7 +106,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/plain_with-license-text_1.2.xml.bin b/tests/_data/snapshots/environment/plain_with-license-text_1.2.xml.bin index bb207cb6..a8cff13d 100644 --- a/tests/_data/snapshots/environment/plain_with-license-text_1.2.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-license-text_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_with-license-text_1.3.json.bin b/tests/_data/snapshots/environment/plain_with-license-text_1.3.json.bin index fb9a12f9..ff26e876 100644 --- a/tests/_data/snapshots/environment/plain_with-license-text_1.3.json.bin +++ b/tests/_data/snapshots/environment/plain_with-license-text_1.3.json.bin @@ -130,7 +130,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/plain_with-license-text_1.3.xml.bin b/tests/_data/snapshots/environment/plain_with-license-text_1.3.xml.bin index bab72695..feface8a 100644 --- a/tests/_data/snapshots/environment/plain_with-license-text_1.3.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-license-text_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_with-license-text_1.4.json.bin b/tests/_data/snapshots/environment/plain_with-license-text_1.4.json.bin index 969721e3..01f58531 100644 --- a/tests/_data/snapshots/environment/plain_with-license-text_1.4.json.bin +++ b/tests/_data/snapshots/environment/plain_with-license-text_1.4.json.bin @@ -129,6 +129,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/environment/plain_with-license-text_1.4.xml.bin b/tests/_data/snapshots/environment/plain_with-license-text_1.4.xml.bin index c4ca4f86..96c29808 100644 --- a/tests/_data/snapshots/environment/plain_with-license-text_1.4.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-license-text_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_with-license-text_1.5.json.bin b/tests/_data/snapshots/environment/plain_with-license-text_1.5.json.bin index ab848066..3ddaa8d0 100644 --- a/tests/_data/snapshots/environment/plain_with-license-text_1.5.json.bin +++ b/tests/_data/snapshots/environment/plain_with-license-text_1.5.json.bin @@ -128,14 +128,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/environment/plain_with-license-text_1.5.xml.bin b/tests/_data/snapshots/environment/plain_with-license-text_1.5.xml.bin index d56840b9..96f4f29f 100644 --- a/tests/_data/snapshots/environment/plain_with-license-text_1.5.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-license-text_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-license-text diff --git a/tests/_data/snapshots/environment/plain_with-license-text_1.6.json.bin b/tests/_data/snapshots/environment/plain_with-license-text_1.6.json.bin index 74303268..01f249ed 100644 --- a/tests/_data/snapshots/environment/plain_with-license-text_1.6.json.bin +++ b/tests/_data/snapshots/environment/plain_with-license-text_1.6.json.bin @@ -133,14 +133,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/environment/plain_with-license-text_1.6.xml.bin b/tests/_data/snapshots/environment/plain_with-license-text_1.6.xml.bin index 61dd69d2..a0d73953 100644 --- a/tests/_data/snapshots/environment/plain_with-license-text_1.6.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-license-text_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-license-text diff --git a/tests/_data/snapshots/environment/plain_with-urls_1.2.json.bin b/tests/_data/snapshots/environment/plain_with-urls_1.2.json.bin index 1464717f..106c7a15 100644 --- a/tests/_data/snapshots/environment/plain_with-urls_1.2.json.bin +++ b/tests/_data/snapshots/environment/plain_with-urls_1.2.json.bin @@ -169,7 +169,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/plain_with-urls_1.2.xml.bin b/tests/_data/snapshots/environment/plain_with-urls_1.2.xml.bin index 489e45f6..27120966 100644 --- a/tests/_data/snapshots/environment/plain_with-urls_1.2.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-urls_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/plain_with-urls_1.3.json.bin b/tests/_data/snapshots/environment/plain_with-urls_1.3.json.bin index 9429c24c..a41f22dc 100644 --- a/tests/_data/snapshots/environment/plain_with-urls_1.3.json.bin +++ b/tests/_data/snapshots/environment/plain_with-urls_1.3.json.bin @@ -34,14 +34,6 @@ ], "name": "packaging", "properties": [ - { - "name": "cdx:poetry:package:source:vcs:commit_id", - "value": "b3a5d7d68991c040615d5345bb55f61de53ba176" - }, - { - "name": "cdx:poetry:package:source:vcs:requested_revision", - "value": "23.2" - }, { "name": "cdx:python:package:source:vcs:commit_id", "value": "b3a5d7d68991c040615d5345bb55f61de53ba176" @@ -211,7 +203,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/plain_with-urls_1.3.xml.bin b/tests/_data/snapshots/environment/plain_with-urls_1.3.xml.bin index aed0badc..cdd63909 100644 --- a/tests/_data/snapshots/environment/plain_with-urls_1.3.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-urls_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing @@ -51,8 +51,6 @@ - b3a5d7d68991c040615d5345bb55f61de53ba176 - 23.2 b3a5d7d68991c040615d5345bb55f61de53ba176 23.2 diff --git a/tests/_data/snapshots/environment/plain_with-urls_1.4.json.bin b/tests/_data/snapshots/environment/plain_with-urls_1.4.json.bin index e345e655..384957f7 100644 --- a/tests/_data/snapshots/environment/plain_with-urls_1.4.json.bin +++ b/tests/_data/snapshots/environment/plain_with-urls_1.4.json.bin @@ -34,14 +34,6 @@ ], "name": "packaging", "properties": [ - { - "name": "cdx:poetry:package:source:vcs:commit_id", - "value": "b3a5d7d68991c040615d5345bb55f61de53ba176" - }, - { - "name": "cdx:poetry:package:source:vcs:requested_revision", - "value": "23.2" - }, { "name": "cdx:python:package:source:vcs:commit_id", "value": "b3a5d7d68991c040615d5345bb55f61de53ba176" @@ -210,6 +202,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/environment/plain_with-urls_1.4.xml.bin b/tests/_data/snapshots/environment/plain_with-urls_1.4.xml.bin index 28b52284..e9e5ecfc 100644 --- a/tests/_data/snapshots/environment/plain_with-urls_1.4.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-urls_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing @@ -78,8 +78,6 @@ - b3a5d7d68991c040615d5345bb55f61de53ba176 - 23.2 b3a5d7d68991c040615d5345bb55f61de53ba176 23.2 diff --git a/tests/_data/snapshots/environment/plain_with-urls_1.5.json.bin b/tests/_data/snapshots/environment/plain_with-urls_1.5.json.bin index e9057aaf..08772f30 100644 --- a/tests/_data/snapshots/environment/plain_with-urls_1.5.json.bin +++ b/tests/_data/snapshots/environment/plain_with-urls_1.5.json.bin @@ -34,14 +34,6 @@ ], "name": "packaging", "properties": [ - { - "name": "cdx:poetry:package:source:vcs:commit_id", - "value": "b3a5d7d68991c040615d5345bb55f61de53ba176" - }, - { - "name": "cdx:poetry:package:source:vcs:requested_revision", - "value": "23.2" - }, { "name": "cdx:python:package:source:vcs:commit_id", "value": "b3a5d7d68991c040615d5345bb55f61de53ba176" @@ -209,14 +201,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/environment/plain_with-urls_1.5.xml.bin b/tests/_data/snapshots/environment/plain_with-urls_1.5.xml.bin index dda892d6..4b12543a 100644 --- a/tests/_data/snapshots/environment/plain_with-urls_1.5.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-urls_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-urls @@ -78,8 +88,6 @@ - b3a5d7d68991c040615d5345bb55f61de53ba176 - 23.2 b3a5d7d68991c040615d5345bb55f61de53ba176 23.2 diff --git a/tests/_data/snapshots/environment/plain_with-urls_1.6.json.bin b/tests/_data/snapshots/environment/plain_with-urls_1.6.json.bin index 26660354..5affcb70 100644 --- a/tests/_data/snapshots/environment/plain_with-urls_1.6.json.bin +++ b/tests/_data/snapshots/environment/plain_with-urls_1.6.json.bin @@ -36,14 +36,6 @@ ], "name": "packaging", "properties": [ - { - "name": "cdx:poetry:package:source:vcs:commit_id", - "value": "b3a5d7d68991c040615d5345bb55f61de53ba176" - }, - { - "name": "cdx:poetry:package:source:vcs:requested_revision", - "value": "23.2" - }, { "name": "cdx:python:package:source:vcs:commit_id", "value": "b3a5d7d68991c040615d5345bb55f61de53ba176" @@ -214,14 +206,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/environment/plain_with-urls_1.6.xml.bin b/tests/_data/snapshots/environment/plain_with-urls_1.6.xml.bin index 1b7efbd2..60600031 100644 --- a/tests/_data/snapshots/environment/plain_with-urls_1.6.xml.bin +++ b/tests/_data/snapshots/environment/plain_with-urls_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-urls @@ -78,8 +88,6 @@ - b3a5d7d68991c040615d5345bb55f61de53ba176 - 23.2 b3a5d7d68991c040615d5345bb55f61de53ba176 23.2 diff --git a/tests/_data/snapshots/environment/texts_with-license-pep639_1.2.json.bin b/tests/_data/snapshots/environment/texts_with-license-pep639_1.2.json.bin index 2f2f678d..07ab2198 100644 --- a/tests/_data/snapshots/environment/texts_with-license-pep639_1.2.json.bin +++ b/tests/_data/snapshots/environment/texts_with-license-pep639_1.2.json.bin @@ -190,7 +190,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/texts_with-license-pep639_1.2.xml.bin b/tests/_data/snapshots/environment/texts_with-license-pep639_1.2.xml.bin index 7fe5601e..f6694405 100644 --- a/tests/_data/snapshots/environment/texts_with-license-pep639_1.2.xml.bin +++ b/tests/_data/snapshots/environment/texts_with-license-pep639_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/texts_with-license-pep639_1.3.json.bin b/tests/_data/snapshots/environment/texts_with-license-pep639_1.3.json.bin index 946efb40..b5fc2710 100644 --- a/tests/_data/snapshots/environment/texts_with-license-pep639_1.3.json.bin +++ b/tests/_data/snapshots/environment/texts_with-license-pep639_1.3.json.bin @@ -196,7 +196,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/environment/texts_with-license-pep639_1.3.xml.bin b/tests/_data/snapshots/environment/texts_with-license-pep639_1.3.xml.bin index a9a7f53e..7332598c 100644 --- a/tests/_data/snapshots/environment/texts_with-license-pep639_1.3.xml.bin +++ b/tests/_data/snapshots/environment/texts_with-license-pep639_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/texts_with-license-pep639_1.4.json.bin b/tests/_data/snapshots/environment/texts_with-license-pep639_1.4.json.bin index 8460caae..565f0e8c 100644 --- a/tests/_data/snapshots/environment/texts_with-license-pep639_1.4.json.bin +++ b/tests/_data/snapshots/environment/texts_with-license-pep639_1.4.json.bin @@ -195,6 +195,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/environment/texts_with-license-pep639_1.4.xml.bin b/tests/_data/snapshots/environment/texts_with-license-pep639_1.4.xml.bin index 15201240..61db29c5 100644 --- a/tests/_data/snapshots/environment/texts_with-license-pep639_1.4.xml.bin +++ b/tests/_data/snapshots/environment/texts_with-license-pep639_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/environment/texts_with-license-pep639_1.5.json.bin b/tests/_data/snapshots/environment/texts_with-license-pep639_1.5.json.bin index 1b8833e1..db5b81a8 100644 --- a/tests/_data/snapshots/environment/texts_with-license-pep639_1.5.json.bin +++ b/tests/_data/snapshots/environment/texts_with-license-pep639_1.5.json.bin @@ -194,14 +194,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/environment/texts_with-license-pep639_1.5.xml.bin b/tests/_data/snapshots/environment/texts_with-license-pep639_1.5.xml.bin index bf911fb1..1e93e3eb 100644 --- a/tests/_data/snapshots/environment/texts_with-license-pep639_1.5.xml.bin +++ b/tests/_data/snapshots/environment/texts_with-license-pep639_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-extras diff --git a/tests/_data/snapshots/environment/texts_with-license-pep639_1.6.json.bin b/tests/_data/snapshots/environment/texts_with-license-pep639_1.6.json.bin index 516b4621..4d3832ff 100644 --- a/tests/_data/snapshots/environment/texts_with-license-pep639_1.6.json.bin +++ b/tests/_data/snapshots/environment/texts_with-license-pep639_1.6.json.bin @@ -201,14 +201,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/environment/texts_with-license-pep639_1.6.xml.bin b/tests/_data/snapshots/environment/texts_with-license-pep639_1.6.xml.bin index 6089decd..5c97bd7c 100644 --- a/tests/_data/snapshots/environment/texts_with-license-pep639_1.6.xml.bin +++ b/tests/_data/snapshots/environment/texts_with-license-pep639_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-extras diff --git a/tests/_data/snapshots/pipenv/plain_category-deps_1.2.json.bin b/tests/_data/snapshots/pipenv/plain_category-deps_1.2.json.bin index 29db2b69..53045085 100644 --- a/tests/_data/snapshots/pipenv/plain_category-deps_1.2.json.bin +++ b/tests/_data/snapshots/pipenv/plain_category-deps_1.2.json.bin @@ -33,7 +33,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/pipenv/plain_category-deps_1.2.xml.bin b/tests/_data/snapshots/pipenv/plain_category-deps_1.2.xml.bin index 8bb75f31..6c6f2368 100644 --- a/tests/_data/snapshots/pipenv/plain_category-deps_1.2.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_category-deps_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/plain_category-deps_1.3.json.bin b/tests/_data/snapshots/pipenv/plain_category-deps_1.3.json.bin index bf5f1400..7e759057 100644 --- a/tests/_data/snapshots/pipenv/plain_category-deps_1.3.json.bin +++ b/tests/_data/snapshots/pipenv/plain_category-deps_1.3.json.bin @@ -55,7 +55,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/pipenv/plain_category-deps_1.3.xml.bin b/tests/_data/snapshots/pipenv/plain_category-deps_1.3.xml.bin index 66ddf3f3..00cdaff1 100644 --- a/tests/_data/snapshots/pipenv/plain_category-deps_1.3.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_category-deps_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/plain_category-deps_1.4.json.bin b/tests/_data/snapshots/pipenv/plain_category-deps_1.4.json.bin index 4ab1f8f5..218633bb 100644 --- a/tests/_data/snapshots/pipenv/plain_category-deps_1.4.json.bin +++ b/tests/_data/snapshots/pipenv/plain_category-deps_1.4.json.bin @@ -54,6 +54,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/pipenv/plain_category-deps_1.4.xml.bin b/tests/_data/snapshots/pipenv/plain_category-deps_1.4.xml.bin index f84397a3..63092183 100644 --- a/tests/_data/snapshots/pipenv/plain_category-deps_1.4.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_category-deps_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/plain_category-deps_1.5.json.bin b/tests/_data/snapshots/pipenv/plain_category-deps_1.5.json.bin index 7697d684..530d535c 100644 --- a/tests/_data/snapshots/pipenv/plain_category-deps_1.5.json.bin +++ b/tests/_data/snapshots/pipenv/plain_category-deps_1.5.json.bin @@ -53,14 +53,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/pipenv/plain_category-deps_1.5.xml.bin b/tests/_data/snapshots/pipenv/plain_category-deps_1.5.xml.bin index 5fc396b6..30b52e21 100644 --- a/tests/_data/snapshots/pipenv/plain_category-deps_1.5.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_category-deps_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + category-deps diff --git a/tests/_data/snapshots/pipenv/plain_category-deps_1.6.json.bin b/tests/_data/snapshots/pipenv/plain_category-deps_1.6.json.bin index 2f925cc4..5fa5a89f 100644 --- a/tests/_data/snapshots/pipenv/plain_category-deps_1.6.json.bin +++ b/tests/_data/snapshots/pipenv/plain_category-deps_1.6.json.bin @@ -53,14 +53,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/pipenv/plain_category-deps_1.6.xml.bin b/tests/_data/snapshots/pipenv/plain_category-deps_1.6.xml.bin index c913d861..0de77f29 100644 --- a/tests/_data/snapshots/pipenv/plain_category-deps_1.6.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_category-deps_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + category-deps diff --git a/tests/_data/snapshots/pipenv/plain_default-and-dev_1.2.json.bin b/tests/_data/snapshots/pipenv/plain_default-and-dev_1.2.json.bin index 0e111c17..234443b0 100644 --- a/tests/_data/snapshots/pipenv/plain_default-and-dev_1.2.json.bin +++ b/tests/_data/snapshots/pipenv/plain_default-and-dev_1.2.json.bin @@ -50,7 +50,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/pipenv/plain_default-and-dev_1.2.xml.bin b/tests/_data/snapshots/pipenv/plain_default-and-dev_1.2.xml.bin index 63499151..ac20e8a7 100644 --- a/tests/_data/snapshots/pipenv/plain_default-and-dev_1.2.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_default-and-dev_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/plain_default-and-dev_1.3.json.bin b/tests/_data/snapshots/pipenv/plain_default-and-dev_1.3.json.bin index af4a6d9c..19d633c7 100644 --- a/tests/_data/snapshots/pipenv/plain_default-and-dev_1.3.json.bin +++ b/tests/_data/snapshots/pipenv/plain_default-and-dev_1.3.json.bin @@ -88,7 +88,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/pipenv/plain_default-and-dev_1.3.xml.bin b/tests/_data/snapshots/pipenv/plain_default-and-dev_1.3.xml.bin index 166d4c3e..d4897808 100644 --- a/tests/_data/snapshots/pipenv/plain_default-and-dev_1.3.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_default-and-dev_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/plain_default-and-dev_1.4.json.bin b/tests/_data/snapshots/pipenv/plain_default-and-dev_1.4.json.bin index 3b30cd66..af946e36 100644 --- a/tests/_data/snapshots/pipenv/plain_default-and-dev_1.4.json.bin +++ b/tests/_data/snapshots/pipenv/plain_default-and-dev_1.4.json.bin @@ -87,6 +87,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/pipenv/plain_default-and-dev_1.4.xml.bin b/tests/_data/snapshots/pipenv/plain_default-and-dev_1.4.xml.bin index bbc5eaff..f92d1e7d 100644 --- a/tests/_data/snapshots/pipenv/plain_default-and-dev_1.4.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_default-and-dev_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/plain_default-and-dev_1.5.json.bin b/tests/_data/snapshots/pipenv/plain_default-and-dev_1.5.json.bin index 3cfb9c32..b1e5a703 100644 --- a/tests/_data/snapshots/pipenv/plain_default-and-dev_1.5.json.bin +++ b/tests/_data/snapshots/pipenv/plain_default-and-dev_1.5.json.bin @@ -86,14 +86,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/pipenv/plain_default-and-dev_1.5.xml.bin b/tests/_data/snapshots/pipenv/plain_default-and-dev_1.5.xml.bin index b263c7c2..5be0aa94 100644 --- a/tests/_data/snapshots/pipenv/plain_default-and-dev_1.5.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_default-and-dev_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + default-and-dev diff --git a/tests/_data/snapshots/pipenv/plain_default-and-dev_1.6.json.bin b/tests/_data/snapshots/pipenv/plain_default-and-dev_1.6.json.bin index 0cb9c670..48c90fbb 100644 --- a/tests/_data/snapshots/pipenv/plain_default-and-dev_1.6.json.bin +++ b/tests/_data/snapshots/pipenv/plain_default-and-dev_1.6.json.bin @@ -86,14 +86,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/pipenv/plain_default-and-dev_1.6.xml.bin b/tests/_data/snapshots/pipenv/plain_default-and-dev_1.6.xml.bin index b9ed026f..43b54086 100644 --- a/tests/_data/snapshots/pipenv/plain_default-and-dev_1.6.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_default-and-dev_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + default-and-dev diff --git a/tests/_data/snapshots/pipenv/plain_editable-self_1.2.json.bin b/tests/_data/snapshots/pipenv/plain_editable-self_1.2.json.bin index acc0bc18..fbfc1445 100644 --- a/tests/_data/snapshots/pipenv/plain_editable-self_1.2.json.bin +++ b/tests/_data/snapshots/pipenv/plain_editable-self_1.2.json.bin @@ -14,7 +14,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/pipenv/plain_editable-self_1.2.xml.bin b/tests/_data/snapshots/pipenv/plain_editable-self_1.2.xml.bin index 914a56f6..c48d9e83 100644 --- a/tests/_data/snapshots/pipenv/plain_editable-self_1.2.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_editable-self_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/plain_editable-self_1.3.json.bin b/tests/_data/snapshots/pipenv/plain_editable-self_1.3.json.bin index ff13d796..cba63306 100644 --- a/tests/_data/snapshots/pipenv/plain_editable-self_1.3.json.bin +++ b/tests/_data/snapshots/pipenv/plain_editable-self_1.3.json.bin @@ -26,7 +26,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/pipenv/plain_editable-self_1.3.xml.bin b/tests/_data/snapshots/pipenv/plain_editable-self_1.3.xml.bin index f549a582..67d75d4a 100644 --- a/tests/_data/snapshots/pipenv/plain_editable-self_1.3.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_editable-self_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/plain_editable-self_1.4.json.bin b/tests/_data/snapshots/pipenv/plain_editable-self_1.4.json.bin index 1bd3f8a4..cbf1f78f 100644 --- a/tests/_data/snapshots/pipenv/plain_editable-self_1.4.json.bin +++ b/tests/_data/snapshots/pipenv/plain_editable-self_1.4.json.bin @@ -25,6 +25,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/pipenv/plain_editable-self_1.4.xml.bin b/tests/_data/snapshots/pipenv/plain_editable-self_1.4.xml.bin index 695555b5..5e465b09 100644 --- a/tests/_data/snapshots/pipenv/plain_editable-self_1.4.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_editable-self_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/plain_editable-self_1.5.json.bin b/tests/_data/snapshots/pipenv/plain_editable-self_1.5.json.bin index b587a645..c9e433e6 100644 --- a/tests/_data/snapshots/pipenv/plain_editable-self_1.5.json.bin +++ b/tests/_data/snapshots/pipenv/plain_editable-self_1.5.json.bin @@ -24,14 +24,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/pipenv/plain_editable-self_1.5.xml.bin b/tests/_data/snapshots/pipenv/plain_editable-self_1.5.xml.bin index 2324e763..06b8c6a2 100644 --- a/tests/_data/snapshots/pipenv/plain_editable-self_1.5.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_editable-self_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + editable-self diff --git a/tests/_data/snapshots/pipenv/plain_editable-self_1.6.json.bin b/tests/_data/snapshots/pipenv/plain_editable-self_1.6.json.bin index 5e076cbd..fc1983cf 100644 --- a/tests/_data/snapshots/pipenv/plain_editable-self_1.6.json.bin +++ b/tests/_data/snapshots/pipenv/plain_editable-self_1.6.json.bin @@ -24,14 +24,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/pipenv/plain_editable-self_1.6.xml.bin b/tests/_data/snapshots/pipenv/plain_editable-self_1.6.xml.bin index 4fde0c39..b97ea001 100644 --- a/tests/_data/snapshots/pipenv/plain_editable-self_1.6.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_editable-self_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + editable-self diff --git a/tests/_data/snapshots/pipenv/plain_local_1.2.json.bin b/tests/_data/snapshots/pipenv/plain_local_1.2.json.bin index b2a62add..f46d43a5 100644 --- a/tests/_data/snapshots/pipenv/plain_local_1.2.json.bin +++ b/tests/_data/snapshots/pipenv/plain_local_1.2.json.bin @@ -64,7 +64,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/pipenv/plain_local_1.2.xml.bin b/tests/_data/snapshots/pipenv/plain_local_1.2.xml.bin index f520d6c9..cd29abc0 100644 --- a/tests/_data/snapshots/pipenv/plain_local_1.2.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_local_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/plain_local_1.3.json.bin b/tests/_data/snapshots/pipenv/plain_local_1.3.json.bin index 2b17976e..9edeb9bb 100644 --- a/tests/_data/snapshots/pipenv/plain_local_1.3.json.bin +++ b/tests/_data/snapshots/pipenv/plain_local_1.3.json.bin @@ -100,7 +100,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/pipenv/plain_local_1.3.xml.bin b/tests/_data/snapshots/pipenv/plain_local_1.3.xml.bin index 990af727..9115ff8b 100644 --- a/tests/_data/snapshots/pipenv/plain_local_1.3.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_local_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/plain_local_1.4.json.bin b/tests/_data/snapshots/pipenv/plain_local_1.4.json.bin index ef125263..69ce89e1 100644 --- a/tests/_data/snapshots/pipenv/plain_local_1.4.json.bin +++ b/tests/_data/snapshots/pipenv/plain_local_1.4.json.bin @@ -96,6 +96,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/pipenv/plain_local_1.4.xml.bin b/tests/_data/snapshots/pipenv/plain_local_1.4.xml.bin index 8a9e27a0..c91b655c 100644 --- a/tests/_data/snapshots/pipenv/plain_local_1.4.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_local_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/plain_local_1.5.json.bin b/tests/_data/snapshots/pipenv/plain_local_1.5.json.bin index 43c61ebd..3feb1a0c 100644 --- a/tests/_data/snapshots/pipenv/plain_local_1.5.json.bin +++ b/tests/_data/snapshots/pipenv/plain_local_1.5.json.bin @@ -95,14 +95,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/pipenv/plain_local_1.5.xml.bin b/tests/_data/snapshots/pipenv/plain_local_1.5.xml.bin index fcf732d9..4a4f290f 100644 --- a/tests/_data/snapshots/pipenv/plain_local_1.5.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_local_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + local diff --git a/tests/_data/snapshots/pipenv/plain_local_1.6.json.bin b/tests/_data/snapshots/pipenv/plain_local_1.6.json.bin index 8d4d7bac..1a73a078 100644 --- a/tests/_data/snapshots/pipenv/plain_local_1.6.json.bin +++ b/tests/_data/snapshots/pipenv/plain_local_1.6.json.bin @@ -95,14 +95,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/pipenv/plain_local_1.6.xml.bin b/tests/_data/snapshots/pipenv/plain_local_1.6.xml.bin index c1d0cc24..5e23a0ee 100644 --- a/tests/_data/snapshots/pipenv/plain_local_1.6.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_local_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + local diff --git a/tests/_data/snapshots/pipenv/plain_no-deps_1.2.json.bin b/tests/_data/snapshots/pipenv/plain_no-deps_1.2.json.bin index 6de193b1..f7ab17f1 100644 --- a/tests/_data/snapshots/pipenv/plain_no-deps_1.2.json.bin +++ b/tests/_data/snapshots/pipenv/plain_no-deps_1.2.json.bin @@ -51,7 +51,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/pipenv/plain_no-deps_1.2.xml.bin b/tests/_data/snapshots/pipenv/plain_no-deps_1.2.xml.bin index a982f421..5c6c1fc0 100644 --- a/tests/_data/snapshots/pipenv/plain_no-deps_1.2.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_no-deps_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/plain_no-deps_1.3.json.bin b/tests/_data/snapshots/pipenv/plain_no-deps_1.3.json.bin index 4922946d..3cfa3a05 100644 --- a/tests/_data/snapshots/pipenv/plain_no-deps_1.3.json.bin +++ b/tests/_data/snapshots/pipenv/plain_no-deps_1.3.json.bin @@ -57,7 +57,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/pipenv/plain_no-deps_1.3.xml.bin b/tests/_data/snapshots/pipenv/plain_no-deps_1.3.xml.bin index f70c1e34..c326a1fb 100644 --- a/tests/_data/snapshots/pipenv/plain_no-deps_1.3.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_no-deps_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/plain_no-deps_1.4.json.bin b/tests/_data/snapshots/pipenv/plain_no-deps_1.4.json.bin index 354ca1e5..9c91dd7a 100644 --- a/tests/_data/snapshots/pipenv/plain_no-deps_1.4.json.bin +++ b/tests/_data/snapshots/pipenv/plain_no-deps_1.4.json.bin @@ -56,6 +56,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/pipenv/plain_no-deps_1.4.xml.bin b/tests/_data/snapshots/pipenv/plain_no-deps_1.4.xml.bin index e0d55c55..374af51d 100644 --- a/tests/_data/snapshots/pipenv/plain_no-deps_1.4.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_no-deps_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/plain_no-deps_1.5.json.bin b/tests/_data/snapshots/pipenv/plain_no-deps_1.5.json.bin index e246c19d..5445bead 100644 --- a/tests/_data/snapshots/pipenv/plain_no-deps_1.5.json.bin +++ b/tests/_data/snapshots/pipenv/plain_no-deps_1.5.json.bin @@ -55,14 +55,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/pipenv/plain_no-deps_1.5.xml.bin b/tests/_data/snapshots/pipenv/plain_no-deps_1.5.xml.bin index d4d39154..c08c97e1 100644 --- a/tests/_data/snapshots/pipenv/plain_no-deps_1.5.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_no-deps_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + no-deps diff --git a/tests/_data/snapshots/pipenv/plain_no-deps_1.6.json.bin b/tests/_data/snapshots/pipenv/plain_no-deps_1.6.json.bin index 60631689..4dba1ef2 100644 --- a/tests/_data/snapshots/pipenv/plain_no-deps_1.6.json.bin +++ b/tests/_data/snapshots/pipenv/plain_no-deps_1.6.json.bin @@ -56,14 +56,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/pipenv/plain_no-deps_1.6.xml.bin b/tests/_data/snapshots/pipenv/plain_no-deps_1.6.xml.bin index 8081bd9d..aa980c04 100644 --- a/tests/_data/snapshots/pipenv/plain_no-deps_1.6.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_no-deps_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + no-deps diff --git a/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.2.json.bin b/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.2.json.bin index c4c0b9ad..f2933a79 100644 --- a/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.2.json.bin +++ b/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.2.json.bin @@ -67,7 +67,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.2.xml.bin b/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.2.xml.bin index c3eb34cb..2ad4df62 100644 --- a/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.2.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.3.json.bin b/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.3.json.bin index 268e3669..57fa1812 100644 --- a/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.3.json.bin +++ b/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.3.json.bin @@ -317,7 +317,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.3.xml.bin b/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.3.xml.bin index b7e88b80..7981bf02 100644 --- a/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.3.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.4.json.bin b/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.4.json.bin index 25c9cced..895a5dfe 100644 --- a/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.4.json.bin +++ b/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.4.json.bin @@ -316,6 +316,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.4.xml.bin b/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.4.xml.bin index b7511100..4f427b2e 100644 --- a/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.4.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.5.json.bin b/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.5.json.bin index 2b6a9f4a..b33bdff3 100644 --- a/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.5.json.bin +++ b/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.5.json.bin @@ -315,14 +315,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.5.xml.bin b/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.5.xml.bin index eea28adf..d9b233ea 100644 --- a/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.5.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + normalize-packagename diff --git a/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.6.json.bin b/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.6.json.bin index c99c322e..9930a55c 100644 --- a/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.6.json.bin +++ b/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.6.json.bin @@ -315,14 +315,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.6.xml.bin b/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.6.xml.bin index e752cdfc..871a538d 100644 --- a/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.6.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_normalize-packagename_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + normalize-packagename diff --git a/tests/_data/snapshots/pipenv/plain_private-packages_1.2.json.bin b/tests/_data/snapshots/pipenv/plain_private-packages_1.2.json.bin index 9a5d62fb..da5b99a9 100644 --- a/tests/_data/snapshots/pipenv/plain_private-packages_1.2.json.bin +++ b/tests/_data/snapshots/pipenv/plain_private-packages_1.2.json.bin @@ -67,7 +67,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/pipenv/plain_private-packages_1.2.xml.bin b/tests/_data/snapshots/pipenv/plain_private-packages_1.2.xml.bin index b0886c84..f3fd1392 100644 --- a/tests/_data/snapshots/pipenv/plain_private-packages_1.2.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_private-packages_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/plain_private-packages_1.3.json.bin b/tests/_data/snapshots/pipenv/plain_private-packages_1.3.json.bin index 7bd93b67..c87e3653 100644 --- a/tests/_data/snapshots/pipenv/plain_private-packages_1.3.json.bin +++ b/tests/_data/snapshots/pipenv/plain_private-packages_1.3.json.bin @@ -257,7 +257,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/pipenv/plain_private-packages_1.3.xml.bin b/tests/_data/snapshots/pipenv/plain_private-packages_1.3.xml.bin index 15cdc4d7..e145c697 100644 --- a/tests/_data/snapshots/pipenv/plain_private-packages_1.3.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_private-packages_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/plain_private-packages_1.4.json.bin b/tests/_data/snapshots/pipenv/plain_private-packages_1.4.json.bin index f995c8ac..7ac99aee 100644 --- a/tests/_data/snapshots/pipenv/plain_private-packages_1.4.json.bin +++ b/tests/_data/snapshots/pipenv/plain_private-packages_1.4.json.bin @@ -255,6 +255,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/pipenv/plain_private-packages_1.4.xml.bin b/tests/_data/snapshots/pipenv/plain_private-packages_1.4.xml.bin index 39542fdf..9351a78a 100644 --- a/tests/_data/snapshots/pipenv/plain_private-packages_1.4.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_private-packages_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/plain_private-packages_1.5.json.bin b/tests/_data/snapshots/pipenv/plain_private-packages_1.5.json.bin index 6d4ff3ef..b94ed393 100644 --- a/tests/_data/snapshots/pipenv/plain_private-packages_1.5.json.bin +++ b/tests/_data/snapshots/pipenv/plain_private-packages_1.5.json.bin @@ -254,14 +254,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/pipenv/plain_private-packages_1.5.xml.bin b/tests/_data/snapshots/pipenv/plain_private-packages_1.5.xml.bin index 5626503a..133a05fc 100644 --- a/tests/_data/snapshots/pipenv/plain_private-packages_1.5.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_private-packages_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + private-packges diff --git a/tests/_data/snapshots/pipenv/plain_private-packages_1.6.json.bin b/tests/_data/snapshots/pipenv/plain_private-packages_1.6.json.bin index 0e34cb60..7635ed9d 100644 --- a/tests/_data/snapshots/pipenv/plain_private-packages_1.6.json.bin +++ b/tests/_data/snapshots/pipenv/plain_private-packages_1.6.json.bin @@ -254,14 +254,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/pipenv/plain_private-packages_1.6.xml.bin b/tests/_data/snapshots/pipenv/plain_private-packages_1.6.xml.bin index 1f5eb47b..7ced2226 100644 --- a/tests/_data/snapshots/pipenv/plain_private-packages_1.6.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_private-packages_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + private-packges diff --git a/tests/_data/snapshots/pipenv/plain_with-extras_1.2.json.bin b/tests/_data/snapshots/pipenv/plain_with-extras_1.2.json.bin index 702fba85..73a9f7e2 100644 --- a/tests/_data/snapshots/pipenv/plain_with-extras_1.2.json.bin +++ b/tests/_data/snapshots/pipenv/plain_with-extras_1.2.json.bin @@ -441,7 +441,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/pipenv/plain_with-extras_1.2.xml.bin b/tests/_data/snapshots/pipenv/plain_with-extras_1.2.xml.bin index fdd001ee..ca9bd385 100644 --- a/tests/_data/snapshots/pipenv/plain_with-extras_1.2.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_with-extras_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/plain_with-extras_1.3.json.bin b/tests/_data/snapshots/pipenv/plain_with-extras_1.3.json.bin index 462fac4e..ee9f79a8 100644 --- a/tests/_data/snapshots/pipenv/plain_with-extras_1.3.json.bin +++ b/tests/_data/snapshots/pipenv/plain_with-extras_1.3.json.bin @@ -1611,7 +1611,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/pipenv/plain_with-extras_1.3.xml.bin b/tests/_data/snapshots/pipenv/plain_with-extras_1.3.xml.bin index 96211627..30b33194 100644 --- a/tests/_data/snapshots/pipenv/plain_with-extras_1.3.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_with-extras_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/plain_with-extras_1.4.json.bin b/tests/_data/snapshots/pipenv/plain_with-extras_1.4.json.bin index 6f50e4ee..ee97a719 100644 --- a/tests/_data/snapshots/pipenv/plain_with-extras_1.4.json.bin +++ b/tests/_data/snapshots/pipenv/plain_with-extras_1.4.json.bin @@ -1610,6 +1610,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/pipenv/plain_with-extras_1.4.xml.bin b/tests/_data/snapshots/pipenv/plain_with-extras_1.4.xml.bin index fa6de8b6..ccafeee6 100644 --- a/tests/_data/snapshots/pipenv/plain_with-extras_1.4.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_with-extras_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/plain_with-extras_1.5.json.bin b/tests/_data/snapshots/pipenv/plain_with-extras_1.5.json.bin index 581961b0..f09cf9cc 100644 --- a/tests/_data/snapshots/pipenv/plain_with-extras_1.5.json.bin +++ b/tests/_data/snapshots/pipenv/plain_with-extras_1.5.json.bin @@ -1609,14 +1609,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/pipenv/plain_with-extras_1.5.xml.bin b/tests/_data/snapshots/pipenv/plain_with-extras_1.5.xml.bin index 18ba1d2d..3eae373b 100644 --- a/tests/_data/snapshots/pipenv/plain_with-extras_1.5.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_with-extras_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-extras diff --git a/tests/_data/snapshots/pipenv/plain_with-extras_1.6.json.bin b/tests/_data/snapshots/pipenv/plain_with-extras_1.6.json.bin index 176fb925..c7fde1ff 100644 --- a/tests/_data/snapshots/pipenv/plain_with-extras_1.6.json.bin +++ b/tests/_data/snapshots/pipenv/plain_with-extras_1.6.json.bin @@ -1609,14 +1609,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/pipenv/plain_with-extras_1.6.xml.bin b/tests/_data/snapshots/pipenv/plain_with-extras_1.6.xml.bin index bcea4ae9..f42156a4 100644 --- a/tests/_data/snapshots/pipenv/plain_with-extras_1.6.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_with-extras_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-extras diff --git a/tests/_data/snapshots/pipenv/plain_with-urls_1.2.json.bin b/tests/_data/snapshots/pipenv/plain_with-urls_1.2.json.bin index b1c819b1..2f866973 100644 --- a/tests/_data/snapshots/pipenv/plain_with-urls_1.2.json.bin +++ b/tests/_data/snapshots/pipenv/plain_with-urls_1.2.json.bin @@ -135,7 +135,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/pipenv/plain_with-urls_1.2.xml.bin b/tests/_data/snapshots/pipenv/plain_with-urls_1.2.xml.bin index 52f5e33b..ff40c2d1 100644 --- a/tests/_data/snapshots/pipenv/plain_with-urls_1.2.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_with-urls_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/plain_with-urls_1.3.json.bin b/tests/_data/snapshots/pipenv/plain_with-urls_1.3.json.bin index 75b7bd2c..47c76c70 100644 --- a/tests/_data/snapshots/pipenv/plain_with-urls_1.3.json.bin +++ b/tests/_data/snapshots/pipenv/plain_with-urls_1.3.json.bin @@ -565,7 +565,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/pipenv/plain_with-urls_1.3.xml.bin b/tests/_data/snapshots/pipenv/plain_with-urls_1.3.xml.bin index 98cfb39b..ffc3eb6e 100644 --- a/tests/_data/snapshots/pipenv/plain_with-urls_1.3.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_with-urls_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/plain_with-urls_1.4.json.bin b/tests/_data/snapshots/pipenv/plain_with-urls_1.4.json.bin index 48e8e488..1d626b2e 100644 --- a/tests/_data/snapshots/pipenv/plain_with-urls_1.4.json.bin +++ b/tests/_data/snapshots/pipenv/plain_with-urls_1.4.json.bin @@ -560,6 +560,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/pipenv/plain_with-urls_1.4.xml.bin b/tests/_data/snapshots/pipenv/plain_with-urls_1.4.xml.bin index 3107fa74..4036524c 100644 --- a/tests/_data/snapshots/pipenv/plain_with-urls_1.4.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_with-urls_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/plain_with-urls_1.5.json.bin b/tests/_data/snapshots/pipenv/plain_with-urls_1.5.json.bin index cad1041d..ad5e0c09 100644 --- a/tests/_data/snapshots/pipenv/plain_with-urls_1.5.json.bin +++ b/tests/_data/snapshots/pipenv/plain_with-urls_1.5.json.bin @@ -559,14 +559,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/pipenv/plain_with-urls_1.5.xml.bin b/tests/_data/snapshots/pipenv/plain_with-urls_1.5.xml.bin index c137954b..9dfce4af 100644 --- a/tests/_data/snapshots/pipenv/plain_with-urls_1.5.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_with-urls_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-urls diff --git a/tests/_data/snapshots/pipenv/plain_with-urls_1.6.json.bin b/tests/_data/snapshots/pipenv/plain_with-urls_1.6.json.bin index 02ad92c3..848ea55d 100644 --- a/tests/_data/snapshots/pipenv/plain_with-urls_1.6.json.bin +++ b/tests/_data/snapshots/pipenv/plain_with-urls_1.6.json.bin @@ -559,14 +559,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/pipenv/plain_with-urls_1.6.xml.bin b/tests/_data/snapshots/pipenv/plain_with-urls_1.6.xml.bin index 532d2890..d144ae21 100644 --- a/tests/_data/snapshots/pipenv/plain_with-urls_1.6.xml.bin +++ b/tests/_data/snapshots/pipenv/plain_with-urls_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-urls diff --git a/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.2.json.bin b/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.2.json.bin index 96980c92..106b86a2 100644 --- a/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.2.json.bin +++ b/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.2.json.bin @@ -57,7 +57,7 @@ "metadata": { "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.2.xml.bin b/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.2.xml.bin index 1d141c57..59ae3df2 100644 --- a/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.2.xml.bin +++ b/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.3.json.bin b/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.3.json.bin index 79ec9fa5..16d37be6 100644 --- a/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.3.json.bin +++ b/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.3.json.bin @@ -247,7 +247,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.3.xml.bin b/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.3.xml.bin index 0443a3f4..31ba484f 100644 --- a/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.3.xml.bin +++ b/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.4.json.bin b/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.4.json.bin index 56eca7f7..7e7ff071 100644 --- a/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.4.json.bin +++ b/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.4.json.bin @@ -245,6 +245,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.4.xml.bin b/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.4.xml.bin index 238bd01b..9deadf5a 100644 --- a/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.4.xml.bin +++ b/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.5.json.bin b/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.5.json.bin index bf1a61b0..59bb3cfb 100644 --- a/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.5.json.bin +++ b/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.5.json.bin @@ -244,14 +244,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.5.xml.bin b/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.5.xml.bin index e99a90d8..ac2c76c7 100644 --- a/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.5.xml.bin +++ b/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + true diff --git a/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.6.json.bin b/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.6.json.bin index 2abeebf8..bbc78062 100644 --- a/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.6.json.bin +++ b/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.6.json.bin @@ -244,14 +244,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.6.xml.bin b/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.6.xml.bin index 49cd5f40..7d9402d8 100644 --- a/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.6.xml.bin +++ b/tests/_data/snapshots/pipenv/pypi-mirror_private-packages_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + true diff --git a/tests/_data/snapshots/pipenv/some-categories_category-deps_1.2.json.bin b/tests/_data/snapshots/pipenv/some-categories_category-deps_1.2.json.bin index 9f24c8d3..78c7969f 100644 --- a/tests/_data/snapshots/pipenv/some-categories_category-deps_1.2.json.bin +++ b/tests/_data/snapshots/pipenv/some-categories_category-deps_1.2.json.bin @@ -142,7 +142,7 @@ "metadata": { "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/pipenv/some-categories_category-deps_1.2.xml.bin b/tests/_data/snapshots/pipenv/some-categories_category-deps_1.2.xml.bin index 6e2744f7..fda50aaa 100644 --- a/tests/_data/snapshots/pipenv/some-categories_category-deps_1.2.xml.bin +++ b/tests/_data/snapshots/pipenv/some-categories_category-deps_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/some-categories_category-deps_1.3.json.bin b/tests/_data/snapshots/pipenv/some-categories_category-deps_1.3.json.bin index d6e23efd..2ce86266 100644 --- a/tests/_data/snapshots/pipenv/some-categories_category-deps_1.3.json.bin +++ b/tests/_data/snapshots/pipenv/some-categories_category-deps_1.3.json.bin @@ -280,7 +280,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/pipenv/some-categories_category-deps_1.3.xml.bin b/tests/_data/snapshots/pipenv/some-categories_category-deps_1.3.xml.bin index 784cefbd..b6f9cfe9 100644 --- a/tests/_data/snapshots/pipenv/some-categories_category-deps_1.3.xml.bin +++ b/tests/_data/snapshots/pipenv/some-categories_category-deps_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/some-categories_category-deps_1.4.json.bin b/tests/_data/snapshots/pipenv/some-categories_category-deps_1.4.json.bin index a78ebf22..d5eb44ee 100644 --- a/tests/_data/snapshots/pipenv/some-categories_category-deps_1.4.json.bin +++ b/tests/_data/snapshots/pipenv/some-categories_category-deps_1.4.json.bin @@ -279,6 +279,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/pipenv/some-categories_category-deps_1.4.xml.bin b/tests/_data/snapshots/pipenv/some-categories_category-deps_1.4.xml.bin index d8f78199..2ccb8b03 100644 --- a/tests/_data/snapshots/pipenv/some-categories_category-deps_1.4.xml.bin +++ b/tests/_data/snapshots/pipenv/some-categories_category-deps_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/some-categories_category-deps_1.5.json.bin b/tests/_data/snapshots/pipenv/some-categories_category-deps_1.5.json.bin index 7d64ee96..f01cd89e 100644 --- a/tests/_data/snapshots/pipenv/some-categories_category-deps_1.5.json.bin +++ b/tests/_data/snapshots/pipenv/some-categories_category-deps_1.5.json.bin @@ -278,14 +278,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/pipenv/some-categories_category-deps_1.5.xml.bin b/tests/_data/snapshots/pipenv/some-categories_category-deps_1.5.xml.bin index 52d4bb4b..e917398f 100644 --- a/tests/_data/snapshots/pipenv/some-categories_category-deps_1.5.xml.bin +++ b/tests/_data/snapshots/pipenv/some-categories_category-deps_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + true diff --git a/tests/_data/snapshots/pipenv/some-categories_category-deps_1.6.json.bin b/tests/_data/snapshots/pipenv/some-categories_category-deps_1.6.json.bin index be16f47c..ddb893d8 100644 --- a/tests/_data/snapshots/pipenv/some-categories_category-deps_1.6.json.bin +++ b/tests/_data/snapshots/pipenv/some-categories_category-deps_1.6.json.bin @@ -278,14 +278,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/pipenv/some-categories_category-deps_1.6.xml.bin b/tests/_data/snapshots/pipenv/some-categories_category-deps_1.6.xml.bin index 40a774ba..d37180b1 100644 --- a/tests/_data/snapshots/pipenv/some-categories_category-deps_1.6.xml.bin +++ b/tests/_data/snapshots/pipenv/some-categories_category-deps_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + true diff --git a/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.2.json.bin b/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.2.json.bin index affd82b1..40cba5bd 100644 --- a/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.2.json.bin +++ b/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.2.json.bin @@ -125,7 +125,7 @@ "metadata": { "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.2.xml.bin b/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.2.xml.bin index dc016405..1376a560 100644 --- a/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.2.xml.bin +++ b/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.3.json.bin b/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.3.json.bin index 209e8cb1..0a88905f 100644 --- a/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.3.json.bin +++ b/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.3.json.bin @@ -243,7 +243,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.3.xml.bin b/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.3.xml.bin index be7b125e..64de1765 100644 --- a/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.3.xml.bin +++ b/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.4.json.bin b/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.4.json.bin index e0b64e60..316baa53 100644 --- a/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.4.json.bin +++ b/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.4.json.bin @@ -242,6 +242,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.4.xml.bin b/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.4.xml.bin index 1eb8df70..8cc6edbc 100644 --- a/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.4.xml.bin +++ b/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.5.json.bin b/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.5.json.bin index 908c84e2..8cecd9dc 100644 --- a/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.5.json.bin +++ b/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.5.json.bin @@ -241,14 +241,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.5.xml.bin b/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.5.xml.bin index 6fb5cd5d..c67fedea 100644 --- a/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.5.xml.bin +++ b/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + true diff --git a/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.6.json.bin b/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.6.json.bin index 7e35baea..5005754a 100644 --- a/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.6.json.bin +++ b/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.6.json.bin @@ -241,14 +241,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.6.xml.bin b/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.6.xml.bin index 792cc3f9..142956e5 100644 --- a/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.6.xml.bin +++ b/tests/_data/snapshots/pipenv/with-dev_default-and-dev_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + true diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.2.json.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.2.json.bin index 9fa9ff65..348ef0e2 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.2.json.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.2.json.bin @@ -115,7 +115,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.2.xml.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.2.xml.bin index 19802b19..e5a2a801 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.2.xml.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.3.json.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.3.json.bin index b2c46da2..9c6558a2 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.3.json.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.3.json.bin @@ -177,7 +177,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.3.xml.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.3.xml.bin index c244f88f..5f771125 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.3.xml.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.4.json.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.4.json.bin index 9d2c8300..3f54577c 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.4.json.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.4.json.bin @@ -176,6 +176,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.4.xml.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.4.xml.bin index 613527a0..0a28bae3 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.4.xml.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.5.json.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.5.json.bin index 913113e4..ea26dd08 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.5.json.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.5.json.bin @@ -175,14 +175,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.5.xml.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.5.xml.bin index 181a1f4a..aa9ad436 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.5.xml.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-extras diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.6.json.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.6.json.bin index 3e990a95..206cb463 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.6.json.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.6.json.bin @@ -175,14 +175,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.6.xml.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.6.xml.bin index 759fc50b..c6e38789 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.6.xml.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock10_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-extras diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.2.json.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.2.json.bin index f9f876b3..56dd1a68 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.2.json.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.2.json.bin @@ -1122,7 +1122,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.2.xml.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.2.xml.bin index c8224de0..8aff0645 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.2.xml.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.3.json.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.3.json.bin index c6f3eedd..c3c67041 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.3.json.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.3.json.bin @@ -2124,7 +2124,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.3.xml.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.3.xml.bin index f6bbeb3e..82b97792 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.3.xml.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.4.json.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.4.json.bin index 04eeeac3..85612d06 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.4.json.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.4.json.bin @@ -2123,6 +2123,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.4.xml.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.4.xml.bin index 8f1401ef..33b153e8 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.4.xml.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.5.json.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.5.json.bin index db2452cd..9c67f3d6 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.5.json.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.5.json.bin @@ -2122,14 +2122,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.5.xml.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.5.xml.bin index 9dd62f6d..3177a7f3 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.5.xml.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-extras diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.6.json.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.6.json.bin index d96ee702..f94a4edf 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.6.json.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.6.json.bin @@ -2122,14 +2122,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.6.xml.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.6.xml.bin index 560d8b43..cfd56ce2 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.6.xml.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock11_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-extras diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.2.json.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.2.json.bin index 2a8d2398..0732df65 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.2.json.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.2.json.bin @@ -1680,7 +1680,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.2.xml.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.2.xml.bin index 300bf5ad..58d2a696 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.2.xml.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.3.json.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.3.json.bin index a6d6fd0d..065fe09c 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.3.json.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.3.json.bin @@ -3170,7 +3170,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.3.xml.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.3.xml.bin index d93b0190..7cab6f77 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.3.xml.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.4.json.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.4.json.bin index 6eaa1df7..58d3ca22 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.4.json.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.4.json.bin @@ -3169,6 +3169,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.4.xml.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.4.xml.bin index 82c9034b..c719ad2a 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.4.xml.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.5.json.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.5.json.bin index 740ee9f9..f1c1d97b 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.5.json.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.5.json.bin @@ -3168,14 +3168,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.5.xml.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.5.xml.bin index 177793b8..0a78625b 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.5.xml.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.5.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-extras diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.6.json.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.6.json.bin index 515fd603..88c23d18 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.6.json.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.6.json.bin @@ -3168,14 +3168,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.6.xml.bin b/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.6.xml.bin index 547263e5..df469de7 100644 --- a/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.6.xml.bin +++ b/tests/_data/snapshots/poetry/all-extras_with-extras_lock20_1.6.xml.bin @@ -2,43 +2,53 @@ - - CycloneDX - cyclonedx-bom - thisVersion-testing - - - https://github.com/CycloneDX/cyclonedx-python/actions - - - https://pypi.org/project/cyclonedx-bom/ - - - https://cyclonedx-bom-tool.readthedocs.io/ - - - https://github.com/CycloneDX/cyclonedx-python/issues - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE - - - https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md - - - https://github.com/CycloneDX/cyclonedx-python/ - - - https://github.com/CycloneDX/cyclonedx-python/#readme - - - - - CycloneDX - cyclonedx-python-lib - libVersion-testing - - + + + CycloneDX + cyclonedx-py + thisVersion-testing + CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments + + + Apache-2.0 + + + + + https://github.com/CycloneDX/cyclonedx-python/actions + + + https://pypi.org/project/cyclonedx-bom/ + + + https://cyclonedx-bom-tool.readthedocs.io/ + + + https://github.com/CycloneDX/cyclonedx-python/issues + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE + + + https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md + + + https://github.com/CycloneDX/cyclonedx-python/ + + + https://github.com/CycloneDX/cyclonedx-python/#readme + + + + + CycloneDX + cyclonedx-python-lib + libVersion-testing + + + + + with-extras diff --git a/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.2.json.bin b/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.2.json.bin index c4ed24b7..e59540e3 100644 --- a/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.2.json.bin +++ b/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.2.json.bin @@ -42,7 +42,7 @@ }, "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.2.xml.bin b/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.2.xml.bin index 50e031a6..9f5b73f0 100644 --- a/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.2.xml.bin +++ b/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.2.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.3.json.bin b/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.3.json.bin index ab8c21a2..db7c61f1 100644 --- a/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.3.json.bin +++ b/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.3.json.bin @@ -66,7 +66,7 @@ ], "tools": [ { - "name": "cyclonedx-bom", + "name": "cyclonedx-py", "vendor": "CycloneDX", "version": "thisVersion-testing" }, diff --git a/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.3.xml.bin b/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.3.xml.bin index 546a4a19..a6c23702 100644 --- a/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.3.xml.bin +++ b/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.3.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.4.json.bin b/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.4.json.bin index 35e48f2f..e4590fe0 100644 --- a/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.4.json.bin +++ b/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.4.json.bin @@ -65,6 +65,45 @@ } ], "tools": [ + { + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "name": "cyclonedx-py", + "vendor": "CycloneDX", + "version": "thisVersion-testing" + }, { "externalReferences": [ ], "name": "cyclonedx-python-lib", diff --git a/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.4.xml.bin b/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.4.xml.bin index 05f80dfb..391fe83d 100644 --- a/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.4.xml.bin +++ b/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.4.xml.bin @@ -4,7 +4,7 @@ CycloneDX - cyclonedx-bom + cyclonedx-py thisVersion-testing diff --git a/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.5.json.bin b/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.5.json.bin index 3a00590e..9fa3e6de 100644 --- a/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.5.json.bin +++ b/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.5.json.bin @@ -64,14 +64,67 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.5.schema.json", diff --git a/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.5.xml.bin b/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.5.xml.bin index d04755d2..28f188d4 100644 --- a/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.5.xml.bin +++ b/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.5.xml.bin @@ -2,43 +2,53 @@ - - + diff --git a/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.6.json.bin b/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.6.json.bin index fe05bd28..f2b229d1 100644 --- a/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.6.json.bin +++ b/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.6.json.bin @@ -64,14 +64,68 @@ "value": "true" } ], - "tools": [ - { - "externalReferences": [ ], - "name": "cyclonedx-python-lib", - "vendor": "CycloneDX", - "version": "libVersion-testing" - } - ] + "tools": { + "components": [ + { + "description": "CycloneDX Software Bill of Materials (SBOM) generator for Python projects and environments", + "externalReferences": [ + { + "type": "build-system", + "url": "https://github.com/CycloneDX/cyclonedx-python/actions" + }, + { + "type": "distribution", + "url": "https://pypi.org/project/cyclonedx-bom/" + }, + { + "type": "documentation", + "url": "https://cyclonedx-bom-tool.readthedocs.io/" + }, + { + "type": "issue-tracker", + "url": "https://github.com/CycloneDX/cyclonedx-python/issues" + }, + { + "type": "license", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/LICENSE" + }, + { + "type": "release-notes", + "url": "https://github.com/CycloneDX/cyclonedx-python/blob/main/CHANGELOG.md" + }, + { + "type": "vcs", + "url": "https://github.com/CycloneDX/cyclonedx-python/" + }, + { + "type": "website", + "url": "https://github.com/CycloneDX/cyclonedx-python/#readme" + } + ], + "group": "CycloneDX", + "licenses": [ + { + "license": { + "acknowledgement": "declared", + "id": "Apache-2.0" + } + } + ], + "name": "cyclonedx-py", + "type": "application", + "version": "thisVersion-testing" + }, + { + "description": "stripped", + "externalReferences": [ ], + "group": "CycloneDX", + "licenses": [ ], + "name": "cyclonedx-python-lib", + "type": "library", + "version": "libVersion-testing" + } + ] + } }, "version": 1, "$schema": "http://cyclonedx.org/schema/bom-1.6.schema.json", diff --git a/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.6.xml.bin b/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.6.xml.bin index cc9e2f48..233c258e 100644 --- a/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.6.xml.bin +++ b/tests/_data/snapshots/poetry/no-dev_group-deps_lock11_1.6.xml.bin @@ -2,43 +2,53 @@