Skip to content

feat: add properties for licenses according to CycloneDX 1.5#947

Merged
jkowalleck merged 1 commit intoCycloneDX:mainfrom
peschuster:fest/schema1.5-license-properties
Mar 17, 2026
Merged

feat: add properties for licenses according to CycloneDX 1.5#947
jkowalleck merged 1 commit intoCycloneDX:mainfrom
peschuster:fest/schema1.5-license-properties

Conversation

@peschuster
Copy link
Contributor

@peschuster peschuster commented Mar 16, 2026

This change adds properties to DisjunctiveLicense according to CycloneDX v1.5

Related to / implements a part of issue #578


AI Tool Disclosure

  • My contribution does not include any AI-generated content
  • My contribution includes AI-generated content, as disclosed below:
    • AI Tools: [e.g. GitHub CoPilot, ChatGPT, JetBrains Junie etc.]
    • LLMs and versions: [e.g. GPT-4.1, Claude Haiku 4.5, Gemini 2.5 Pro etc.]
    • Prompts: [Summarize the key prompts or instructions given to the AI tools]

Affirmation

@peschuster peschuster requested a review from a team as a code owner March 16, 2026 16:35
@read-the-docs-community
Copy link

read-the-docs-community bot commented Mar 16, 2026

Documentation build overview

📚 CycloneDX Python Library | 🛠️ Build #31845166 | 📁 Comparing 7e3018c against latest (71edacf)


🔍 Preview build

Show files changed (2 files in total): 📝 2 modified | ➕ 0 added | ➖ 0 deleted
File Status
genindex.html 📝 modified
autoapi/cyclonedx/model/license/index.html 📝 modified

Copy link
Member

@jkowalleck jkowalleck left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for taking care of this.
there is a thing that needs chaning.

@jkowalleck
Copy link
Member

jkowalleck commented Mar 16, 2026

@peschuster ,
please fill the AI related checkboxes in the PR description.

according to https://github.com/CycloneDX/cyclonedx-python-lib/actions/runs/23154706928/job/67267559075?pr=947,
some code can be optimized. see how pyupgrade can do this for you: https://github.com/CycloneDX/cyclonedx-python-lib/blob/main/CONTRIBUTING.md#code-style

@jkowalleck jkowalleck added the enhancement New feature or request label Mar 16, 2026
@peschuster peschuster force-pushed the fest/schema1.5-license-properties branch from 4258e99 to 8053ebc Compare March 16, 2026 18:09
@peschuster
Copy link
Contributor Author

@peschuster , please fill the AI related checkboxes in the PR description.

according to https://github.com/CycloneDX/cyclonedx-python-lib/actions/runs/23154706928/job/67267559075?pr=947, some code can be optimized. see how pyupgrade can do this for you: https://github.com/CycloneDX/cyclonedx-python-lib/blob/main/CONTRIBUTING.md#code-style

I updated the commit with the changes suggested in the review.

I also checked pyupgrade again and noticed that the command in tox.ini does not work on Windows. This meant that it did not change anything before. However, running pyupgrade with a Windows-specific command worked, and I hope this issue has now been resolved as well.

@peschuster peschuster requested a review from jkowalleck March 16, 2026 18:14
@jkowalleck
Copy link
Member

I also checked pyupgrade again and noticed that the command in tox.ini does not work on Windows. This meant that it did not change anything before. However, running pyupgrade with a Windows-specific command worked, and I hope this issue has now been resolved as well.

fantastic! what was this windows-specific command you used?
Could you open a pullrequest changing the command for windows compatibility?

@jkowalleck
Copy link
Member

there is a flake8 violation: https://github.com/CycloneDX/cyclonedx-python-lib/actions/runs/23158846467/job/67367320116?pr=947#step:6:183

tests/_data/models.py:1088:121: E501 line too long (132 > 120 characters)

could you fix this, too?

Signed-off-by: Peter Schuster <p.schuster@pilz.de>
@peschuster peschuster force-pushed the fest/schema1.5-license-properties branch from 8053ebc to 7e3018c Compare March 17, 2026 14:03
@peschuster
Copy link
Contributor Author

I also checked pyupgrade again and noticed that the command in tox.ini does not work on Windows. This meant that it did not change anything before. However, running pyupgrade with a Windows-specific command worked, and I hope this issue has now been resolved as well.

fantastic! what was this windows-specific command you used? Could you open a pullrequest changing the command for windows compatibility?

I will do that. However, I had to extract the "glob" logic into a separate python script to make it cross platform.

@jkowalleck jkowalleck merged commit 375d209 into CycloneDX:main Mar 17, 2026
45 checks passed
@jkowalleck
Copy link
Member

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

enhancement New feature or request schema 1.5

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants