feat(python): add license support for requirement.txt files
#6782
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
DmitriyLewen
changed the title
requirement.txt filesrequirement.txt files
knqyf263
reviewed
May 28, 2024
knqyf263
reviewed
May 28, 2024
knqyf263
reviewed
May 28, 2024
knqyf263
reviewed
May 29, 2024
Comment on lines
219
to
244
| sort.Slice(pythonDirs, func(i, j int) bool { | ||
| majorVer1, minorVer1, found1 := strings.Cut(pythonDirs[i], ".") | ||
| majorVer2, minorVer2, found2 := strings.Cut(pythonDirs[j], ".") | ||
|
|
||
| // if one of dir doesn't contain minor version => sort as strings | ||
| if !found1 || !found2 { | ||
| return pythonDirs[i] < pythonDirs[j] | ||
| } | ||
|
|
||
| // Sort major versions as strings | ||
| // e.g. `python2.7` and `python3.10` | ||
| if majorVer1 != majorVer2 { | ||
| return majorVer1 < majorVer2 | ||
| } | ||
|
|
||
| // Convert minor versions | ||
| ver1, err1 := strconv.Atoi(minorVer1) | ||
| ver2, err2 := strconv.Atoi(minorVer2) | ||
|
|
||
| // If we can't convert minor versions => sort as strings | ||
| if err1 != nil || err2 != nil { | ||
| return pythonDirs[i] < pythonDirs[j] | ||
| } | ||
|
|
||
| return ver1 < ver2 | ||
| }) |
There was a problem hiding this comment.
I believe go-version helps.
https://go.dev/play/p/Ytgevsntqr7
There was a problem hiding this comment.
hm... i didn't think about this 👍
Updated in 226b3da
Comment on lines
212
to
217
| var pythonDirs []string | ||
| for _, entry := range entries { | ||
| if entry.IsDir() && strings.HasPrefix(entry.Name(), "python") { | ||
| pythonDirs = append(pythonDirs, entry.Name()) | ||
| } | ||
| } |
There was a problem hiding this comment.
Suggested change
| var pythonDirs []string | |
| for _, entry := range entries { | |
| if entry.IsDir() && strings.HasPrefix(entry.Name(), "python") { | |
| pythonDirs = append(pythonDirs, entry.Name()) | |
| } | |
| } | |
| var pythonVers []version.Version | |
| for _, entry := range entries { | |
| if entry.IsDir() && strings.HasPrefix(entry.Name(), "python") { | |
| ver := strings.TrimPrefix(entry.Name(), "python") | |
| v, err := version.Parse(ver) | |
| if err != nil { | |
| log.Debug("...", log.Err(err)) | |
| continue | |
| } | |
| pythonVers = append(pythonVers, v) | |
| } |
Signed-off-by: knqyf263 <[email protected]>
Signed-off-by: knqyf263 <[email protected]>
Signed-off-by: knqyf263 <[email protected]>
Signed-off-by: knqyf263 <[email protected]>
Signed-off-by: knqyf263 <[email protected]>
knqyf263
approved these changes
May 30, 2024
github-merge-queue bot
pushed a commit
that referenced
this pull request
May 30, 2024
Signed-off-by: knqyf263 <[email protected]> Co-authored-by: knqyf263 <[email protected]>
github-merge-queue
bot
removed this pull request from the merge queue due to failed status checks
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.
Description
Add license support for
requirement.txtfiles.Related issues
Checklist