Guess unpinned versions in python requirements.txt #1966
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
Signed-off-by: manifestori <ori@manifestcyber.com>
Signed-off-by: manifestori <ori@manifestcyber.com>
…txt-parsing feat: make python requirements.txt parser more inclusive
…ntstxt-parsing Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
…tion Signed-off-by: Alex Goodman <alex.goodman@anchore.com>
Benchmark Test ResultsBenchmark results from the latest changes vs base branch |
wagoodman
force-pushed
the
feat-python-requirementstxt-parsing
branch
from
d1231b4
to
ad3926b
Compare
|
Note: depends on #1967 before reviewing / merging |
…ntstxt-parsing Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
# $ diff -C 2 ./schema/json/schema-9.0.2.json ./schema/json/schema-10.0.0.json
*** ./schema/json/schema-9.0.2.json0.2.jThu Jul 27 08:55:01 2023-10.0.0.json
--- ./schema/json/schema-10.0.0.json Thu Jul 27 11:30:14 2023
***************
*** 1,5 ****
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
! "$id": "anchore.io/schema/syft/json/9.0.2/document",
"$ref": "#/$defs/Document",
"$defs": {
--- 1,5 ----
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
! "$id": "anchore.io/schema/syft/json/10.0.0/document",
"$ref": "#/$defs/Document",
"$defs": {
***************
*** 1621,1630 ****
},
"markers": {
! "patternProperties": {
! ".*": {
! "type": "string"
! }
! },
! "type": "object"
}
},
--- 1621,1625 ----
},
"markers": {
! "type": "string"
}
},
***************
*** 1632,1639 ****
"required": [
"name",
! "extras",
! "versionConstraint",
! "url",
! "markers"
]
},
--- 1627,1631 ----
"required": [
"name",
! "versionConstraint"
]
},
|
wagoodman
added
breaking-change
Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com>
wagoodman
added
the
changelog-ignore
spiffcs
approved these changes
Jul 27, 2023
wagoodman
removed
the
changelog-ignore
This was referenced Jul 31, 2023
This was referenced Aug 1, 2023
Closed
This was referenced Aug 15, 2023
Merged
GijsCalis
pushed a commit
to GijsCalis/syft
that referenced
this pull request
Feb 19, 2024
* feat: python requirements.txt parsing inclusive Signed-off-by: manifestori <ori@manifestcyber.com> * refactor: parseVersion Signed-off-by: manifestori <ori@manifestcyber.com> * add python config for optional requirements version constraint resolution Signed-off-by: Alex Goodman <alex.goodman@anchore.com> * fix tests Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * allow for python requirements metadata to be optional Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> * restore cyclonedx dependency Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> --------- Signed-off-by: manifestori <ori@manifestcyber.com> Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.com> Signed-off-by: Alex Goodman <alex.goodman@anchore.com> Co-authored-by: manifestori <ori@manifestcyber.com>
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.
Expands on #1597 by exposing a new
python.guess-unpinned-requirementsconfiguration, allowing loose requirements to be filled in with the lowest expressible version instead of dropping the package altogether. Note: since this is synthesizing version information this is an opt-in feature.This replaces the v10 schema changes in #1967 since they have not been released yet (a condition specifically allowed in the schema readme). The small change is to allow for some elements to be optional in the requirements metadata (everything except for name and version).