Skip to content

Report packages at top level with file level package_manifests - #2710

Merged
pombredanne merged 9 commits into
developfrom
2098-top-level-packages
Oct 8, 2021
Merged

Report packages at top level with file level package_manifests #2710
pombredanne merged 9 commits into
developfrom
2098-top-level-packages

Conversation

@AyanSinhaMahapatra

@AyanSinhaMahapatra AyanSinhaMahapatra commented Sep 22, 2021

Copy link
Copy Markdown
Member

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 📁

See #2694

Signed-off-by: Ayan Sinha <ayansmahapatra@gmail.com>
@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 <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra
AyanSinhaMahapatra force-pushed the 2098-top-level-packages branch 2 times, most recently from d0d1f8f to 802fe3a Compare September 23, 2021 14:29
Signed-off-by: Ayan Sinha <ayansmahapatra@gmail.com>
@AyanSinhaMahapatra

Copy link
Copy Markdown
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 <ayansmahapatra@gmail.com>
Signed-off-by: Ayan Sinha <ayansmahapatra@gmail.com>
Signed-off-by: Ayan Sinha <ayansmahapatra@gmail.com>
@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

@pombredanne pombredanne left a comment

Copy link
Copy Markdown
Member

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!

Comment thread src/packagedcode/plugin_package.py Outdated
Comment thread src/summarycode/plugin_consolidate.py
Comment thread tests/formattedcode/data/csv/livescan/expected.csv Outdated
Comment thread tests/licensedcode/data/plugin_license/package/package.expected.json Outdated
Comment thread tests/packagedcode/data/plugin/about-package-expected.json
Comment thread src/scancode/api.py Outdated
Comment thread src/summarycode/score.py
Comment thread src/summarycode/summarizer.py
Comment thread src/summarycode/summarizer.py
Comment thread src/summarycode/summarizer.py Outdated

@pombredanne pombredanne left a comment

Copy link
Copy Markdown
Member

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
Copy Markdown
Member Author

@pombredanne changes requested in the review are addressed now.

@pombredanne pombredanne left a comment

Copy link
Copy Markdown
Member

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.

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

Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>
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 <ayansmahapatra@gmail.com>
Signed-off-by: Ayan Sinha Mahapatra <ayansmahapatra@gmail.com>

@pombredanne pombredanne left a comment

Copy link
Copy Markdown
Member

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
Copy Markdown
Member Author

All green now.

@pombredanne pombredanne left a comment

Copy link
Copy Markdown
Member

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