Skip to content
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

Fix package/dependency creation bugs #2932

Merged
merged 11 commits into from
Apr 30, 2022
Merged

Conversation

AyanSinhaMahapatra
Copy link
Member

@AyanSinhaMahapatra AyanSinhaMahapatra commented Apr 29, 2022

Tasks

  • Reviewed contribution guidelines
  • PR is descriptively titled 📑 and links the original issue above 🔗
  • Tests pass -- look for a green checkbox ✔️ a few minutes after opening your PR
    Run tests locally to check for errors.
  • Commits are in uniquely-named feature branch and has no merge conflicts 📁

JonoYang and others added 4 commits April 28, 2022 18:00
Signed-off-by: Jono Yang <jyang@nexb.com>
Fixes #2928 in pypi and others which were being caused by infinite recursion between the
functions `assign_package_to_parent_tree` and `assign_package_to_resources` because of
improper overriding.

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
Fixes #2911

Do not create top level dependencies in case of dependencies
without purls, these are encountered in pypi requirements
with local paths.

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
Copy link
Member

@pombredanne pombredanne left a comment

Choose a reason for hiding this comment

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

LGTM!
I just have a small comment wrt. https://github.com/nexB/scancode-toolkit/pull/2932/files#r861907921 where subclassing is not needed especially since you call super() which will travel up the class hierarchy and MRO alright

Call resource updating functions directly from models.DatafileHandler
instead of calling super().

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
Copy link
Member Author

@pombredanne updated that.

AyanSinhaMahapatra and others added 5 commits April 29, 2022 21:36
Try and catch failures in top level packages and
dependencies creation, and add them to resource level
`scan_errors`, instead of crashing.

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
with git add --force

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
There is still a pending bug.
See: #2934

Signed-off-by: Philippe Ombredanne <pombredanne@nexb.com>
@pombredanne
Copy link
Member

LGTM. Thanks! merging!

@pombredanne pombredanne merged commit ec9444b into develop Apr 30, 2022
@pombredanne pombredanne deleted the fix-2911-purl-less-deps branch April 30, 2022 06:31
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants