-
-
Notifications
You must be signed in to change notification settings - Fork 90
fix: make pep621 license detections type-aware #920
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Merged
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Manav Gupta <manavg@gmail.com>
jkowalleck
requested changes
Jun 24, 2025
Signed-off-by: Manav Gupta <manavg@gmail.com>
jkowalleck
requested changes
Jun 24, 2025
- Simplified license handling to only process dict (PEP 621) values. - Silently skip string/other types. - Combined assignment and type check for clarity. Signed-off-by: Manav Gupta <manavg@gmail.com>
jkowalleck
requested changes
Jun 24, 2025
…ion/test_utils_pep621.py, and improved test coverage Signed-off-by: Manav Gupta <manavg@gmail.com>
jkowalleck
requested changes
Jun 25, 2025
Signed-off-by: Manav Gupta <manavg@gmail.com>
Signed-off-by: Jan Kowalleck <jan.kowalleck@gmail.com>
Member
|
some CI/CT is failing:
|
Member
|
fixed the still open points in the tests. |
jkowalleck
approved these changes
Jun 26, 2025
Member
|
the fix was released via https://github.com/CycloneDX/cyclonedx-python/releases/tag/v6.1.2 |
2 tasks
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Addresses #915
Description
This PR fixes a bug where an
AttributeErrorwas raised when parsing apyproject.tomlfile with alicensefield specified as a string (per PEP 639), rather than as a table (per PEP 621). The bug occurred because the code assumed the license field was always a dict and attempted to call.get()on a string.Key Changes
project2licensesinpep621.py:licensefield inpyproject.toml.textandfilekeys).Added Unit Tests:
Created
tests/unit/test_pep621.pyto directly testproject2licensesfor:licenseas a string (PEP 639)licenseas a dict withtext(PEP 621)licenseas a dict withfile(PEP 621)Tests cover correct parsing and object creation for all supported license formats.
Test Robustness:
Tests are robust to the behavior of the license factory for unknown license references, checking both id and text fields.
Code Style:
Motivation and Context
AttributeErrorwhen using a PEP 639 license string inpyproject.toml.Checklist
[x] Code style and imports are clean (
pyupgrade,isort,autopep8).[x] All new and existing tests pass.
[x] Commits are signed off (
git commit -s).