Simplify python env markers #1967
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: Alex Goodman <wagoodman@users.noreply.github.com>
wagoodman
force-pushed
the
simplify-python-env-markers
branch
from
eb2c0e5
to
acf8206
Compare
|
Schema diff for reviewers: # $ 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 10:04:40 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"
}
},
|
Benchmark Test ResultsBenchmark results from the latest changes vs base branch |
kzantow
approved these changes
Jul 27, 2023
This was referenced Jul 31, 2023
Closed
GijsCalis
pushed a commit
to GijsCalis/syft
that referenced
this pull request
Feb 19, 2024
…e#1967) Signed-off-by: Alex Goodman <wagoodman@users.noreply.github.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.
This PR adjusts the python environment markers field in the
PythonRequirementsMetadatato be astringinstead of amap[string]string, thus requiring a breaking change to the JSON schema. Why do this? PEP 496 governs what can be expressed in environment markers. During the initial work it appeared that these could be simple key values (e.g.sys_platform == 'win32'->sys_platform: win32) however the PEP makes clear that these case be arbitrary expressionspython_version < '2.7.9' or (python_version >= '3.0' and python_version < '3.4'). For this reason the data shape has been relaxed to account for this.