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.

Sign up for GitHub

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

Jump to bottom

feat(python): add license fields #4722

Merged
merged 4 commits into from
Jul 13, 2023
Merged

feat(python): add license fields #4722

merged 4 commits into from
Jul 13, 2023

Conversation

nikpivkin
Copy link
Contributor

@nikpivkin nikpivkin commented Jun 28, 2023 •
edited
Loading

Description

According to PEP-639 license field is deprecated and replaced by the new License-Expression field, and there was added License-File field.

We left compatibility with the deprecated field, and also added support for new ones.

See #4261

Related PRs

Checklist

  • I've read the guidelines for contributing to this repository.
  • I've followed the conventions in the PR title.
  • I've added tests that prove my fix is effective or that my feature works.
  • I've updated the documentation with the relevant information (if needed).
  • I've added usage information (if the PR introduces new options)
  • I've included a "before" and "after" example to the description (if the PR is a user interface change).

@afdesk afdesk mentioned this pull request Jul 10, 2023
Merged
6 tasks
@nikpivkin nikpivkin mentioned this pull request Jul 12, 2023
Merged
7 tasks
@nikpivkin nikpivkin marked this pull request as ready for review July 12, 2023 08:24
@nikpivkin nikpivkin requested a review from knqyf263 as a code owner July 12, 2023 08:24
@knqyf263
Copy link
Collaborator

@DmitriyLewen Can you please take a look?

DmitriyLewen
DmitriyLewen reviewed Jul 13, 2023
View reviewed changes
Copy link
Contributor

@DmitriyLewen DmitriyLewen 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 think about case, when package hasn't been updated.
Docs say If only the License field is present, such tools SHOULD issue a warning informing users it is deprecated and recommending License-Expression instead.. We need to follow their logic and can only use the new field. But perhaps we want to add some information in python page with link to official docs?

@DmitriyLewen
Copy link
Contributor

Oh... I missed that you kept previous field for backwards compatibility.
Then we don't need to add information to documents because we support both cases.

@knqyf263 knqyf263 added this pull request to the merge queue Jul 13, 2023
Merged via the queue into aquasecurity:main with commit b43a3e6 Jul 13, 2023
@nikpivkin nikpivkin deleted the feat/python-lic-fields branch July 20, 2023 16:06
AnaisUrlichs pushed a commit to AnaisUrlichs/trivy that referenced this pull request Aug 10, 2023
@nikpivkin @AnaisUrlichs
feat(python): add license fields (aquasecurity#4722)
60f20f8 
* bump go-dep-parser

* update tests

* fix testdata
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@DmitriyLewen DmitriyLewen DmitriyLewen approved these changes

@knqyf263 knqyf263 knqyf263 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@nikpivkin @knqyf263 @DmitriyLewen