Skip to content

Commit 26f2500

Browse files
authored
Merge pull request #245 from CycloneDX/feat/add-basic-license-support
Add license information in CycloneDX BOM when using Environment as the source
2 parents 1e46b3d + 5d1f9a7 commit 26f2500

File tree

3 files changed

+19
-13
lines changed

3 files changed

+19
-13
lines changed

README.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
This project provides a runnable Python-based application for generating CycloneDX bill-of-material documents from either:
1616
1. Your current Python Environment
17-
2. Your project's manifest (e.g. `requirements.txt`)
17+
2. Your project's manifest (e.g. `Pipfile.lock`, `poetry.lock` or `requirements.txt`)
1818

1919
The BOM will contain an aggregate of all your current project's dependencies, or those defined by the manifest you supply.
2020

@@ -96,6 +96,9 @@ SBOM Output Configuration:
9696
This will produce the most accurate and complete CycloneDX BOM as it will include all transitive dependencies required
9797
by the packages defined in your project's manifest (think `requriements.txt`).
9898

99+
When using _Environment_ as the source, any license information avaialble from the installed packages will also be
100+
included in the generated CycloneDX BOM.
101+
99102
Simply run:
100103

101104
```
@@ -108,6 +111,9 @@ in XML using the latest schema version `1.3` by default.
108111

109112
### Building CycloneDX from your Manifest
110113

114+
_Note: Manifest scanning limits the amount of information available. Each manifest type contains different information
115+
but all are significantly less complete than scanning your actual Python Environment._
116+
111117
#### Poetry
112118

113119
We support parsing your `poetry.lock` file which should be committed along with your `pyrpoject.toml` and details

poetry.lock

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

pyproject.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ include = [
1616

1717
[tool.poetry.dependencies]
1818
python = "^3.6"
19-
cyclonedx-python-lib = "^0.8.1"
19+
cyclonedx-python-lib = "^0.9.0"
2020

2121
[tool.poetry.dev-dependencies]
2222
tox = "^3.24.3"

0 commit comments

Comments
 (0)