Fix Poetry lock optional dependency parsing - #5295
Open
Mars-60 wants to merge 1 commit into
Open
Conversation
Signed-off-by: Adnan Raza <imadnanraza4@gmail.com>
AyanSinhaMahapatra
requested changes
Sep 1, 2026
AyanSinhaMahapatra
left a comment
AyanSinhaMahapatra
left a comment
Member
There was a problem hiding this comment.
Thanks @Mars-60 see comments for updating the tests, ready to merge otherwise.
| expected_loc = self.get_test_loc('pypi/poetry/univers-poetry.lock-expected.json') | ||
| self.check_packages_data(package, expected_loc, regen=REGEN_TEST_FIXTURES) | ||
|
|
||
| def test_parse_poetry_lock_package_optional(self): |
Member
There was a problem hiding this comment.
Can you use an actual test file and expected results file like in the tests above?
| resolved_package = models.PackageData.from_data(package_data, package_only) | ||
|
|
||
| is_optional = package.get("is_optional") or True | ||
| is_optional = package.get("optional", False) |
| } | ||
|
|
||
| assert dependencies_by_purl['pkg:pypi/required-dep@1.0.0']['is_optional'] is False | ||
| assert dependencies_by_purl['pkg:pypi/optional-dep@2.0.0']['is_optional'] is True |
Member
There was a problem hiding this comment.
No need to parse results and assert specifically, we run whole file results test with a test and an expected file, just check the expected behaviour and results as a whole
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Fixes #5294
Tasks
Run tests locally to check for errors.
Description
PoetryLockHandlerincorrectly reported resolved Poetry lockfile packages as optional even when the package hadoptional = falseinpoetry.lock.The fix maps Poetry's
optionalfield to ScanCode'sis_optionalfield: