Skip to content

fix(python): Trim the end-of-range suffix for packages from requiremets.txt files #9618

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

Merged
DmitriyLewen merged 8 commits into from
Oct 13, 2025
Merged

fix(python): Trim the end-of-range suffix for packages from requiremets.txt files #9618

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
e5a63eb
fix: Trim the end-of-range suffix when using the --detection-priority…
raghur-orca Oct 8, 2025
b247fa3
Adding a test file
raghur-orca Oct 9, 2025
66335ac
Update pkg/dependency/parser/python/pip/parse.go
raghur-orca Oct 9, 2025
c3b09ef
Update pkg/dependency/parser/python/pip/parse.go
raghur-orca Oct 9, 2025
92cce2c
Update requirements_operator.txt
raghur-orca Oct 9, 2025
346e7b2
Merge branch 'aquasecurity:main' into fix/trim-version-specifier
raghur-orca Oct 9, 2025
80c32bd
Added the suggested changes..
raghur-orca Oct 9, 2025
1d5245b
Fixing Linter Errors in parse_testcase.go
raghur-orca Oct 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions pkg/dependency/parser/python/pip/parse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,10 @@ func (p *Parser) splitLine(line string) []string {
}
for _, sep := range separators {
if result := strings.Split(line, sep); len(result) == 2 {
// Trim the end-of-range suffix. For example, ">=2.31.0,<3" becomes ">=2.31.0".
// In version ranges, only `,` can be used as a separator:
// "The comma (“,”) is equivalent to a logical AND operator" (see PEP 440).
result[1], _, _ = strings.Cut(result[1], ",")
return result
}
}
Expand Down
3 changes: 2 additions & 1 deletion pkg/dependency/parser/python/pip/testdata/requirements_operator.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,4 +4,5 @@ Mopidy-Dirble ~= 1.1 # Compatible release. Same as >= 1.1, == 1.*
Django == 2.3.4
SomeProject ==5.4 ; python_version < '3.8'
numpyNew; sys_platform == 'win32'
numpy >= 3.4.1; sys_platform == 'win32'
numpy >= 3.4.1; sys_platform == 'win32'
requests>=2.31.0,<3 # Minimum version 2.31.0. Trim the end-of-range suffix.