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

Report packages at top level with file level package_manifests #2710

Merged
merged 9 commits into from
Oct 8, 2021

Conversation

AyanSinhaMahapatra
Copy link
Member

@AyanSinhaMahapatra AyanSinhaMahapatra commented Sep 22, 2021

Fixes #2694

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 📁

@AyanSinhaMahapatra AyanSinhaMahapatra changed the title Modify file level attribute packages to package_manifests Rename file level attribute packages to package_manifests Sep 22, 2021
@AyanSinhaMahapatra AyanSinhaMahapatra force-pushed the 2098-top-level-packages branch 4 times, most recently from 8345632 to d609786 Compare September 23, 2021 13:27
Modifies tests and test expectations for the change of
file level attribute `packages` to `package_manifests`.

Signed-off-by: Ayan Sinha <[email protected]>
@AyanSinhaMahapatra AyanSinhaMahapatra force-pushed the 2098-top-level-packages branch 2 times, most recently from d0d1f8f to 802fe3a Compare September 23, 2021 14:29
@AyanSinhaMahapatra
Copy link
Member Author

@pombredanne All green! Ready to review.

Adds `packages` codebase attribute and temporarily populate with
all package manifests detected in the codebase.

Signed-off-by: Ayan Sinha <[email protected]>
@AyanSinhaMahapatra AyanSinhaMahapatra changed the title Rename file level attribute packages to package_manifests Report packages at top level with file level package_manifests Sep 27, 2021
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.

Thanks: see my review in line!

src/packagedcode/plugin_package.py Outdated Show resolved Hide resolved
src/summarycode/plugin_consolidate.py Outdated Show resolved Hide resolved
tests/formattedcode/data/csv/livescan/expected.csv Outdated Show resolved Hide resolved
src/scancode/api.py Outdated Show resolved Hide resolved
src/summarycode/score.py Outdated Show resolved Hide resolved
src/summarycode/summarizer.py Outdated Show resolved Hide resolved
src/summarycode/summarizer.py Outdated Show resolved Hide resolved
src/summarycode/summarizer.py Outdated Show resolved Hide resolved
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.

Also please update the changelog and bump the data version to 2.0
You can hold on for the doc changes, and may have separate issue for the doc to do it at once.

@AyanSinhaMahapatra AyanSinhaMahapatra force-pushed the 2098-top-level-packages branch 2 times, most recently from 7d668cb to c3cbd41 Compare September 29, 2021 13:33
@AyanSinhaMahapatra
Copy link
Member Author

@pombredanne changes requested in the review are addressed now.

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.

Thank you for making the changes,
Some extra things for your review before we can merge.

CHANGELOG.rst Outdated Show resolved Hide resolved
src/scancode/api.py Outdated Show resolved Hide resolved
Restores previously made changes in summarycode, and deprecates
package API with a warning, and adds other small bugfixes.

Signed-off-by: Ayan Sinha Mahapatra <[email protected]>
Package_manifests were not being collected when there was
a single file in the codebase, this fixes the bug and regenerates tests.

Signed-off-by: Ayan Sinha <[email protected]>
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.

(The previous comment was made on the wrong PR )

@AyanSinhaMahapatra
Copy link
Member Author

All green now.

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... merging: thank you!

@pombredanne pombredanne merged commit c09309f into develop Oct 8, 2021
@pombredanne pombredanne deleted the 2098-top-level-packages branch October 8, 2021 06:56
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.

Files model updates: Rename the current file-level packages to package_manifests.
2 participants