Fix misc package scanning bugs #4073
Merged
Conversation
This file contains 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
AyanSinhaMahapatra
force-pushed
the
fix-package-scan-bugs
branch
3 times, most recently
from
5fce14d to
5f62b34
Compare
AyanSinhaMahapatra
changed the title
AyanSinhaMahapatra
force-pushed
the
fix-package-scan-bugs
branch
from
5f62b34 to
7454fab
Compare
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
AyanSinhaMahapatra
force-pushed
the
fix-package-scan-bugs
branch
from
7454fab to
a98327e
Compare
pombredanne
reviewed
Jan 6, 2025
| @@ -14,6 +14,7 @@ | |||
|
|
|||
| from packagedcode import models | |||
| from packagedcode.pypi import BaseDependencyFileHandler | |||
| from dparse2.parser import parse_requirement_line | |||
There was a problem hiding this comment.
Do you really want to use this and not our own pip-requirements-parser?
There was a problem hiding this comment.
This is what we were using previously with dparse, I added some improvements on the function, and this was using parse_requirement_line internally, but pip-requirements-parser would make more sense possibly, I will open a follow up issue on conda to include this. This would be helpful also to parse requirement lines with source repos.
pombredanne
reviewed
Jan 6, 2025
pombredanne
reviewed
Jan 6, 2025
| @@ -107,33 +125,152 @@ def parse(cls, location, package_only=False): | |||
| # u'progressbar2', u'python >=3.6'])]) | |||
| for req in reqs: | |||
| name, _, requirement = req.partition(" ") | |||
| purl = PackageURL(type=cls.default_package_type, name=name) | |||
| version = None | |||
| if requirement.startswith("=="): | |||
There was a problem hiding this comment.
I guess this is OK as a quick fix, but we should steal the code from https://github.com/conda/conda/blob/5eed0193f2acd45b26599af4b71f241fd8666ccd/conda/models/version.py#L52 in the future
pombredanne
approved these changes
Jan 6, 2025
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.
Tasks
Run tests locally to check for errors.