feat(python): add license fields #217
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
knqyf263
reviewed
May 17, 2023
pkg/python/packaging/parse.go
Outdated
Comment on lines
30
to
42
| license := h.Get("License-Expression") | ||
| if license == "" { | ||
| license = h.Get("License") | ||
| } | ||
| if license == "" { | ||
| for _, classifier := range h.Values("Classifier") { | ||
| if strings.HasPrefix(classifier, "License :: ") { | ||
| values := strings.Split(classifier, " :: ") | ||
| license = values[len(values)-1] | ||
| break | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
We may want to flatten the conditions.
Suggested change
| license := h.Get("License-Expression") | |
| if license == "" { | |
| license = h.Get("License") | |
| } | |
| if license == "" { | |
| for _, classifier := range h.Values("Classifier") { | |
| if strings.HasPrefix(classifier, "License :: ") { | |
| values := strings.Split(classifier, " :: ") | |
| license = values[len(values)-1] | |
| break | |
| } | |
| } | |
| } | |
| // "License-Expression" takes precedence as "License" is deprecated. | |
| // cf. https://peps.python.org/pep-0639/#deprecate-license-field | |
| var license string | |
| if l := h.Get("License-Expression"); l != "" { | |
| license = l | |
| else if l := h.Get("License"); l != "" { | |
| license = l | |
| else { | |
| for _, classifier := range h.Values("Classifier") { | |
| if strings.HasPrefix(classifier, "License :: ") { | |
| values := strings.Split(classifier, " :: ") | |
| license = values[len(values)-1] | |
| break | |
| } | |
| } | |
| } |
knqyf263
reviewed
May 17, 2023
pkg/python/packaging/parse.go
Outdated
| Name: h.Get("Name"), | ||
| Version: h.Get("Version"), | ||
| License: license, | ||
| LicenseFile: h.Get("License-File"), |
There was a problem hiding this comment.
It could be a bit hacky, but I'm not keen on adding a new field only for python. What if adding file://license.txt to License if the license is empty?
|
@knqyf263 could you take a look at this PR again? |
7 tasks
rishabh-arya95
added a commit
to LambdaTest/go-dep-parser
that referenced
this pull request
Jun 28, 2023
feat(python): add license fields (aquasecurity#217)
Sq34sy
pushed a commit
to Sq34sy/go-dep-parser
that referenced
this pull request
Jul 28, 2023
Sq34sy
pushed a commit
to Sq34sy/go-dep-parser
that referenced
this pull request
Jul 28, 2023
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.
Licensefield is deprecated and replaced by the newLicense-Expressionfield, and there was addedLicense-Filefield.Read more here PEP 639 – Improving License Clarity with Better Package .
also there are legacy packages that use license classifiers (
Classifierfield), so we have to check it too.